fix: removed unsupported portfinder

packages/amplify-appsync-simulator/package.json

@@ -34,6 +34,7 @@
     "cors": "^2.8.5",
     "dataloader": "^2.0.0",
     "express": "^4.17.3",
+    "get-port": "^5.1.1",
     "graphql": "^14.5.8",
     "graphql-iso-date": "^3.6.1",
     "graphql-subscriptions": "^1.1.0",
@@ -48,7 +49,6 @@
     "mqtt-connection": "4.0.0",
     "nanoid": "^3.3.1",
     "pino": "^6.13.0",
-    "portfinder": "^1.0.25",
     "promise-toolbox": "^0.20.0",
     "qlobber": "3.1.0",
     "retimer": "2.0.0",

packages/amplify-appsync-simulator/src/__tests__/server/subscription/websocket-server/server.test.ts

@@ -1,7 +1,7 @@
 import { createServer, Server } from 'http';
 import { URL, URLSearchParams } from 'url';
 import WS from 'ws';
-import portFinder from 'portfinder';
+import getPort from 'get-port';
 import { PubSub } from 'graphql-subscriptions';
 import { parse } from 'graphql';
 
@@ -70,9 +70,8 @@ describe('WebsocketSubscriptionServer', () => {
       { server: httpServer, path: SUBSCRIPTION_PATH },
     );
 
-    serverPort = await portFinder.getPortPromise({
-      startPort: 20001,
-      stopPort: 66666,
+    serverPort = await getPort({
+      port: getPort.makeRange(20001, 65536),
     });
     httpServer.listen(serverPort);
     server.start();

packages/amplify-appsync-simulator/src/server/index.ts

@@ -3,10 +3,10 @@ import { SubscriptionServer } from './subscription';
 import { AmplifyAppSyncSimulator } from '..';
 import { AppSyncSimulatorServerConfig } from '../type-definition';
 import { Server, createServer } from 'http';
-import portFinder from 'portfinder';
 import { fromEvent } from 'promise-toolbox';
 import { address as getLocalIpAddress } from 'ip';
 import { AppSyncSimulatorSubscriptionServer } from './websocket-subscription';
+import getPort from 'get-port';
 
 const BASE_PORT = 8900;
 const MAX_PORT = 9999;
@@ -32,18 +32,14 @@ export class AppSyncSimulatorServer {
     await this._realTimeSubscriptionServer.start();
 
     if (!port) {
-      port = await portFinder.getPortPromise({
-        startPort: BASE_PORT,
-        stopPort: MAX_PORT,
-        port: BASE_PORT,
-      });
+      port = await getPort({
+        port: getPort.makeRange(BASE_PORT, MAX_PORT),
+      })
     } else {
       try {
-        await portFinder.getPortPromise({
-          startPort: port,
-          stopPort: port,
-          port: port,
-        });
+        await getPort({
+          port,
+        })
       } catch (e) {
         throw new Error(`Port ${port} is already in use. Please kill the program using this port and restart Mock`);
       }

packages/amplify-appsync-simulator/src/server/subscription.ts

@@ -5,12 +5,12 @@ import { DocumentNode, ExecutableDefinitionNode, ExecutionResult, FieldNode } fr
 import { createServer as createHTTPServer, Server } from 'http';
 import { address as getLocalIpAddress } from 'ip';
 import { AddressInfo } from 'net';
-import portfinder from 'portfinder';
 import { inspect } from 'util';
 import { AmplifyAppSyncSimulator } from '..';
 import { AppSyncSimulatorServerConfig } from '../type-definition';
 import { MQTTServer } from './subscription/mqtt-server';
 import { WebsocketSubscriptionServer } from './subscription/websocket-server/server';
+import getPort from 'get-port';
 
 const MINUTE = 1000 * 60;
 const CONNECTION_TIMEOUT = 2 * MINUTE; // 2 mins
@@ -64,17 +64,14 @@ export class SubscriptionServer {
 
   async start() {
     if (!this.port) {
-      this.port = await portfinder.getPortPromise({
-        startPort: BASE_PORT,
-        stopPort: MAX_PORT,
-      });
+      this.port = await getPort({
+        port: getPort.makeRange(BASE_PORT, MAX_PORT),
+      })
     } else {
       try {
-        await portfinder.getPortPromise({
-          startPort: this.port,
-          stopPort: this.port,
+        await getPort({
           port: this.port,
-        });
+        })
       } catch (e) {
         throw new Error(`Port ${this.port} is already in use. Please kill the program using this port and restart Mock`);
       }

packages/amplify-dynamodb-simulator/__test__/index.test.js

@@ -91,7 +91,7 @@ describe('emulator operations', () => {
   });
 
   it('should start on specific port', async () => {
-    const port = await require('portfinder').getPortPromise();
+    const port = await require('get-port')();
     const emu = await ddbSimulator.launch({ port });
     emulators.push(emu);
     expect(emu.port).toBe(port);

packages/amplify-dynamodb-simulator/package.json

@@ -32,7 +32,7 @@
   },
   "devDependencies": {
     "download-cli": "^1.1.1",
-    "portfinder": "^1.0.25"
+    "get-port": "^5.1.1"
   },
   "jest": {
     "testEnvironment": "node",

packages/amplify-go-function-runtime-provider/package.json

@@ -27,7 +27,7 @@
     "execa": "^5.1.1",
     "fs-extra": "^8.1.0",
     "glob": "^7.2.0",
-    "portfinder": "^1.0.25",
+    "get-port": "^5.1.1",
     "semver": "^7.3.5",
     "which": "^2.0.2"
   },

packages/amplify-go-function-runtime-provider/src/localinvoke.ts

@@ -1,8 +1,7 @@
 import path from 'path';
 import fs from 'fs-extra';
-import portfinder from 'portfinder';
 import { $TSContext, pathManager } from 'amplify-cli-core';
-
+import getPort from 'get-port';
 import { InvocationRequest } from 'amplify-function-plugin-interface';
 import { executeCommand } from './runtime';
 import { MAIN_SOURCE, MAX_PORT, BASE_PORT, BIN_LOCAL, MAIN_BINARY, MAIN_BINARY_WIN, packageName, relativeShimSrcPath } from './constants';
@@ -68,10 +67,7 @@ export const localInvoke = async (request: InvocationRequest, context: $TSContex
   const localInvoker = await buildLocalInvoker(context);
 
   // Find a free tcp port for the Lambda to launch on
-  const portNumber = await portfinder.getPortPromise({
-    startPort: BASE_PORT,
-    stopPort: MAX_PORT,
-  });
+  const portNumber = await getPort({port: getPort.makeRange(BASE_PORT, MAX_PORT)});
 
   const lambdaExecutableDir = path.join(request.srcRoot, BIN_LOCAL);
   const lambdaExecutablePath = path.join(lambdaExecutableDir, MAIN_BINARY);

yarn.lock

@@ -19906,7 +19906,7 @@ pluralize@8.0.0, pluralize@^8.0.0:
   resolved "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz#1a6fa16a38d12a1901e0320fa017051c539ce3b1"
   integrity sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==
 
-portfinder@^1.0.25, portfinder@^1.0.28:
+portfinder@^1.0.28:
   version "1.0.28"
   resolved "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778"
   integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==