dsh-remote-control-plugin 0.3.1 → 0.3.2

package/INSTALL.md

@@ -5,7 +5,7 @@ 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.2`, keep the
 official npm registry selected, then **Install** and **Enable now**. Restart DSH.
 
 A **Devices** icon appears in the sidebar.
@@ -13,7 +13,7 @@ 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`):
 
-> 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.2` with plugin_manager, then tell me when it is applied.
 
 ## 2. Connect two machines
 
@@ -34,5 +34,6 @@ 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.2 fixes three relay bugs: a hosted relay now survives a restart, peers no
+  longer linger as `503 relay-offline` after a relay goes away, and a blocked
+  direct LAN route falls back to the outbound relay instead of failing.

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/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,6 +1,6 @@
 {
   "name": "dsh-remote-control-plugin",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "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",