← Commit history

enum_windows goes event-driven, per John's design call: the enum exists to find a newborn window's handle, so once every live window's handle is resolved the snapshot serves for 45 seconds with zero ab calls, and it invalidates the instant anything could change - a window-opened event, a pup open or close, or a reap. Steady state is now zero calls, not a slower drip.

John Lauer ·5a95935aa4 ·2mo ago ·parent d46e7c1
4 files changed +27−7
adom-bridge-puppeteer-manifest.json+4−4
@@ -1,10 +1,10 @@ {   "manifest_version": 1,   "name": "puppeteer",-  "version": "2.0.186",-  "url": "https://wiki.adom.inc/download/adom/pup-bridge/2.0.186/adom-bridge-puppeteer-v2.0.186.zip",-  "sha256": "277a89092561a353eff3687b323f010e63cde2e6951d53533179de67ac164cb9",-  "size": 922591,+  "version": "2.0.187",+  "url": "https://wiki.adom.inc/download/adom/pup-bridge/2.0.187/adom-bridge-puppeteer-v2.0.187.zip",+  "sha256": "75e5bd3fe67b9887cb2fe0623d2410a974e7fd8e7498cec486beb4ad4667b60f",+  "size": 923164,   "verbPrefixes": [     "browser_",     "desktop_recorder_",
src/BRIDGE_VERSION+1−1
@@ -1 +1 @@-2.0.186+2.0.187
src/bridge.json+1−1
@@ -2,7 +2,7 @@   "manifest_version": 1,   "name": "puppeteer",   "displayName": "Puppeteer (Chrome for Testing + Native)",-  "version": "2.0.186",+  "version": "2.0.187",   "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+21−1
@@ -7321,6 +7321,21 @@ const ENUM_CACHE_MS = 1500; // set-diff tolerates a <=1s-stale snapshot fine: it just sees the new window one poll later, and // window creation takes 1-3s anyway. const ENUM_FRESH_MS = 1000;+// v2.0.187 (John, 4th report, and he named the actual design flaw: "you find the hwnd and then+// never clean up after yourself — stop polling once you've figured out what you needed"). He is+// right: the enum exists for BIRTH (find the new hwnd by set-diff). Steady-state sweeps were lazily+// reusing it every 1.5s forever. Now: when every live session already has a resolved hwnd, the+// snapshot is served for up to ENUM_CACHE_LONG_MS without touching ab at all, and the cache is+// INVALIDATED the moment anything could have changed — a window-opened UI event, a pup open/close,+// a reap. Steady state = zero enum calls, not a slower drip of them.+const ENUM_CACHE_LONG_MS = 45000;+function invalidateEnumCache() { _enumCache = { at: 0, rows: null }; }+function _allHwndsResolved() {+  if (!sessions.size) return false;+  let any = false;+  for (const [, s] of sessions) { if (!(s.tabs || []).length) continue; any = true; if (!s._hwnd) return false; }+  return any;+} let _enumInflight = null; let _enumFreshInflight = null; let _enumCache = { at: 0, rows: null };@@ -7333,7 +7348,7 @@ async function enumChromeWidgetWindows(opts) {     if (_enumCache.rows && Date.now() - _enumCache.at < ENUM_FRESH_MS) return _enumCache.rows;     if (_enumFreshInflight) return _enumFreshInflight;   }-  if (!fresh && _enumCache.rows && Date.now() - _enumCache.at < ENUM_CACHE_MS) return _enumCache.rows;+  if (!fresh && _enumCache.rows && Date.now() - _enumCache.at < (_allHwndsResolved() ? ENUM_CACHE_LONG_MS : ENUM_CACHE_MS)) return _enumCache.rows;   if (!fresh && _enumInflight) return _enumInflight;   const run = (async () => {     try {@@ -8117,6 +8132,9 @@ async function drainWindowOpenedEvents() {     if (!data) { console.log('[drag] drain: unparseable response'); return; }     const evs = data.events || [];     if (typeof data.nextSeq === 'number') _uiWatchSeq = data.nextSeq;+    // v2.0.187: any window-opened event means the desktop changed — the long-TTL enum snapshot is+    // no longer trustworthy. Invalidate so the next consumer re-reads reality.+    if ((data.events || []).length) invalidateEnumCache();     // v1.9.32: do NOT filter these events by window NAME. A window fires window-opened at CREATION,     // before its title exists, so the dragged-out Chrome window arrived with an EMPTY name and the     // old `/Chrome|Chromium/` filter threw away the one event that mattered (verified live: the@@ -9606,6 +9624,7 @@ async function createPageInNewWindow(browser, profileName) {     // the page target is unique per createTarget regardless.     let fresh = null, capturedHwnd = null;     await withBirthLock(async () => {+      invalidateEnumCache();   // v2.0.187: a birth changes the desktop — never diff against a stale snapshot       let beforeHwnds = new Set();       if (process.platform === 'win32') { try { beforeHwnds = new Set((await enumChromeWidgetWindows()).map(r => Number(r.h))); } catch (e) {} }       await cdp.send('Target.createTarget', { url: 'about:blank', newWindow: true, left: birthLeft, top: -32000, width: 1280, height: 800 });@@ -13720,6 +13739,7 @@ const server = http.createServer(async (req, res) => {           return;         }         case 'pup_close_window': {+          invalidateEnumCache();   // v2.0.187: the desktop is about to change           const sessionId = args.sessionId;           if (!sessionId || !sessions.has(sessionId)) {             sendJSON(res, { success: false, error: `Session "${sessionId}" not found` });