← Commit history

Overlay GUARANTEE hardening + graceful notch (John: bare window = broken-looking empty notch; overlays must always be present). ROOT CAUSE of missing overlays: applyAppOverlay REFUSES to paint when it can't confirm the window's hwnd (the Edge-protection guard), and your AD rebuilds constantly respawn+re-adopt windows, forcing hwnd re-resolution and transient bareness. Fixes: (1) baked a small Adom-mark fallback into the notch so a bare window shows a tidy branded corner, not a hole; (2) enforcer sweeps every 4s (was 10s) with a 4s bare cooldown (was 20s) so a bare window heals in seconds; (3) enforcer no longer SKIPS the overlay paint when a base-tile re-stamp is pending (they're independent now).

John Lauer ·d74f50aa78 ·3mo ago ·parent 82b6d0d
4 files changed +30−12
adom-bridge-puppeteer-manifest.json+4−4
@@ -1,10 +1,10 @@ {   "manifest_version": 1,   "name": "puppeteer",-  "version": "1.9.328",-  "url": "https://wiki.adom.inc/download/adom/adom-desktop-puppeteer-bridge/1.9.328/adom-bridge-puppeteer-v1.9.328.zip",-  "sha256": "0925d91b5bd53d229af47438f845a2d0a85cdc6e1452cb76ac0b6c7dfd217283",-  "size": 624104,+  "version": "1.9.329",+  "url": "https://wiki.adom.inc/download/adom/adom-desktop-puppeteer-bridge/1.9.329/adom-bridge-puppeteer-v1.9.329.zip",+  "sha256": "9942122ca716ca8cb60c8b898a2138e3a3b44e46b38b3aa27373b70a4e6ccf5c",+  "size": 624614,   "verbPrefixes": [     "browser_",     "desktop_recorder_",
src/BRIDGE_VERSION+1−1
@@ -1 +1 @@-1.9.328+1.9.329
src/bridge.json+1−1
@@ -2,7 +2,7 @@   "manifest_version": 1,   "name": "puppeteer",   "displayName": "Puppeteer (Chrome for Testing + Native)",-  "version": "1.9.328",+  "version": "1.9.329",   "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+24−6
@@ -3053,7 +3053,7 @@ function pupIconPath(sessionId) { // and only the inner (bottom-left) corner shows the radius — instead of a rounded-rect that rounds all // four corners into a blob. const NOTCH = { frac: 0.50, over: 0.16, rx: 0.11 };   // square side = 50% of tile; inner-corner radius 11% of tile-const _NOTCH_CACHE = path.join(os.tmpdir(), 'pup-notched-icons', PUP_ICON_GEN + '-sq');   // -sq: square notch (was a circular blob)+const _NOTCH_CACHE = path.join(os.tmpdir(), 'pup-notched-icons', PUP_ICON_GEN + '-sq2');   // -sq2: square notch + baked Adom-mark fallback let _notchDone = false; function notchedIconPath(origPath) {   if (!_notchDone) return origPath;   // not built yet → original tile (harmless; a later reconcile swaps it)@@ -3090,7 +3090,20 @@ async function _buildNotchedIco(sharp, srcPath, destPath) {     // (bottom-left) corner stays on-canvas and shows the radius — the notch reads as a square opening,     // not a circular blob. Matches the square overlay favicon.     const mask = Buffer.from(`<svg xmlns="http://www.w3.org/2000/svg" width="${N}" height="${N}"><rect x="${N - s}" y="${-over}" width="${s + over}" height="${s + over}" rx="${rx}" ry="${rx}" fill="#fff"/></svg>`);-    const png = await sharp(base).composite([{ input: mask, blend: 'dest-out' }]).png().toBuffer();   // dest-out punches a transparent notch+    let png = await sharp(base).composite([{ input: mask, blend: 'dest-out' }]).png().toBuffer();   // dest-out punches a transparent notch+    // v1.9.329 (John: "if there's no overlay icon, the notch looks retarded"). GRACEFUL FALLBACK: drop+    // a small Adom mark centered in the notch, baked into the STATIC tile (no churn). A window that is+    // momentarily WITHOUT a live favicon overlay (e.g. right after a bridge respawn, before its hwnd+    // re-resolves) then shows a tidy branded corner instead of a raw transparent hole. When the real+    // favicon overlay IS present, AD paints it on top and it covers this.+    try {+      const markB64 = pupBadgeB64();+      if (markB64) {+        const ms = Math.round(s * 0.56);+        const mark = await sharp(Buffer.from(markB64, 'base64')).resize(ms, ms, { fit: 'contain', background: { r: 0, g: 0, b: 0, alpha: 0 } }).png().toBuffer();+        png = await sharp(png).composite([{ input: mark, top: Math.round((s - ms) / 2), left: (N - s) + Math.round((s - ms) / 2) }]).png().toBuffer();+      }+    } catch (e) {}     frames.push({ size: N, png });   }   fs.mkdirSync(path.dirname(destPath), { recursive: true });@@ -13896,15 +13909,20 @@ server.listen(PORT, BIND_HOST, async () => {     try {       for (const [sid2, s2] of [...sessions]) {         if (s2._lostBrowser || !(s2.tabs || []).length) continue;-        if (pupSettings().aumidIcons === 'on' && !s2._curAppId && Date.now() - (s2._stampTriedAt || 0) > 45000) {-          s2._stampTriedAt = Date.now(); stampPupIdentity(sid2, { once: true }).catch(() => {}); continue;+        // v1.9.329: re-stamp an unstamped base tile if needed, but DO NOT `continue` — the overlay+        // paint below is independent and MUST still run this cycle. The old `continue` meant an+        // unstamped window never got its overlay either, so it stayed a bare (now notched → hole)+        // button until it happened to stamp. Both are attempted every sweep now.+        if (pupSettings().aumidIcons === 'on' && !s2._curAppId && Date.now() - (s2._stampTriedAt || 0) > 20000) {+          s2._stampTriedAt = Date.now(); stampPupIdentity(sid2, { once: true }).catch(() => {});         }         if (pupSettings().overlayBadges !== 'on') continue;         const bare = !s2._appOverlay;         const stuckGeneric = s2._appOverlay && s2._overlayIsGeneric;         if (!bare && !stuckGeneric) continue;         const last = s2._overlayEnforceAt || 0;-        const cooldown = bare ? 20000 : 90000;+        // v1.9.329: a bare window is now a VISIBLE hole (the notch), so recover it fast — 4s, not 20s.+        const cooldown = bare ? 4000 : 90000;         if (Date.now() - last < cooldown) continue;         s2._overlayEnforceAt = Date.now();         const wasGeneric = stuckGeneric;@@ -13915,7 +13933,7 @@ server.listen(PORT, BIND_HOST, async () => {         }).catch(() => {});       }     } catch (e) {}-  }, 10000);+  }, 4000);   // v1.9.329: 4s sweep (was 10s) — a bare window is now a visible notch-hole; heal it fast    setInterval(async () => {     if (process.platform !== 'win32') return;