← Commit history

The out-of-band favicon recovery now logs every outcome per rail and always falls through to Chrome's CDP network stack when the bridge-side bytes are not a readable icon, closing the silent path where a bot wall's 200-status HTML challenge page masqueraded as a fetched favicon and the badge went generic without a trace.

John Lauer ·c76db62c65 ·2mo ago ·parent 8ac541f
4 files changed +39−29
adom-bridge-puppeteer-manifest.json+4−4
@@ -1,10 +1,10 @@ {   "manifest_version": 1,   "name": "puppeteer",-  "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,+  "version": "2.0.211",+  "url": "https://wiki.adom.inc/download/adom/pup-bridge/2.0.211/adom-bridge-puppeteer-v2.0.211.zip",+  "sha256": "9edc441655f413c1dc1edafc41f2c478d3caa457d378267f94211560e4ebfd0c",+  "size": 936111,   "verbPrefixes": [     "browser_",     "desktop_recorder_",
src/BRIDGE_VERSION+1−1
@@ -1 +1 @@-2.0.210+2.0.211
src/bridge.json+1−1
@@ -2,7 +2,7 @@   "manifest_version": 1,   "name": "puppeteer",   "displayName": "Puppeteer (Chrome for Testing + Native)",-  "version": "2.0.210",+  "version": "2.0.211",   "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+33−23
@@ -5886,7 +5886,7 @@ async function fetchFaviconViaChrome(page, url) {     client.send('IO.close', { handle: r.resource.stream }).catch(() => {});     const buf = Buffer.concat(parts);     return buf.length > 100 ? buf : null;-  } catch (e) { return null; }+  } catch (e) { console.log(`[overlay] CDP favicon fetch threw: ${e && e.message}`); return null; } } async function applyAppOverlay(session, sessionId) {   // v1.9.191 (John): overlays are the GENTLE branding path and are ALLOWED in minimal-touch.@@ -5998,39 +5998,49 @@ async function applyAppOverlay(session, sessionId) {           console.log(`[overlay] "${sessionId}" reused last real favicon (${src.href}) instead of the generic globe — same page, favicon just not re-fetchable this cycle`);         }       }-      // v2.0.209 (#55, and the flaky-Mouser twin John caught on his own taskbar): when the in-page-      // favicon path yields nothing (hostile CDNs block in-page fetch; some sites declare no icons),-      // fetch <origin>/favicon.ico BRIDGE-SIDE with a real browser UA — node's fetch has no CORS and-      // no page sandbox. This is how ti.com's red Texas logo finally gets painted live.+      // v2.0.211 (#55): when the in-page favicon path yields nothing, fetch <origin>/favicon.ico+      // out-of-band. TWO rails, each honestly logged: (1) bridge-side node fetch with a browser UA;+      // (2) Chrome's OWN network stack via CDP Network.loadNetworkResource (survives TLS+      // fingerprinting that kills node). The 2.0.209/210 versions failed SILENTLY here: Akamai's bot+      // wall answers 200 with an HTML challenge page, so the node rail "succeeded" with unreadable+      // bytes, skipped the CDP rail, and fell to the generic glyph without a single log line.       if (!src || !src.b64) {         try {           let _u9 = ''; try { _u9 = (activePage && activePage.url()) || ''; } catch (e) {}           const _o9 = (() => { try { const u = new URL(_u9); return /^https?:$/.test(u.protocol) && !/^(localhost|127\.)/.test(u.hostname) ? u.origin : null; } catch (e) { return null; } })();           if (_o9) {+            const _icoUrl = _o9 + '/favicon.ico';+            const _tryIcon = async (buf, mime, rail) => {+              if (!buf || buf.length <= 100) return false;+              const _an = await analyzeIconBytes(buf.toString('base64'), mime || 'image/x-icon', _icoUrl).catch(() => null);+              if (_an && _an.b64 && !_an.unreadable) {+                src = { b64: _an.b64, mime: 'image/png', href: _icoUrl, darkDominant: _an.darkDominant, transparent: _an.transparent };+                session._overlayFav = { kind: 'page-favicon', format: _an.format, mode: 'default', transparent: _an.transparent, darkDominant: _an.darkDominant, via: rail + ' fetch (in-page favicon path came up empty)', href: _icoUrl };+                try { session._lastRealSrc = { b64: src.b64, mime: src.mime, href: _icoUrl, forUrl: _u9 }; } catch (e) {}+                console.log(`[overlay] "${sessionId}" favicon recovered ${rail} from ${_icoUrl}`);+                return true;+              }+              console.log(`[overlay] "${sessionId}" ${rail} fetch got ${buf.length}B from ${_icoUrl} but it is NOT a readable icon (bot-wall HTML?)`);+              return false;+            };+            let _got = false;             const _ctl = new AbortController(); const _tm = setTimeout(() => _ctl.abort(), 5000);-            const _resp = await fetch(_o9 + '/favicon.ico', { redirect: 'follow', signal: _ctl.signal,+            const _resp = await fetch(_icoUrl, { 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);-            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 (_resp && _resp.ok) {+              _got = await _tryIcon(Buffer.from(await _resp.arrayBuffer()), _resp.headers.get('content-type'), 'bridge-side');+            } else {+              console.log(`[overlay] "${sessionId}" bridge-side favicon fetch: ${_resp ? 'HTTP ' + _resp.status : 'network error/timeout'} for ${_icoUrl}`);             }-            if (_buf) {-              if (_buf.length > 100) {-                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 };-                  try { session._lastRealSrc = { b64: src.b64, mime: src.mime, href: src.href, forUrl: _u9 }; } catch (e) {}-                  console.log(`[overlay] "${sessionId}" favicon recovered BRIDGE-SIDE from ${src.href}`);-                }-              }+            if (!_got) {+              const _cb = await fetchFaviconViaChrome(activePage, _icoUrl);+              if (_cb) _got = await _tryIcon(_cb, null, 'via-Chrome-CDP');+              else console.log(`[overlay] "${sessionId}" via-Chrome-CDP favicon fetch returned nothing for ${_icoUrl}`);             }+            if (!_got) console.log(`[overlay] "${sessionId}" favicon fetch failed on BOTH rails for ${_o9} — generic it is`);           }-        } catch (e) {}+        } catch (e) { console.log(`[overlay] "${sessionId}" favicon fallback threw: ${e && e.message}`); }       }       if (!src || !src.b64) {         // Generic glyph: a teal-on-dark globe, same silhouette Chrome falls back to.