← Commit history

Reliable wiggle-free handle resolution: a profile process with exactly one window resolves to that window directly (works on maximized windows, which the width-wiggle never could); multi-window profiles still leave bare rather than guess until birth-time resolution lands

John Lauer ·b1b0e2039e ·3mo ago ·parent 2da5b81
4 files changed +24−13
adom-bridge-puppeteer-manifest.json+4−4
@@ -1,10 +1,10 @@ {   "manifest_version": 1,   "name": "puppeteer",-  "version": "1.9.302",-  "url": "https://wiki.adom.inc/download/adom/adom-desktop-puppeteer-bridge/1.9.302/adom-bridge-puppeteer-v1.9.302.zip",-  "sha256": "d0b115d36bddeb0b067080ff27d2758aeec7a990076168c175adda9fc9175040",-  "size": 725797,+  "version": "1.9.303",+  "url": "https://wiki.adom.inc/download/adom/adom-desktop-puppeteer-bridge/1.9.303/adom-bridge-puppeteer-v1.9.303.zip",+  "sha256": "91038fe7735245505470b1615ec0ce72e7ea3c4dc07949abfbaf5c89ffc32ecf",+  "size": 726129,   "verbPrefixes": [     "browser_",     "desktop_recorder_",
src/BRIDGE_VERSION+1−1
@@ -1 +1 @@-1.9.302+1.9.303
src/bridge.json+1−1
@@ -2,7 +2,7 @@   "manifest_version": 1,   "name": "puppeteer",   "displayName": "Puppeteer (Chrome for Testing + Native)",-  "version": "1.9.302",+  "version": "1.9.303",   "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+18−7
@@ -5014,14 +5014,25 @@ async function resolveSessionHwndByBounds(session, sessionId) {     try { if (_widthChanged) await cdp.send('Browser.setWindowBounds', { windowId, bounds: { width: _origW } }); } catch (e) {}     if (_releaseWiggle) { try { _releaseWiggle(); } catch (e) {} }     try { if (cdp) await cdp.detach(); } catch (e) {}-    if (matches.size === 1) {-      const h = [...matches][0];-      session._hwnd = h;-      persistSessionHwnd(sessionId, h);-      console.log(`[hwnd] "${sessionId}" resolved OS handle ${h} by ${markerW != null ? 'unique-width wiggle' : 'window bounds'} (exactly 1 match)`);-      return h;+    // v1.9.303: the RELIABLE, wiggle-free path (the wiggle never worked on maximized windows — proven).+    // Windows owned by THIS profile's browser process ARE this profile's windows. If the profile has+    // exactly ONE such window, that IS this session's window, maximized or not — no geometry guessing.+    const _profPids = pupBrowserPidSet(session.profileName);+    const _profWins = new Set();+    for (const line of out.split(/\r?\n/)) { const p = line.split(','); const h = Number(p[0]); const wpid = Number(p[1]); if (h && _profPids.has(wpid)) _profWins.add(h); }+    let resolved = null, how = '';+    if (matches.size === 1) { resolved = [...matches][0]; how = markerW != null ? 'unique-width wiggle' : 'window bounds'; }+    else if (_profWins.size === 1) { resolved = [..._profWins][0]; how = 'sole window of profile process (wiggle-free)'; }+    if (resolved) {+      session._hwnd = resolved;+      persistSessionHwnd(sessionId, resolved);+      console.log(`[hwnd] "${sessionId}" resolved OS handle ${resolved} — ${how}`);+      return resolved;     }-    console.log(`[hwnd] "${sessionId}" NOT resolved — ${matches.size} candidate windows matched (${markerW != null ? 'wiggle' : 'bounds'}); leaving bare rather than painting a guess`);+    // Multiple windows on the profile and no unique wiggle match → we cannot know which is ours, so+    // leave it BARE rather than paint a guessed/shared handle (John's rule: bare > wrong). This is the+    // case the birth-time resolution (todo #5) will finally fix for multi-window profiles.+    console.log(`[hwnd] "${sessionId}" NOT resolved — ${_profWins.size} windows on this profile, ${matches.size} wiggle-matches; leaving bare rather than guessing`);     return null;   } catch (e) { if (_releaseWiggle) { try { _releaseWiggle(); } catch (x) {} } console.log(`[hwnd] "${sessionId}" bounds resolve failed: ${e.message}`); return null; } }