@monoes/monobrowse 1.0.6 → 1.0.7

package/dist/src/cli/commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../../src/cli/commands.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAiC,MAAM,YAAY,CAAC;AAm7EzE;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,GACrE;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAUlG;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CA6B5H;AAwcD,QAAA,MAAM,aAAa,EAAE,OAmJpB,CAAC;eAEa,aAAa"}
+{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../../src/cli/commands.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAiC,MAAM,YAAY,CAAC;AAwgFzE;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,GACrE;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAUlG;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CA6B5H;AAycD,QAAA,MAAM,aAAa,EAAE,OAmJpB,CAAC;eAEa,aAAa"}

package/dist/src/cli/commands.js

@@ -12,9 +12,55 @@ let _sessionId = '';
 let _targetId = '';
 let _port = DEFAULT_PORT;
 let _refs = new Map();
+// Saved parent sessionId when inside an iframe — restored by `frame main`.
+let _parentSessionId = '';
 async function getBrowser() {
     return import('../index.js');
 }
+// Best-effort cleanup on Ctrl-C / kill so a launched Chrome doesn't linger as
+// an orphan process when a command is interrupted mid-flight (e.g. during a
+// long-running wait/eval that CdpClient.send()'s own timeout hasn't tripped
+// yet).
+//
+// This module is imported for EVERY `monomind` CLI invocation (commands/
+// index.ts statically imports browse.ts, which imports this file) — not just
+// browse commands — so the handler is only *registered* once a browser
+// session is actually launched here (see ensureSignalCleanupHandlers(),
+// called from the `open` action below), not at module load. Registering
+// unconditionally at import time would call process.exit() on Ctrl-C for
+// every unrelated monomind command (e.g. a long-running `org run` daemon),
+// pre-empting whatever other SIGINT/SIGTERM handling that process needs.
+const SIGNAL_EXIT_CODES = { SIGINT: 130, SIGTERM: 143 };
+let _signalHandlersRegistered = false;
+function ensureSignalCleanupHandlers() {
+    if (_signalHandlersRegistered)
+        return;
+    _signalHandlersRegistered = true;
+    for (const sig of ['SIGINT', 'SIGTERM']) {
+        process.on(sig, () => {
+            void (async () => {
+                try {
+                    const browser = await getBrowser();
+                    if (_client) {
+                        await browser.closeBrowser(_client, _port);
+                    }
+                    else {
+                        const pid = browser.getLaunchedPid(_port);
+                        if (pid !== undefined) {
+                            try {
+                                process.kill(pid, 'SIGKILL');
+                            }
+                            catch { /* already exited */ }
+                        }
+                    }
+                }
+                catch {
+                    // best-effort — never block process exit on cleanup failure
+                }
+            })().finally(() => process.exit(SIGNAL_EXIT_CODES[sig]));
+        });
+    }
+}
 // Each CLI invocation is a fresh process, so this module's `_port` variable
 // is always freshly initialized to DEFAULT_PORT — a `--port 9333` passed to
 // an earlier `open` command has no effect on this process's own default.
@@ -57,6 +103,7 @@ async function ensureConnected(port, targetId) {
         _client = conn.client;
         _sessionId = conn.sessionId;
         _targetId = conn.target.id;
+        _parentSessionId = '';
         _refs = new Map();
         await hydrateRefsFromCache(browser, _targetId, conn.target.url);
     }
@@ -145,6 +192,7 @@ async function switchToHeaded(url, port) {
         _client.close();
         _client = null;
         _sessionId = '';
+        _parentSessionId = '';
         _targetId = '';
     }
     // Launch headed on a neighbouring port to avoid collision
@@ -190,6 +238,7 @@ async function switchToHeaded(url, port) {
     _client.close();
     _client = null;
     _sessionId = '';
+    _parentSessionId = '';
     _targetId = '';
     // Relaunch headless and restore session
     _port = await browser.launchBrowser({ port, headless: true });
@@ -272,13 +321,40 @@ const openCommand = {
             prevClient.close();
             _client = null;
             _sessionId = '';
+            _parentSessionId = '';
             _targetId = '';
             _refs = new Map();
         }
         _port = await browser.launchBrowser({ port, headless: !forceHeaded });
         // Persist the active port so subsequent CLI invocations (each a fresh
-        // process) default to attaching here instead of hardcoded 9222.
-        await browser.saveActivePort(_port);
+        // process) default to attaching here instead of hardcoded 9222. Also
+        // persist the launched PID/userDataDir so a later process's closeBrowser
+        // can still kill this Chrome even though launchedPids (browser.ts) is
+        // per-process and empty there.
+        //
+        // launchBrowser() can either LAUNCH a fresh Chrome or ATTACH to one
+        // already listening on the requested port (see its own "attach if
+        // already Chrome" comment) — it returns only a port number, with no
+        // signal telling this caller which happened. getLaunchedPid(_port) is
+        // undefined on the attach path (this process never spawned anything).
+        // Bug fixed here: unconditionally saving {pid: undefined, ...} on
+        // attach used to CLOBBER a real PID a previous `open` had already
+        // persisted for this exact port, destroying the only way a later
+        // process's closeBrowser() PID-kill fallback could ever find it.
+        const freshPid = browser.getLaunchedPid(_port);
+        const freshUserDataDir = browser.getLaunchedUserDataDir(_port);
+        if (freshPid !== undefined) {
+            await browser.saveActivePort(_port, { pid: freshPid, userDataDir: freshUserDataDir });
+        }
+        else {
+            // Attach path: preserve whatever PID/userDataDir was already on file
+            // for this port (most likely from the process that originally
+            // launched it) instead of overwriting with undefined.
+            const existing = await browser.loadActivePortInfo();
+            const preserved = existing && existing.port === _port ? existing : undefined;
+            await browser.saveActivePort(_port, { pid: preserved?.pid, userDataDir: preserved?.userDataDir });
+        }
+        ensureSignalCleanupHandlers();
         const conn = await browser.connectToTarget(_port);
         _client = conn.client;
         _sessionId = conn.sessionId;
@@ -1312,6 +1388,7 @@ const closeCommand = {
             client.close();
             _client = null;
             _sessionId = '';
+            _parentSessionId = '';
             _targetId = '';
             _refs = new Map();
             // Session is gone — forget the persisted port and stale refs so later
@@ -1969,11 +2046,24 @@ const frameCommand = {
         if (!target)
             throw new Error('Usage: monomind browse frame <selector>|main');
         if (target === 'main') {
+            if (_parentSessionId) {
+                // Detach from the OOPIF session (best-effort — it may already be gone)
+                await client.send('Target.detachFromTarget', { sessionId: _sessionId }).catch(() => { });
+                _sessionId = _parentSessionId;
+                _parentSessionId = '';
+            }
             output.printSuccess('Switched to main frame');
         }
         else {
-            const frameSrc = await browser.switchToFrame(client, sessionId, target);
-            output.printSuccess(`Switched to frame: ${frameSrc ?? target}`);
+            const frameResult = await browser.switchToFrame(client, sessionId, target);
+            if (frameResult.sessionId) {
+                // Save the parent session so `frame main` can restore it
+                _parentSessionId = _sessionId;
+                _sessionId = frameResult.sessionId;
+                // Enable CDP domains on the iframe's session so subsequent commands work
+                await browser.enableSessionDomains(client, _sessionId);
+            }
+            output.printSuccess(`Switched to frame: ${frameResult.url ?? target}`);
         }
         return { success: true };
     },
@@ -2034,6 +2124,7 @@ const tabCommand = {
                     client.close();
                     _client = null;
                     _sessionId = '';
+                    _parentSessionId = '';
                     _targetId = '';
                     _refs = new Map();
                 }
@@ -2845,6 +2936,7 @@ const connectCommand = {
             prevClient.close();
             _client = null;
             _sessionId = '';
+            _parentSessionId = '';
             _targetId = '';
             _refs = new Map();
         }