dsh-ssh-tunnel 1.0.1 → 1.0.2

package/lib/shared/session-policy.js

@@ -1,125 +1,151 @@
-/**
- * Pure SSH session policy: timeouts, status invariant, reuse vs tombstone.
- * No ssh2, no I/O.
- */
-
-export const SSH_KEEPALIVE_INTERVAL_MS = 30_000
-export const SSH_KEEPALIVE_COUNT_MAX = 3
-export const SSH_READY_TIMEOUT_MS = 20_000
-export const SSH_RECONNECT_MAX_ATTEMPTS = 3
-export const SSH_RECONNECT_DELAYS_MS = [5_000, 10_000, 10_000]
-export const SSH_RECONNECT_ATTEMPT_TIMEOUT_MS = 20_000
-export const SSH_TOOL_TIMEOUT_MS = 300_000
-export const SSH_TIMEOUT_MIN_MS = 1_000
-export const SSH_TIMEOUT_MAX_MS = 300_000
-export const SSH_EXEC_DEFAULT_TIMEOUT_MS = 30_000
-export const SSH_SFTP_META_TIMEOUT_MS = 30_000
-export const SSH_SFTP_TRANSFER_TIMEOUT_MS = 120_000
-export const SSH_SHELL_OPEN_TIMEOUT_MS = 10_000
-
-export const SSH_STATUS_CONNECTED = 'connected'
-export const SSH_STATUS_RECONNECTING = 'reconnecting'
-export const SSH_STATUS_DISCONNECTED = 'disconnected'
-
-export function clampTimeoutMs(value, fallback) {
-  const n = Number(value)
-  const base = Number.isFinite(n) && n > 0 ? n : fallback
-  return Math.min(SSH_TIMEOUT_MAX_MS, Math.max(SSH_TIMEOUT_MIN_MS, Math.floor(base)))
-}
-
-export function defaultTimeoutMsForAction(action) {
-  const a = String(action || '')
-  if (a === 'exec') return SSH_EXEC_DEFAULT_TIMEOUT_MS
-  if (a === 'sftp_read_text' || a === 'sftp_write_text' || a === 'sftp_upload' || a === 'sftp_download') {
-    return SSH_SFTP_TRANSFER_TIMEOUT_MS
-  }
-  if (a.startsWith('sftp_')) return SSH_SFTP_META_TIMEOUT_MS
-  if (a === 'read_session' || a === 'send_input' || a === 'resize_session') return SSH_SHELL_OPEN_TIMEOUT_MS
-  return SSH_EXEC_DEFAULT_TIMEOUT_MS
-}
-
-export function isLiveStatus(status, running) {
-  return status === SSH_STATUS_CONNECTED && running === true
-}
-
-export function assertStatusInvariant(rec) {
-  const running = rec.status === SSH_STATUS_CONNECTED
-  return { ...rec, running }
-}
-
-export function findReusableLive(sessions, { projectPathKey, hostId, needsSftp }) {
-  return sessions
-    .filter((s) => {
-      if (s.projectPathKey !== projectPathKey || s.hostId !== hostId) return false
-      if (!isLiveStatus(s.status, s.running)) return false
-      if (needsSftp && !s.sftpEnabled) return false
-      return true
-    })
-    .sort((a, b) => a.createdAt - b.createdAt || String(a.id).localeCompare(String(b.id)))[0]
-}
-
-export function pickOldestTombstone(sessions, { projectPathKey, hostId, needsSftp }) {
-  return sessions
-    .filter((s) => {
-      if (s.projectPathKey !== projectPathKey || s.hostId !== hostId) return false
-      if (s.status !== SSH_STATUS_DISCONNECTED || s.running) return false
-      if (needsSftp && !s.sftpEnabled) return false
-      return true
-    })
-    .sort((a, b) => a.createdAt - b.createdAt || String(a.id).localeCompare(String(b.id)))[0]
-}
-
-export function disconnectedSessionError() {
-  return 'SSH session is disconnected. Reconnect in the SSH Tunnel tab, or omit session_id to reuse_or_create.'
-}
-
-export function kbiReconnectError() {
-  return 'keyboard-interactive auth is not supported; edit the host to password or private key.'
-}
-
-export function kbiUnsupportedError() {
-  return 'keyboard-interactive auth is not supported; edit the host to password or private key.'
-}
-
-export function withTimeout(work, ms, { signal, onTimeout } = {}) {
-  const timeoutMs = clampTimeoutMs(ms, SSH_EXEC_DEFAULT_TIMEOUT_MS)
-  const run = typeof work === 'function' ? work() : work
-  return new Promise((resolve, reject) => {
-    let settled = false
-    const finish = (kind, value) => {
-      if (settled) return
-      settled = true
-      clearTimeout(timer)
-      if (signal) signal.removeEventListener('abort', onAbort)
-      if (kind === 'ok') resolve(value)
-      else reject(value)
-    }
-    const onAbort = () => {
-      try {
-        onTimeout?.()
-      } catch {}
-      const err = new Error('Cancelled')
-      err.aborted = true
-      finish('err', err)
-    }
-    const timer = setTimeout(() => {
-      try {
-        onTimeout?.()
-      } catch {}
-      const err = new Error('timeout')
-      err.timedOut = true
-      finish('err', err)
-    }, timeoutMs)
-    if (signal) {
-      if (signal.aborted) {
-        onAbort()
-        return
-      }
-      signal.addEventListener('abort', onAbort, { once: true })
-    }
-    Promise.resolve(run).then(
-      (v) => finish('ok', v),
-      (e) => finish('err', e),
-    )
-  })
-}
+/**
+ * Pure SSH session policy: timeouts, status invariant, reuse vs tombstone.
+ * No ssh2, no I/O.
+ */
+
+export const SSH_KEEPALIVE_INTERVAL_MS = 30_000
+export const SSH_KEEPALIVE_COUNT_MAX = 3
+export const SSH_READY_TIMEOUT_MS = 20_000
+export const SSH_RECONNECT_MAX_ATTEMPTS = 3
+export const SSH_RECONNECT_DELAYS_MS = [5_000, 10_000, 10_000]
+export const SSH_RECONNECT_ATTEMPT_TIMEOUT_MS = 20_000
+export const SSH_TOOL_TIMEOUT_MS = 300_000
+export const SSH_TIMEOUT_MIN_MS = 1_000
+export const SSH_TIMEOUT_MAX_MS = 300_000
+export const SSH_EXEC_DEFAULT_TIMEOUT_MS = 30_000
+export const SSH_SFTP_META_TIMEOUT_MS = 30_000
+export const SSH_SFTP_TRANSFER_TIMEOUT_MS = 120_000
+export const SSH_SHELL_OPEN_TIMEOUT_MS = 10_000
+
+export const SSH_STATUS_CONNECTED = 'connected'
+export const SSH_STATUS_RECONNECTING = 'reconnecting'
+export const SSH_STATUS_DISCONNECTED = 'disconnected'
+
+export function clampTimeoutMs(value, fallback) {
+  const n = Number(value)
+  const base = Number.isFinite(n) && n > 0 ? n : fallback
+  return Math.min(SSH_TIMEOUT_MAX_MS, Math.max(SSH_TIMEOUT_MIN_MS, Math.floor(base)))
+}
+
+export function defaultTimeoutMsForAction(action) {
+  const a = String(action || '')
+  if (a === 'exec') return SSH_EXEC_DEFAULT_TIMEOUT_MS
+  if (a === 'sftp_read_text' || a === 'sftp_write_text' || a === 'sftp_upload' || a === 'sftp_download') {
+    return SSH_SFTP_TRANSFER_TIMEOUT_MS
+  }
+  if (a.startsWith('sftp_')) return SSH_SFTP_META_TIMEOUT_MS
+  if (a === 'read_session' || a === 'send_input' || a === 'resize_session') return SSH_SHELL_OPEN_TIMEOUT_MS
+  return SSH_EXEC_DEFAULT_TIMEOUT_MS
+}
+
+export function isLiveStatus(status, running) {
+  return status === SSH_STATUS_CONNECTED && running === true
+}
+
+export function findReusableLive(sessions, { projectPathKey, hostId, needsSftp }) {
+  return sessions
+    .filter((s) => {
+      if (s.projectPathKey !== projectPathKey || s.hostId !== hostId) return false
+      if (!isLiveStatus(s.status, s.running)) return false
+      if (needsSftp && !s.sftpEnabled) return false
+      return true
+    })
+    .sort((a, b) => a.createdAt - b.createdAt || String(a.id).localeCompare(String(b.id)))[0]
+}
+
+export function pickOldestTombstone(sessions, { projectPathKey, hostId, needsSftp }) {
+  return sessions
+    .filter((s) => {
+      if (s.projectPathKey !== projectPathKey || s.hostId !== hostId) return false
+      if (s.status !== SSH_STATUS_DISCONNECTED || s.running) return false
+      if (needsSftp && !s.sftpEnabled) return false
+      return true
+    })
+    .sort((a, b) => a.createdAt - b.createdAt || String(a.id).localeCompare(String(b.id)))[0]
+}
+
+export function disconnectedSessionError() {
+  return 'SSH session is disconnected. Reconnect in the SSH Tunnel tab, or omit session_id to reuse_or_create.'
+}
+
+export function kbiReconnectError() {
+  return 'keyboard-interactive auth is not supported; edit the host to password or private key.'
+}
+
+export function kbiUnsupportedError() {
+  return 'keyboard-interactive auth is not supported; edit the host to password or private key.'
+}
+
+export function withTimeout(work, ms, { signal, onTimeout } = {}) {
+  const timeoutMs = clampTimeoutMs(ms, SSH_EXEC_DEFAULT_TIMEOUT_MS)
+  const run = typeof work === 'function' ? work() : work
+  return new Promise((resolve, reject) => {
+    let settled = false
+    const finish = (kind, value) => {
+      if (settled) return
+      settled = true
+      clearTimeout(timer)
+      if (signal) signal.removeEventListener('abort', onAbort)
+      if (kind === 'ok') resolve(value)
+      else reject(value)
+    }
+    const onAbort = () => {
+      try {
+        onTimeout?.()
+      } catch {}
+      const err = new Error('Cancelled')
+      err.aborted = true
+      finish('err', err)
+    }
+    const timer = setTimeout(() => {
+      try {
+        onTimeout?.()
+      } catch {}
+      const err = new Error('timeout')
+      err.timedOut = true
+      finish('err', err)
+    }, timeoutMs)
+    if (signal) {
+      if (signal.aborted) {
+        onAbort()
+        return
+      }
+      signal.addEventListener('abort', onAbort, { once: true })
+    }
+    Promise.resolve(run).then(
+      (v) => finish('ok', v),
+      (e) => finish('err', e),
+    )
+  })
+}
+
+export const MAX_BYTES_MIN = 1_024
+export const MAX_BYTES_MAX = 1_048_576
+export const MAX_BYTES_EXEC_DEFAULT = 262_144
+export const MAX_BYTES_SFTP_READ_DEFAULT = 524_288
+
+export function clampMaxBytes(value, fallback) {
+  const n = Number(value)
+  const base = Number.isFinite(n) && n > 0 ? n : fallback
+  return Math.min(MAX_BYTES_MAX, Math.max(MAX_BYTES_MIN, Math.floor(base)))
+}
+
+/** HTTP status for an API error code; anything unmapped stays a server fault. */
+export const API_ERROR_STATUS = {
+  bad_request: 400,
+  forbidden: 403,
+  not_found: 404,
+  conflict: 409,
+  gone: 410,
+  payload_too_large: 413,
+}
+
+export function sshError(code, message) {
+  const err = new Error(message)
+  err.code = code
+  return err
+}
+
+export function hostKeyPromptMessage() {
+  return 'Connection needs your confirmation: complete the trust/MFA prompt in the SSH Tunnel tab, then retry.'
+}

package/lib/shared/shell-buffer.js

@@ -1,10 +1,10 @@
-/** Incremental shell output slice for polling clients. */
-export function chunkFromBuffer(fullText, since) {
-  const full = fullText == null ? '' : String(fullText)
-  const start = Math.max(0, Math.min(Number(since) || 0, full.length))
-  return {
-    chunk: full.slice(start),
-    length: full.length,
-    since: start,
-  }
-}
+/** Incremental shell output slice for polling clients. */
+export function chunkFromBuffer(fullText, since) {
+  const full = fullText == null ? '' : String(fullText)
+  const start = Math.max(0, Math.min(Number(since) || 0, full.length))
+  return {
+    chunk: full.slice(start),
+    length: full.length,
+    since: start,
+  }
+}

package/lib/shared/vendor.js

@@ -1,50 +1,50 @@
-/**
- * Same-origin static assets for the browser client.
- *
- * `dsh-ssh-tunnel/lib/client.js` is a raw browser bundle executed by the DSH
- * client module system; its `require()` only answers platform seeds and
- * registered plugin rows, so `@xterm/xterm` is NOT resolvable there. Instead
- * of the removed jsDelivr fallback we serve the UMD builds from our own web
- * route (`/dsh-ssh-tunnel/vendor/*`) and load them with plain <script>/<link>
- * tags. This module is the host-side allowlist + resolver (Node only).
- */
-
-import { createRequire } from 'node:module'
-
-const requireHost = createRequire(import.meta.url)
-
-/** name -> { spec (resolved from this plugin's deps), content-type } */
-export const VENDOR_ASSETS = {
-  'xterm.js': {
-    spec: '@xterm/xterm/lib/xterm.js',
-    type: 'text/javascript; charset=utf-8',
-  },
-  'xterm.css': {
-    spec: '@xterm/xterm/css/xterm.css',
-    type: 'text/css; charset=utf-8',
-  },
-  'addon-fit.js': {
-    spec: '@xterm/addon-fit/lib/addon-fit.js',
-    type: 'text/javascript; charset=utf-8',
-  },
-}
-
-/**
- * Resolve an allowlisted vendor asset to an absolute file path.
- * Anything not in the allowlist throws — callers must treat that as 404 and
- * must not interpolate user input into the file lookup.
- * @param {string} name exact basename from the allowlist
- * @returns {{ path: string, type: string }}
- */
-export function resolveVendorAsset(name) {
-  const entry = VENDOR_ASSETS[name]
-  if (!entry) {
-    throw new Error(`dsh-ssh-tunnel: vendor asset not allowed: ${String(name)}`)
-  }
-  return { path: requireHost.resolve(entry.spec), type: entry.type }
-}
-
-/** @param {string} name checked against the allowlist only */
-export function isVendorAssetAllowed(name) {
-  return Object.prototype.hasOwnProperty.call(VENDOR_ASSETS, name)
+/**
+ * Same-origin static assets for the browser client.
+ *
+ * `dsh-ssh-tunnel/lib/client.js` is a raw browser bundle executed by the DSH
+ * client module system; its `require()` only answers platform seeds and
+ * registered plugin rows, so `@xterm/xterm` is NOT resolvable there. Instead
+ * of the removed jsDelivr fallback we serve the UMD builds from our own web
+ * route (`/dsh-ssh-tunnel/vendor/*`) and load them with plain <script>/<link>
+ * tags. This module is the host-side allowlist + resolver (Node only).
+ */
+
+import { createRequire } from 'node:module'
+
+const requireHost = createRequire(import.meta.url)
+
+/** name -> { spec (resolved from this plugin's deps), content-type } */
+export const VENDOR_ASSETS = {
+  'xterm.js': {
+    spec: '@xterm/xterm/lib/xterm.js',
+    type: 'text/javascript; charset=utf-8',
+  },
+  'xterm.css': {
+    spec: '@xterm/xterm/css/xterm.css',
+    type: 'text/css; charset=utf-8',
+  },
+  'addon-fit.js': {
+    spec: '@xterm/addon-fit/lib/addon-fit.js',
+    type: 'text/javascript; charset=utf-8',
+  },
+}
+
+/**
+ * Resolve an allowlisted vendor asset to an absolute file path.
+ * Anything not in the allowlist throws — callers must treat that as 404 and
+ * must not interpolate user input into the file lookup.
+ * @param {string} name exact basename from the allowlist
+ * @returns {{ path: string, type: string }}
+ */
+export function resolveVendorAsset(name) {
+  const entry = VENDOR_ASSETS[name]
+  if (!entry) {
+    throw new Error(`dsh-ssh-tunnel: vendor asset not allowed: ${String(name)}`)
+  }
+  return { path: requireHost.resolve(entry.spec), type: entry.type }
+}
+
+/** @param {string} name checked against the allowlist only */
+export function isVendorAssetAllowed(name) {
+  return Object.prototype.hasOwnProperty.call(VENDOR_ASSETS, name)
 }

package/package.json

@@ -1,88 +1,91 @@
-{
-  "name": "dsh-ssh-tunnel",
-  "version": "1.0.1",
-  "description": "Multi-host SSH tunnel and SSHManager tool for DeepSeek Harness (project-scoped grants)",
-  "type": "module",
-  "license": "MIT",
-  "author": "thirsty5034",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/OMSociety/dsh-ssh-tunnel.git"
-  },
-  "homepage": "https://github.com/OMSociety/dsh-ssh-tunnel#readme",
-  "bugs": {
-    "url": "https://github.com/OMSociety/dsh-ssh-tunnel/issues"
-  },
-  "contributors": [
-    {
-      "name": "OMSociety",
-      "url": "https://github.com/OMSociety"
-    }
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "keywords": [
-    "dsh",
-    "dsh-plugin",
-    "deepseek-harness",
-    "ssh",
-    "sftp",
-    "cordis",
-    "better-sidebar",
-    "dsh-better-sidebar"
-  ],
-  "engines": {
-    "node": ">=20",
-    "dsh": ">=0.1.7-rc.2 <0.3.0-0"
-  },
-  "main": "lib/index.js",
-  "icon": "./icon.svg",
-  "exports": {
-    ".": "./lib/index.js",
-    "./locale/*.json": "./locale/*.json",
-    "./client": "./lib/client.js",
-    "./package.json": "./package.json"
-  },
-  "scripts": {
-    "test": "node scripts/smoke-test.mjs",
-    "check": "node --check lib/index.js && node scripts/smoke-test.mjs"
-  },
-  "dsh": {
-    "manifestVersion": 1,
-    "bundle": {
-      "patch": "./cordis.patch.yml"
-    },
-    "client": {
-      "inject": [
-        "@deepseek-ai/dsh-client-locale"
-      ],
-      "platform": "web"
-    }
-  },
-  "dependencies": {
-    "@xterm/addon-fit": "0.11.0",
-    "@xterm/xterm": "5.5.0",
-    "ssh2": "^1.17.0"
-  },
-  "peerDependencies": {
-    "@deepseek-ai/cordis": "^4.0.4",
-    "@deepseek-ai/dsh-client-locale": ">=0.1.7-rc.2 <0.3.0-0",
-    "dsh-better-sidebar": ">=0.12.0"
-  },
-  "files": [
-    "CHANGELOG.md",
-    "LICENSE",
-    "README.md",
-    "README_en.md",
-    "cordis.patch.yml",
-    "lib",
-    "scripts/install.sh",
-    "scripts/install.ps1",
-    "scripts/portal-probe.mjs",
-    "scripts/smoke-test.mjs",
-    "scripts/sync-to-dsh.sh",
-    "icon.svg",
-    "locale/*.json"
-  ]
-}
+{
+  "name": "dsh-ssh-tunnel",
+  "version": "1.0.2",
+  "description": "Multi-host SSH tunnel and SSHManager tool for DeepSeek Harness (project-scoped grants)",
+  "type": "module",
+  "license": "MIT",
+  "author": "thirsty5034",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/OMSociety/dsh-ssh-tunnel.git"
+  },
+  "homepage": "https://github.com/OMSociety/dsh-ssh-tunnel#readme",
+  "bugs": {
+    "url": "https://github.com/OMSociety/dsh-ssh-tunnel/issues"
+  },
+  "contributors": [
+    {
+      "name": "OMSociety",
+      "url": "https://github.com/OMSociety"
+    }
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "keywords": [
+    "dsh",
+    "dsh-plugin",
+    "deepseek-harness",
+    "ssh",
+    "sftp",
+    "cordis",
+    "better-sidebar",
+    "dsh-better-sidebar"
+  ],
+  "engines": {
+    "node": ">=20",
+    "dsh": ">=0.1.7-rc.2 <0.2.0-0 || >=0.2.0-rc.1 <0.3.0-0"
+  },
+  "main": "lib/index.js",
+  "icon": "./icon.svg",
+  "exports": {
+    ".": "./lib/index.js",
+    "./locale/*.json": "./locale/*.json",
+    "./client": "./lib/client.js",
+    "./cordis.patch.yml": "./cordis.patch.yml",
+    "./package.json": "./package.json"
+  },
+  "scripts": {
+    "test": "node scripts/smoke-test.mjs",
+    "check": "node --check lib/index.js && node scripts/smoke-test.mjs"
+  },
+  "dsh": {
+    "manifestVersion": 1,
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    },
+    "client": {
+      "inject": [
+        "dsh-better-sidebar",
+        "@deepseek-ai/dsh-client-locale"
+      ],
+      "platform": "web"
+    }
+  },
+  "dependencies": {
+    "@xterm/addon-fit": "0.11.0",
+    "@xterm/xterm": "5.5.0",
+    "ssh2": "^1.17.0"
+  },
+  "peerDependencies": {
+    "@deepseek-ai/cordis": "^4.0.4",
+    "@deepseek-ai/dsh-client-locale": ">=0.1.7-rc.2 <0.2.0-0 || >=0.2.0-rc.1 <0.3.0-0",
+    "dsh-better-sidebar": ">=0.12.0"
+  },
+  "files": [
+    "CHANGELOG.md",
+    "LICENSE",
+    "README.md",
+    "README_en.md",
+    "cordis.patch.yml",
+    "lib",
+    "scripts/install.sh",
+    "scripts/install.ps1",
+    "scripts/lib/*.cjs",
+    "scripts/portal-probe.mjs",
+    "scripts/smoke-test.mjs",
+    "scripts/sync-to-dsh.sh",
+    "icon.svg",
+    "locale/*.json"
+  ]
+}