← Commit history

Fixes a data-loss race in pup_quit_idle_browsers that could close a browser holding live windows. It judged idle purely by adopted in-memory sessions, so right after a bridge restart, before re-adoption runs, a warm browser still holding real windows looked session-less and got closed, taking every window with it. It now inspects the browsers ACTUAL open pages before closing and skips any browser that still holds a non-blank page, or that cannot be inspected, so a browser mid-re-adoption or user-held is never reaped

John Lauer ·3dc39153af ·2mo ago ·parent ee71768
4 files changed +20−8
adom-bridge-puppeteer-manifest.json+4−4
@@ -1,10 +1,10 @@ {   "manifest_version": 1,   "name": "puppeteer",-  "version": "2.0.116",-  "url": "https://wiki.adom.inc/download/adom/pup-bridge/2.0.116/adom-bridge-puppeteer-v2.0.116.zip",-  "sha256": "b55ff703005a94b1654a6caf3a40e4c5e57f06412198144a02a778e93008bd2e",-  "size": 863336,+  "version": "2.0.117",+  "url": "https://wiki.adom.inc/download/adom/pup-bridge/2.0.117/adom-bridge-puppeteer-v2.0.117.zip",+  "sha256": "4a378f591ef1fa7102e2d03168d50cdb5c63da3ca3894093d099bc1dc7d12c0d",+  "size": 863802,   "verbPrefixes": [     "browser_",     "desktop_recorder_",
src/BRIDGE_VERSION+1−1
@@ -1 +1 @@-2.0.116+2.0.117
src/bridge.json+1−1
@@ -2,7 +2,7 @@   "manifest_version": 1,   "name": "puppeteer",   "displayName": "Puppeteer (Chrome for Testing + Native)",-  "version": "2.0.116",+  "version": "2.0.117",   "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+14−2
@@ -12283,14 +12283,26 @@ const server = http.createServer(async (req, res) => {           // rides them — never an OS process kill.           const liveProfiles = new Set();           for (const s9 of sessions.values()) { if (!s9._lostBrowser && (s9.tabs || []).length) liveProfiles.add(s9.profileName); }-          const closed = [], skipped = [];+          const closed = [], skipped = [], protectedByPages = [];           for (const [prof, be9] of [...browsers]) {             if (liveProfiles.has(prof)) { skipped.push(prof); continue; }+            // v2.0.117 (John — this verb once closed a browser holding 8 windows): "no adopted+            // session" does NOT mean idle. Right after a bridge restart, re-adoption may not have+            // run yet, so a warm browser still holding real windows looks session-less. Before+            // closing, confirm via the browser's ACTUAL open pages that it holds no real window;+            // any non-blank page means it is mid-re-adoption (or user-held), never close it. If the+            // browser can't be inspected, be conservative and skip — a false "idle" here is data loss.+            let realPages = 0;+            try {+              const pages = await Promise.race([be9.browser.pages(), new Promise((_, rej) => setTimeout(() => rej(new Error('pages timeout')), 3000))]);+              for (const pg of (pages || [])) { let u = ''; try { u = pg.url(); } catch (e) {} if (u && u !== 'about:blank' && !/^chrome:\/\/(newtab|new-tab-page)/.test(u)) realPages++; }+            } catch (e) { realPages = -1; }+            if (realPages !== 0) { protectedByPages.push(`${prof} (${realPages < 0 ? 'uninspectable' : realPages + ' open page(s)'})`); skipped.push(prof); continue; }             try { await be9.browser.close(); } catch (e) {}             browsers.delete(prof);             closed.push(prof);           }-          sendJSON(res, { success: true, output: JSON.stringify({ ok: true, closed, skipped, _hint: closed.length ? `Closed the idle browser process for: ${closed.join(', ')}. The next pup_open_window on these profiles launches a FRESH Chrome, which re-reads staged extensions.` : 'No idle browsers to close — every known browser still carries live sessions (listed in skipped).' }) });+          sendJSON(res, { success: true, output: JSON.stringify({ ok: true, closed, skipped, protectedByPages, _hint: closed.length ? `Closed the idle browser process for: ${closed.join(', ')}. The next pup_open_window on these profiles launches a FRESH Chrome, which re-reads staged extensions.` : `No idle browsers to close.${protectedByPages.length ? ` PROTECTED from closing (still hold open windows, likely mid-re-adoption after a restart): ${protectedByPages.join(', ')}.` : ' Every known browser still carries live sessions (listed in skipped).'}` }) });           return;         }         case 'pup_rescan': {