mooncat-browser 0.1.0 → 0.2.1

package/browser-op/backend/browserd.cjs

@@ -62,7 +62,10 @@ function getDefaultOp (options = {}) {
   }
   const profileRoot = options.profileRoot || process.env.BROWSER_OP_PROFILE_ROOT || getDefaultProfileRoot()
   const userDataDir = options.userDataDir || process.env.BROWSER_OP_USERDATA || null
-  _op = new BrowserOp({ executablePath, profileRoot, userDataDir })
+  // 多实例 WS 端口:由 wrapper (mooncat-browser) 通过 env 注入本实例的 extensionPort。
+  // 不传则 BrowserOp/WebService 内部回退默认 17321(向后兼容)。
+  const wsPort = options.wsPort || (process.env.BROWSER_OP_WS_PORT ? Number(process.env.BROWSER_OP_WS_PORT) : null)
+  _op = new BrowserOp({ executablePath, profileRoot, userDataDir, wsPort })
   return _op
 }
 

package/browser-op/extension/server.cjs

@@ -59,10 +59,11 @@ class WebPluginServer {
 
       this.wss.on('error', (err) => {
         if (err.message.includes('EADDRINUSE')) {
-          // 必须失败: 17321 被占说明已有 browserd 在管插件, 不能两个同时管
+          // 本端口被占:可能是本实例残留进程,或别的进程占用该端口。
+          // 多实例下每个实例有独立 WS 端口,不再有"全局唯一 17321"语义。
           this.info('[web] port %d already in use — EADDRINUSE', port)
           this.wss = null
-          reject(new Error(`EADDRINUSE: port ${port} already in use (another browserd owns it)`))
+          reject(new Error(`EADDRINUSE: port ${port} already in use (stale process on this port, or another process occupied it)`))
           return
         }
         this.info('[web] server error: %s', err.message)

package/browser-op/extension/service.cjs

@@ -45,8 +45,13 @@ class WebService {
 
   // ── 生命周期 ──────────────────────────────────────────────
 
-  async startServer () {
-    await this.server.start()
+  /**
+   * 启动 WS server(供 WebPlater 扩展 offscreen 回连)。
+   * @param {number=} port  实例 WS 端口;不传则用 server 默认(17321,仅向后兼容)。
+   *                        多实例下由 index.cjs 从 env BROWSER_OP_WS_PORT 透传。
+   */
+  async startServer (port) {
+    await this.server.start(undefined, port)
   }
 
   async stopServer () {

package/browser-op/index.cjs

@@ -49,6 +49,7 @@ class BrowserOp {
    * @param {string} deps.executablePath  Chrome 路径（必填）
    * @param {string} deps.profileRoot     profile 根目录（检测插件用，可选）
    * @param {string=} deps.userDataDir    显式 userDataDir（不传则 launcher 用 profileRoot/default）
+   * @param {number=} deps.wsPort         插件路 WS server 端口(多实例化;不传则用默认 17321)
    * @param {Function=} deps.info         日志函数
    * @param {Function=} deps.errorLog     错误日志函数
    */
@@ -59,6 +60,9 @@ class BrowserOp {
     this.executablePath = deps.executablePath
     this.profileRoot = deps.profileRoot || null
     this.userDataDirOverride = deps.userDataDir || null
+    // 多实例:每个 browserd 在自己的 wsPort 上起 WS server,扩展 offscreen 连本实例端口。
+    // 不传时回退默认 17321(向后兼容旧调用方)。
+    this.wsPort = deps.wsPort || null
     this.info = deps.info || defaultInfo
     this.errorLog = deps.errorLog || defaultError
 
@@ -109,15 +113,17 @@ class BrowserOp {
     let pluginFallbackNotice = null
 
     // 启动前：开插件 WS server（插件链路需要；CDP 链路开起来也不碍事，便于 checkRoute）
-    // startServer 现在 EADDRINUSE 会 reject: 17321 被占 = 已有 browserd 在管插件
+    // 多实例:用本实例 wsPort(从 env BROWSER_OP_WS_PORT 经 browserd → getDefaultOp → BrowserOp 注入)。
+    // 不传则 web.startServer() 内部回退默认 17321。
     if (!this._serverStarted) {
       try {
-        await this.web.startServer()
+        await this.web.startServer(this.wsPort)
         this._serverStarted = true
       } catch (e) {
         const portBusy = /EADDRINUSE|already in use/.test(e.message)
+        const portLabel = this.wsPort || 'default(17321)'
         const message = portBusy
-          ? 'WebPlater WS 端口 17321 已被占用（另一个 browserd 正在管理插件，或残留进程）。'
+          ? `WebPlater WS 端口 ${portLabel} 已被占用（本实例残留进程，或别的进程占用了该端口）。`
           : `WS server 启动失败: ${e.message}`
         if (routeMode === 'extension') {
           return { ok: false, mode: 'extension', notice: { level: 'error', message }, error: message }
@@ -159,19 +165,10 @@ class BrowserOp {
 
     // tryPlugin=true → 插件模式启动（无端口）
     if (tryPlugin) {
-      // ★ 扩展路 handshake-first: startServer 后先等已有 Chrome 的 offscreen 回连 (2s)。
-      // 已有 Chrome 开着 (别的进程起的/上次没关干净) → offscreen 自动重连当前 17321 → 复用, 不 launch。
-      // 没回连 → Chrome 没开或坏了 → 才 launch。
-      const reused = await this.waitForPluginHeartbeat(2000)
-      if (reused) {
-        this.info('open mode=extension (reused: plugin already connected, skip launch)')
-        this.currentMode = 'extension'
-        extState.write(userDataDir, { wsPort: extState.DEFAULT_WS_PORT, lastHeartbeatAt: Date.now() })
-        globalState.writeGlobal(userDataDir, { profile: 'default' })
-        return { ok: true, mode: 'extension', notice: { level: 'info', message: '检测到该 profile 的 Chrome 已开且插件已连接，复用，未重复启动。' } }
-      }
-
-      // 没回连 → Chrome 没开, 正常 launch
+      // 多实例:本实例在自己的 wsPort 上起 WS server,扩展 offscreen 连本端口。
+      // 不再做"先等 2s 看有没有别的 browserd 的 Chrome offscreen 回连"的复用分支——
+      // 那基于"17321 全局唯一"假设,多实例下每个实例端口独立,该假设不成立。
+      // 直接 launch 本实例的 Chrome(profile 独立),launch 后等自己的 offscreen 回连。
       const result = await this.launcher.launch({
         executablePath: this.executablePath,
         userDataDir,
@@ -191,7 +188,7 @@ class BrowserOp {
       if (alive) {
         this.info('open mode=extension (plugin alive)')
         this.currentMode = 'extension'
-        extState.write(userDataDir, { wsPort: extState.DEFAULT_WS_PORT, lastHeartbeatAt: Date.now() })
+        extState.write(userDataDir, { wsPort: this.wsPort || extState.DEFAULT_WS_PORT, lastHeartbeatAt: Date.now() })
         globalState.writeGlobal(userDataDir, { profile: 'default' })
         return { ok: true, mode: 'extension', pid: this.launcher.processId, notice: null }
       }

package/browser-op/webplater/dist/chrome-mv3/chunks/offscreen-JoFB8k4y.js

@@ -0,0 +1 @@
+import"./_virtual_wxt-html-plugins-DPbbfBKe.js";const l="__MOONCAT_BROWSER_HOST_WS_URL__",S=1e3,E=2e4;let e=null,s=null,c=null;function d(){(e==null?void 0:e.readyState)===WebSocket.CONNECTING||(e==null?void 0:e.readyState)===WebSocket.OPEN||(e=new WebSocket(l),e.addEventListener("open",()=>{s&&(clearTimeout(s),s=null),console.log("[WebPlater/offscreen] connected to host",l),i({type:"hello",name:"bee-web-plugin"}),_()}),e.addEventListener("message",async t=>{let n;try{n=JSON.parse(String(t.data))}catch{console.error("[WebPlater/offscreen] invalid JSON from host",t.data);return}if(!(!n||n.type!=="command"||typeof n.id!="number"))try{const r=await p(n.id,n.method,n.params??{});u(n.id,{ok:!0,result:r})}catch(r){u(n.id,{ok:!1,error:r instanceof Error?r.message:String(r)})}}),e.addEventListener("close",()=>{console.log("[WebPlater/offscreen] disconnected, reconnecting..."),e=null,f(),y()}),e.addEventListener("error",()=>{e==null||e.close()}))}function i(t){(e==null?void 0:e.readyState)===WebSocket.OPEN&&e.send(JSON.stringify(t))}function u(t,n){const r={id:t,type:"response",...n};i(r)}function p(t,n,r){return new Promise((m,a)=>{chrome.runtime.sendMessage({source:"offscreen-command",id:t,method:n,params:r},g=>{if(chrome.runtime.lastError){a(new Error(chrome.runtime.lastError.message));return}const o=g;if(o&&typeof o=="object"&&o.ok===!1){a(new Error(o.error??"background error"));return}m(o==null?void 0:o.result)})})}function _(){f(),c=setInterval(()=>{i({type:"ping",time:Date.now()})},E)}function f(){c&&(clearInterval(c),c=null)}function y(){s||(s=setTimeout(()=>{s=null,d()},S))}d();

package/browser-op/webplater/dist/chrome-mv3/manifest.json

@@ -1 +1 @@
-{"manifest_version":3,"name":"WebPlater","description":"Generic browser automation bridge — Playwright alternative layer","version":"0.0.1.2607032021","key":"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlljeBdeINKB8ouCR6euqG5iegaoSZY3c/uubW1AJoJzoVNyiB8UPzpL98zfWXW5nMF+KTdGa1Vb19sBACMVxO8gXEbxS/gobfqJHddfe0qZpNDEBrM7lwVJtocPb9lYJK3rHASx2VSkRFRPoymaaNDaeEO/uiu9uCG2dut/V00UvUAaeMDM9bwiWxD8aJ5IINRFIk+UniZsPB0kY3tbcmqayGYsjYpwZmU9RXoLSBZjWa8CfFjTNeyPBtLpkj2groQN/Ytk1RWf5AEwAPIahfz/hn2kDOnL1OSNGyQfswL8GuWJZs9h2bvDQMKwCRUQ/iUuqypNQfbin42rpD1kz9QIDAQAB","permissions":["tabs","scripting","cookies","storage","offscreen","webNavigation","downloads"],"host_permissions":["<all_urls>"],"background":{"service_worker":"background.js"},"action":{"default_title":"WebPlater","default_popup":"popup.html"},"content_scripts":[{"matches":["<all_urls>"],"all_frames":true,"run_at":"document_idle","js":["content-scripts/content.js"]}]}
+{"manifest_version":3,"name":"WebPlater","description":"Generic browser automation bridge — Playwright alternative layer","version":"0.0.1.2607041709","key":"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlljeBdeINKB8ouCR6euqG5iegaoSZY3c/uubW1AJoJzoVNyiB8UPzpL98zfWXW5nMF+KTdGa1Vb19sBACMVxO8gXEbxS/gobfqJHddfe0qZpNDEBrM7lwVJtocPb9lYJK3rHASx2VSkRFRPoymaaNDaeEO/uiu9uCG2dut/V00UvUAaeMDM9bwiWxD8aJ5IINRFIk+UniZsPB0kY3tbcmqayGYsjYpwZmU9RXoLSBZjWa8CfFjTNeyPBtLpkj2groQN/Ytk1RWf5AEwAPIahfz/hn2kDOnL1OSNGyQfswL8GuWJZs9h2bvDQMKwCRUQ/iUuqypNQfbin42rpD1kz9QIDAQAB","permissions":["tabs","scripting","cookies","storage","offscreen","webNavigation","downloads"],"host_permissions":["<all_urls>"],"background":{"service_worker":"background.js"},"action":{"default_title":"WebPlater","default_popup":"popup.html"},"content_scripts":[{"matches":["<all_urls>"],"all_frames":true,"run_at":"document_idle","js":["content-scripts/content.js"]}]}

package/browser-op/webplater/dist/chrome-mv3/offscreen.html

@@ -3,7 +3,7 @@
   <head>
     <meta charset="UTF-8">
     <title>WebPlater Offscreen</title>
-    <script type="module" crossorigin src="/chunks/offscreen-CFXYw9Mo.js"></script>
+    <script type="module" crossorigin src="/chunks/offscreen-JoFB8k4y.js"></script>
     <link rel="modulepreload" crossorigin href="/chunks/_virtual_wxt-html-plugins-DPbbfBKe.js">
   </head>
   <body>

package/browser-op/webplater/entrypoints/offscreen/main.ts

@@ -34,7 +34,10 @@ interface BackgroundResponse {
   error?: string
 }
 
-const HOST_WS_URL = 'ws://127.0.0.1:17321'
+// 占位符:prepare-extension <name> 时会被替换为 ws://127.0.0.1:<extensionPort>。
+// wxt build 保留字符串字面量(minification 只改变量名,不改字符串内容)。
+// 包内 dist 只 build 一次,每个实例复制后由 mooncat-browser prepare-extension 换端口。
+const HOST_WS_URL = '__MOONCAT_BROWSER_HOST_WS_URL__'
 const RECONNECT_DELAY_MS = 1000
 const PING_INTERVAL_MS = 20000
 

package/dist/cli.d.ts

@@ -1,2 +1,3 @@
+#!/usr/bin/env node
 export {};
 //# sourceMappingURL=cli.d.ts.map