@midscene/web 0.16.3 → 0.16.4

package/dist/es/bridge-mode-browser.js

@@ -258,7 +258,7 @@ function sleep(ms) {
 var ChromeExtensionProxyPage = class {
   constructor(forceSameTabNavigation) {
     this.pageType = "chrome-extension-proxy";
-    this.version = "0.16.3";
+    this.version = "0.16.4";
     this.activeTabId = null;
     this.tabIdOfDebuggerAttached = null;
     this.attachingDebugger = null;
@@ -704,7 +704,7 @@ var BridgeClient = class {
       this.socket = ClientIO(this.endpoint, {
         reconnection: false,
         query: {
-          version: "0.16.3"
+          version: "0.16.4"
         }
       });
       const timeout = setTimeout(() => {
@@ -845,7 +845,7 @@ var ExtensionBridgePageBrowserSide = class extends ChromeExtensionProxyPage {
     );
     await this.bridgeClient.connect();
     this.onLogMessage(
-      `Bridge connected, cli-side version v${this.bridgeClient.serverVersion}, browser-side version v${"0.16.3"}`,
+      `Bridge connected, cli-side version v${this.bridgeClient.serverVersion}, browser-side version v${"0.16.4"}`,
       "log"
     );
   }

package/dist/es/bridge-mode.js

@@ -1990,6 +1990,7 @@ var BridgeErrorCodeNoClientConnected = "no-client-connected";
 
 // src/bridge-mode/io-server.ts
 import { logMsg as logMsg2 } from "@midscene/shared/utils";
+import killPort from "kill-port";
 import { Server } from "socket.io";
 var BridgeServer = class {
   constructor(port, onConnect, onDisconnect) {
@@ -2009,7 +2010,11 @@ var BridgeServer = class {
       return `Connection lost, reason: ${this.connectionLostReason}`;
     };
   }
-  async listen(timeout = 3e4) {
+  async listen(opts = {}) {
+    const { timeout = 3e4, forceCloseServer = false } = opts;
+    if (forceCloseServer) {
+      await this.killPort();
+    }
     return new Promise((resolve2, reject) => {
       if (this.listeningTimerFlag) {
         return reject(new Error("already listening"));
@@ -2054,7 +2059,7 @@ var BridgeServer = class {
           this.socket = socket;
           const clientVersion = socket.handshake.query.version;
           logMsg2(
-            `Bridge connected, cli-side version v${"0.16.3"}, browser-side version v${clientVersion}`
+            `Bridge connected, cli-side version v${"0.16.4"}, browser-side version v${clientVersion}`
           );
           socket.on("bridge-call-response" /* CallResponse */, (params) => {
             const id = params.id;
@@ -2085,7 +2090,7 @@ var BridgeServer = class {
           setTimeout(() => {
             this.onConnect?.();
             const payload = {
-              version: "0.16.3"
+              version: "0.16.4"
             };
             socket.emit("bridge-connected" /* Connected */, payload);
             Promise.resolve().then(() => {
@@ -2102,8 +2107,19 @@ var BridgeServer = class {
           reject(e);
         }
       });
+      this.io.on("close", () => {
+        this.close();
+      });
     });
   }
+  async killPort() {
+    if (!this.listeningTimerFlag) {
+      try {
+        await killPort(this.port, "tcp");
+      } catch (e) {
+      }
+    }
+  }
   async triggerCallResponseCallback(id, error, response) {
     const call = this.calls[id];
     if (!call) {
@@ -2173,9 +2189,12 @@ var BridgeServer = class {
 
 // src/bridge-mode/agent-cli-side.ts
 var sleep2 = (ms) => new Promise((resolve2) => setTimeout(resolve2, ms));
-var getBridgePageInCliSide = (timeout) => {
+var getBridgePageInCliSide = (forceCloseServer, timeout) => {
   const server = new BridgeServer(DefaultBridgeServerPort);
-  server.listen(timeout);
+  server.listen({
+    timeout,
+    forceCloseServer
+  });
   const bridgeCaller = (method) => {
     return async (...args) => {
       const response = await server.call(method, args);
@@ -2238,7 +2257,10 @@ var getBridgePageInCliSide = (timeout) => {
 };
 var AgentOverChromeBridge = class extends PageAgent {
   constructor(opts) {
-    const page = getBridgePageInCliSide(opts?.serverListeningTimeout);
+    const page = getBridgePageInCliSide(
+      opts?.forceCloseServer,
+      opts?.serverListeningTimeout
+    );
     super(
       page,
       Object.assign(opts || {}, {