@midscene/web 1.10.4 → 1.10.5-beta-20260714101501.0

package/dist/es/bridge-mode/io-client.mjs

@@ -23,7 +23,7 @@ class BridgeClient {
                     ]
                 } : {},
                 query: {
-                    version: "1.10.4"
+                    version: "1.10.5-beta-20260714101501.0"
                 }
             });
             const timeout = setTimeout(()=>{

package/dist/es/bridge-mode/io-server.mjs

@@ -102,7 +102,7 @@ class BridgeServer {
                     logMsg('one client connected');
                     this.socket = socket;
                     const clientVersion = socket.handshake.query.version;
-                    logMsg(`Bridge connected, cli-side version v1.10.4, browser-side version v${clientVersion}`);
+                    logMsg(`Bridge connected, cli-side version v1.10.5-beta-20260714101501.0, browser-side version v${clientVersion}`);
                     socket.on(BridgeEvent.CallResponse, (params)=>{
                         const id = params.id;
                         const response = params.response;
@@ -126,7 +126,7 @@ class BridgeServer {
                     setTimeout(()=>{
                         this.onConnect?.();
                         const payload = {
-                            version: "1.10.4"
+                            version: "1.10.5-beta-20260714101501.0"
                         };
                         socket.emit(BridgeEvent.Connected, payload);
                         Promise.resolve().then(()=>{

package/dist/es/bridge-mode/io-server.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"bridge-mode/io-server.mjs","sources":["../../../src/bridge-mode/io-server.ts"],"sourcesContent":["import {\n  type IncomingMessage,\n  type ServerResponse,\n  createServer,\n} from 'node:http';\nimport { sleep } from '@midscene/core/utils';\nimport { getDebug } from '@midscene/shared/logger';\nimport { logMsg } from '@midscene/shared/utils';\nimport { Server, type Socket as ServerSocket } from 'socket.io';\nimport { io as ClientIO } from 'socket.io-client';\n\nimport {\n  type BridgeCall,\n  type BridgeCallResponse,\n  BridgeCallTimeout,\n  type BridgeConnectedEventPayload,\n  BridgeErrorCodeNoClientConnected,\n  BridgeEvent,\n  BridgeSignalKill,\n  DefaultBridgeServerPort,\n} from './common';\n\nconst debug = getDebug('web:bridge:io-server');\n\ndeclare const __VERSION__: string;\n\n/**\n * Returns true if the given Origin header value is allowed to connect\n * to the bridge server. Trusted origins are:\n * - No Origin header (local Node.js processes like killRunningServer)\n * - chrome-extension:// origins (the Midscene Chrome extension)\n *\n * Browser pages (https://evil.com, etc.) are rejected to prevent\n * Cross-Site WebSocket Hijacking (CSWSH) attacks.\n */\nfunction isTrustedOrigin(origin: string | undefined): boolean {\n  if (!origin) return true;\n  if (origin.startsWith('chrome-extension://')) return true;\n  return false;\n}\n\nexport const killRunningServer = async (port?: number, host = 'localhost') => {\n  try {\n    const client = ClientIO(`ws://${host}:${port || DefaultBridgeServerPort}`, {\n      query: {\n        [BridgeSignalKill]: 1,\n      },\n    });\n    await sleep(300);\n    await client.close();\n  } catch (e) {\n    debug('failed to kill port: %O', e);\n  }\n};\n\n// ws server, this is where the request is sent\nexport class BridgeServer {\n  private callId = 0;\n  private io: Server | null = null;\n  private socket: ServerSocket | null = null;\n  private listeningTimeoutId: NodeJS.Timeout | null = null;\n  private listeningTimerFlag = false;\n  private connectionTipTimer: NodeJS.Timeout | null = null;\n  public calls: Record<string, BridgeCall> = {};\n\n  private connectionLost = false;\n  private connectionLostReason = '';\n\n  constructor(\n    public host: string,\n    public port: number,\n    public onConnect?: () => void,\n    public onDisconnect?: (reason: string) => void,\n    public closeConflictServer?: boolean,\n  ) {}\n\n  async listen(\n    opts: {\n      timeout?: number | false;\n    } = {},\n  ): Promise<void> {\n    const { timeout = 30000 } = opts;\n\n    if (this.closeConflictServer) {\n      await killRunningServer(this.port, this.host);\n    }\n\n    return new Promise((resolve, reject) => {\n      if (this.listeningTimerFlag) {\n        return reject(new Error('already listening'));\n      }\n      this.listeningTimerFlag = true;\n\n      this.listeningTimeoutId = timeout\n        ? setTimeout(() => {\n            reject(\n              new Error(\n                `no extension connected after ${timeout}ms (${BridgeErrorCodeNoClientConnected})`,\n              ),\n            );\n          }, timeout)\n        : null;\n\n      this.connectionTipTimer =\n        !timeout || timeout > 3000\n          ? setTimeout(() => {\n              logMsg('waiting for bridge to connect...');\n            }, 2000)\n          : null;\n\n      // Create HTTP server — no /bridge-auth endpoint needed since we use\n      // pure Origin checking in the Socket.IO middleware below.\n      const httpServer = createServer(\n        (_req: IncomingMessage, res: ServerResponse) => {\n          res.writeHead(404);\n          res.end();\n        },\n      );\n\n      // Set up HTTP server event listeners FIRST\n      httpServer.once('listening', () => {\n        resolve();\n      });\n\n      httpServer.once('error', (err: Error) => {\n        reject(new Error(`Bridge Listening Error: ${err.message}`));\n      });\n\n      // Start listening BEFORE creating Socket.IO Server\n      // When host is 127.0.0.1 (default), don't specify host to listen on all local interfaces (IPv4 + IPv6)\n      // This ensures localhost resolves correctly in both IPv4 and IPv6 environments\n      if (this.host === '127.0.0.1') {\n        httpServer.listen(this.port);\n      } else {\n        httpServer.listen(this.port, this.host);\n      }\n\n      // Now create Socket.IO Server attached to the already-listening HTTP server\n      this.io = new Server(httpServer, {\n        maxHttpBufferSize: 100 * 1024 * 1024, // 100MB\n        // Increase pingTimeout to tolerate Chrome MV3 Service Worker suspension.\n        // The SW keepalive alarm fires every ~24s; default pingTimeout (20s) may\n        // be too short if the SW is suspended between alarm pings.\n        pingTimeout: 60000,\n      });\n\n      this.io.use((socket, next) => {\n        // Reject connections from untrusted browser origins to prevent\n        // Cross-Site WebSocket Hijacking (CSWSH) and unauthorized kill signals.\n        // The browser automatically sets the Origin header on WebSocket\n        // handshakes, and JavaScript cannot override it.\n        const origin = socket.handshake.headers.origin;\n        if (!isTrustedOrigin(origin)) {\n          debug('connection rejected: untrusted origin=%s', origin);\n          return next(new Error('origin not allowed'));\n        }\n\n        // Allow new connections to replace old ones (reconnection after\n        // extension Stop→Start). If the old socket is already disconnected\n        // or unresponsive, accept the new connection immediately.\n        if (\n          socket.handshake.url.includes(BridgeSignalKill) === false &&\n          this.socket?.connected\n        ) {\n          return next(new Error('server already connected by another client'));\n        }\n        next();\n      });\n\n      this.io.on('connection', (socket) => {\n        // check the connection url\n        const url = socket.handshake.url;\n        if (url.includes(BridgeSignalKill)) {\n          console.warn('kill signal received, closing bridge server');\n          return this.close();\n        }\n\n        this.connectionLost = false;\n        this.connectionLostReason = '';\n        this.listeningTimeoutId && clearTimeout(this.listeningTimeoutId);\n        this.listeningTimeoutId = null;\n        this.connectionTipTimer && clearTimeout(this.connectionTipTimer);\n        this.connectionTipTimer = null;\n        if (this.socket?.connected) {\n          socket.emit(BridgeEvent.Refused);\n          socket.disconnect();\n          logMsg(\n            'refused new connection: server already connected by another client',\n          );\n          return;\n        }\n\n        // Clean up stale old socket if it exists but is no longer connected\n        if (this.socket) {\n          try {\n            this.socket.disconnect();\n          } catch (e) {\n            logMsg(`failed to disconnect stale socket: ${e}`);\n          }\n          this.socket = null;\n        }\n\n        try {\n          logMsg('one client connected');\n          this.socket = socket;\n\n          const clientVersion = socket.handshake.query.version;\n          logMsg(\n            `Bridge connected, cli-side version v${__VERSION__}, browser-side version v${clientVersion}`,\n          );\n\n          socket.on(BridgeEvent.CallResponse, (params: BridgeCallResponse) => {\n            const id = params.id;\n            const response = params.response;\n            const error = params.error;\n\n            this.triggerCallResponseCallback(id, error, response);\n          });\n\n          socket.on('disconnect', (reason: string) => {\n            this.connectionLost = true;\n            this.connectionLostReason = reason;\n            this.socket = null;\n\n            // flush all pending calls as error and clean up completed calls\n            for (const id in this.calls) {\n              const call = this.calls[id];\n\n              if (!call.responseTime) {\n                const errorMessage = this.connectionLostErrorMsg();\n                this.triggerCallResponseCallback(\n                  id,\n                  new Error(errorMessage),\n                  null,\n                );\n              }\n            }\n\n            // Clean up completed calls to prevent memory leaks in long-running sessions\n            for (const id in this.calls) {\n              if (this.calls[id].responseTime) {\n                delete this.calls[id];\n              }\n            }\n\n            this.onDisconnect?.(reason);\n          });\n\n          setTimeout(() => {\n            this.onConnect?.();\n\n            const payload = {\n              version: __VERSION__,\n            } as BridgeConnectedEventPayload;\n            socket.emit(BridgeEvent.Connected, payload);\n            Promise.resolve().then(() => {\n              for (const id in this.calls) {\n                if (this.calls[id].callTime === 0) {\n                  this.emitCall(id);\n                }\n              }\n            });\n          }, 0);\n        } catch (e) {\n          logMsg(`failed to handle connection event: ${e}`);\n        }\n      });\n\n      this.io.on('close', () => {\n        this.close();\n      });\n    });\n  }\n\n  private connectionLostErrorMsg = () => {\n    return `Connection lost, reason: ${this.connectionLostReason}`;\n  };\n\n  private async triggerCallResponseCallback(\n    id: string | number,\n    error: Error | string | null,\n    response: any,\n  ) {\n    const call = this.calls[id];\n    if (!call) {\n      throw new Error(`call ${id} not found`);\n    }\n    // Ensure error is always an Error object (bridge client may send strings)\n    if (error) {\n      call.error =\n        error instanceof Error\n          ? error\n          : new Error(typeof error === 'string' ? error : String(error));\n    } else {\n      call.error = undefined;\n    }\n    call.response = response;\n    call.responseTime = Date.now();\n\n    call.callback(call.error, response);\n  }\n\n  private async emitCall(id: string) {\n    const call = this.calls[id];\n    if (!call) {\n      throw new Error(`call ${id} not found`);\n    }\n\n    if (this.connectionLost) {\n      const message = `Connection lost, reason: ${this.connectionLostReason}`;\n      call.callback(new Error(message), null);\n      return;\n    }\n\n    if (this.socket) {\n      this.socket.emit(BridgeEvent.Call, {\n        id,\n        method: call.method,\n        args: call.args,\n      });\n      call.callTime = Date.now();\n    }\n  }\n\n  async call<T = any>(\n    method: string,\n    args: any[],\n    timeout = BridgeCallTimeout,\n  ): Promise<T> {\n    const id = `${this.callId++}`;\n\n    return new Promise((resolve, reject) => {\n      const timeoutId = setTimeout(() => {\n        logMsg(`bridge call timeout, id=${id}, method=${method}, args=`, args);\n        this.calls[id].error = new Error(\n          `Bridge call timeout after ${timeout}ms: ${method}`,\n        );\n        reject(this.calls[id].error);\n      }, timeout);\n\n      this.calls[id] = {\n        method,\n        args,\n        response: null,\n        callTime: 0,\n        responseTime: 0,\n        callback: (error: Error | undefined, response: any) => {\n          clearTimeout(timeoutId);\n          if (error) {\n            reject(error);\n          } else {\n            resolve(response);\n          }\n        },\n      };\n\n      this.emitCall(id);\n    });\n  }\n\n  // do NOT restart after close\n  async close() {\n    this.listeningTimeoutId && clearTimeout(this.listeningTimeoutId);\n    this.connectionTipTimer && clearTimeout(this.connectionTipTimer);\n    const closeProcess = this.io?.close();\n    this.io = null;\n\n    return closeProcess;\n  }\n}\n"],"names":["debug","getDebug","isTrustedOrigin","origin","killRunningServer","port","host","client","ClientIO","DefaultBridgeServerPort","BridgeSignalKill","sleep","e","BridgeServer","opts","timeout","Promise","resolve","reject","Error","setTimeout","BridgeErrorCodeNoClientConnected","logMsg","httpServer","createServer","_req","res","err","Server","socket","next","url","console","clearTimeout","BridgeEvent","clientVersion","params","id","response","error","reason","call","errorMessage","payload","__VERSION__","String","undefined","Date","message","method","args","BridgeCallTimeout","timeoutId","closeProcess","onConnect","onDisconnect","closeConflictServer"],"mappings":"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"}
+{"version":3,"file":"bridge-mode/io-server.mjs","sources":["../../../src/bridge-mode/io-server.ts"],"sourcesContent":["import {\n  type IncomingMessage,\n  type ServerResponse,\n  createServer,\n} from 'node:http';\nimport { sleep } from '@midscene/core/utils';\nimport { getDebug } from '@midscene/shared/logger';\nimport { logMsg } from '@midscene/shared/utils';\nimport { Server, type Socket as ServerSocket } from 'socket.io';\nimport { io as ClientIO } from 'socket.io-client';\n\nimport {\n  type BridgeCall,\n  type BridgeCallResponse,\n  BridgeCallTimeout,\n  type BridgeConnectedEventPayload,\n  BridgeErrorCodeNoClientConnected,\n  BridgeEvent,\n  BridgeSignalKill,\n  DefaultBridgeServerPort,\n} from './common';\n\nconst debug = getDebug('web:bridge:io-server');\n\ndeclare const __VERSION__: string;\n\n/**\n * Returns true if the given Origin header value is allowed to connect\n * to the bridge server. Trusted origins are:\n * - No Origin header (local Node.js processes like killRunningServer)\n * - chrome-extension:// origins (the Midscene Chrome extension)\n *\n * Browser pages (https://evil.com, etc.) are rejected to prevent\n * Cross-Site WebSocket Hijacking (CSWSH) attacks.\n */\nfunction isTrustedOrigin(origin: string | undefined): boolean {\n  if (!origin) return true;\n  if (origin.startsWith('chrome-extension://')) return true;\n  return false;\n}\n\nexport const killRunningServer = async (port?: number, host = 'localhost') => {\n  try {\n    const client = ClientIO(`ws://${host}:${port || DefaultBridgeServerPort}`, {\n      query: {\n        [BridgeSignalKill]: 1,\n      },\n    });\n    await sleep(300);\n    await client.close();\n  } catch (e) {\n    debug('failed to kill port: %O', e);\n  }\n};\n\n// ws server, this is where the request is sent\nexport class BridgeServer {\n  private callId = 0;\n  private io: Server | null = null;\n  private socket: ServerSocket | null = null;\n  private listeningTimeoutId: NodeJS.Timeout | null = null;\n  private listeningTimerFlag = false;\n  private connectionTipTimer: NodeJS.Timeout | null = null;\n  public calls: Record<string, BridgeCall> = {};\n\n  private connectionLost = false;\n  private connectionLostReason = '';\n\n  constructor(\n    public host: string,\n    public port: number,\n    public onConnect?: () => void,\n    public onDisconnect?: (reason: string) => void,\n    public closeConflictServer?: boolean,\n  ) {}\n\n  async listen(\n    opts: {\n      timeout?: number | false;\n    } = {},\n  ): Promise<void> {\n    const { timeout = 30000 } = opts;\n\n    if (this.closeConflictServer) {\n      await killRunningServer(this.port, this.host);\n    }\n\n    return new Promise((resolve, reject) => {\n      if (this.listeningTimerFlag) {\n        return reject(new Error('already listening'));\n      }\n      this.listeningTimerFlag = true;\n\n      this.listeningTimeoutId = timeout\n        ? setTimeout(() => {\n            reject(\n              new Error(\n                `no extension connected after ${timeout}ms (${BridgeErrorCodeNoClientConnected})`,\n              ),\n            );\n          }, timeout)\n        : null;\n\n      this.connectionTipTimer =\n        !timeout || timeout > 3000\n          ? setTimeout(() => {\n              logMsg('waiting for bridge to connect...');\n            }, 2000)\n          : null;\n\n      // Create HTTP server — no /bridge-auth endpoint needed since we use\n      // pure Origin checking in the Socket.IO middleware below.\n      const httpServer = createServer(\n        (_req: IncomingMessage, res: ServerResponse) => {\n          res.writeHead(404);\n          res.end();\n        },\n      );\n\n      // Set up HTTP server event listeners FIRST\n      httpServer.once('listening', () => {\n        resolve();\n      });\n\n      httpServer.once('error', (err: Error) => {\n        reject(new Error(`Bridge Listening Error: ${err.message}`));\n      });\n\n      // Start listening BEFORE creating Socket.IO Server\n      // When host is 127.0.0.1 (default), don't specify host to listen on all local interfaces (IPv4 + IPv6)\n      // This ensures localhost resolves correctly in both IPv4 and IPv6 environments\n      if (this.host === '127.0.0.1') {\n        httpServer.listen(this.port);\n      } else {\n        httpServer.listen(this.port, this.host);\n      }\n\n      // Now create Socket.IO Server attached to the already-listening HTTP server\n      this.io = new Server(httpServer, {\n        maxHttpBufferSize: 100 * 1024 * 1024, // 100MB\n        // Increase pingTimeout to tolerate Chrome MV3 Service Worker suspension.\n        // The SW keepalive alarm fires every ~24s; default pingTimeout (20s) may\n        // be too short if the SW is suspended between alarm pings.\n        pingTimeout: 60000,\n      });\n\n      this.io.use((socket, next) => {\n        // Reject connections from untrusted browser origins to prevent\n        // Cross-Site WebSocket Hijacking (CSWSH) and unauthorized kill signals.\n        // The browser automatically sets the Origin header on WebSocket\n        // handshakes, and JavaScript cannot override it.\n        const origin = socket.handshake.headers.origin;\n        if (!isTrustedOrigin(origin)) {\n          debug('connection rejected: untrusted origin=%s', origin);\n          return next(new Error('origin not allowed'));\n        }\n\n        // Allow new connections to replace old ones (reconnection after\n        // extension Stop→Start). If the old socket is already disconnected\n        // or unresponsive, accept the new connection immediately.\n        if (\n          socket.handshake.url.includes(BridgeSignalKill) === false &&\n          this.socket?.connected\n        ) {\n          return next(new Error('server already connected by another client'));\n        }\n        next();\n      });\n\n      this.io.on('connection', (socket) => {\n        // check the connection url\n        const url = socket.handshake.url;\n        if (url.includes(BridgeSignalKill)) {\n          console.warn('kill signal received, closing bridge server');\n          return this.close();\n        }\n\n        this.connectionLost = false;\n        this.connectionLostReason = '';\n        this.listeningTimeoutId && clearTimeout(this.listeningTimeoutId);\n        this.listeningTimeoutId = null;\n        this.connectionTipTimer && clearTimeout(this.connectionTipTimer);\n        this.connectionTipTimer = null;\n        if (this.socket?.connected) {\n          socket.emit(BridgeEvent.Refused);\n          socket.disconnect();\n          logMsg(\n            'refused new connection: server already connected by another client',\n          );\n          return;\n        }\n\n        // Clean up stale old socket if it exists but is no longer connected\n        if (this.socket) {\n          try {\n            this.socket.disconnect();\n          } catch (e) {\n            logMsg(`failed to disconnect stale socket: ${e}`);\n          }\n          this.socket = null;\n        }\n\n        try {\n          logMsg('one client connected');\n          this.socket = socket;\n\n          const clientVersion = socket.handshake.query.version;\n          logMsg(\n            `Bridge connected, cli-side version v${__VERSION__}, browser-side version v${clientVersion}`,\n          );\n\n          socket.on(BridgeEvent.CallResponse, (params: BridgeCallResponse) => {\n            const id = params.id;\n            const response = params.response;\n            const error = params.error;\n\n            this.triggerCallResponseCallback(id, error, response);\n          });\n\n          socket.on('disconnect', (reason: string) => {\n            this.connectionLost = true;\n            this.connectionLostReason = reason;\n            this.socket = null;\n\n            // flush all pending calls as error and clean up completed calls\n            for (const id in this.calls) {\n              const call = this.calls[id];\n\n              if (!call.responseTime) {\n                const errorMessage = this.connectionLostErrorMsg();\n                this.triggerCallResponseCallback(\n                  id,\n                  new Error(errorMessage),\n                  null,\n                );\n              }\n            }\n\n            // Clean up completed calls to prevent memory leaks in long-running sessions\n            for (const id in this.calls) {\n              if (this.calls[id].responseTime) {\n                delete this.calls[id];\n              }\n            }\n\n            this.onDisconnect?.(reason);\n          });\n\n          setTimeout(() => {\n            this.onConnect?.();\n\n            const payload = {\n              version: __VERSION__,\n            } as BridgeConnectedEventPayload;\n            socket.emit(BridgeEvent.Connected, payload);\n            Promise.resolve().then(() => {\n              for (const id in this.calls) {\n                if (this.calls[id].callTime === 0) {\n                  this.emitCall(id);\n                }\n              }\n            });\n          }, 0);\n        } catch (e) {\n          logMsg(`failed to handle connection event: ${e}`);\n        }\n      });\n\n      this.io.on('close', () => {\n        this.close();\n      });\n    });\n  }\n\n  private connectionLostErrorMsg = () => {\n    return `Connection lost, reason: ${this.connectionLostReason}`;\n  };\n\n  private async triggerCallResponseCallback(\n    id: string | number,\n    error: Error | string | null,\n    response: any,\n  ) {\n    const call = this.calls[id];\n    if (!call) {\n      throw new Error(`call ${id} not found`);\n    }\n    // Ensure error is always an Error object (bridge client may send strings)\n    if (error) {\n      call.error =\n        error instanceof Error\n          ? error\n          : new Error(typeof error === 'string' ? error : String(error));\n    } else {\n      call.error = undefined;\n    }\n    call.response = response;\n    call.responseTime = Date.now();\n\n    call.callback(call.error, response);\n  }\n\n  private async emitCall(id: string) {\n    const call = this.calls[id];\n    if (!call) {\n      throw new Error(`call ${id} not found`);\n    }\n\n    if (this.connectionLost) {\n      const message = `Connection lost, reason: ${this.connectionLostReason}`;\n      call.callback(new Error(message), null);\n      return;\n    }\n\n    if (this.socket) {\n      this.socket.emit(BridgeEvent.Call, {\n        id,\n        method: call.method,\n        args: call.args,\n      });\n      call.callTime = Date.now();\n    }\n  }\n\n  async call<T = any>(\n    method: string,\n    args: any[],\n    timeout = BridgeCallTimeout,\n  ): Promise<T> {\n    const id = `${this.callId++}`;\n\n    return new Promise((resolve, reject) => {\n      const timeoutId = setTimeout(() => {\n        logMsg(`bridge call timeout, id=${id}, method=${method}, args=`, args);\n        this.calls[id].error = new Error(\n          `Bridge call timeout after ${timeout}ms: ${method}`,\n        );\n        reject(this.calls[id].error);\n      }, timeout);\n\n      this.calls[id] = {\n        method,\n        args,\n        response: null,\n        callTime: 0,\n        responseTime: 0,\n        callback: (error: Error | undefined, response: any) => {\n          clearTimeout(timeoutId);\n          if (error) {\n            reject(error);\n          } else {\n            resolve(response);\n          }\n        },\n      };\n\n      this.emitCall(id);\n    });\n  }\n\n  // do NOT restart after close\n  async close() {\n    this.listeningTimeoutId && clearTimeout(this.listeningTimeoutId);\n    this.connectionTipTimer && clearTimeout(this.connectionTipTimer);\n    const closeProcess = this.io?.close();\n    this.io = null;\n\n    return closeProcess;\n  }\n}\n"],"names":["debug","getDebug","isTrustedOrigin","origin","killRunningServer","port","host","client","ClientIO","DefaultBridgeServerPort","BridgeSignalKill","sleep","e","BridgeServer","opts","timeout","Promise","resolve","reject","Error","setTimeout","BridgeErrorCodeNoClientConnected","logMsg","httpServer","createServer","_req","res","err","Server","socket","next","url","console","clearTimeout","BridgeEvent","clientVersion","params","id","response","error","reason","call","errorMessage","payload","__VERSION__","String","undefined","Date","message","method","args","BridgeCallTimeout","timeoutId","closeProcess","onConnect","onDisconnect","closeConflictServer"],"mappings":"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"}

package/dist/es/bridge-mode/page-browser-side.mjs

@@ -100,7 +100,7 @@ class ExtensionBridgePageBrowserSide extends page {
                 throw new Error('Connection denied by user');
             }
         }
-        this.onLogMessage(`Bridge connected, cli-side version v${this.bridgeClient.serverVersion}, browser-side version v1.10.4`, 'log');
+        this.onLogMessage(`Bridge connected, cli-side version v${this.bridgeClient.serverVersion}, browser-side version v1.10.5-beta-20260714101501.0`, 'log');
     }
     async connect() {
         return await this.setupBridgeClient();

package/dist/es/bridge-mode/page-browser-side.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"bridge-mode/page-browser-side.mjs","sources":["../../../src/bridge-mode/page-browser-side.ts"],"sourcesContent":["import { assert } from '@midscene/shared/utils';\nimport ChromeExtensionProxyPage from '../chrome-extension/page';\nimport type {\n  ChromePageDestroyOptions,\n  KeyboardAction,\n  MouseAction,\n} from '../web-page';\nimport {\n  type BridgeConnectTabOptions,\n  BridgeEvent,\n  DefaultBridgeServerPort,\n  KeyboardEvent,\n  MouseEvent,\n} from './common';\nimport { BridgeClient } from './io-client';\n\ndeclare const __VERSION__: string;\n\nconst NEW_TAB_LOAD_TIMEOUT_MS = 30_000;\n\nfunction isBlankUrl(url: string | undefined): boolean {\n  if (!url) return true;\n  return url === 'about:blank' || url.startsWith('chrome://newtab');\n}\n\n// Wait until the freshly created tab has navigated away from about:blank\n// and reached `status === 'complete'`. Resolves on timeout instead of\n// throwing so callers degrade to the existing lazy-attach behavior.\nfunction waitForTabNavigationComplete(\n  tabId: number,\n  targetUrl: string,\n  timeoutMs = NEW_TAB_LOAD_TIMEOUT_MS,\n): Promise<void> {\n  return new Promise((resolve) => {\n    let settled = false;\n    const finish = () => {\n      if (settled) return;\n      settled = true;\n      try {\n        chrome.tabs.onUpdated.removeListener(onUpdated);\n      } catch {}\n      clearTimeout(timer);\n      resolve();\n    };\n\n    const isReady = (tab: chrome.tabs.Tab | undefined): boolean => {\n      if (!tab) return false;\n      if (tab.status !== 'complete') return false;\n      const currentUrl = tab.url || tab.pendingUrl || '';\n      // Skip the initial about:blank \"complete\" that fires before\n      // the target URL navigation kicks in.\n      if (isBlankUrl(currentUrl) && !isBlankUrl(targetUrl)) return false;\n      return true;\n    };\n\n    const onUpdated = (\n      id: number,\n      _info: chrome.tabs.TabChangeInfo,\n      tab: chrome.tabs.Tab,\n    ) => {\n      if (id !== tabId) return;\n      if (isReady(tab)) finish();\n    };\n\n    chrome.tabs.onUpdated.addListener(onUpdated);\n    const timer = setTimeout(finish, timeoutMs);\n\n    // Handle the race where the tab already finished loading before\n    // we registered the listener.\n    chrome.tabs\n      .get(tabId)\n      .then((tab) => {\n        if (isReady(tab)) finish();\n      })\n      .catch(() => {});\n  });\n}\n\nexport class ExtensionBridgePageBrowserSide extends ChromeExtensionProxyPage {\n  public bridgeClient: BridgeClient | null = null;\n\n  private destroyOptions?: ChromePageDestroyOptions;\n\n  private newlyCreatedTabIds: number[] = [];\n\n  // Connection confirmation state\n  private confirmationPromise: Promise<boolean> | null = null;\n\n  constructor(\n    public serverEndpoint?: string,\n    public onDisconnect: () => void = () => {},\n    public onLogMessage: (\n      message: string,\n      type: 'log' | 'status',\n    ) => void = () => {},\n    forceSameTabNavigation = true,\n    public onConnectionRequest?: () => Promise<boolean>,\n  ) {\n    super(forceSameTabNavigation);\n  }\n\n  private async setupBridgeClient() {\n    const endpoint =\n      this.serverEndpoint || `ws://localhost:${DefaultBridgeServerPort}`;\n\n    // Create confirmation gate BEFORE establishing connection,\n    // so that any calls received immediately after connection are blocked\n    // until user confirms. This prevents a race condition where server-side\n    // queued calls bypass the confirmation dialog.\n    let resolveConfirmationGate: (allowed: boolean) => void = () => {};\n    if (this.onConnectionRequest) {\n      this.confirmationPromise = new Promise<boolean>((resolve) => {\n        resolveConfirmationGate = resolve;\n      });\n    }\n\n    this.bridgeClient = new BridgeClient(\n      endpoint,\n      async (method, args: any[]) => {\n        // Wait for user confirmation before processing any commands\n        if (this.confirmationPromise) {\n          const allowed = await this.confirmationPromise;\n          if (!allowed) {\n            throw new Error('Connection denied by user');\n          }\n        }\n\n        this.onLogMessage(`bridge call from cli side: ${method}`, 'log');\n        if (method === BridgeEvent.ConnectNewTabWithUrl) {\n          return this.connectNewTabWithUrl.apply(\n            this,\n            args as unknown as [string],\n          );\n        }\n\n        if (method === BridgeEvent.GetBrowserTabList) {\n          return this.getBrowserTabList.apply(this, args as any);\n        }\n\n        if (method === BridgeEvent.SetActiveTabId) {\n          return this.setActiveTabId.apply(this, args as any);\n        }\n\n        if (method === BridgeEvent.ConnectCurrentTab) {\n          return this.connectCurrentTab.apply(this, args as any);\n        }\n\n        if (method === BridgeEvent.UpdateAgentStatus) {\n          return this.onLogMessage(args[0] as string, 'status');\n        }\n\n        const tabId = await this.getActiveTabId();\n        if (!tabId || tabId === 0) {\n          throw new Error('no tab is connected');\n        }\n\n        // this.onLogMessage(`calling method: ${method}`);\n\n        if (method.startsWith(MouseEvent.PREFIX)) {\n          const actionName = method.split('.')[1] as keyof MouseAction;\n          if (actionName === 'drag') {\n            return this.mouse[actionName].apply(this.mouse, args as any);\n          }\n          return this.mouse[actionName].apply(this.mouse, args as any);\n        }\n\n        if (method.startsWith(KeyboardEvent.PREFIX)) {\n          const actionName = method.split('.')[1] as keyof KeyboardAction;\n          if (actionName === 'press') {\n            return this.keyboard[actionName].apply(this.keyboard, args as any);\n          }\n          return this.keyboard[actionName].apply(this.keyboard, args as any);\n        }\n\n        if (!this[method as keyof ChromeExtensionProxyPage]) {\n          this.onLogMessage(`method not found: ${method}`, 'log');\n          return undefined;\n        }\n\n        try {\n          // @ts-expect-error\n          const result = await this[method as keyof ChromeExtensionProxyPage](\n            ...args,\n          );\n          return result;\n        } catch (e) {\n          const errorMessage = e instanceof Error ? e.message : 'Unknown error';\n          this.onLogMessage(\n            `Error calling method: ${method}, ${errorMessage}`,\n            'log',\n          );\n          throw new Error(errorMessage, { cause: e });\n        }\n      },\n      // on disconnect\n      () => {\n        return this.destroy();\n      },\n    );\n    await this.bridgeClient.connect();\n\n    // Show confirmation dialog after connection is established\n    if (this.onConnectionRequest) {\n      this.onLogMessage('Waiting for user confirmation...', 'log');\n      const allowed = await this.onConnectionRequest();\n      resolveConfirmationGate(allowed);\n      this.confirmationPromise = null;\n\n      if (!allowed) {\n        this.onLogMessage('Connection denied by user', 'log');\n        this.bridgeClient.disconnect();\n        this.bridgeClient = null;\n        throw new Error('Connection denied by user');\n      }\n    }\n\n    this.onLogMessage(\n      `Bridge connected, cli-side version v${this.bridgeClient.serverVersion}, browser-side version v${__VERSION__}`,\n      'log',\n    );\n  }\n\n  public async connect() {\n    return await this.setupBridgeClient();\n  }\n\n  public async connectNewTabWithUrl(\n    url: string,\n    options: BridgeConnectTabOptions = {\n      forceSameTabNavigation: true,\n    },\n  ) {\n    const tab = await chrome.tabs.create({ url });\n    const tabId = tab.id;\n    assert(tabId, 'failed to get tabId after creating a new tab');\n\n    // new tab\n    this.onLogMessage(`Creating new tab: ${url}`, 'log');\n    this.newlyCreatedTabIds.push(tabId);\n\n    if (options?.forceSameTabNavigation) {\n      this.forceSameTabNavigation = true;\n    }\n\n    // chrome.tabs.create returns immediately with an about:blank target,\n    // then navigates to `url`. If we attach the debugger during that\n    // cross-origin transition Site Isolation will detach it again, leaving\n    // the first CDP command to fail with \"Debugger is not attached to the\n    // tab\". Wait for navigation to settle so the lazy attach lands on a\n    // stable target.\n    await waitForTabNavigationComplete(tabId, url);\n\n    await this.setActiveTabId(tabId);\n  }\n\n  public async connectCurrentTab(\n    options: BridgeConnectTabOptions = {\n      forceSameTabNavigation: true,\n    },\n  ) {\n    const tabs = await chrome.tabs.query({ active: true, currentWindow: true });\n    const tabId = tabs[0]?.id;\n    assert(tabId, 'failed to get tabId');\n\n    this.onLogMessage(`Connected to current tab: ${tabs[0]?.url}`, 'log');\n\n    if (options?.forceSameTabNavigation) {\n      this.forceSameTabNavigation = true;\n    }\n\n    await this.setActiveTabId(tabId);\n  }\n\n  public async setDestroyOptions(options: ChromePageDestroyOptions) {\n    this.destroyOptions = options;\n  }\n\n  async destroy() {\n    if (this.destroyOptions?.closeTab && this.newlyCreatedTabIds.length > 0) {\n      this.onLogMessage('Closing all newly created tabs by bridge...', 'log');\n      for (const tabId of this.newlyCreatedTabIds) {\n        await chrome.tabs.remove(tabId);\n      }\n      this.newlyCreatedTabIds = [];\n    }\n\n    await super.destroy();\n\n    if (this.bridgeClient) {\n      this.bridgeClient.disconnect();\n      this.bridgeClient = null;\n      this.onDisconnect();\n    }\n  }\n}\n"],"names":["NEW_TAB_LOAD_TIMEOUT_MS","isBlankUrl","url","waitForTabNavigationComplete","tabId","targetUrl","timeoutMs","Promise","resolve","settled","finish","chrome","onUpdated","clearTimeout","timer","isReady","tab","currentUrl","id","_info","setTimeout","ExtensionBridgePageBrowserSide","ChromeExtensionProxyPage","endpoint","DefaultBridgeServerPort","resolveConfirmationGate","BridgeClient","method","args","allowed","Error","BridgeEvent","MouseEvent","actionName","KeyboardEvent","result","e","errorMessage","options","assert","tabs","serverEndpoint","onDisconnect","onLogMessage","forceSameTabNavigation","onConnectionRequest"],"mappings":"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"}
+{"version":3,"file":"bridge-mode/page-browser-side.mjs","sources":["../../../src/bridge-mode/page-browser-side.ts"],"sourcesContent":["import { assert } from '@midscene/shared/utils';\nimport ChromeExtensionProxyPage from '../chrome-extension/page';\nimport type {\n  ChromePageDestroyOptions,\n  KeyboardAction,\n  MouseAction,\n} from '../web-page';\nimport {\n  type BridgeConnectTabOptions,\n  BridgeEvent,\n  DefaultBridgeServerPort,\n  KeyboardEvent,\n  MouseEvent,\n} from './common';\nimport { BridgeClient } from './io-client';\n\ndeclare const __VERSION__: string;\n\nconst NEW_TAB_LOAD_TIMEOUT_MS = 30_000;\n\nfunction isBlankUrl(url: string | undefined): boolean {\n  if (!url) return true;\n  return url === 'about:blank' || url.startsWith('chrome://newtab');\n}\n\n// Wait until the freshly created tab has navigated away from about:blank\n// and reached `status === 'complete'`. Resolves on timeout instead of\n// throwing so callers degrade to the existing lazy-attach behavior.\nfunction waitForTabNavigationComplete(\n  tabId: number,\n  targetUrl: string,\n  timeoutMs = NEW_TAB_LOAD_TIMEOUT_MS,\n): Promise<void> {\n  return new Promise((resolve) => {\n    let settled = false;\n    const finish = () => {\n      if (settled) return;\n      settled = true;\n      try {\n        chrome.tabs.onUpdated.removeListener(onUpdated);\n      } catch {}\n      clearTimeout(timer);\n      resolve();\n    };\n\n    const isReady = (tab: chrome.tabs.Tab | undefined): boolean => {\n      if (!tab) return false;\n      if (tab.status !== 'complete') return false;\n      const currentUrl = tab.url || tab.pendingUrl || '';\n      // Skip the initial about:blank \"complete\" that fires before\n      // the target URL navigation kicks in.\n      if (isBlankUrl(currentUrl) && !isBlankUrl(targetUrl)) return false;\n      return true;\n    };\n\n    const onUpdated = (\n      id: number,\n      _info: chrome.tabs.TabChangeInfo,\n      tab: chrome.tabs.Tab,\n    ) => {\n      if (id !== tabId) return;\n      if (isReady(tab)) finish();\n    };\n\n    chrome.tabs.onUpdated.addListener(onUpdated);\n    const timer = setTimeout(finish, timeoutMs);\n\n    // Handle the race where the tab already finished loading before\n    // we registered the listener.\n    chrome.tabs\n      .get(tabId)\n      .then((tab) => {\n        if (isReady(tab)) finish();\n      })\n      .catch(() => {});\n  });\n}\n\nexport class ExtensionBridgePageBrowserSide extends ChromeExtensionProxyPage {\n  public bridgeClient: BridgeClient | null = null;\n\n  private destroyOptions?: ChromePageDestroyOptions;\n\n  private newlyCreatedTabIds: number[] = [];\n\n  // Connection confirmation state\n  private confirmationPromise: Promise<boolean> | null = null;\n\n  constructor(\n    public serverEndpoint?: string,\n    public onDisconnect: () => void = () => {},\n    public onLogMessage: (\n      message: string,\n      type: 'log' | 'status',\n    ) => void = () => {},\n    forceSameTabNavigation = true,\n    public onConnectionRequest?: () => Promise<boolean>,\n  ) {\n    super(forceSameTabNavigation);\n  }\n\n  private async setupBridgeClient() {\n    const endpoint =\n      this.serverEndpoint || `ws://localhost:${DefaultBridgeServerPort}`;\n\n    // Create confirmation gate BEFORE establishing connection,\n    // so that any calls received immediately after connection are blocked\n    // until user confirms. This prevents a race condition where server-side\n    // queued calls bypass the confirmation dialog.\n    let resolveConfirmationGate: (allowed: boolean) => void = () => {};\n    if (this.onConnectionRequest) {\n      this.confirmationPromise = new Promise<boolean>((resolve) => {\n        resolveConfirmationGate = resolve;\n      });\n    }\n\n    this.bridgeClient = new BridgeClient(\n      endpoint,\n      async (method, args: any[]) => {\n        // Wait for user confirmation before processing any commands\n        if (this.confirmationPromise) {\n          const allowed = await this.confirmationPromise;\n          if (!allowed) {\n            throw new Error('Connection denied by user');\n          }\n        }\n\n        this.onLogMessage(`bridge call from cli side: ${method}`, 'log');\n        if (method === BridgeEvent.ConnectNewTabWithUrl) {\n          return this.connectNewTabWithUrl.apply(\n            this,\n            args as unknown as [string],\n          );\n        }\n\n        if (method === BridgeEvent.GetBrowserTabList) {\n          return this.getBrowserTabList.apply(this, args as any);\n        }\n\n        if (method === BridgeEvent.SetActiveTabId) {\n          return this.setActiveTabId.apply(this, args as any);\n        }\n\n        if (method === BridgeEvent.ConnectCurrentTab) {\n          return this.connectCurrentTab.apply(this, args as any);\n        }\n\n        if (method === BridgeEvent.UpdateAgentStatus) {\n          return this.onLogMessage(args[0] as string, 'status');\n        }\n\n        const tabId = await this.getActiveTabId();\n        if (!tabId || tabId === 0) {\n          throw new Error('no tab is connected');\n        }\n\n        // this.onLogMessage(`calling method: ${method}`);\n\n        if (method.startsWith(MouseEvent.PREFIX)) {\n          const actionName = method.split('.')[1] as keyof MouseAction;\n          if (actionName === 'drag') {\n            return this.mouse[actionName].apply(this.mouse, args as any);\n          }\n          return this.mouse[actionName].apply(this.mouse, args as any);\n        }\n\n        if (method.startsWith(KeyboardEvent.PREFIX)) {\n          const actionName = method.split('.')[1] as keyof KeyboardAction;\n          if (actionName === 'press') {\n            return this.keyboard[actionName].apply(this.keyboard, args as any);\n          }\n          return this.keyboard[actionName].apply(this.keyboard, args as any);\n        }\n\n        if (!this[method as keyof ChromeExtensionProxyPage]) {\n          this.onLogMessage(`method not found: ${method}`, 'log');\n          return undefined;\n        }\n\n        try {\n          // @ts-expect-error\n          const result = await this[method as keyof ChromeExtensionProxyPage](\n            ...args,\n          );\n          return result;\n        } catch (e) {\n          const errorMessage = e instanceof Error ? e.message : 'Unknown error';\n          this.onLogMessage(\n            `Error calling method: ${method}, ${errorMessage}`,\n            'log',\n          );\n          throw new Error(errorMessage, { cause: e });\n        }\n      },\n      // on disconnect\n      () => {\n        return this.destroy();\n      },\n    );\n    await this.bridgeClient.connect();\n\n    // Show confirmation dialog after connection is established\n    if (this.onConnectionRequest) {\n      this.onLogMessage('Waiting for user confirmation...', 'log');\n      const allowed = await this.onConnectionRequest();\n      resolveConfirmationGate(allowed);\n      this.confirmationPromise = null;\n\n      if (!allowed) {\n        this.onLogMessage('Connection denied by user', 'log');\n        this.bridgeClient.disconnect();\n        this.bridgeClient = null;\n        throw new Error('Connection denied by user');\n      }\n    }\n\n    this.onLogMessage(\n      `Bridge connected, cli-side version v${this.bridgeClient.serverVersion}, browser-side version v${__VERSION__}`,\n      'log',\n    );\n  }\n\n  public async connect() {\n    return await this.setupBridgeClient();\n  }\n\n  public async connectNewTabWithUrl(\n    url: string,\n    options: BridgeConnectTabOptions = {\n      forceSameTabNavigation: true,\n    },\n  ) {\n    const tab = await chrome.tabs.create({ url });\n    const tabId = tab.id;\n    assert(tabId, 'failed to get tabId after creating a new tab');\n\n    // new tab\n    this.onLogMessage(`Creating new tab: ${url}`, 'log');\n    this.newlyCreatedTabIds.push(tabId);\n\n    if (options?.forceSameTabNavigation) {\n      this.forceSameTabNavigation = true;\n    }\n\n    // chrome.tabs.create returns immediately with an about:blank target,\n    // then navigates to `url`. If we attach the debugger during that\n    // cross-origin transition Site Isolation will detach it again, leaving\n    // the first CDP command to fail with \"Debugger is not attached to the\n    // tab\". Wait for navigation to settle so the lazy attach lands on a\n    // stable target.\n    await waitForTabNavigationComplete(tabId, url);\n\n    await this.setActiveTabId(tabId);\n  }\n\n  public async connectCurrentTab(\n    options: BridgeConnectTabOptions = {\n      forceSameTabNavigation: true,\n    },\n  ) {\n    const tabs = await chrome.tabs.query({ active: true, currentWindow: true });\n    const tabId = tabs[0]?.id;\n    assert(tabId, 'failed to get tabId');\n\n    this.onLogMessage(`Connected to current tab: ${tabs[0]?.url}`, 'log');\n\n    if (options?.forceSameTabNavigation) {\n      this.forceSameTabNavigation = true;\n    }\n\n    await this.setActiveTabId(tabId);\n  }\n\n  public async setDestroyOptions(options: ChromePageDestroyOptions) {\n    this.destroyOptions = options;\n  }\n\n  async destroy() {\n    if (this.destroyOptions?.closeTab && this.newlyCreatedTabIds.length > 0) {\n      this.onLogMessage('Closing all newly created tabs by bridge...', 'log');\n      for (const tabId of this.newlyCreatedTabIds) {\n        await chrome.tabs.remove(tabId);\n      }\n      this.newlyCreatedTabIds = [];\n    }\n\n    await super.destroy();\n\n    if (this.bridgeClient) {\n      this.bridgeClient.disconnect();\n      this.bridgeClient = null;\n      this.onDisconnect();\n    }\n  }\n}\n"],"names":["NEW_TAB_LOAD_TIMEOUT_MS","isBlankUrl","url","waitForTabNavigationComplete","tabId","targetUrl","timeoutMs","Promise","resolve","settled","finish","chrome","onUpdated","clearTimeout","timer","isReady","tab","currentUrl","id","_info","setTimeout","ExtensionBridgePageBrowserSide","ChromeExtensionProxyPage","endpoint","DefaultBridgeServerPort","resolveConfirmationGate","BridgeClient","method","args","allowed","Error","BridgeEvent","MouseEvent","actionName","KeyboardEvent","result","e","errorMessage","options","assert","tabs","serverEndpoint","onDisconnect","onLogMessage","forceSameTabNavigation","onConnectionRequest"],"mappings":";;;;;;;;;;;;;;AAkBA,MAAMA,0BAA0B;AAEhC,SAASC,WAAWC,GAAuB;IACzC,IAAI,CAACA,KAAK,OAAO;IACjB,OAAOA,AAAQ,kBAARA,OAAyBA,IAAI,UAAU,CAAC;AACjD;AAKA,SAASC,6BACPC,KAAa,EACbC,SAAiB,EACjBC,YAAYN,uBAAuB;IAEnC,OAAO,IAAIO,QAAQ,CAACC;QAClB,IAAIC,UAAU;QACd,MAAMC,SAAS;YACb,IAAID,SAAS;YACbA,UAAU;YACV,IAAI;gBACFE,OAAO,IAAI,CAAC,SAAS,CAAC,cAAc,CAACC;YACvC,EAAE,OAAM,CAAC;YACTC,aAAaC;YACbN;QACF;QAEA,MAAMO,UAAU,CAACC;YACf,IAAI,CAACA,KAAK,OAAO;YACjB,IAAIA,AAAe,eAAfA,IAAI,MAAM,EAAiB,OAAO;YACtC,MAAMC,aAAaD,IAAI,GAAG,IAAIA,IAAI,UAAU,IAAI;YAGhD,IAAIf,WAAWgB,eAAe,CAAChB,WAAWI,YAAY,OAAO;YAC7D,OAAO;QACT;QAEA,MAAMO,YAAY,CAChBM,IACAC,OACAH;YAEA,IAAIE,OAAOd,OAAO;YAClB,IAAIW,QAAQC,MAAMN;QACpB;QAEAC,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAACC;QAClC,MAAME,QAAQM,WAAWV,QAAQJ;QAIjCK,OAAO,IAAI,CACR,GAAG,CAACP,OACJ,IAAI,CAAC,CAACY;YACL,IAAID,QAAQC,MAAMN;QACpB,GACC,KAAK,CAAC,KAAO;IAClB;AACF;AAEO,MAAMW,uCAAuCC;IAuBlD,MAAc,oBAAoB;QAChC,MAAMC,WACJ,IAAI,CAAC,cAAc,IAAI,CAAC,eAAe,EAAEC,yBAAyB;QAMpE,IAAIC,0BAAsD,KAAO;QACjE,IAAI,IAAI,CAAC,mBAAmB,EAC1B,IAAI,CAAC,mBAAmB,GAAG,IAAIlB,QAAiB,CAACC;YAC/CiB,0BAA0BjB;QAC5B;QAGF,IAAI,CAAC,YAAY,GAAG,IAAIkB,aACtBH,UACA,OAAOI,QAAQC;YAEb,IAAI,IAAI,CAAC,mBAAmB,EAAE;gBAC5B,MAAMC,UAAU,MAAM,IAAI,CAAC,mBAAmB;gBAC9C,IAAI,CAACA,SACH,MAAM,IAAIC,MAAM;YAEpB;YAEA,IAAI,CAAC,YAAY,CAAC,CAAC,2BAA2B,EAAEH,QAAQ,EAAE;YAC1D,IAAIA,WAAWI,YAAY,oBAAoB,EAC7C,OAAO,IAAI,CAAC,oBAAoB,CAAC,KAAK,CACpC,IAAI,EACJH;YAIJ,IAAID,WAAWI,YAAY,iBAAiB,EAC1C,OAAO,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAI,EAAEH;YAG5C,IAAID,WAAWI,YAAY,cAAc,EACvC,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,EAAEH;YAGzC,IAAID,WAAWI,YAAY,iBAAiB,EAC1C,OAAO,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAI,EAAEH;YAG5C,IAAID,WAAWI,YAAY,iBAAiB,EAC1C,OAAO,IAAI,CAAC,YAAY,CAACH,IAAI,CAAC,EAAE,EAAY;YAG9C,MAAMxB,QAAQ,MAAM,IAAI,CAAC,cAAc;YACvC,IAAI,CAACA,SAASA,AAAU,MAAVA,OACZ,MAAM,IAAI0B,MAAM;YAKlB,IAAIH,OAAO,UAAU,CAACK,WAAW,MAAM,GAAG;gBACxC,MAAMC,aAAaN,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE;gBAIvC,OAAO,IAAI,CAAC,KAAK,CAACM,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAEL;YAClD;YAEA,IAAID,OAAO,UAAU,CAACO,cAAc,MAAM,GAAG;gBAC3C,MAAMD,aAAaN,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE;gBAIvC,OAAO,IAAI,CAAC,QAAQ,CAACM,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAEL;YACxD;YAEA,IAAI,CAAC,IAAI,CAACD,OAAyC,EAAE,YACnD,IAAI,CAAC,YAAY,CAAC,CAAC,kBAAkB,EAAEA,QAAQ,EAAE;YAInD,IAAI;gBAEF,MAAMQ,SAAS,MAAM,IAAI,CAACR,OAAyC,IAC9DC;gBAEL,OAAOO;YACT,EAAE,OAAOC,GAAG;gBACV,MAAMC,eAAeD,aAAaN,QAAQM,EAAE,OAAO,GAAG;gBACtD,IAAI,CAAC,YAAY,CACf,CAAC,sBAAsB,EAAET,OAAO,EAAE,EAAEU,cAAc,EAClD;gBAEF,MAAM,IAAIP,MAAMO,cAAc;oBAAE,OAAOD;gBAAE;YAC3C;QACF,GAEA,IACS,IAAI,CAAC,OAAO;QAGvB,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO;QAG/B,IAAI,IAAI,CAAC,mBAAmB,EAAE;YAC5B,IAAI,CAAC,YAAY,CAAC,oCAAoC;YACtD,MAAMP,UAAU,MAAM,IAAI,CAAC,mBAAmB;YAC9CJ,wBAAwBI;YACxB,IAAI,CAAC,mBAAmB,GAAG;YAE3B,IAAI,CAACA,SAAS;gBACZ,IAAI,CAAC,YAAY,CAAC,6BAA6B;gBAC/C,IAAI,CAAC,YAAY,CAAC,UAAU;gBAC5B,IAAI,CAAC,YAAY,GAAG;gBACpB,MAAM,IAAIC,MAAM;YAClB;QACF;QAEA,IAAI,CAAC,YAAY,CACf,uCAAuC,IAAI,CAAC,YAAY,CAAC,aAAa,sDAAwC,EAC9G;IAEJ;IAEA,MAAa,UAAU;QACrB,OAAO,MAAM,IAAI,CAAC,iBAAiB;IACrC;IAEA,MAAa,qBACX5B,GAAW,EACXoC,UAAmC;QACjC,wBAAwB;IAC1B,CAAC,EACD;QACA,MAAMtB,MAAM,MAAML,OAAO,IAAI,CAAC,MAAM,CAAC;YAAET;QAAI;QAC3C,MAAME,QAAQY,IAAI,EAAE;QACpBuB,OAAOnC,OAAO;QAGd,IAAI,CAAC,YAAY,CAAC,CAAC,kBAAkB,EAAEF,KAAK,EAAE;QAC9C,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAACE;QAE7B,IAAIkC,SAAS,wBACX,IAAI,CAAC,sBAAsB,GAAG;QAShC,MAAMnC,6BAA6BC,OAAOF;QAE1C,MAAM,IAAI,CAAC,cAAc,CAACE;IAC5B;IAEA,MAAa,kBACXkC,UAAmC;QACjC,wBAAwB;IAC1B,CAAC,EACD;QACA,MAAME,OAAO,MAAM7B,OAAO,IAAI,CAAC,KAAK,CAAC;YAAE,QAAQ;YAAM,eAAe;QAAK;QACzE,MAAMP,QAAQoC,IAAI,CAAC,EAAE,EAAE;QACvBD,OAAOnC,OAAO;QAEd,IAAI,CAAC,YAAY,CAAC,CAAC,0BAA0B,EAAEoC,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE;QAE/D,IAAIF,SAAS,wBACX,IAAI,CAAC,sBAAsB,GAAG;QAGhC,MAAM,IAAI,CAAC,cAAc,CAAClC;IAC5B;IAEA,MAAa,kBAAkBkC,OAAiC,EAAE;QAChE,IAAI,CAAC,cAAc,GAAGA;IACxB;IAEA,MAAM,UAAU;QACd,IAAI,IAAI,CAAC,cAAc,EAAE,YAAY,IAAI,CAAC,kBAAkB,CAAC,MAAM,GAAG,GAAG;YACvE,IAAI,CAAC,YAAY,CAAC,+CAA+C;YACjE,KAAK,MAAMlC,SAAS,IAAI,CAAC,kBAAkB,CACzC,MAAMO,OAAO,IAAI,CAAC,MAAM,CAACP;YAE3B,IAAI,CAAC,kBAAkB,GAAG,EAAE;QAC9B;QAEA,MAAM,KAAK,CAAC;QAEZ,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,IAAI,CAAC,YAAY,CAAC,UAAU;YAC5B,IAAI,CAAC,YAAY,GAAG;YACpB,IAAI,CAAC,YAAY;QACnB;IACF;IA7MA,YACSqC,cAAuB,EACvBC,eAA2B,KAAO,CAAC,EACnCC,eAGK,KAAO,CAAC,EACpBC,yBAAyB,IAAI,EACtBC,mBAA4C,CACnD;QACA,KAAK,CAACD,yBAAAA,iBAAAA,IAAAA,EAAAA,kBAAAA,KAAAA,IAAAA,iBAAAA,IAAAA,EAAAA,gBAAAA,KAAAA,IAAAA,iBAAAA,IAAAA,EAAAA,gBAAAA,KAAAA,IAAAA,iBAAAA,IAAAA,EAAAA,uBAAAA,KAAAA,IAnBR,uBAAO,gBAAP,SAEA,uBAAQ,kBAAR,SAEA,uBAAQ,sBAAR,SAGA,uBAAQ,uBAAR,cAGSH,cAAc,GAAdA,gBAAAA,IAAAA,CACAC,YAAY,GAAZA,cAAAA,IAAAA,CACAC,YAAY,GAAZA,cAAAA,IAAAA,CAKAE,mBAAmB,GAAnBA,qBAAAA,IAAAA,CAjBF,YAAY,GAAwB,WAInC,kBAAkB,GAAa,EAAE,OAGjC,mBAAmB,GAA4B;IAavD;AAmMF"}

package/dist/es/cli.mjs

@@ -18,7 +18,7 @@ Promise.resolve().then(()=>{
     return runToolsCLI(tools, 'midscene-web', {
         stripPrefix: 'web_',
         argv: parsedOptions.argv,
-        version: "1.10.4",
+        version: "1.10.5-beta-20260714101501.0",
         extraCommands: createReportCliCommands()
     });
 }).catch((e)=>{

package/dist/es/puppeteer/base-page.mjs

@@ -24,12 +24,17 @@ const warnPage = getDebug('web:page', {
 const BROWSER_NAVIGATION_ERROR_PATTERN = /execution context was destroyed|frame was detached|target closed|page has been closed|context was destroyed|net::ERR_ABORTED/i;
 const CDP_SCREENCAST_QUALITY = 70;
 const CDP_SCREENCAST_EVERY_NTH_FRAME = 1;
+const VISUAL_UPDATE_FOLLOWUP_DELAY_MS = 800;
 const FLUSH_VISUAL_UPDATE_TIMEOUT_MS = 50;
 const DATA_URL_BASE64_PREFIX = /^data:image\/\w+;base64,/;
 function isClosedPageError(error) {
     if (!(error instanceof Error)) return false;
     return /target page, context or browser has been closed|page has been closed|target closed|browser has been closed/i.test(error.message);
 }
+function isTransientNavigationError(error) {
+    if (!(error instanceof Error)) return false;
+    return /execution context was destroyed|frame was detached|context was destroyed|net::ERR_ABORTED/i.test(error.message);
+}
 class Page {
     actionSpace() {
         const defaultActions = commonWebActionsForWebPage(this, this.enableTouchEventsInActionSpace);
@@ -264,7 +269,7 @@ class Page {
     }
     async flushPendingVisualUpdate() {
         const activeStream = this.activeMjpegStream;
-        if (!activeStream) return;
+        if (!activeStream || activeStream.hasReceivedScreencastFrame) return;
         try {
             await this.evaluate((timeoutMs)=>new Promise((resolve)=>{
                     let done = false;
@@ -276,18 +281,20 @@ class Page {
                     setTimeout(finish, timeoutMs);
                     requestAnimationFrame(()=>requestAnimationFrame(finish));
                 }), FLUSH_VISUAL_UPDATE_TIMEOUT_MS);
+            if (this.activeMjpegStream?.token !== activeStream.token || activeStream.hasReceivedScreencastFrame) return;
             const dataUrl = await this.screenshotBase64();
-            if (this.activeMjpegStream?.token !== activeStream.token) return;
+            if (this.activeMjpegStream?.token !== activeStream.token || activeStream.hasReceivedScreencastFrame) return;
             activeStream.onFrame({
                 data: dataUrl.replace(DATA_URL_BASE64_PREFIX, ''),
                 contentType: 'image/jpeg'
             });
         } catch (error) {
             debugPage('screencast visual refresh failed: %s', error);
+            if (isTransientNavigationError(error) && !isClosedPageError(error)) return;
             activeStream.onError?.(error);
         }
     }
-    schedulePendingVisualUpdate() {
+    queuePendingVisualUpdate() {
         if (!this.activeMjpegStream) return;
         if (this.visualUpdateFlushInFlight) {
             this.visualUpdateFlushQueued = true;
@@ -306,6 +313,15 @@ class Page {
         });
         this.visualUpdateFlushInFlight = flushTask;
     }
+    schedulePendingVisualUpdate() {
+        if (!this.activeMjpegStream) return;
+        this.queuePendingVisualUpdate();
+        if (this.visualUpdateFollowupTimer) clearTimeout(this.visualUpdateFollowupTimer);
+        this.visualUpdateFollowupTimer = setTimeout(()=>{
+            this.visualUpdateFollowupTimer = void 0;
+            this.queuePendingVisualUpdate();
+        }, VISUAL_UPDATE_FOLLOWUP_DELAY_MS);
+    }
     async startMjpegStream(options) {
         const { signal, onFrame, onError } = options;
         if ('function' == typeof this.underlyingPage.bringToFront) await this.underlyingPage.bringToFront();
@@ -322,6 +338,7 @@ class Page {
         const handleFrame = (event)=>{
             (async ()=>{
                 if (stopped) return;
+                if (this.activeMjpegStream?.token === streamToken) this.activeMjpegStream.hasReceivedScreencastFrame = true;
                 try {
                     onFrame({
                         data: event.data,
@@ -347,6 +364,10 @@ class Page {
             if (stopped) return;
             stopped = true;
             if (this.activeMjpegStream?.token === streamToken) this.activeMjpegStream = void 0;
+            if (this.visualUpdateFollowupTimer) {
+                clearTimeout(this.visualUpdateFollowupTimer);
+                this.visualUpdateFollowupTimer = void 0;
+            }
             signal?.removeEventListener('abort', abortHandler);
             removeFrameListener();
             await client.send('Page.stopScreencast').catch((error)=>{
@@ -362,6 +383,7 @@ class Page {
         try {
             client.on('Page.screencastFrame', handleFrame);
             this.activeMjpegStream = {
+                hasReceivedScreencastFrame: false,
                 token: streamToken,
                 onFrame,
                 onError
@@ -390,7 +412,7 @@ class Page {
                 quality: CDP_SCREENCAST_QUALITY,
                 everyNthFrame: CDP_SCREENCAST_EVERY_NTH_FRAME
             });
-            this.flushPendingVisualUpdate();
+            this.schedulePendingVisualUpdate();
             return {
                 stop
             };
@@ -841,6 +863,7 @@ class Page {
         _define_property(this, "activeMjpegStream", void 0);
         _define_property(this, "visualUpdateFlushInFlight", null);
         _define_property(this, "visualUpdateFlushQueued", false);
+        _define_property(this, "visualUpdateFollowupTimer", void 0);
         _define_property(this, "interfaceType", void 0);
         _define_property(this, "everMoved", false);
         this.underlyingPage = underlyingPage;
@@ -867,7 +890,10 @@ function forceClosePopup(page, debugProfile) {
         }
         if (page.isClosed()) debugProfile(`page is already closed, skip goto ${url}`);
         else try {
-            await page.goto(url);
+            await page.goto(url, {
+                waitUntil: 'domcontentloaded',
+                timeout: 10000
+            });
         } catch (error) {
             debugProfile(`failed to goto ${url}, error: ${error}`);
         }