← Commit history

Fix missing taskbar overlay: hwndBelongsToPup now requires a real top-level visible Chrome_WidgetWin_1 frame, not just any window owned by the profile process. A stale same-process utility handle (18) was passing the pid-only check forever, so overlays painted onto a non-taskbar window and never appeared

John Lauer ·7a02804ee1 ·3mo ago ·parent ee5f322
4 files changed +27−9
adom-bridge-puppeteer-manifest.json+4−4
@@ -1,10 +1,10 @@ {   "manifest_version": 1,   "name": "puppeteer",-  "version": "1.9.296",-  "url": "https://wiki.adom.inc/download/adom/adom-desktop-puppeteer-bridge/1.9.296/adom-bridge-puppeteer-v1.9.296.zip",-  "sha256": "34235f89286e45b0af48aceb0b77eb5ebd490a787a6c189eb6f21df96484a2ff",-  "size": 720885,+  "version": "1.9.297",+  "url": "https://wiki.adom.inc/download/adom/adom-desktop-puppeteer-bridge/1.9.297/adom-bridge-puppeteer-v1.9.297.zip",+  "sha256": "aec7b25e90a15ed661f4d24af704877e8390d3cd80974d187dbcd1dfa4292961",+  "size": 721334,   "verbPrefixes": [     "browser_",     "desktop_recorder_",
src/BRIDGE_VERSION+1−1
@@ -1 +1 @@-1.9.296+1.9.297
src/bridge.json+1−1
@@ -2,7 +2,7 @@   "manifest_version": 1,   "name": "puppeteer",   "displayName": "Puppeteer (Chrome for Testing + Native)",-  "version": "1.9.296",+  "version": "1.9.297",   "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+21−3
@@ -4799,17 +4799,35 @@ function pupBrowserPidSet(profileName) {   return pids; } async function hwndOwnerPid(hwnd) {+  // v1.9.297 (John: "why is there no overlay on this taskbar icon?"): return the owner pid ONLY when+  // the handle is a REAL top-level Chrome browser FRAME — the window that owns the taskbar button —+  // not merely any window owned by the profile's Chrome process. Chrome spawns small same-process+  // utility/message HWNDs; one of those (handle 18, in John's case) got cached as a session's _hwnd.+  // The old pid-only check PASSED it forever (right process, wrong window), so hwndBelongsToPup never+  // rejected it, the overlay painted onto a non-taskbar window (invisible), and the enforcer just+  // re-composed the same dead badge in a loop — no overlay ever appeared. Requiring a top-level+  // visible Chrome_WidgetWin_1 frame rejects those handles and forces a proper re-resolve.   if (process.platform !== 'win32' || !hwnd) return null;   try {     const sp = path.join(require('os').tmpdir(), `_adom_hpid_${process.pid}.ps1`);     fs.writeFileSync(sp, [       'Add-Type @"',-      'using System; using System.Runtime.InteropServices;',-      'public class HPid { [DllImport("user32.dll")] public static extern uint GetWindowThreadProcessId(IntPtr h, out uint pid);',-      '  [DllImport("user32.dll")] public static extern bool IsWindow(IntPtr h); }',+      'using System; using System.Runtime.InteropServices; using System.Text;',+      'public class HPid {',+      '  [DllImport("user32.dll")] public static extern uint GetWindowThreadProcessId(IntPtr h, out uint pid);',+      '  [DllImport("user32.dll")] public static extern bool IsWindow(IntPtr h);',+      '  [DllImport("user32.dll")] public static extern bool IsWindowVisible(IntPtr h);',+      '  [DllImport("user32.dll")] public static extern IntPtr GetAncestor(IntPtr h, uint f);',+      '  [DllImport("user32.dll")] public static extern int GetClassName(IntPtr h, StringBuilder s, int n); }',       '"@',       `$h = [IntPtr]${Number(hwnd)}`,       'if (-not [HPid]::IsWindow($h)) { Write-Output "0"; exit }',+      'if (-not [HPid]::IsWindowVisible($h)) { Write-Output "0"; exit }',+      // Must be the ROOT window (GA_ROOT = 2) — utility/child HWNDs resolve to a different root.+      'if ([HPid]::GetAncestor($h, 2) -ne $h) { Write-Output "0"; exit }',+      // Must be a Chrome browser frame — the class that carries the taskbar button.+      '$cn = New-Object System.Text.StringBuilder 64; [void][HPid]::GetClassName($h, $cn, 64)',+      'if ($cn.ToString() -ne "Chrome_WidgetWin_1") { Write-Output "0"; exit }',       '$p = 0; [void][HPid]::GetWindowThreadProcessId($h, [ref]$p); Write-Output $p',     ].join(String.fromCharCode(13, 10)));     const out = (runPsHidden(sp, { timeout: 4000 }) || '').trim();