dsh-remote-control-plugin 0.3.1 → 0.3.3

package/INSTALL.md

@@ -1,29 +1,29 @@
 # Install on another desktop
 
-Published as `dsh-remote-control-plugin`. The package is self-contained — no dependencies, no
+Published as `dsh-remote-control-plugin`. The package is self-contained — no dependencies, no
 build step, no postinstall script.
 
 ## 1. Install it
 
-In the Web GUI: **Plugins → Add plugin**, enter `dsh-remote-control-plugin@0.3.1`, keep the
+In the Web GUI: **Plugins → Add plugin**, enter `dsh-remote-control-plugin@0.3.3`, keep the
 official npm registry selected, then **Install** and **Enable now**. Restart DSH.
 
 A **Devices** icon appears in the sidebar.
 
 From a chat, the same install works where the plugin tool is enabled (Standard or Creator
-preset — PTC disables `tool-plugin-manager`):
+preset — PTC disables `tool-plugin-manager`):
 
-> Install the DSH plugin bundle `dsh-remote-control-plugin@0.3.1` with plugin_manager, then tell me when it is applied.
+> Install the DSH plugin bundle `dsh-remote-control-plugin@0.3.3` with plugin_manager, then tell me when it is applied.
 
 ## 2. Connect two machines
 
 Pick the machine with a reachable address (same LAN, VPN, or a forwarded port):
 
-1. On that machine: **Devices → Relay → Create relay here**, then **Copy** the invite.
-2. On the other machine: **Devices → Relay**, paste the invite into the URL field, **Connect**.
+1. On that machine: **Devices → Relay → Create relay here**, then **Copy** the invite.
+2. On the other machine: **Devices → Relay**, paste the invite into the URL field, **Connect**.
 3. Either machine: **Request** next to the peer, then **Allow** on the target.
 
-Two machines on the same LAN need no relay at all — LAN discovery lists them directly.
+Two machines on the same LAN need no relay at all — LAN discovery lists them directly.
 
 No reachable machine? Run a relay anywhere both can reach (`PORT=8787 node relay/server.js`) and
 paste `http://<host>:8787 <workspace key>` into both panels.
@@ -34,5 +34,7 @@ paste `http://<host>:8787 <workspace key>` into both panels.
 - Approvals persist in `$DSH_HOME/remote-control-peers.json`; deleting it revokes every peer.
 - The relay and the control API share one port (default `57330`), so one forwarded port is enough.
 - Peer traffic is signed but not encrypted. Use a private network or TLS in front of the port.
-- 0.3.1 fixes two relay bugs: peers no longer linger as `503 relay-offline` after a relay goes
-  away, and a failed Connect no longer tears down a working hosted relay.
+- 0.3.3 fixes four relay bugs: a hosted relay now survives a restart, peers no
+  longer linger as `503 relay-offline` after a relay goes away, a blocked direct
+  LAN route falls back to the outbound relay, and transcript chunks are sent in
+  order so a large snapshot always assembles into a complete frame.

package/client.js

@@ -1,5 +1,5 @@
 window.__ModuleLoader__.load({
-  id: 'dsh-remote-control-plugin',
+  id: '@local/dsh-remote-control',
   factory(require) {
     const React = require('react')
     const h = React.createElement
@@ -117,12 +117,14 @@ window.__ModuleLoader__.load({
 
     /* ---------------- chat ---------------- */
 
-    function Chat({ peerId, sessionId, title }) {
+    function Chat({ peerId, sessionId, title, blank }) {
       const [entries, setEntries] = useState([])
       const [live, setLive] = useState('')
       const [running, setRunning] = useState(false)
       const [draft, setDraft] = useState('')
       const [error, setError] = useState(null)
+      const [streamState, setStreamState] = useState('connecting')
+      const [attempt, setAttempt] = useState(0)
       const seen = useRef(new Set())
       const logRef = useRef(null)
       const pinned = useRef(true)
@@ -133,11 +135,14 @@ window.__ModuleLoader__.load({
         setLive('')
         setRunning(false)
         setError(null)
+        setStreamState('connecting')
         if (!peerId || !sessionId) return undefined
         const source = new EventSource(
           `/remote-control/api/peer/${encodeURIComponent(peerId)}/stream?sessionId=${encodeURIComponent(sessionId)}`,
         )
+        source.onopen = () => setStreamState('live')
         source.onmessage = (event) => {
+          setStreamState('live')
           let frame
           try { frame = JSON.parse(event.data) } catch { return }
           if (frame.type === 'snapshot') {
@@ -172,9 +177,13 @@ window.__ModuleLoader__.load({
           }
           if (frame.type === 'remote-error') setError(`${frame.code || 'error'}: ${frame.message || 'stream failed'}`)
         }
-        source.onerror = () => { /* EventSource retries on its own */ }
+        source.onerror = () => {
+          // EventSource retries by itself, but a dead stream must not look like
+          // an empty conversation.
+          setStreamState('error')
+        }
         return () => source.close()
-      }, [peerId, sessionId])
+      }, [peerId, sessionId, attempt])
 
       useEffect(() => {
         if (!pinned.current) return
@@ -217,8 +226,25 @@ window.__ModuleLoader__.load({
           },
         },
           entries.length === 0 && !live
-            ? h('div', { style: S.empty }, 'No messages yet. Send one below.')
+            ? h('div', { style: S.empty },
+              streamState === 'error'
+                ? h('div', null,
+                  h('div', { style: { marginBottom: '8px' } },
+                    'Could not open the transcript. The device may be unreachable, or it refused the stream.'),
+                  h('button', {
+                    type: 'button',
+                    style: S.button,
+                    onClick: () => setAttempt((value) => value + 1),
+                  }, 'Retry'))
+                : streamState === 'connecting'
+                  ? 'Connecting to the device…'
+                  : (blank
+                    ? 'This session is empty. Send a message to start it.'
+                    : 'No messages yet. Send one below.'))
             : entries.map((entry) => renderEntry(entry)),
+          streamState === 'error' && entries.length > 0
+            ? h('div', { style: S.note }, 'Stream lost — retrying…')
+            : null,
           live ? h('div', { style: { ...S.bubble, ...S.assistantBubble, opacity: 0.85 } }, live) : null,
         ),
         h('div', { style: S.composer },
@@ -337,7 +363,10 @@ window.__ModuleLoader__.load({
         setSessionId(null)
         try {
           const value = await api(`/remote-control/api/peer/${encodeURIComponent(peer.deviceId)}/sessions`)
-          setSessions(value.items || [])
+          const items = (value.items || []).slice().sort(
+            (a, b) => Number(Boolean(a.blank)) - Number(Boolean(b.blank)) || (b.updatedAt || 0) - (a.updatedAt || 0),
+          )
+          setSessions(items)
         } catch (failure) {
           setError(failure.message)
           setSessions([])
@@ -530,7 +559,7 @@ window.__ModuleLoader__.load({
                         h('div', { style: { minWidth: 0 } },
                           h('div', { style: S.name }, session.title || session.cwd || session.id),
                           h('div', { style: S.meta },
-                            [session.running ? 'running' : '', relativeTime(session.updatedAt)].filter(Boolean).join(' · ')),
+                            [session.running ? 'running' : '', session.blank ? 'empty' : '', relativeTime(session.updatedAt)].filter(Boolean).join(' · ')),
                         ),
                       ))),
                     ),
@@ -539,6 +568,7 @@ window.__ModuleLoader__.load({
                         peerId: openPeer.deviceId,
                         sessionId,
                         title: sessions.find((session) => session.id === sessionId)?.title,
+                        blank: sessions.find((session) => session.id === sessionId)?.blank === true,
                       })
                       : h('div', { style: S.empty }, 'Pick a session to control it.'),
                   ),

package/host/fabric.js

@@ -374,8 +374,17 @@ export function createFabric({ log, config, self, sessions, stateFile }) {
    */
   async function peerCall(peer, method, pathname, body, secret) {
     if (peer.proto !== 'relay') {
-      return callRaw(peer, method, pathname, body, secret, self().deviceId)
+      const direct = await callRaw(peer, method, pathname, body, secret, self().deviceId)
+      // A direct LAN route can be silently blocked (firewall profile, VPN
+      // change). The relay is outbound-only, so fall back instead of failing.
+      if (!direct.error || !relay) return direct
+      const viaRelay = await relayCall(peer, method, pathname, body, secret)
+      return viaRelay.ok || viaRelay.status !== 503 ? viaRelay : direct
     }
+    return relayCall(peer, method, pathname, body, secret)
+  }
+
+  async function relayCall(peer, method, pathname, body, secret) {
     if (!relay) return { ok: false, status: 503, json: { error: 'relay-offline' } }
     const callerId = self().deviceId
     const timestamp = String(Date.now())
@@ -439,17 +448,18 @@ export function createFabric({ log, config, self, sessions, stateFile }) {
       }, res)
       return
     }
+    const streamHeaders = {
+      accept: 'text/event-stream',
+      'x-dsh-peer-id': callerId,
+      'x-dsh-peer-ts': timestamp,
+      'x-dsh-peer-sig': sign(approval.secret, callerId, 'GET', target, timestamp, ''),
+    }
     const upstream = http.request({
       host: peer.address,
       port: peer.port,
       path: target,
       method: 'GET',
-      headers: {
-        accept: 'text/event-stream',
-        'x-dsh-peer-id': callerId,
-        'x-dsh-peer-ts': timestamp,
-        'x-dsh-peer-sig': sign(approval.secret, callerId, 'GET', target, timestamp, ''),
-      },
+      headers: streamHeaders,
     }, (response) => {
       res.writeHead(response.statusCode ?? 502, {
         'content-type': response.headers['content-type'] || 'text/event-stream; charset=utf-8',
@@ -461,6 +471,12 @@ export function createFabric({ log, config, self, sessions, stateFile }) {
       response.on('end', () => { try { res.end() } catch { /* ignore */ } })
     })
     upstream.on('error', () => {
+      // Same fallback as peerCall: a blocked LAN route may still reach the
+      // peer through the outbound relay.
+      if (relay && !res.headersSent) {
+        relay.stream(peer.deviceId, { path: target, headers: streamHeaders }, res)
+        return
+      }
       try { json(res, 502, { error: 'peer-unreachable' }) } catch { /* ignore */ }
     })
     res.on('close', () => { try { upstream.destroy() } catch { /* ignore */ } })

package/host/relay-link.js

@@ -194,23 +194,29 @@ export function createRelayLink({ url, key, deviceId, deviceName, userId, localP
       method: 'GET',
       headers: { ...message.headers, host: `127.0.0.1:${localPort}` },
     }, (response) => {
-      send(from, { kind: 'stream-status', id, status: response.statusCode ?? 502 }).catch(() => {})
+      // Chunks must reach the peer in order: one POST per chunk has no ordering
+      // guarantee, and a reordered SSE stream never forms a complete frame.
+      let chain = Promise.resolve()
+      const push = (message) => {
+        chain = chain.then(() => send(from, message)).catch(() => {})
+      }
+      push({ kind: 'stream-status', id, status: response.statusCode ?? 502 })
       if ((response.statusCode ?? 500) >= 400) {
         response.resume()
         locals.delete(id)
-        send(from, { kind: 'stream-end', id }).catch(() => {})
+        push({ kind: 'stream-end', id })
         return
       }
       response.on('data', (chunk) => {
-        send(from, { kind: 'stream-chunk', id, chunk: chunk.toString('utf8') }).catch(() => {})
+        push({ kind: 'stream-chunk', id, chunk: chunk.toString('utf8') })
       })
       response.on('end', () => {
         locals.delete(id)
-        send(from, { kind: 'stream-end', id }).catch(() => {})
+        push({ kind: 'stream-end', id })
       })
       response.on('error', () => {
         locals.delete(id)
-        send(from, { kind: 'stream-end', id }).catch(() => {})
+        push({ kind: 'stream-end', id })
       })
     })
     request.on('error', () => {

package/index.js

@@ -157,7 +157,12 @@ export function apply(ctx, rawConfig) {
   async function loadRelayConfig() {
     try {
       const raw = JSON.parse(await readFile(relayFile, 'utf8'))
-      if (raw && typeof raw.url === 'string' && typeof raw.key === 'string') return { url: raw.url, key: raw.key }
+      if (raw && typeof raw.url === 'string' && typeof raw.key === 'string') {
+        // `hosted` decides whether boot remounts the relay before connecting.
+        // Dropping it made every restart fall into the join branch, which then
+        // pointed at an unmounted /v1/* and left the relay dead.
+        return { hosted: raw.hosted === true, url: raw.url, key: raw.key }
+      }
     } catch (error) {
       if (error?.code !== 'ENOENT') log.warn(`[remote-control] could not read ${relayFile}: ${error?.message || error}`)
     }

package/package.json

@@ -1,48 +1,48 @@
-{
-  "name": "dsh-remote-control-plugin",
-  "version": "0.3.1",
-  "description": "Remote control for DSH: a Devices panel that discovers other DSH desktops, pairs with them once, and drives their sessions across LAN or a relay.",
-  "license": "MIT",
-  "type": "module",
-  "keywords": [
-    "dsh",
-    "deepseek-harness",
-    "cordis",
-    "cordis-plugin",
-    "remote-control",
-    "devices"
-  ],
-  "exports": {
-    ".": "./index.js",
-    "./client": "./client.js",
-    "./locale/*.json": "./locale/*.json",
-    "./icon": "./icon.svg"
-  },
-  "files": [
-    "index.js",
-    "client.js",
-    "host/*.js",
-    "cordis.patch.yml",
-    "locale/*.json",
-    "icon.svg",
-    "README.md",
-    "INSTALL.md",
-    "LICENSE",
-    "web/index.html",
-    "web/app.js",
-    "web/app.css",
-    "web/icon.svg"
-  ],
-  "engines": {
-    "node": ">=20"
-  },
-  "dsh": {
-    "bundle": {
-      "patch": "./cordis.patch.yml"
-    },
-    "client": {
-      "platform": "web",
-      "immediately": true
-    }
-  }
-}
+{
+    "name":  "dsh-remote-control-plugin",
+    "version":  "0.3.3",
+    "description":  "Remote control for DSH: a Devices panel that discovers other DSH desktops, pairs with them once, and drives their sessions across LAN or a relay.",
+    "license":  "MIT",
+    "type":  "module",
+    "keywords":  [
+                     "dsh",
+                     "deepseek-harness",
+                     "cordis",
+                     "cordis-plugin",
+                     "remote-control",
+                     "devices"
+                 ],
+    "exports":  {
+                    ".":  "./index.js",
+                    "./client":  "./client.js",
+                    "./locale/*.json":  "./locale/*.json",
+                    "./icon":  "./icon.svg"
+                },
+    "files":  [
+                  "index.js",
+                  "client.js",
+                  "host/*.js",
+                  "cordis.patch.yml",
+                  "locale/*.json",
+                  "icon.svg",
+                  "README.md",
+                  "INSTALL.md",
+                  "LICENSE",
+                  "web/index.html",
+                  "web/app.js",
+                  "web/app.css",
+                  "web/icon.svg"
+              ],
+    "engines":  {
+                    "node":  "\u003e=20"
+                },
+    "dsh":  {
+                "bundle":  {
+                               "patch":  "./cordis.patch.yml"
+                           },
+                "client":  {
+                               "platform":  "web",
+                               "immediately":  true
+                           }
+            }
+}