← Commit history

Fix multi-monitor park overflow: a freshly opened pup window is launched off-screen then parked by reading screen.availWidth/Height, which reflects whichever monitor the window momentarily sits on. On a multi-monitor setup that could size the window for a LARGER monitor while it lands on the smaller primary, overflowing off the bottom-right so page content past the fold was unreachable until the slow 120s placement sweep re-parked it. placeOnScreen now settles then re-reads the destination monitor's work area and re-clamps immediately if it differs, so a window is never left bigger than the screen it is actually on.

John Lauer ·2ed43c154e ·2mo ago ·parent 234bfff
4 files changed +34−18
adom-bridge-puppeteer-manifest.json+4−4
@@ -1,10 +1,10 @@ {   "manifest_version": 1,   "name": "puppeteer",-  "version": "1.9.341",-  "url": "https://wiki.adom.inc/download/adom/adom-desktop-puppeteer-bridge/1.9.341/adom-bridge-puppeteer-v1.9.341.zip",-  "sha256": "6e63fbf43d9b1ba83c7bbc94918ec816485c14c3983386a40b05eba9b8a658ad",-  "size": 632961,+  "version": "1.9.342",+  "url": "https://wiki.adom.inc/download/adom/adom-desktop-puppeteer-bridge/1.9.342/adom-bridge-puppeteer-v1.9.342.zip",+  "sha256": "7f8b46100f9063605b37e31361926d8fa2c52eb939a71c786431bdeb5fe0144f",+  "size": 633534,   "verbPrefixes": [     "browser_",     "desktop_recorder_",
src/BRIDGE_VERSION+1−1
@@ -1 +1 @@-1.9.341+1.9.342
src/bridge.json+1−1
@@ -2,7 +2,7 @@   "manifest_version": 1,   "name": "puppeteer",   "displayName": "Puppeteer (Chrome for Testing + Native)",-  "version": "1.9.341",+  "version": "1.9.342",   "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+28−12
@@ -4914,17 +4914,6 @@ async function applyAppOverlay(session, sessionId) {     const nm = session._appName ? `${session._appName} — ` : '';     // v1.9.212: address the button BY HWND when known — the title tag is unavailable on PDF windows,     // which is why those buttons never got painted no matter what the compositor produced.-    // v1.9.215 DIAGNOSTIC: dump the EXACT bytes we are about to hand AD, plus the target we address,-    // so the composite can be inspected directly instead of inferred from a screenshot. Four of my-    // theories about this button were wrong; this measurement splits the problem: if the PNG contains-    // the generic icon, the compositor is exonerated and the fault is delivery to this window.-    try {-      const _dbgDir = path.join(require('os').tmpdir(), 'pup-badge-debug');-      fs.mkdirSync(_dbgDir, { recursive: true });-      const _dbgPath = path.join(_dbgDir, `${sessionId}.png`);-      fs.writeFileSync(_dbgPath, Buffer.from(overlay, 'base64'));-      console.log(`[overlay-debug] "${sessionId}" composed ${Buffer.from(overlay, 'base64').length}B -> ${_dbgPath} | src=${(src && src.href) || '?'} | hwnd=${session._hwnd || '(none, using title)'}`);-    } catch (e) { console.log(`[overlay-debug] dump failed: ${e.message}`); }     if (!session._hwnd) { try { await resolveSessionHwndByBounds(session, sessionId); } catch (e) {} }     // v1.9.278 THE EDGE GUARD: paint ONLY to an hwnd proven to be a pup browser window. If we cannot     // prove ownership (recycled/dead handle), REFUSE - never fall back to a bare title match that@@ -4949,6 +4938,16 @@ async function applyAppOverlay(session, sessionId) {       session._appOverlay = true; // identical overlay already on the button — skip the AD round-trip       return true;     }+    // v1.9.215 DIAGNOSTIC (now AFTER the dedup so it only fires on a REAL paint, not every re-run):+    // dump the EXACT bytes we are about to hand AD so the composite can be inspected directly. If the+    // PNG contains the generic icon, the compositor is exonerated and the fault is delivery.+    try {+      const _dbgDir = path.join(require('os').tmpdir(), 'pup-badge-debug');+      fs.mkdirSync(_dbgDir, { recursive: true });+      const _dbgPath = path.join(_dbgDir, `${sessionId}.png`);+      fs.writeFileSync(_dbgPath, Buffer.from(overlay, 'base64'));+      console.log(`[overlay-debug] "${sessionId}" PAINT ${Buffer.from(overlay, 'base64').length}B -> ${_dbgPath} | src=${(src && src.href) || '?'} | hwnd=${session._hwnd || '(none, using title)'}`);+    } catch (e) { console.log(`[overlay-debug] dump failed: ${e.message}`); }     await chrome.adCommand('desktop_taskbar', {       hwnd: session._hwnd,       overlay: { icon: overlay, tooltip: _tooltip },@@ -6636,6 +6635,7 @@ async function parkSessionWindowDirect(page, sessionId) {       }       return null;     };+    const place = (d) => cdp.send('Browser.setWindowBounds', { windowId, bounds: { left: Math.round(d.x + 10), top: Math.round(d.y + 10), width: Math.round(d.w - 20), height: Math.round(d.h - 20) } });     const placeOnScreen = async () => {       const s = await cssScreen();       if (!s) return false;@@ -6643,7 +6643,23 @@ async function parkSessionWindowDirect(page, sessionId) {       // v1.9.139 (John): 10px inset on ALL sides of the work area — the visible signature that       // placement is computed, not accidental. THIS is the real park geometry; the WinBgP/WinClr       // PS sites I patched in 1.9.136-137 are flash/minimize paths, not this one.-      await cdp.send('Browser.setWindowBounds', { windowId, bounds: { left: Math.round(s.x + 10), top: Math.round(s.y + 10), width: Math.round(s.w - 20), height: Math.round(s.h - 20) } });+      await place(s);+      // v1.9.342 (John: "the window was BIGGER than the screen, i couldn't scroll to the bottom / see+      // my content"). ROOT CAUSE: screen.avail* reflects whatever monitor the window is CURRENTLY on.+      // A freshly opened window is launched OFF-SCREEN and then parked, and during that sequence it can+      // momentarily sit on a DIFFERENT (larger) monitor — so it gets SIZED for that monitor's work area+      // but LANDS on the smaller primary, overflowing off the bottom-right until the slow (120s)+      // placement sweep happens to re-park it. Close the race HERE: once the window is actually placed,+      // re-read screen.avail (now it reflects the DESTINATION monitor) and, if that monitor differs,+      // re-place to ITS work area. A window is never left overflowing its own screen, even for a moment.+      try {+        await new Promise(r2 => setTimeout(r2, 250));+        const s2 = await cssScreen();+        if (s2 && s2.w > 400 && s2.h > 300 && (s2.w !== s.w || s2.h !== s.h || s2.x !== s.x || s2.y !== s.y)) {+          await place(s2);+          console.log(`[park] "${sessionId}": destination monitor differs from park-time monitor (${s.w}x${s.h}@${s.x},${s.y} → ${s2.w}x${s2.h}@${s2.x},${s2.y}) — re-clamped to the real screen so no content is off-screen`);+        }+      } catch (e) {}       return true;     };     const moveOffScreen = async () => {