witbitz-code 1.9.0__tar.gz → 1.9.1__tar.gz

{witbitz_code-1.9.0/src/witbitz_code.egg-info → witbitz_code-1.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: witbitz-code
-Version: 1.9.0
+Version: 1.9.1
 Summary: Reach OpenCode on this computer from the Witbitz Spaces Code section, through an end-to-end sealed relay.
 Author: Witbitz
 License-Expression: MIT

{witbitz_code-1.9.0 → witbitz_code-1.9.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "witbitz-code"
-version = "1.9.0"
+version = "1.9.1"
 description = "Reach OpenCode on this computer from the Witbitz Spaces Code section, through an end-to-end sealed relay."
 readme = "README.md"
 requires-python = ">=3.10"

{witbitz_code-1.9.0 → witbitz_code-1.9.1}/src/witbitz_code/__init__.py

@@ -4,4 +4,4 @@ The Python implementation of tools/witbitz-code.mjs (docs/opencode-relay.md phas
 vectors and cross-implementation tests.
 """
 
-__version__ = "1.9.0"
+__version__ = "1.9.1"

{witbitz_code-1.9.0 → witbitz_code-1.9.1}/src/witbitz_code/opencode_plugins/witbitz-browse-publisher.mjs

@@ -258,16 +258,28 @@ function createCast({ cdpHttp, onFrame, onState = () => {
       const sh = c.h + BARS(c.h);
       await onPage("Emulation.setDeviceMetricsOverride", { width: c.w, height: pageFull ? sh : c.h, deviceScaleFactor: c.dpr, mobile, screenWidth: c.w, screenHeight: sh });
       await onPage("Emulation.setTouchEmulationEnabled", mobile ? { enabled: true, maxTouchPoints: 5 } : { enabled: false });
-      if (desktopUA) await onPage("Emulation.setUserAgentOverride", { userAgent: mobile ? phoneUA(desktopUA) : desktopUA });
+      if (desktopUA) await onPage("Emulation.setUserAgentOverride", uaOverride(desktopUA, await realHints(), mobile));
     } else {
       await onPage("Emulation.clearDeviceMetricsOverride").catch(() => {
       });
       await onPage("Emulation.setTouchEmulationEnabled", { enabled: false }).catch(() => {
       });
-      if (desktopUA) await onPage("Emulation.setUserAgentOverride", { userAgent: desktopUA }).catch(() => {
+      if (desktopUA) await onPage("Emulation.setUserAgentOverride", uaOverride(desktopUA, await realHints(), false)).catch(() => {
       });
     }
   }
+  let hintsOf = null;
+  async function realHints() {
+    if (hintsOf) return hintsOf;
+    const r = await onPage("Runtime.evaluate", { expression: HINTS_NOW, returnByValue: true, awaitPromise: true }).catch(() => null);
+    const v = r && r.result && r.result.value;
+    if (v && Array.isArray(v.brands) && v.brands.length) hintsOf = v;
+    if (!hintsOf) {
+      const b = await send("Browser.getVersion").catch(() => null);
+      hintsOf = hintsFromVersion(b && b.product, desktopUA);
+    }
+    return hintsOf;
+  }
   async function hookFullscreen() {
     await onPage("Runtime.enable");
     await onPage("Runtime.addBinding", { name: FS_BINDING });
@@ -467,6 +479,20 @@ function norm(v) {
   return { w, h, dpr: dpr >= 1 && dpr <= 4 ? dpr : 1, mobile: !!v.mobile };
 }
 var PHONE = { w: 412, h: 915, dpr: 2, mobile: true };
+var HINTS_NOW = `(async () => { const d = navigator.userAgentData; if (!d) return null; let h = {}; try { h = await d.getHighEntropyValues(['platformVersion', 'architecture', 'bitness', 'model', 'fullVersionList', 'wow64']) } catch (e) {} return { brands: d.brands, fullVersionList: h.fullVersionList || d.brands, platform: d.platform, platformVersion: h.platformVersion || '', architecture: h.architecture || '', bitness: h.bitness || '', model: h.model || '', wow64: !!h.wow64 } })()`;
+function hintsFromVersion(product, ua = "") {
+  const full = (/\/(\d+(?:\.\d+){1,3})/.exec(String(product || "")) || [])[1];
+  if (!full) return null;
+  const major = full.split(".")[0];
+  const platform = /Windows/.test(ua) ? "Windows" : /Mac OS X/.test(ua) ? "macOS" : /CrOS/.test(ua) ? "Chrome OS" : "Linux";
+  return { brands: [{ brand: "Chromium", version: major }, { brand: "Not)A;Brand", version: "99" }], fullVersionList: [{ brand: "Chromium", version: full }, { brand: "Not)A;Brand", version: "99.0.0.0" }], platform, platformVersion: "", architecture: /arm|aarch64/i.test(ua) ? "arm" : "x86", bitness: "64", model: "", wow64: false };
+}
+function uaOverride(desktop, real, mobile) {
+  const userAgent = mobile ? phoneUA(desktop) : desktop;
+  if (!real || !Array.isArray(real.brands) || !real.brands.length) return { userAgent };
+  const meta = { brands: real.brands, fullVersionList: real.fullVersionList || real.brands, platform: real.platform || "", platformVersion: real.platformVersion || "", architecture: real.architecture || "", model: real.model || "", mobile: false, bitness: real.bitness || "", wow64: !!real.wow64 };
+  return mobile ? { userAgent, platform: "Linux armv8l", userAgentMetadata: { ...meta, platform: "Android", platformVersion: "14.0.0", architecture: "", bitness: "", model: "Pixel 8", mobile: true, wow64: false } } : { userAgent, userAgentMetadata: meta };
+}
 function phoneUA(desktop) {
   return desktop.replace(/\([^)]*\)/, "(Linux; Android 14; Pixel 8)").replace(/ Safari\//, " Mobile Safari/");
 }
@@ -476,6 +502,7 @@ var BINDING = "__wbm";
 var MAX_BATCH = 8 << 20;
 var MAX_SINCE_SNAPSHOT = 48 << 20;
 var ASSET_CACHE = 96 << 20;
+var MAX_ANSWER = 2900 << 10;
 var MAX_SIDE2 = 1600;
 var STILL_MS = 500;
 var STILL_SIDE = 480;
@@ -607,12 +634,19 @@ function createMirrors({ liveHttp, mirrorHttp, rrwebUmd, onFrame, log: log2 = ()
       for (const h of c.handlers) h(m);
     };
     ws.onclose = () => {
+      c.closed = true;
+      log2("mirror: the CDP connection to", http, "closed");
       for (const p of c.pending.values()) p.reject(new Error("cdp: closed"));
       c.pending.clear();
     };
     return c;
   }
   async function attachLive() {
+    if (live && live.closed) {
+      live = null;
+      liveSid = null;
+      liveTargetId = null;
+    }
     const t = liveTarget();
     if (!t || t === liveTargetId) return;
     if (!live) {
@@ -698,8 +732,14 @@ function createMirrors({ liveHttp, mirrorHttp, rrwebUmd, onFrame, log: log2 = ()
       body: body ? Buffer.from(body).toString("base64") : ""
     }, tab.sid).catch(() => {
     });
+    const tooBig = (b) => b && Buffer.byteLength(b) > MAX_ANSWER;
+    const send = (status, headers, body) => tooBig(body) ? (tab.refused++, log2("mirror: not sent,", Math.round(Buffer.byteLength(body) / 1024), "KB \u2014", url.slice(0, 100)), done(404, {}, "")) : done(status, headers, body);
     if (url === "http://mirror.invalid/") return done(200, { "content-type": "text/html; charset=utf-8" }, shell);
     if (p.request.method !== "GET" || !/^https?:\/\//.test(url)) return done(404, {}, "");
+    if (p.resourceType === "Media") {
+      tab.refused++;
+      return done(404, {}, "");
+    }
     if (p.resourceType === "Document") {
       let host = "";
       try {
@@ -714,14 +754,14 @@ function createMirrors({ liveHttp, mirrorHttp, rrwebUmd, onFrame, log: log2 = ()
       try {
         const r = await live.send("Network.getResponseBody", { requestId: known.requestId }, liveSid);
         tab.served++;
-        return done(known.status || 200, { "content-type": known.mime || "application/octet-stream" }, r.base64Encoded ? Buffer.from(r.body, "base64") : r.body);
+        return send(known.status || 200, { "content-type": known.mime || "application/octet-stream" }, r.base64Encoded ? Buffer.from(r.body, "base64") : r.body);
       } catch {
       }
     }
     if (assets.has(url)) {
       tab.served++;
       const a = assets.get(url);
-      return done(a.status, a.headers, a.body);
+      return send(a.status, a.headers, a.body);
     }
     if (!STATIC.has(p.resourceType) || !liveSid) {
       tab.refused++;
@@ -730,7 +770,7 @@ function createMirrors({ liveHttp, mirrorHttp, rrwebUmd, onFrame, log: log2 = ()
     try {
       const a = await loadCredentialless(url);
       tab.loaded++;
-      return done(a.status, a.headers, a.body);
+      return send(a.status, a.headers, a.body);
     } catch (e) {
       tab.refused++;
       log2("mirror: could not load", url.slice(0, 100), "\u2014", String(e.message || e).slice(0, 120));
@@ -816,7 +856,7 @@ function createMirrors({ liveHttp, mirrorHttp, rrwebUmd, onFrame, log: log2 = ()
     });
   }
   async function open2(stream, shape) {
-    if (!mirror) {
+    if (!mirror || mirror.closed) {
       mirror = await connect(mirrorHttp);
       mirror.handlers.push(onMirror);
     }
@@ -881,6 +921,10 @@ function createMirrors({ liveHttp, mirrorHttp, rrwebUmd, onFrame, log: log2 = ()
     /** Make the set of mirrors equal `wanted` (stream → shape). Opens, reshapes and closes as needed. */
     async set(wanted) {
       await attachLive();
+      if (mirror && mirror.closed) {
+        mirror = null;
+        tabs.clear();
+      }
       for (const [stream] of tabs) if (!wanted.has(stream)) await close(stream);
       for (const [stream, shape] of wanted) {
         const tab = tabs.get(stream);
@@ -1225,7 +1269,22 @@ async function assignNow() {
     } catch {
     }
   }
-  if (mirrors) await mirrors.set(wanted);
+  if (!mirrors) return;
+  try {
+    await mirrors.set(wanted);
+  } catch (e) {
+    const why = "mirror could not open: " + String(e.message || e).slice(0, 80);
+    for (const [vid, s] of assigned) {
+      if (!wanted.has(s)) continue;
+      assigned.set(vid, "live");
+      if (relay && relay.readyState === 1) relay.send(await sealCtl(key, { wb: "stream", vid, stream: "live", why }));
+    }
+    const l = cast && cast.last();
+    if (l) outOrder(async () => {
+      if (relay && relay.readyState === 1) relay.send(await seal(key, KIND_FRAME, packFrame(l.header, l.jpeg)));
+    });
+    throw e;
+  }
 }
 async function startCast() {
   const c = ensureCast();

{witbitz_code-1.9.0 → witbitz_code-1.9.1}/src/witbitz_code/opencode_plugins/witbitz-browse-tree.mjs

@@ -4,14 +4,14 @@
 // tools/browse-tree/pin.json
 var pin_default = {
   _: "THE CLOUD COMPUTER'S BROWSER FOR LINUX that this release installs (tools/browse-tree; make.sh writes it). The files are public at <base><tag>/; both sha256s are checked before anything is unpacked.",
-  tag: "p2v",
+  tag: "p2x",
   base: "https://drwev5vxt2t2e.cloudfront.net/browse-tree/",
-  pcr0: "87162d8648af94daec37f9d022c43546f6dc5c9018b7225ee5ccaf3cecd1c7924c7681f0ca48fddb84f5d0a2f987f719",
-  commit: "e303d54e2295c148c5177b2216eca21de6b6f3a3",
+  pcr0: "050541844610fd5ed4b586259906d9219edbabc4445ed7943885ac737ee4918e144af2e49838a8313f5823184bc503cf",
+  commit: "235ef2b815ef74b46e954f48f860197d8d2b612c",
   tree: {
     file: "tree.tar.zst",
-    sha256: "1fceee1d2ddbda8a6ec9f792755a960a877af6342645b8a29fbbf94b28b9536e",
-    size: 664712218
+    sha256: "839b7cc06c70946a4912578115e6cd053cb6b2811cc458457e012ece885b36b6",
+    size: 664701891
   },
   lab: {
     file: "ccvm-lab.bin",

{witbitz_code-1.9.0 → witbitz_code-1.9.1/src/witbitz_code.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: witbitz-code
-Version: 1.9.0
+Version: 1.9.1
 Summary: Reach OpenCode on this computer from the Witbitz Spaces Code section, through an end-to-end sealed relay.
 Author: Witbitz
 License-Expression: MIT