← Commit history

Fix THE fourth matcher — the from-disk recovery binder — closing the recovery mis-bind saga (three red binding tables cornered it). It matched by saved URL with a last-page fallback and NO claim tracking, so: a session file POISONED by a prior mis-bind (docs-writer's said espn.com) URL-matched another session's page every restart, two sessions bound one page, and the genuinely-owned page was orphaned and reaped as a leftover. Now: (1) window.name ('pup:<sid>', stamped by all four injectors since 1.9.153) is matched FIRST; (2) URL matching skips pages claimed this pass and pages carrying a DIFFERENT session's pup name; (3) the last-page fallback respects both rules too; (4) a per-pass claimed-set makes double-binding structurally impossible.

John Lauer ·39b45c7390 ·3mo ago ·parent f088fed
4 files changed +45−13
adom-bridge-puppeteer-manifest.json+4−4
@@ -1,10 +1,10 @@ {   "manifest_version": 1,   "name": "puppeteer",-  "version": "1.9.153",-  "url": "https://wiki.adom.inc/download/adom/adom-desktop-puppeteer-bridge/1.9.153/adom-bridge-puppeteer-v1.9.153.zip",-  "sha256": "eb8ec32b908922bb8b106bff1c9e0d26e6c0e751a00d7eb8a8c61beb15c945ba",-  "size": 400798,+  "version": "1.9.154",+  "url": "https://wiki.adom.inc/download/adom/adom-desktop-puppeteer-bridge/1.9.154/adom-bridge-puppeteer-v1.9.154.zip",+  "sha256": "84446ab4bca3f6f2814e090032295065b964a76d7b88a513100be7bd66253556",+  "size": 401231,   "verbPrefixes": [     "browser_",     "desktop_recorder_",
src/BRIDGE_VERSION+1−1
@@ -1 +1 @@-1.9.153+1.9.154
src/bridge.json+1−1
@@ -2,7 +2,7 @@   "manifest_version": 1,   "name": "puppeteer",   "displayName": "Puppeteer (Chrome for Testing + Native)",-  "version": "1.9.153",+  "version": "1.9.154",   "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. browser_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. browser_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, browser_alert_window posts a native toast whose click focuses the window, browser_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-desktop",   "author": "Adom Inc.",
src/server.js+39−7
@@ -1340,6 +1340,9 @@ async function recoverSessions() {   } catch (e) {}   if (files.length === 0) return;   console.log(`Recovering ${files.length} session(s) from disk...`);+  // v1.9.154: pages already bound in THIS recovery pass — two sessions must never share a page+  // (the espn double-bind: a poisoned session file URL-matched another session's page).+  const _recoveryClaimed = new Set();    for (const sf of files) {     const { sessionId, profile: profileName, pid, cdpPort, url } = sf;@@ -1427,16 +1430,45 @@ async function recoverSessions() {       const pages = await browser.pages();       let page = null; -      // Try to match by URL-      if (url) {-        page = pages.find(p => {-          try { return p.url().startsWith(url.split('?')[0]); } catch { return false; }-        });+      // v1.9.154 — THE fourth matcher, fixed (two failed binding proofs cornered it here):+      // 1) window.name FIRST: the durable identity every injector stamps since 1.9.153. A saved+      //    URL can be POISONED by a prior mis-bind (docs-writer's file said espn.com), so URL+      //    matching alone re-creates the bug forever.+      for (const p of pages) {+        if (_recoveryClaimed.has(p)) continue;+        try {+          const wn = await p.evaluate(() => window.name);+          if (wn === 'pup:' + sessionId) { page = p; break; }+        } catch (e) {}       }-      // Fallback: use the last page that isn't about:blank+      // 2) URL match — but NEVER a page another session already claimed, and never one that+      //    carries a DIFFERENT session's pup:<id> name.+      if (!page && url) {+        for (const p of pages) {+          if (_recoveryClaimed.has(p)) continue;+          try {+            if (!p.url().startsWith(url.split('?')[0])) continue;+            const wn = await p.evaluate(() => window.name).catch(() => '');+            if (wn && wn.startsWith('pup:') && wn !== 'pup:' + sessionId) continue;+            page = p; break;+          } catch (e) {}+        }+      }+      // 3) last unclaimed non-blank page that doesn't belong to someone else.       if (!page) {-        page = pages.filter(p => { try { return p.url() !== 'about:blank'; } catch { return false; } }).pop();+        const cands = [];+        for (const p of pages) {+          if (_recoveryClaimed.has(p)) continue;+          try {+            if (p.url() === 'about:blank') continue;+            const wn = await p.evaluate(() => window.name).catch(() => '');+            if (wn && wn.startsWith('pup:') && wn !== 'pup:' + sessionId) continue;+            cands.push(p);+          } catch (e) {}+        }+        page = cands.pop() || null;       }+      if (page) _recoveryClaimed.add(page);       // Last resort: any page       if (!page && pages.length > 0) {         page = pages[pages.length - 1];