dsh-plugin-mobile-gateway 0.7.2 → 0.7.3

package/lib/gateway-state.mjs

@@ -0,0 +1,57 @@
+import fs from 'node:fs'
+import path from 'node:path'
+import crypto from 'node:crypto'
+
+export const GATEWAY_MODES = ['disabled', 'temporary', 'persistent']
+
+// A dedicated file keeps installation identity independent of device revocation.
+// A malformed file must fail startup rather than silently replace that identity.
+export function createGatewayState(file) {
+  const validate = (value) => {
+    if (!value || value.version !== 1 ||
+        typeof value.gatewayId !== 'string' ||
+        !/^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/.test(value.gatewayId) ||
+        (value.mode !== null && !GATEWAY_MODES.includes(value.mode))) {
+      throw new Error('invalid gateway identity or mode')
+    }
+    return value
+  }
+  const read = () => validate(JSON.parse(fs.readFileSync(file, 'utf8')))
+  const write = (value, initial = false) => {
+    fs.mkdirSync(path.dirname(file), { recursive: true, mode: 0o700 })
+    const tmp = `${file}.${process.pid}.${crypto.randomUUID()}.tmp`
+    try {
+      fs.writeFileSync(tmp, `${JSON.stringify(value, null, 2)}\n`, { mode: 0o600, flag: 'wx' })
+      if (initial) fs.linkSync(tmp, file) // Never overwrite a concurrently created identity.
+      else fs.renameSync(tmp, file)
+    } finally {
+      fs.rmSync(tmp, { force: true })
+    }
+  }
+  let state
+  try {
+    try {
+      state = read()
+    } catch (error) {
+      if (error.code !== 'ENOENT') throw error
+      state = { version: 1, gatewayId: crypto.randomUUID(), mode: null }
+      try { write(state, true) } catch (cause) {
+        if (cause.code !== 'EEXIST') throw cause
+        state = read()
+      }
+    }
+    fs.chmodSync(file, 0o600)
+  } catch (error) {
+    throw new Error(`failed to load gateway state ${file}: ${error.message}`, { cause: error })
+  }
+  return {
+    get gatewayId() { return state.gatewayId },
+    get mode() { return state.mode },
+    setMode(mode) {
+      if (!GATEWAY_MODES.includes(mode)) throw new TypeError('invalid gateway mode')
+      const next = { ...state, mode }
+      write(next)
+      state = next
+    },
+  }
+}

package/lib/index.mjs

@@ -129,6 +129,7 @@ import Schema from '@deepseek-ai/schemastery'
 import { WebSocketServer } from 'ws'
 import devicesModule from './devices.js'
 import { createDshHostAdapter } from './dsh-host-adapter.mjs'
+import { createGatewayState, GATEWAY_MODES } from './gateway-state.mjs'
 import QRCode from 'qrcode'
 
 const { createRegistry } = devicesModule
@@ -201,6 +202,10 @@ const Config = Schema.object({
   path: Schema.string().default(DEFAULT_WS_PATH),
   requireAuth: Schema.boolean().default(true),
   gatewayEnabled: Schema.boolean().default(false),
+  gatewayMode: Schema.union(GATEWAY_MODES),
+  gatewayStateFile: Schema.string().default(''),
+  gatewayName: Schema.string().default(''),
+  endpoints: Schema.array(Schema.string()).default([]),
   gatewayWaitTimeoutMs: Schema.natural().min(30_000).max(30 * 60 * 1000).default(DEFAULT_GATEWAY_WAIT_TIMEOUT_MS),
   maxPayloadBytes: Schema.natural().min(1024 * 1024).max(160 * 1024 * 1024).default(DEFAULT_MAX_WS_PAYLOAD_BYTES),
   fileDownloadsEnabled: Schema.boolean().default(true),
@@ -1845,11 +1850,13 @@ function normalizePublicUrl(value, req, wsPath) {
     const host = req.headers.host || `127.0.0.1`
     raw = `${req.socket && req.socket.encrypted ? 'wss' : 'ws'}://${host}${wsPath}`
   }
-  const url = new URL(raw)
+  let url
+  try { url = new URL(raw) } catch { throw badRequest('invalid WebSocket endpoint URL') }
   if (url.protocol === 'https:') url.protocol = 'wss:'
   if (url.protocol === 'http:') url.protocol = 'ws:'
   if (url.protocol !== 'ws:' && url.protocol !== 'wss:') throw badRequest('publicUrl must use wss:// (ws:// is allowed only for localhost and private LAN addresses)')
   if (url.username || url.password || url.search || url.hash) throw badRequest('publicUrl must not contain credentials, query parameters, or a fragment')
+  if (['0.0.0.0', '[::]', '::'].includes(url.hostname)) throw badRequest('endpoint must not use an unspecified listen address')
   if (url.protocol === 'ws:' && !isPrivateNetworkHostname(url.hostname)) throw badRequest('publicUrl must use wss:// outside localhost or a private LAN')
   return url.toString()
 }
@@ -1882,8 +1889,12 @@ function readBody(req) {
         reject(error)
         return
       }
-      try { resolve(data === '' ? {} : JSON.parse(data)) } catch (cause) {
-        const error = new Error('request body must be valid JSON', { cause })
+      try {
+        const body = data === '' ? {} : JSON.parse(data)
+        if (!body || typeof body !== 'object' || Array.isArray(body)) throw new TypeError('expected an object')
+        resolve(body)
+      } catch (cause) {
+        const error = new Error('request body must be a JSON object', { cause })
         error.status = 400
         reject(error)
       }
@@ -1974,6 +1985,9 @@ const plugin = {
       path: DEFAULT_WS_PATH,
       requireAuth: true,
       gatewayEnabled: false,
+      gatewayStateFile: '',
+      gatewayName: '',
+      endpoints: [],
       gatewayWaitTimeoutMs: DEFAULT_GATEWAY_WAIT_TIMEOUT_MS,
       maxPayloadBytes: DEFAULT_MAX_WS_PAYLOAD_BYTES,
       fileDownloadsEnabled: true,
@@ -2006,6 +2020,17 @@ const plugin = {
     let requireAuth = options.requireAuth !== false
     const adminLoopbackOnly = options.adminLoopbackOnly !== false
     const deviceFile = options.deviceFile || path.join(os.homedir(), '.dsh', 'mobile-gateway-devices.json')
+    if (options.gatewayMode !== undefined && !GATEWAY_MODES.includes(options.gatewayMode)) throw new Error('invalid gatewayMode')
+    if (typeof options.gatewayName !== 'string' || options.gatewayName.trim().length > 80) throw new Error('gatewayName must be at most 80 characters')
+    const normalizeEndpoints = (values) => {
+      if (!Array.isArray(values) || values.length > 16 || values.some((value) => typeof value !== 'string' || !value.trim() || value.length > 2048)) {
+        throw badRequest('endpoints must be an array of at most 16 nonempty URLs (2048 characters each)')
+      }
+      return [...new Set(values.map((value) => normalizePublicUrl(value, { headers: {} }, wsPath)))]
+    }
+    const configuredEndpoints = normalizeEndpoints(options.endpoints)
+    const gatewayState = createGatewayState(options.gatewayStateFile || `${deviceFile}.gateway.json`)
+    const gatewayIdentity = { gatewayId: gatewayState.gatewayId, gatewayName: options.gatewayName.trim() || os.hostname().slice(0, 80) }
     const registry = createRegistry(deviceFile, { pairingTtlMs: options.pairingTtlMs })
     const wss = new WebSocketServer({
       noServer: true,
@@ -2029,7 +2054,8 @@ const plugin = {
     let archivedSessionIds = null
     let sessionQueues = null
     let counter = 0
-    let gatewayEnabled = options.gatewayEnabled === true
+    let gatewayMode = gatewayState.mode ?? options.gatewayMode ?? (options.gatewayEnabled === true ? 'persistent' : 'disabled')
+    let gatewayEnabled = gatewayMode !== 'disabled'
     let waitExpiresAt = null
     let waitTimer = null
     let connectedSinceEnabled = false
@@ -2053,25 +2079,44 @@ const plugin = {
       }
     }
 
-    const setGatewayEnabled = (enabled, reason) => {
+    const advertisedEndpoints = (primary, extra = []) => {
+      const publicUrl = configuredPublicUrl()
+      return normalizeEndpoints([...new Set([
+        ...(primary ? [primary] : []),
+        ...extra,
+        ...configuredEndpoints,
+        ...(publicUrl ? [publicUrl] : []),
+        ...(lanListening ? lanWebSocketUrls(options, wsPath, lanBoundPort) : []),
+      ])])
+    }
+
+    const setGatewayMode = (mode, reason, persist = true) => {
+      if (!GATEWAY_MODES.includes(mode)) throw badRequest('mode must be disabled, temporary, or persistent')
+      // Commit before changing the live service, so a failed save never reports success.
+      if (persist) gatewayState.setMode(mode)
       if (waitTimer) clearTimeout(waitTimer)
       waitTimer = null
-      gatewayEnabled = enabled
+      gatewayMode = mode
+      gatewayEnabled = mode !== 'disabled'
       waitExpiresAt = null
-      connectedSinceEnabled = false
-      if (enabled) {
+      connectedSinceEnabled = [...clients].some((client) => client.readyState === 1)
+      if (mode === 'temporary' && !connectedSinceEnabled) {
         waitExpiresAt = Date.now() + options.gatewayWaitTimeoutMs
         waitTimer = setTimeout(() => {
           waitTimer = null
-          if (!gatewayEnabled || connectedSinceEnabled || clients.size > 0) return
+          if (!gatewayEnabled || connectedSinceEnabled || [...clients].some((client) => client.readyState === 1)) return
           gatewayEnabled = false
+          gatewayMode = 'disabled'
           waitExpiresAt = null
+          try { gatewayState.setMode('disabled') } catch (error) {
+            log(`failed to persist automatic gateway disable: ${error.message}`)
+          }
           log('mobile gateway automatically disabled: no device connected before timeout')
         }, options.gatewayWaitTimeoutMs)
-      } else {
+      } else if (mode === 'disabled') {
         for (const client of clients) client.close(4004, 'mobile gateway disabled')
       }
-      log(`mobile gateway ${enabled ? 'enabled' : 'disabled'}${reason ? `: ${reason}` : ''}`)
+      log(`mobile gateway mode=${mode}${reason ? `: ${reason}` : ''}`)
     }
 
     const logAuthRejected = (req) => {
@@ -2303,12 +2348,8 @@ const plugin = {
       }
     }
 
-    // Startup-config enablement (gatewayEnabled: true in cordis.patch.yml) is a
-    // standing-service decision made by the operator: do NOT arm the no-device
-    // auto-close. That safety net stays attached to the ephemeral panel toggle,
-    // where it belongs. gatewayEnabled is already true from options at this point,
-    // so nothing else is needed here beyond the log line.
-    if (gatewayEnabled) log('mobile gateway enabled by startup config: standing mode, no auto-close timer')
+    // Saved user choice wins; a temporary startup gets a fresh first-connection window.
+    setGatewayMode(gatewayMode, 'startup', false)
 
     log(`applying: version=${PLUGIN_VERSION} interactionProtocol=${INTERACTION_PROTOCOL_REVISION} path=${wsPath}, webServer.port=${webServer.port}, gatewayEnabled=${gatewayEnabled}, requireAuth=${requireAuth}, devices=${registry.count()}`)
 
@@ -2333,6 +2374,9 @@ const plugin = {
               version: PLUGIN_VERSION,
               requireAuth,
               gatewayEnabled,
+              gatewayMode,
+              ...gatewayIdentity,
+              endpoints: advertisedEndpoints(),
               waitExpiresAt,
               connectedClients: clients.size,
               webPort: webServer.port,
@@ -2364,9 +2408,10 @@ const plugin = {
             sendJson(res, 200, result)
           } else if (req.method === 'POST' && p === '/mgw/gateway') {
             const body = await readBody(req)
-            if (typeof body.enabled !== 'boolean') throw badRequest('enabled must be a boolean')
-            setGatewayEnabled(body.enabled, 'changed from management UI')
-            sendJson(res, 200, { gatewayEnabled, waitExpiresAt, connectedClients: clients.size })
+            if (body.mode !== undefined && body.enabled !== undefined) throw badRequest('provide mode or enabled, not both')
+            if (body.mode === undefined && typeof body.enabled !== 'boolean') throw badRequest('mode or boolean enabled is required')
+            setGatewayMode(body.mode !== undefined ? body.mode : (body.enabled ? 'temporary' : 'disabled'), 'changed from management UI')
+            sendJson(res, 200, { gatewayEnabled, gatewayMode, waitExpiresAt, connectedClients: clients.size })
           } else if (req.method === 'POST' && p === '/mgw/auth') {
             const body = await readBody(req)
             if (typeof body.enabled !== 'boolean') throw badRequest('enabled must be a boolean')
@@ -2393,12 +2438,15 @@ const plugin = {
             const body = await readBody(req)
             const name = typeof body.name === 'string' ? body.name : undefined
             const publicUrl = normalizePublicUrl(body.publicUrl || configuredPublicUrl(), req, wsPath)
+            const endpoints = advertisedEndpoints(publicUrl, normalizeEndpoints(body.endpoints ?? []))
             const pairing = registry.createPairing(name)
             const payload = {
               version: 2,
               publicUrl,
               pairingCode: pairing.code,
               expiresAt: pairing.expiresAt,
+              ...gatewayIdentity,
+              endpoints,
             }
             // QR/manual pairing has one canonical wire representation: the
             // UTF-8 JSON payload encoded as unpadded Base64URL. Base64URL is
@@ -2568,10 +2616,12 @@ const plugin = {
               kind: 'paired',
               token: paired.token,
               device: paired.device,
+              ...gatewayIdentity,
             }))
           }
           ws.send(JSON.stringify({
             kind: 'hello',
+            ...gatewayIdentity,
             protocol: 3,
             capabilities: [
               'split-channels',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-mobile-gateway",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "description": "Secure mobile gateway for DeepSeek Harness with split realtime/control channels, editable queues, stop/resume, archive/rename sync, tasks, goals, commands, approvals, and file transfers",
   "main": "lib/index.mjs",
   "files": [
@@ -26,7 +26,7 @@
   },
   "bin": "bin/setup-ip.mjs",
   "scripts": {
-    "test": "node test/setup-ip.test.mjs && node test/host-adapter.test.mjs && node test/gateway.test.mjs && node test/auth.test.mjs && node test/lan.test.mjs"
+    "test": "node test/setup-ip.test.mjs && node test/host-adapter.test.mjs && node test/gateway.test.mjs && node test/auth.test.mjs && node test/lan.test.mjs && node test/multi-gateway.test.mjs"
   },
   "exports": {
     ".": "./lib/index.mjs",