← Commit history

Favicons that hostile CDNs blocked now fetch through Chrome's own network stack via CDP as the final fallback with failures logged honestly, the dashboard taskbar strip serves the thread tile a button actually wears in tiles mode instead of always showing category art, and the reclaim sweep throttles to thirty seconds so busy multi-thread machines stop paying an enum call every few seconds.

John Lauer ·8ac541fc15 ·2mo ago ·parent 9cfb96b
4 files changed +52−10
adom-bridge-puppeteer-manifest.json+4−4
@@ -1,10 +1,10 @@ {   "manifest_version": 1,   "name": "puppeteer",-  "version": "2.0.209",-  "url": "https://wiki.adom.inc/download/adom/pup-bridge/2.0.209/adom-bridge-puppeteer-v2.0.209.zip",-  "sha256": "799f93bd6058779963cba206c4684886d6546f07373e282136c52dcf19124f38",-  "size": 934996,+  "version": "2.0.210",+  "url": "https://wiki.adom.inc/download/adom/pup-bridge/2.0.210/adom-bridge-puppeteer-v2.0.210.zip",+  "sha256": "3d45080fd66848b79d9ed650768c2e4436b8b97ed9f1d14e80fbc5339d3dcb22",+  "size": 935847,   "verbPrefixes": [     "browser_",     "desktop_recorder_",
src/BRIDGE_VERSION+1−1
@@ -1 +1 @@-2.0.209+2.0.210
src/bridge.json+1−1
@@ -2,7 +2,7 @@   "manifest_version": 1,   "name": "puppeteer",   "displayName": "Puppeteer (Chrome for Testing + Native)",-  "version": "2.0.209",+  "version": "2.0.210",   "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+46−4
@@ -5867,6 +5867,27 @@ async function resolveFaviconRich(page) {   }   return firstReadable;   // best-effort: readable but possibly dark-on-dark }+// v2.0.210 (#55 final): fetch a favicon through CHROME's own network stack via CDP+// Network.loadNetworkResource — hostile CDNs fingerprint TLS, so node/curl get blocked where the+// real browser passes. Returns a Buffer or null.+async function fetchFaviconViaChrome(page, url) {+  try {+    const client = typeof page._client === 'function' ? page._client() : page._client;+    if (!client) return null;+    const frameId = page.mainFrame() && page.mainFrame()._id;+    const r = await client.send('Network.loadNetworkResource', { frameId, url, options: { disableCache: false, includeCredentials: true } });+    if (!r || !r.resource || !r.resource.success || !r.resource.stream) return null;+    const parts = [];+    for (;;) {+      const chunk = await client.send('IO.read', { handle: r.resource.stream, size: 65536 });+      parts.push(chunk.base64Encoded ? Buffer.from(chunk.data, 'base64') : Buffer.from(chunk.data, 'utf8'));+      if (chunk.eof) break;+    }+    client.send('IO.close', { handle: r.resource.stream }).catch(() => {});+    const buf = Buffer.concat(parts);+    return buf.length > 100 ? buf : null;+  } catch (e) { return null; }+} async function applyAppOverlay(session, sessionId) {   // v1.9.191 (John): overlays are the GENTLE branding path and are ALLOWED in minimal-touch.   // ITaskbarList3::SetOverlayIcon paints a badge onto the EXISTING taskbar button; it never@@ -5990,10 +6011,16 @@ async function applyAppOverlay(session, sessionId) {             const _resp = await fetch(_o9 + '/favicon.ico', { redirect: 'follow', signal: _ctl.signal,               headers: { 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36', 'Accept': 'image/*,*/*;q=0.8' } }).catch(() => null);             clearTimeout(_tm);-            if (_resp && _resp.ok) {-              const _buf = Buffer.from(await _resp.arrayBuffer());+            let _buf = null;+            if (_resp && _resp.ok) { const _b0 = Buffer.from(await _resp.arrayBuffer()); if (_b0.length > 100) _buf = _b0; }+            if (!_buf) {+              // node fetch blocked (TLS fingerprinting) — go through Chrome's own network stack+              _buf = await fetchFaviconViaChrome(activePage, _o9 + '/favicon.ico');+              if (!_buf) console.log(`[overlay] "${sessionId}" favicon fetch failed BOTH bridge-side and via Chrome for ${_o9} — generic it is`);+            }+            if (_buf) {               if (_buf.length > 100) {-                const _an = await analyzeIconBytes(_buf.toString('base64'), _resp.headers.get('content-type') || 'image/x-icon', _o9 + '/favicon.ico');+                const _an = await analyzeIconBytes(_buf.toString('base64'), (_resp && _resp.headers.get('content-type')) || 'image/x-icon', _o9 + '/favicon.ico');                 if (_an && _an.b64 && !_an.unreadable) {                   src = { b64: _an.b64, mime: 'image/png', href: _o9 + '/favicon.ico', darkDominant: _an.darkDominant, transparent: _an.transparent };                   session._overlayFav = { kind: 'page-favicon', format: _an.format, mode: 'default', transparent: _an.transparent, darkDominant: _an.darkDominant, via: 'bridge-side fetch (in-page favicon path came up empty)', href: src.href };@@ -8232,7 +8259,10 @@ async function drainWindowOpenedEvents() {     // to kick a reclaim sweep — pup reacting to itself, and a burst of enum calls right when a     // window opens. Ignore the ring while a nudge is in flight; a real new window is still caught by     // the next drain or the 90s safety-net sweep.-    const THROTTLE_RECLAIM = 4000;+    // v2.0.210 (busy-box hardening): 4s reclaim throttle meant a machine with several active AI+    // threads (constant window-opened events) ran an enum-backed reclaim every few seconds forever.+    // 30s bounds it at 2/min worst case; unmanaged-popup adoption tolerates that delay fine.+    const THROTTLE_RECLAIM = 30000;     if (_nudgeUntil && Date.now() < _nudgeUntil) return;     if (Date.now() - _lastReclaim > THROTTLE_RECLAIM) {       _lastReclaim = Date.now();@@ -12416,6 +12446,18 @@ const server = http.createServer(async (req, res) => {       } catch (e) { res.writeHead(404); res.end(); return; }     }     if (pathname === '/dashboard/stampicon') {+      // v2.0.210 (John: "why aren't your dashboard icons consistent with the settings?"): the strip+      // must show what the button ACTUALLY wears. In tiles mode that is the THREAD TILE, not the+      // category icon this endpoint predates. Serve the tile when tiles mode owns the session.+      try {+        const _sid0 = url.searchParams.get('session') || '';+        const _s0 = sessions.get(_sid0);+        if (pupSettings().aumidIcons === 'on' && pupSettings().threadTiles === 'on' && _s0 && (_s0.owner || _s0._ownerThread)) {+          const _tp0 = path.join(THREAD_TILE_DIR, `${threadSlug(_s0.owner || _s0._ownerThread)}.ico`);+          const _inner0 = icoLargestPng(fs.readFileSync(_tp0));+          if (_inner0) { res.writeHead(200, { 'Content-Type': 'image/png', 'Cache-Control': 'no-store' }); res.end(_inner0); return; }+        }+      } catch (e) {}       // v1.9.246 (John's audit): a STAMPED window's real taskbar button shows the icon the stamp       // registered (pupIconPath's category tile), NOT the Chrome exe icon - the strip must match.       try {