← Commit history

The Settings matrix overlay cells always show an ACCURATE badge: a new bestbadge endpoint serves the newest composed badge whose favicon is real, the cells source from it, and the drawn fallback is a complete generic globe instead of the half-drawn ring John caught.

John Lauer ·aa78c47e7f ·2mo ago ·parent 0da198c
4 files changed +29−7
adom-bridge-puppeteer-manifest.json+4−4
@@ -1,10 +1,10 @@ {   "manifest_version": 1,   "name": "puppeteer",-  "version": "2.0.200",-  "url": "https://wiki.adom.inc/download/adom/pup-bridge/2.0.200/adom-bridge-puppeteer-v2.0.200.zip",-  "sha256": "9395f823bda1296cfeac6326127bd60048874270b34eecc35fb3bd6c1de38dc8",-  "size": 927269,+  "version": "2.0.201",+  "url": "https://wiki.adom.inc/download/adom/pup-bridge/2.0.201/adom-bridge-puppeteer-v2.0.201.zip",+  "sha256": "f54f160e407eb1d6ac7f933ea9726e60f1c83e684bce4369353326361d3e480f",+  "size": 927712,   "verbPrefixes": [     "browser_",     "desktop_recorder_",
src/BRIDGE_VERSION+1−1
@@ -1 +1 @@-2.0.200+2.0.201
src/bridge.json+1−1
@@ -2,7 +2,7 @@   "manifest_version": 1,   "name": "puppeteer",   "displayName": "Puppeteer (Chrome for Testing + Native)",-  "version": "2.0.200",+  "version": "2.0.201",   "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+23−1
@@ -11820,7 +11820,9 @@ function paintThreadExamples(){     return '<img class="mbase" src="/dashboard/baseicon?profile=adom-you'+V+'" data-fb="plain">';   }   function badgeHtml(){-    return liveSid?'<img class="mbadge" src="/dashboard/badge?session='+encodeURIComponent(liveSid)+V+'" data-fbb="1">':'<canvas width="44" height="44" class="mbadge" data-genb="1"></canvas>';+    // v2.0.201: bestbadge = the newest composed badge whose favicon is REAL — the matrix never+    // shows a blank or generic circle while any live window carries an accurate favicon badge.+    return '<img class="mbadge" src="/dashboard/bestbadge?'+V.slice(1)+'" data-fbb="1">';   }   var matrixHtml='<div class="texmatrix">'+cells.map(function(c,i){     const m=c[0],ov=c[1];@@ -11869,11 +11871,14 @@ function paintThreadExamples(){     im.onerror=function(){ swapGenB(im); };   });   function swapGenB(im){+    // full Chrome-style generic globe (card + circle + meridian + equator), not a bare ring     const cv=document.createElement('canvas'); cv.width=44; cv.height=44; cv.className='mbadge';     const ctx=cv.getContext('2d'),b=44;     rr(ctx,0,0,b,b,b*0.16,'#f1f3f4');     ctx.strokeStyle='#5f6368';ctx.lineWidth=2.6;     ctx.beginPath();ctx.arc(b/2,b/2,b*0.28,0,7);ctx.stroke();+    ctx.beginPath();ctx.ellipse(b/2,b/2,b*0.12,b*0.28,0,0,7);ctx.stroke();+    ctx.beginPath();ctx.moveTo(b*0.22,b/2);ctx.lineTo(b*0.78,b/2);ctx.stroke();     im.replaceWith(cv);   }   strip.querySelectorAll('.mcell').forEach(function(cell,i){@@ -12432,6 +12437,23 @@ const server = http.createServer(async (req, res) => {         res.end(buf); return;       } catch (e) { res.writeHead(404); res.end(); return; }     }+    if (pathname === '/dashboard/bestbadge') {+      // v2.0.201 (John: the matrix overlay cells showed blank circles): serve the composed badge of+      // a session whose favicon is REAL (kind page-favicon), so the Settings preview always has an+      // ACCURATE overlay example when any live window has one. 404s only when no such session exists.+      try {+        let best = null;+        for (const [sid0, s0] of sessions) {+          const k = s0 && s0._overlayFav && s0._overlayFav.kind;+          if (k === 'page-favicon' || k === 'app-provided') {+            const f0 = path.join(require('os').tmpdir(), 'pup-badge-debug', `${sid0}.png`);+            try { const st0 = fs.statSync(f0); if (!best || st0.mtimeMs > best.m) best = { f: f0, m: st0.mtimeMs }; } catch (e) {}+          }+        }+        if (best) { const buf = fs.readFileSync(best.f); res.writeHead(200, { 'Content-Type': 'image/png', 'Cache-Control': 'no-store' }); res.end(buf); return; }+      } catch (e) {}+      res.writeHead(404); res.end(); return;+    }     if (pathname === '/dashboard/badge') {       // Serve the exact overlay PNG pup last composed for a session, so the dashboard shows the REAL       // badge rather than a re-render that might differ from what Windows was handed.