← Commit history

Close the whole window, not just the bound tabs, the last ghost-window wonk the mimic ralph surfaced: recovery binds one tab per session and the sibling-tab rescan runs later, so a pup_close_window issued soon after a bridge respawn closed 1 of N tabs, declared the session closed, and left the OS window alive as an orphan that pup later adopted as a strange auto-named adom-you session. pup_close_window now collects the CDP windowId of every bound tab and closes every page living in those windows, bound or not, with a shared-profile guard so a page tracked by any other session is never touched

John Lauer ·81c080b92a ·2mo ago ·parent d2821fe
4 files changed +41−6
adom-bridge-puppeteer-manifest.json+4−4
@@ -1,10 +1,10 @@ {   "manifest_version": 1,   "name": "puppeteer",-  "version": "2.0.45",-  "url": "https://wiki.adom.inc/download/adom/pup-bridge/2.0.45/adom-bridge-puppeteer-v2.0.45.zip",-  "sha256": "ea3b015579f09496744f2695cd3fc11438381fd97745d494ab2b9e931fdec443",-  "size": 648772,+  "version": "2.0.46",+  "url": "https://wiki.adom.inc/download/adom/pup-bridge/2.0.46/adom-bridge-puppeteer-v2.0.46.zip",+  "sha256": "c3bd7acb5b196f97d1c6b3d39a7bf9a54f73012266950b299af141fe7aa0cc26",+  "size": 649480,   "verbPrefixes": [     "browser_",     "desktop_recorder_",
src/BRIDGE_VERSION+1−1
@@ -1 +1 @@-2.0.45+2.0.46
src/bridge.json+1−1
@@ -2,7 +2,7 @@   "manifest_version": 1,   "name": "puppeteer",   "displayName": "Puppeteer (Chrome for Testing + Native)",-  "version": "2.0.45",+  "version": "2.0.46",   "description": "Drives a browser ALREADY on the machine \u2014 installed Chrome, else Microsoft Edge (every Windows PC ships with Edge) \u2014 launched with a FRESH isolated profile, so the common case has NO ~150 MB Chrome-for-Testing download and it never touches the user's real tabs/logins. Binds its local server to LOOPBACK (127.0.0.1) only, so no Windows Firewall 'allow Node through the firewall' prompt ever pops. Chrome for Testing is fetched only as a LAST RESORT if the machine has no Chromium browser at all. SPAWN-VERIFIED fallback: pup tries each detected browser (Chrome \u2192 Edge \u2192 CfT) and actually launches it, falling through to the next if one won't start (and handling browsers like Edge that relaunch onto another PID), so a corrupt/partial install never hard-fails an open. The browser that launches is cached as the default (persisted across restarts) so it isn't re-probed each time. On spawn the bridge SELF-WARMS: detects browsers + disk, and only if the box has no Chrome/Edge and no cached CfT does it background-fetch CfT so the first open is instant. pup_use pins a specific browser (chrome | edge | cft | auto); {browser:'chrome',install:true} downloads & installs REAL Google Chrome (user-scoped, no admin) on an Edge-only box. pup_readiness (READ-ONLY) reports which browser will be used + the full candidate list + the default + free disk. Every failure returns a specific errorCode + _hint (chrome_install_no_disk, chrome_download_network, chrome_install_permission, chrome_stable_not_detected, \u2026). Launches with FULL browser permissions by default for full debug (strictPermissions:true opts out). Headful automation: open/close windows+tabs, navigate, screenshot, eval JS, record. pup is a GENERIC, non-profile browser only \u2014 every session is a fresh isolated Chrome/Edge process, never the user's real signed-in browser; profile defaults to sessionId. To drive the user's REAL Chrome/Edge (their profile, cookies, SSO), use the Adom browser EXTENSION's nbrowser_* verbs \u2014 a separate bridge, not pup's job. macOS (v1.9.74+): full parity with mac-native mechanics \u2014 background-by-default is the app-level hide (windows stay drivable/screenshottable while hidden), raise/lower map to unhide+activate/hide, pup_alert_window posts a native toast whose click focuses the window, pup_use {browser:'chrome',install:true} installs Chrome from the official dmg, and taskbar identity/badging remains Windows-only.",   "homepage": "https://wiki.adom.inc/adom/adom-bridge",   "author": "Adom Inc.",
src/server.js+35
@@ -11281,6 +11281,41 @@ const server = http.createServer(async (req, res) => {            // Close ALL tabs in this session (a window can now hold many tabs)           const _closingAppId = session._curAppId || `${PUP_APP_ID}.${sessionId}`;+          // v2.0.46 (mimic-ralph: closing a freshly-RECOVERED multi-tab window left the window ALIVE+          // as an orphan, later adopted as a weird adom-you-win**** session — the ghost windows John+          // saw): recovery binds ONE tab per session and the sibling-tab rescan runs later, so+          // closing only the BOUND tabs closes 1 of N and the OS window survives with the rest.+          // Close by WINDOW instead: collect the CDP windowId of every bound tab, then close EVERY+          // page in the browser that lives in one of those windows — bound to this session or not.+          // Any window this session owns dies whole; other sessions' windows have different+          // windowIds and are untouched.+          const _winIds = new Set();+          for (const t of [...session.tabs]) {+            try {+              const c = await t.page.target().createCDPSession();+              try { const { windowId } = await c.send('Browser.getWindowForTarget'); if (windowId != null) _winIds.add(windowId); } finally { try { await c.detach(); } catch (e) {} }+            } catch (e) {}+          }+          if (_winIds.size) {+            try {+              const _b = browsers.get(session.profileName) && browsers.get(session.profileName).browser;+              const _boundPages = new Set([...session.tabs].map(t => t.page));+              for (const p of (_b ? await _b.pages() : [])) {+                if (_boundPages.has(p)) continue;   // bound tabs close below (keeps their bookkeeping)+                try {+                  const c = await p.target().createCDPSession();+                  let wid = null;+                  try { ({ windowId: wid } = await c.send('Browser.getWindowForTarget')); } finally { try { await c.detach(); } catch (e) {} }+                  if (wid != null && _winIds.has(wid)) {+                    // never close a page another session tracks (shared-profile safety)+                    let _foreign = false;+                    for (const [ok2, os2] of sessions) { if (ok2 !== sessionId && os2 && (os2.tabs || []).some(t2 => t2 && t2.page === p)) { _foreign = true; break; } }+                    if (!_foreign) { console.log(`[close] "${sessionId}" closing UNBOUND sibling tab in its window (${(p.url() || '').slice(0, 60)})`); await p.close().catch(() => {}); }+                  }+                } catch (e) {}+              }+            } catch (e) {}+          }           for (const t of [...session.tabs]) {             try { await t.page.close(); } catch (e) {}           }