← Commit history

Fix owner-chip toggle timeout: applyOwnerChipSetting awaited page.evaluate on every tab with no bound, so one slow/wedged page (a heavy 3D-viewer tab) hung the whole sweep and browser_set_identity/ownerChip toggles timed out. Each per-page evaluate is now raced against a 1.5s timeout, and browser_set_identity fires the repaint non-blocking, so toggling the chip on/off never hangs on a busy window.

John Lauer ·f17b3c9c29 ·2mo ago ·parent 770fbf9
4 files changed +22−11
adom-bridge-puppeteer-manifest.json+4−4
@@ -1,10 +1,10 @@ {   "manifest_version": 1,   "name": "puppeteer",-  "version": "1.9.343",-  "url": "https://wiki.adom.inc/download/adom/adom-desktop-puppeteer-bridge/1.9.343/adom-bridge-puppeteer-v1.9.343.zip",-  "sha256": "ae8cb82b984c702cb86b7db1283b485fd0fe7a5ec0b1f62ec12ee77f5d5083a9",-  "size": 635255,+  "version": "1.9.344",+  "url": "https://wiki.adom.inc/download/adom/adom-desktop-puppeteer-bridge/1.9.344/adom-bridge-puppeteer-v1.9.344.zip",+  "sha256": "7d7555830e7eb45dd93c288d0cd938ab48782b628eea1686930c25a6a8746dfb",+  "size": 635563,   "verbPrefixes": [     "browser_",     "desktop_recorder_",
src/BRIDGE_VERSION+1−1
@@ -1 +1 @@-1.9.343+1.9.344
src/bridge.json+1−1
@@ -2,7 +2,7 @@   "manifest_version": 1,   "name": "puppeteer",   "displayName": "Puppeteer (Chrome for Testing + Native)",-  "version": "1.9.343",+  "version": "1.9.344",   "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+16−5
@@ -5575,18 +5575,26 @@ let _reconcileBusy = false; // inject-time gate in attachTab. async function applyOwnerChipSetting(on) {   if (process.platform !== 'win32') return;+  // v1.9.344 (John: turning the chip off "Request timed out"): a single wedged/slow page (e.g. a heavy+  // 3D-viewer tab whose renderer is busy) used to hang the whole sweep because each page.evaluate was+  // awaited with no bound. Race every per-page evaluate against a short timeout so one stuck tab can+  // never block toggling the chip across every other window.+  const evalBounded = (page, fn, ...a) => Promise.race([+    page.evaluate(fn, ...a).catch(() => {}),+    new Promise(r => setTimeout(r, 1500)),+  ]);   for (const [sid, s] of [...sessions]) {     for (const t of (s.tabs || [])) {       if (!t || !t.page) continue;       try {         if (!on) {-          await t.page.evaluate(() => { try { const el = document.documentElement.querySelector('div[data-pup-owner]'); if (el) el.remove(); } catch (e) {} });+          await evalBounded(t.page, () => { try { const el = document.documentElement.querySelector('div[data-pup-owner]'); if (el) el.remove(); } catch (e) {} });         } else {           const thread = String(sid).replace(/^ai-/, '');           const prof = s.profileName || 'adom-you';           const avatar = pupSettings().identityAvatarB64 || '';           const ident = pupSettings().identityName || '';-          await t.page.evaluate((thread2, profile, avatar2, ident2) => {+          await evalBounded(t.page, (thread2, profile, avatar2, ident2) => {             try {               const root = document.documentElement; if (!root || root.querySelector('div[data-pup-owner]')) return;               const host = document.createElement('div'); host.setAttribute('data-pup-owner', '1');@@ -12252,9 +12260,12 @@ const server = http.createServer(async (req, res) => {             if (typeof args.name === 'string') patch.identityName = args.name;             if (args.enabled === true || args.enabled === false) patch.ownerChip = args.enabled ? 'on' : 'off';             savePupSettings(patch);-            // Repaint live windows: remove the current chip then re-add with the new identity.-            try { await applyOwnerChipSetting(false); } catch (e) {}-            if (pupSettings().ownerChip === 'on') { try { await applyOwnerChipSetting(true); } catch (e) {} }+            // Repaint live windows NON-BLOCKING (each per-page evaluate is timeout-bounded inside+            // applyOwnerChipSetting): remove the current chip, then re-add with the new identity if the+            // chip is on. Fire-and-forget so a slow page can never make THIS verb time out.+            applyOwnerChipSetting(false)+              .then(() => { if (pupSettings().ownerChip === 'on') return applyOwnerChipSetting(true); })+              .catch(() => {});             const s = pupSettings();             sendJSON(res, { success: true, output: JSON.stringify({ ok: true,               identityName: s.identityName || null,