witbitz-code 1.15.0__tar.gz → 1.15.2__tar.gz

{witbitz_code-1.15.0/src/witbitz_code.egg-info → witbitz_code-1.15.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: witbitz-code
-Version: 1.15.0
+Version: 1.15.2
 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.15.0 → witbitz_code-1.15.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "witbitz-code"
-version = "1.15.0"
+version = "1.15.2"
 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.15.0 → witbitz_code-1.15.2}/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.15.0"
+__version__ = "1.15.2"

{witbitz_code-1.15.0 → witbitz_code-1.15.2}/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: "p2x",
+  tag: "p2y",
   base: "https://drwev5vxt2t2e.cloudfront.net/browse-tree/",
-  pcr0: "050541844610fd5ed4b586259906d9219edbabc4445ed7943885ac737ee4918e144af2e49838a8313f5823184bc503cf",
-  commit: "235ef2b815ef74b46e954f48f860197d8d2b612c",
+  pcr0: "5a0c2c755715eae50b73fdc13856a6df963bf772e68db5f0155e729c3d822807684f3df10945430f7f75c2e36419e0a0",
+  commit: "f45e85eb16a84c90b126915ba8ca8914e2204650",
   tree: {
     file: "tree.tar.zst",
-    sha256: "839b7cc06c70946a4912578115e6cd053cb6b2811cc458457e012ece885b36b6",
-    size: 664701891
+    sha256: "d992f07bbfec50467d9a462a4d443f714332d57cf7dc5a928eb9bde4bd023fc2",
+    size: 664651711
   },
   lab: {
     file: "ccvm-lab.bin",

{witbitz_code-1.15.0 → witbitz_code-1.15.2}/src/witbitz_code/ui.py

@@ -229,7 +229,7 @@ class Manager:
         for p in ps:
             paired.append({"name": p.get("name") or "", "account": p.get("account") or "", "port": wizard.port_of(p), "keys": await self.keys(p),
                            "computer": p.get("computerId") or "", "app": pp.app_label(p)})
-        pair = {k: v for k, v in self.pair_state.items() if k != "log"}
+        pair = {k: v for k, v in self.pair_state.items() if k != "log" and (k != "code" or self.pair_state.get("state") == "waiting")}
         serving = self.serving()
         if serving["state"] == "stopped" and ps:
             el = await self.elsewhere()
@@ -354,7 +354,8 @@ class Manager:
         ch = devicelink.new_link_challenge()
         self.qr_svg = qr.qr_svg(ch.text)
         n = int(self.pair_state.get("n", 0)) + 1
-        self.pair_state = {"state": "waiting", "n": n, "until": int(time.time() * 1000) + link.LIFE_MS, "message": ""}
+        # The code as text beside the QR: a computer cannot scan its own screen, and Add a device takes it pasted.
+        self.pair_state = {"state": "waiting", "n": n, "until": int(time.time() * 1000) + link.LIFE_MS, "message": "", "code": ch.text}
         self.pair_task = asyncio.ensure_future(self._pair_run(ch, await self._pair_port()))
         return {"ok": True}
 

{witbitz_code-1.15.0 → witbitz_code-1.15.2}/src/witbitz_code/ui_static/app.css

@@ -50,6 +50,7 @@ footer { font-size: 13px; text-align: center; }
 @media (prefers-reduced-motion: reduce) { * { transition: none !important; } }
 .actions:not(:has(button:not([hidden]))) { display: none; }
 button.small { font-size: 13px; padding: 2px 10px; margin-left: 8px; }
+pre.cmd.code { white-space: pre-wrap; overflow-wrap: anywhere; font-size: 12px; user-select: all; }
 pre.cmd { background: var(--off-bg); color: var(--text); padding: 8px 10px; border-radius: 8px; }
 /* the security check (seccheck.py) */
 p.small, div.small { font-size: 12.5px; }

{witbitz_code-1.15.0 → witbitz_code-1.15.2}/src/witbitz_code/ui_static/app.js

@@ -92,11 +92,14 @@ function render(s) {
     const want = '/api/pair/qr.svg?n=' + s.pair.n
     if ($('qr').getAttribute('src') !== want) $('qr').setAttribute('src', want)
     show($('qr').parentElement, true)
+    $('pairCode').textContent = s.pair.code || ''
+    show($('codeBox'), !!s.pair.code)
     const left = Math.max(0, Math.round((s.pair.until - Date.now()) / 60000))
     $('pairMsg').textContent = `Waiting for your phone… (this code works for ${left || 'under a'} minute${left === 1 ? '' : 's'})`
     show($('pairRetry'), false)
   } else if (s.pair.state === 'failed') {
     show($('qr').parentElement, false)
+    show($('codeBox'), false)
     $('pairMsg').textContent = s.pair.message || 'Pairing did not finish.'
     show($('pairRetry'), true)
   }
@@ -306,6 +309,11 @@ document.addEventListener('DOMContentLoaded', () => {
   // same OpenCode); nothing is unpaired. Code here pauses while the code is up and comes back when it is scanned or cancelled.
   $('pairAdd').onclick = () => act('/api/pair', {}, 'Add another account? A new code appears — scan it from the other account: Code in Spaces → Computers → Add a computer. Code on this computer pauses until it is scanned or cancelled.')
   $('pairCancel').onclick = () => act('/api/pair/cancel', {})
+  $('pairCopy').onclick = async () => {
+    const b = $('pairCopy')
+    try { await navigator.clipboard.writeText($('pairCode').textContent); b.textContent = 'Copied ✓' } catch { b.textContent = 'Select the code above and copy it' }
+    setTimeout(() => { b.textContent = 'Copy the code' }, 2000)
+  }
   $('pairRetry').onclick = () => act('/api/pair', {})
   $('login').onchange = (e) => act('/api/login', { on: e.target.checked })
   refresh(true)

{witbitz_code-1.15.0 → witbitz_code-1.15.2}/src/witbitz_code/ui_static/index.html

@@ -45,6 +45,11 @@
       <li>Scan this code with the account that should reach this computer.</li>
     </ol>
     <div class="qr-wrap"><img id="qr" alt="Pairing code — scan it in Spaces" width="260" height="260"></div>
+    <div id="codeBox" hidden>
+      <p class="muted">On this computer? Copy the code and paste it under <b>…or paste the code</b> in Add a device.</p>
+      <pre id="pairCode" class="cmd code"></pre>
+      <div class="actions"><button id="pairCopy" type="button" class="ghost">Copy the code</button></div>
+    </div>
     <p id="pairMsg" class="muted">Waiting for your phone…</p>
     <div class="actions"><button id="pairCancel" type="button" class="ghost">Cancel</button><button id="pairRetry" type="button" hidden>Show a new code</button></div>
   </section>

{witbitz_code-1.15.0 → witbitz_code-1.15.2/src/witbitz_code.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: witbitz-code
-Version: 1.15.0
+Version: 1.15.2
 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.15.0 → witbitz_code-1.15.2}/tests/test_ui.py

@@ -147,6 +147,7 @@ def test_unpair_then_pair_again_with_the_code_on_the_page_then_it_serves():
                 assert (await c.post(f"{base}/api/pair", headers=authed(srv), json={})).json() == {"ok": True}
                 st = (await c.get(f"{base}/api/status", headers=authed(srv))).json()
                 assert st["pair"]["state"] == "waiting" and st["pair"]["n"] == 1
+                assert st["pair"]["code"].startswith("wbzlink1:"), "the code as text too: a computer cannot scan its own screen, Add a device takes it pasted"
                 qr = await c.get(f"{base}/api/pair/qr.svg?n=1", headers={"cookie": f"wbui_{srv.port}=T0KEN"})
                 assert qr.status_code == 200 and qr.content.startswith(b"<svg"), "the code an <img> loads with the cookie alone"
                 assert (await c.get(f"{base}/api/pair/qr.svg")).status_code == 403