Merge pull request #69 from webxdc/rtn/68

Use next available port

Author: adbenitez

backend/app.ts

@@ -59,8 +59,8 @@ export function createFrontend(
   app.get<{}, Instance[]>("/instances", (req, res) => {
     res.json(instances.list());
   });
-  app.post<{}, Instance>("/instances", (req, res) => {
-    const instance = instances.add();
+  app.post<{}, Instance>("/instances", async (req, res) => {
+    const instance = await instances.add();
     instance.start();
     res.json({
       id: instance.id,

backend/cli.ts

@@ -18,4 +18,4 @@ const program = createProgram({
   },
 });
 
-program.parse();
+program.parseAsync();

backend/dev-cli.ts

@@ -24,4 +24,4 @@ const program = createProgram({
   },
 });
 
-program.parse();
+program.parseAsync();

backend/instance.ts

@@ -1,5 +1,6 @@
 import expressWs from "express-ws";
 import { WebSocket, Server } from "ws";
+import detectPort from "detect-port";
 
 import { ReceivedStatusUpdate } from "@webxdc/types";
 import { createProcessor, IProcessor, WebXdcMulti, OnMessage } from "./message";
@@ -91,12 +92,12 @@ export class Instances {
     });
   }
 
-  add(): Instance {
-    this.currentPort++;
-    const port = this.currentPort;
+  async add(): Promise<Instance> {
+    const port = await detectPort(this.currentPort + 1);
     if (this.instances.has(port)) {
       throw new Error(`Already have Webxdc instance at port: ${port}`);
     }
+    this.currentPort = port;
 
     const instanceUrl = getInstanceUrl(port);
 

backend/program.ts

@@ -43,8 +43,8 @@ export function createProgram(inject: Inject): Command {
     .description(
       "Run webxdc-dev simulator with webxdc from dev server URL, .xdc file or dist directory",
     )
-    .action((location, options) => {
-      run(
+    .action(async (location, options) => {
+      await run(
         location,
         { basePort: options.port, csp: options.csp, verbose: options.verbose },
         inject,

backend/run.ts

@@ -1,3 +1,4 @@
+import detectPort from "detect-port";
 import process from "process";
 import open from "open";
 
@@ -12,13 +13,18 @@ export type Inject = {
   getIndexHtml: () => string;
 };
 
-function actualRun(appInfo: AppInfo, options: Options, inject: Inject): void {
+async function actualRun(
+  appInfo: AppInfo,
+  options: Options,
+  inject: Inject,
+): Promise<void> {
   const { injectFrontend, injectSim, getIndexHtml } = inject;
+  options.basePort = await detectPort(options.basePort);
   const instances = new Instances(appInfo, injectSim, options);
 
   const numberOfInstances = 2;
   for (let i = 0; i < numberOfInstances; i++) {
-    instances.add();
+    await instances.add();
   }
 
   const frontend = createFrontend(
@@ -37,7 +43,11 @@ function actualRun(appInfo: AppInfo, options: Options, inject: Inject): void {
   open("http://localhost:" + options.basePort);
 }
 
-export function run(locationStr: string, options: Options, inject: Inject) {
+export async function run(
+  locationStr: string,
+  options: Options,
+  inject: Inject,
+): Promise<void> {
   let location: Location;
   try {
     location = getLocation(locationStr);
@@ -57,15 +67,14 @@ export function run(locationStr: string, options: Options, inject: Inject) {
 
   console.log("Starting webxdc project in:", locationStr);
 
-  getAppInfo(location)
-    .then((appInfo) => {
-      actualRun(appInfo, options, inject);
-    })
-    .catch((e) => {
-      if (e instanceof AppInfoError) {
-        console.error(e.message);
-        return;
-      }
-      throw e;
-    });
+  try {
+    const appInfo = await getAppInfo(location);
+    await actualRun(appInfo, options, inject);
+  } catch (e) {
+    if (e instanceof AppInfoError) {
+      console.error(e.message);
+      return;
+    }
+    throw e;
+  }
 }

package-lock.json

@@ -83,6 +83,7 @@
     "adm-zip": "^0.5.9",
     "body-parser": "^1.20.0",
     "commander": "^9.3.0",
+    "detect-port": "^2.1.0",
     "express": "^4.18.1",
     "express-ws": "^5.0.2",
     "http-proxy-middleware": "^2.0.6",