← Commit history

The no-toast bug in the fast capture loop: the harvest evaluated a destructive read-and-clear under a 600ms race, so whenever the CDP round-trip lost the race the capture was consumed in the page and dropped server-side with no trace. The loop now peeks read-only under the race (a lost peek loses nothing) and only performs the destructive read after a confirmed hit, with no racing timeout

John Lauer ·2f0186f8ce ·2mo ago ·parent 1afa4c8
4 files changed +22−13
adom-bridge-puppeteer-manifest.json+4−4
@@ -1,10 +1,10 @@ {   "manifest_version": 1,   "name": "puppeteer",-  "version": "2.0.73",-  "url": "https://wiki.adom.inc/download/adom/pup-bridge/2.0.73/adom-bridge-puppeteer-v2.0.73.zip",-  "sha256": "6cda3be7368efa1413bb51dbd81b359500d360b11284c361757b0531b80339a6",-  "size": 834115,+  "version": "2.0.74",+  "url": "https://wiki.adom.inc/download/adom/pup-bridge/2.0.74/adom-bridge-puppeteer-v2.0.74.zip",+  "sha256": "9f40b4108f13ce1663b33379f62ef058879eb209659d5a5783a254cc5d043a88",+  "size": 834295,   "verbPrefixes": [     "browser_",     "desktop_recorder_",
src/BRIDGE_VERSION+1−1
@@ -1 +1 @@-2.0.73+2.0.74
src/bridge.json+1−1
@@ -2,7 +2,7 @@   "manifest_version": 1,   "name": "puppeteer",   "displayName": "Puppeteer (Chrome for Testing + Native)",-  "version": "2.0.73",+  "version": "2.0.74",   "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+16−7
@@ -15223,17 +15223,26 @@ const _onPupBound = async () => {       if (sQ._lostBrowser || !(sQ.tabs || []).length) continue;       for (const tQ of (sQ.tabs || [])) {         if (!tQ || !tQ.page) continue;-        let got = null;+        // v2.0.74: NEVER destructively read under a timeout race — the page-side clear can win+        // while the round-trip loses, consuming the capture and dropping it silently (the exact+        // no-toast bug). Phase 1: read-only PEEK under the race (a lost peek loses nothing).+        // Phase 2: on a hit, the destructive read runs with no racing timeout.+        let hit = null;         try {-          got = await Promise.race([-            tQ.page.evaluate(() => {-              const c = window.__pupFloatyClick; const r = window.__pupAnnotateResult;-              window.__pupFloatyClick = null; window.__pupAnnotateResult = null;-              return (c || r) ? { c: c || null, r: r || null } : null;-            }),+          hit = await Promise.race([+            tQ.page.evaluate(() => (window.__pupFloatyClick || window.__pupAnnotateResult) ? true : null),             new Promise(r2 => setTimeout(() => r2(null), 600)),           ]);         } catch (e) {}+        if (!hit) continue;+        let got = null;+        try {+          got = await tQ.page.evaluate(() => {+            const c = window.__pupFloatyClick; const r = window.__pupAnnotateResult;+            window.__pupFloatyClick = null; window.__pupAnnotateResult = null;+            return (c || r) ? { c: c || null, r: r || null } : null;+          });+        } catch (e) {}         if (!got) continue;         if (got.c) { console.log(`[floaty] "${sidQ}" pencil clicked (fallback path) — starting annotate on ${tQ.tabId}`); startAnnotation(sQ, sidQ, 'user-floaty', { tool: 'pen', tabId: tQ.tabId }).catch(() => {}); }         if (got.r && got.r.done) processAnnotateCapture(sQ, sidQ, tQ.page, got.r).catch(e2 => console.log(`[annotate] "${sidQ}" capture failed: ${e2.message}`));