← Commit history

Plain mode now truly strips existing windows: deleting the registry keys was not enough because the per-window AppUserModel property trio survives and keeps branding the rebuilt button, so switching to plain wipes those properties with VT_EMPTY through the shell property store and nudges each window back to the stock Chrome button.

John Lauer ·216a26549b ·2mo ago ·parent 0d26f80
4 files changed +48−8
adom-bridge-puppeteer-manifest.json+4−4
@@ -1,10 +1,10 @@ {   "manifest_version": 1,   "name": "puppeteer",-  "version": "2.0.181",-  "url": "https://wiki.adom.inc/download/adom/pup-bridge/2.0.181/adom-bridge-puppeteer-v2.0.181.zip",-  "sha256": "9701a99ae7fa5fed2e79686177b4eb07ecb08233d78ec0ace8ec78d9e8e9af0c",-  "size": 920442,+  "version": "2.0.182",+  "url": "https://wiki.adom.inc/download/adom/pup-bridge/2.0.182/adom-bridge-puppeteer-v2.0.182.zip",+  "sha256": "534450e15357aa1e6fe64a07f638b0358efadfe9d325490a33a712eec9f8119c",+  "size": 921349,   "verbPrefixes": [     "browser_",     "desktop_recorder_",
src/BRIDGE_VERSION+1−1
@@ -1 +1 @@-2.0.181+2.0.182
src/bridge.json+1−1
@@ -2,7 +2,7 @@   "manifest_version": 1,   "name": "puppeteer",   "displayName": "Puppeteer (Chrome for Testing + Native)",-  "version": "2.0.181",+  "version": "2.0.182",   "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+42−2
@@ -4560,11 +4560,51 @@ async function stripAllPupIdentities(reason) {     try { execFileSync('reg', ['delete', `HKCU\\Software\\Classes\\AppUserModelId\\${id}`, '/f'], { timeout: 5000, windowsHide: true, stdio: 'ignore' }); } catch (e) {}   }   try { _registeredPupAumids.clear(); } catch (e) {}+  // v2.0.182 (measured during the ladder proof): deleting the REGISTRY keys is not enough — the+  // per-WINDOW AppUserModel property trio (+ the explicit ID) survives on the window and keeps+  // branding the rebuilt button. Truly plain = wipe those properties with VT_EMPTY via the shell+  // property store, then nudge. One PowerShell run covers every window (verified live: a branded+  // pup window's button reverted to stock "Google Chrome for Testing" the moment this ran).+  const hwnds = [];   for (const [sid, s] of targets) {     try { if (!s._hwnd) await resolveSessionHwndByBounds(s, sid); } catch (e) {}-    if (s._hwnd) nudgeTaskbarButton(s._hwnd, sid);+    if (s._hwnd) hwnds.push(Number(s._hwnd));   }-  console.log(`[identity] stripped ${ids.size} pup identit(ies) + nudged ${targets.length} window(s) (${reason})`);+  if (hwnds.length) {+    _nudgeUntil = Date.now() + 8000;+    const ps = `$code=@'+using System; using System.Runtime.InteropServices;+public static class Wipe {+  [StructLayout(LayoutKind.Sequential)] public struct PROPERTYKEY { public Guid fmtid; public uint pid; }+  [StructLayout(LayoutKind.Explicit)] public struct PROPVARIANT { [FieldOffset(0)] public ushort vt; [FieldOffset(8)] public IntPtr p; }+  [ComImport, Guid("886d8eeb-8cf2-4446-8d02-cdba1dbdcf99"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]+  public interface IPropertyStore { int GetCount(out uint c); int GetAt(uint i, out PROPERTYKEY pk); int GetValue(ref PROPERTYKEY key, out PROPVARIANT pv); int SetValue(ref PROPERTYKEY key, ref PROPVARIANT pv); int Commit(); }+  [DllImport("shell32.dll")] public static extern int SHGetPropertyStoreForWindow(IntPtr hwnd, ref Guid iid, out IPropertyStore pps);+  [DllImport("user32.dll")] public static extern bool ShowWindow(IntPtr h, int cmd);+  [DllImport("user32.dll")] public static extern IntPtr GetForegroundWindow();+  public static void Strip(long h) {+    IntPtr hwnd = (IntPtr)h;+    Guid iid = new Guid("886d8eeb-8cf2-4446-8d02-cdba1dbdcf99"); IPropertyStore ps;+    if (SHGetPropertyStoreForWindow(hwnd, ref iid, out ps) == 0) {+      Guid AUM = new Guid("9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3");+      foreach (uint pid in new uint[]{2,3,4,5}) {+        PROPERTYKEY k = new PROPERTYKEY(); k.fmtid = AUM; k.pid = pid;+        PROPVARIANT pv = new PROPVARIANT(); pv.vt = 0;+        ps.SetValue(ref k, ref pv);+      }+      ps.Commit();+    }+    if (GetForegroundWindow() != hwnd) { ShowWindow(hwnd, 0); System.Threading.Thread.Sleep(80); ShowWindow(hwnd, 4); }+  }+}+'@; Add-Type -TypeDefinition $code; @(${hwnds.join(',')}) | ForEach-Object { [Wipe]::Strip($_) }; 'STRIPPED ${hwnds.length}'`;+    try {+      execFile('powershell', ['-NoProfile', '-Command', ps], { windowsHide: true, timeout: 30000 }, (err, stdout) => {+        console.log(`[identity] plain-mode property wipe: ${err ? 'ERR ' + err.message.slice(0, 80) : String(stdout || '').trim()}`);+      });+    } catch (e) { console.log(`[identity] plain wipe spawn failed: ${e.message}`); }+  }+  console.log(`[identity] stripped ${ids.size} registered identit(ies), wiping window props on ${hwnds.length} window(s) (${reason})`); } let _nudgeUntil = 0;   // v2.0.172: while set, ignore window-opened events caused by our own nudge function nudgeTaskbarButton(hwnd, sessionId) {