← Commit history

Quick capture works again: the 2.0.72 fast-harvest loop never dispatched in production (instrumented and proven silent), so the capture pickup returns to the 2.0.49-proven per-annotation watcher, now feeding the new fast pipeline: screenshot, immediate camera flash and preview toast, then caption bar, iTXt, clipboard and disk in the background, with quick mode re-arming per stroke. The pencil and hotkey keep their instant client-side open and additionally set the click flag so the 10-second sweep arms the watcher (restored, proven), with an arming guard against double-starts. The dead fast loop is deleted

John Lauer ·dcd4083ec3 ·2mo ago ·parent cb182b3
4 files changed +36−45
adom-bridge-puppeteer-manifest.json+4−4
@@ -1,10 +1,10 @@ {   "manifest_version": 1,   "name": "puppeteer",-  "version": "2.0.75",-  "url": "https://wiki.adom.inc/download/adom/pup-bridge/2.0.75/adom-bridge-puppeteer-v2.0.75.zip",-  "sha256": "df6ffcd79ab8671c3b5c177f06dc888ac6807ad0c60c341102ae9824cafba8a8",-  "size": 834396,+  "version": "2.0.76",+  "url": "https://wiki.adom.inc/download/adom/pup-bridge/2.0.76/adom-bridge-puppeteer-v2.0.76.zip",+  "sha256": "edeb1f83a854333633aa44e42a5c9b52c0357817792cb240698aa192379b8ce2",+  "size": 834271,   "verbPrefixes": [     "browser_",     "desktop_recorder_",
src/BRIDGE_VERSION+1−1
@@ -1 +1 @@-2.0.75+2.0.76
src/bridge.json+1−1
@@ -2,7 +2,7 @@   "manifest_version": 1,   "name": "puppeteer",   "displayName": "Puppeteer (Chrome for Testing + Native)",-  "version": "2.0.75",+  "version": "2.0.76",   "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+30−39
@@ -5684,7 +5684,7 @@ const FLOATY_JS = `(() => {       tip.style.left = x + 'px'; tip.style.top = y + 'px'; tip.style.opacity = '1'; tip.style.transform = 'translateY(0)';     }, 600); };     host.onmouseleave = function () { btn.style.opacity = '.55'; clearTimeout(timer); tip.style.opacity = '0'; tip.style.transform = 'translateY(4px)'; };-    host.onclick = function () { clearTimeout(timer); tip.style.opacity = '0'; btn.style.borderColor = '#00d4cb'; if (window.__pupStartAnnotate) { window.__pupStartAnnotate('pen'); } else { window.__pupFloatyClick = Date.now(); } setTimeout(function () { btn.style.borderColor = 'rgba(0,184,177,.45)'; }, 1500); };+    host.onclick = function () { clearTimeout(timer); tip.style.opacity = '0'; btn.style.borderColor = '#00d4cb'; if (window.__pupStartAnnotate) { window.__pupStartAnnotate('pen'); } window.__pupFloatyClick = Date.now(); setTimeout(function () { btn.style.borderColor = 'rgba(0,184,177,.45)'; }, 1500); };     document.body.appendChild(host);   }   add();@@ -5693,7 +5693,8 @@ const FLOATY_JS = `(() => {   addEventListener('keydown', function (e) {     if (e.altKey && e.shiftKey && !e.ctrlKey && !e.metaKey && (e.key === 'A' || e.key === 'a')) {       e.preventDefault(); e.stopPropagation();-      if (window.__pupStartAnnotate) { window.__pupStartAnnotate('pen'); } else { window.__pupFloatyClick = Date.now(); }+      if (window.__pupStartAnnotate) { window.__pupStartAnnotate('pen'); }+      window.__pupFloatyClick = Date.now();     }   }, true); })()`;@@ -5743,6 +5744,21 @@ async function startAnnotation(session, sessionId, callerThread, opts) {   await pg.evaluate((code) => { if (!window.__pupStartAnnotate) eval(code); }, ANNOTATE_OVERLAY_JS);   await pg.evaluate((t2) => { window.__pupAnnotateResult = null; window.__pupStartAnnotate(t2); }, tool);   console.log(`[annotate] "${sessionId}" overlay started (by ${callerThread || 'unknown'}, tool=${tool})`);+  // v2.0.76: the PROVEN watcher (2.0.49 pattern) — the fast-loop pickup never dispatched in+  // production and quick capture broke; this waits on the page itself and feeds the new fast+  // pipeline (flash + instant toast + async slow legs). Quick mode re-arms for the next stroke.+  (async () => {+    const t0 = Date.now();+    while (Date.now() - t0 < 15 * 60000) {+      try { await pg.waitForFunction('window.__pupAnnotateResult', { timeout: 15 * 60000 - (Date.now() - t0), polling: 500 }); } catch (e) { return; }+      let res = null;+      try { res = await pg.evaluate(() => { const r = window.__pupAnnotateResult; window.__pupAnnotateResult = null; return r; }); } catch (e) { return; }+      if (!res) continue;+      if (!res.done) { console.log(`[annotate] "${sessionId}" cancelled`); return; }+      try { await processAnnotateCapture(session, sessionId, pg, res); } catch (e) { console.log(`[annotate] "${sessionId}" capture failed: ${e.message}`); }+      if (!res.quick) return;+    }+  })(); }  // v2.0.72 CAPTURE PIPELINE, reordered for perceived speed (John: the blip, the slow toast):@@ -15220,48 +15236,23 @@ const _onPupBound = async () => {   // return;` — and minimal-touch is the normal mode, so it never ran once. Overlays are explicitly   // ALLOWED in minimal-touch (v1.9.191, gentle branding), so enforcement gets its OWN interval with no   // minimal-touch gate. 10s cadence: a window is never knowingly bare for more than ~10s.-  // v2.0.72: the FAST loop — 700ms harvest of floaty clicks (fallback path only now) and-  // annotate RESULTS, so mouse-up-to-toast is ~1s instead of riding the 10s identity sweep.-  setInterval(async () => {-    if (process.platform !== 'win32') return;-    for (const [sidQ, sQ] of [...sessions]) {-      if (sQ._lostBrowser || !(sQ.tabs || []).length) continue;-      for (const tQ of (sQ.tabs || [])) {-        if (!tQ || !tQ.page) continue;-        // 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 {-          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) { console.log(`[annotate] "${sidQ}" result harvested: ${JSON.stringify(got.r).slice(0, 120)}`); processAnnotateCapture(sQ, sidQ, tQ.page, got.r).catch(e2 => console.log(`[annotate] "${sidQ}" capture failed: ${e2.message}`)); }-        else if (got.r && !got.r.done) console.log(`[annotate] "${sidQ}" cancelled`);-      }-    }-  }, 700);--  setInterval(async () => {+setInterval(async () => {     if (process.platform !== 'win32') return;     // v2.0.67: floaty-click harvest runs BEFORE the identity gate (the pencil must work even when     // identity stamping is unsupported) and heartbeats so a dead sweep is visible in the log.     global.__floatyHb = (global.__floatyHb || 0) + 1;     if (global.__floatyHb % 15 === 1) console.log(`[floaty] sweep heartbeat #${global.__floatyHb} (${sessions.size} session(s), identitySupported=${_identitySupported})`);+    try {+      for (const [sidF, sF] of [...sessions]) {+        if (sF._lostBrowser || !(sF.tabs || []).length || sF._annotateArmed && Date.now() - sF._annotateArmed < 4000) continue;+        for (const tF of (sF.tabs || [])) {+          if (!tF || !tF.page) continue;+          let clickedF = null;+          try { clickedF = await Promise.race([tF.page.evaluate(() => { const c = window.__pupFloatyClick; window.__pupFloatyClick = null; return c || null; }), new Promise(r => setTimeout(() => r(null), 2500))]); } catch (e) {}+          if (clickedF) { sF._annotateArmed = Date.now(); console.log(`[floaty] "${sidF}" pencil clicked — arming capture watcher on ${tF.tabId}`); startAnnotation(sF, sidF, 'user-floaty', { tool: 'pen', tabId: tF.tabId }).catch(() => {}); break; }+        }+      }+    } catch (e) {}     if (_identitySupported !== true) return;     try {       for (const [sid2, s2] of [...sessions]) {