dsh-relay-phone 0.18.0 → 0.18.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-relay-phone",
-  "version": "0.18.0",
+  "version": "0.18.2",
   "description": "Remote-control your local DeepSeek Harness from a phone through your own zero-knowledge relay: phone-first page, QR pairing, end-to-end encryption, approvals, full desktop UI fallback.",
   "type": "module",
   "main": "src/index.js",

package/src/boot-source.js

@@ -246,6 +246,24 @@ export function buildBootSource(id, gate) {
   }
 
   var BOUND = 0x02
+
+  // The target the host will see, not the URL the browser resolved.
+  //
+  // DSH calls relative URLs (for example api/session/list), which resolve against
+  // the page at /c/<id>/ and come back with the relay prefix attached. The host
+  // strips that prefix before comparing, so the sealed value must be stripped
+  // too - a prefix the client adds and the host removes is a guaranteed mismatch.
+  function boundTarget(absolute) {
+    var path = absolute.pathname
+    if (PREFIX && path.indexOf(PREFIX) === 0) path = path.slice(PREFIX.length) || '/'
+    var search = absolute.search
+    if (search) {
+      var parts = search.slice(1).split('&').filter(function (part) { return part.indexOf('g=') !== 0 })
+      search = parts.length > 0 && parts[0] !== '' ? '?' + parts.join('&') : ''
+    }
+    return path + search
+  }
+
   function sealBound(method, target, contentType, bytes) {
     var enc = new TextEncoder()
     var header = enc.encode(JSON.stringify({ m: method, t: target, c: contentType || '' }))
@@ -385,7 +403,7 @@ export function buildBootSource(id, gate) {
           // with the host cookie.
           headers.set('x-relay-bind', bytesToBase64(sealBound(
             options.method || 'GET',
-            absolute.pathname + absolute.search,
+            boundTarget(absolute),
             '',
             new Uint8Array(8).fill(0),
           )))
@@ -404,7 +422,7 @@ export function buildBootSource(id, gate) {
           // Bind the body to the request it was made for: method, path+query and
           // content-type travel inside the envelope, so the relay cannot re-route
           // a captured request to another endpoint.
-          body: sealBound(options.method || 'GET', absolute.pathname + absolute.search, contentType, bytes),
+          body: sealBound(options.method || 'GET', boundTarget(absolute), contentType, bytes),
         })).then(maybeUnwrap)
       }).catch(function (error) {
         // A body-serialization failure must not silently downgrade to plaintext.

package/src/pump.js

@@ -721,7 +721,11 @@ export class PumpManager {
       return index === -1 ? [value, ''] : [value.slice(0, index), value.slice(index + 1)]
     }
     const [outerPath, outerQuery] = splitTarget(info.target ?? info.path)
-    const [innerPath, innerQuery] = splitTarget(String(bound.t))
+    // A browser that resolved a relative URL against the page seals the relay
+    // prefix too (`/c/<id>/api/x`); strip it the same way the router does. The
+    // sealed value still names the method and path, so this removes no authority.
+    const sealedTarget = String(bound.t).replace(/^\/c\/[A-Za-z0-9]{4,16}(?=\/|$)/, '') || '/'
+    const [innerPath, innerQuery] = splitTarget(sealedTarget)
     if (outerPath !== innerPath) {
       return `path ${outerPath.slice(0, 60)} != sealed ${innerPath.slice(0, 60)}`
     }
@@ -988,6 +992,10 @@ export class PumpManager {
       upstream.setNoDelay(true)
       upstream.on('connect', () => {
         upstream.write(out)
+        // Frames are NOT flushed here: the host has not answered 101 yet, and a
+        // byte written before the switch looks like a pipelined HTTP request to
+        // it. Whether the browser's first frame beat the 101 was a race, which is
+        // why the mux sometimes sat silent and the page then retried.
         this.pumpPhoneWs(sid, stream)
       })
       upstream.on('data', (data) => {
@@ -1001,6 +1009,8 @@ export class PumpManager {
           this.client?.sendStream(sid, stream.wsServerBuf.subarray(0, idx + 4))
           stream.wsServerBuf = stream.wsServerBuf.subarray(idx + 4)
           stream.wsHandshakeDone = true
+          // The switch is real now: release whatever the phone already sent.
+          this.pumpPhoneWs(sid, stream)
         }
         this.pumpServerWs(sid, stream)
       })
@@ -1080,6 +1090,8 @@ export class PumpManager {
   // -- websocket sealing ---------------------------------------------------------------
   pumpPhoneWs(sid, stream) {
     if (!stream.upstream || stream.upstream.destroyed) return
+    // Not before the host answered 101: see the comment at the upgrade handler.
+    if (!stream.wsHandshakeDone) return
     for (;;) {
       const parsed = parseFrame(stream.wsPhoneBuf)
       if (!parsed) return