dsh-remote 0.8.51 → 0.8.53

package/lib/pool.js

@@ -197,6 +197,8 @@ export class SshPool {
     this.onReady = null
     /** Optional hook called when the pool closes. */
     this.onCloseHook = null
+    /** Consecutive SFTP subchannel-open timeouts (issue #65). */
+    this._sftpTimeouts = 0
   }
 
   resolveKeyPath() {
@@ -324,6 +326,7 @@ export class SshPool {
           return
         }
         this.client = client
+        this._sftpTimeouts = 0
         resolve(client)
         if (this.onReady) { try { this.onReady(client) } catch {} }
       })
@@ -517,6 +520,12 @@ export class SshPool {
   _execRaw(command, opts, stdinWriter) {
     const timeoutMs = (opts && opts.timeoutMs) || this.config.commandTimeoutMs
     const signal = opts && opts.signal
+    // Streaming tap for background jobs (issue #70): a promoted command's value
+    // is its LIVE output, which the job ring must receive as it arrives rather
+    // than only as a return value the caller already abandoned. Called with
+    // ('stdout'|'stderr', chunk); failures inside the tap must never break the
+    // command itself, so every call site guards it.
+    const onData = opts && typeof opts.onData === 'function' ? opts.onData : null
     return this.connect().then(
       (client) =>
         new Promise((resolve, reject) => {
@@ -611,9 +620,11 @@ export class SshPool {
               })
               stream.on('data', (d) => {
                 if (stdout.length < hardCap) stdout += d
+                if (onData) { try { onData('stdout', d) } catch { /* tap errors are not command errors */ } }
               })
               stream.stderr.on('data', (d) => {
                 if (stderr.length < hardCap) stderr += d
+                if (onData) { try { onData('stderr', d) } catch { /* tap errors are not command errors */ } }
               })
               stream.on('error', (e) => {
                 if (settled) return
@@ -684,10 +695,25 @@ export class SshPool {
                   }
                   return reject(new Error('ssh sftp failed: ' + ((err && err.message) || err)))
                 }
+                // A successful open proves the connection healthy: the strike
+                // counter counts CONSECUTIVE timeouts, so it resets here —
+                // two unrelated transient blips hours apart must not tear down
+                // a fine connection.
+                this._sftpTimeouts = 0
                 // The promisified surface (timeouts, dead-channel fail-fast,
                 // range reads) is shared verbatim with the system-OpenSSH
                 // backend — see lib/sftp-surface.js for the rules it encodes.
-                resolve(buildSftpSurface(sftp, { commandTimeoutMs: this.config.commandTimeoutMs }))
+                resolve(buildSftpSurface(sftp, {
+                  commandTimeoutMs: this.config.commandTimeoutMs,
+                  onTimeout: () => {
+                    // A timed-out SFTP subchannel is dead: close it so the next
+                    // operation does not queue behind the wedged one, and count
+                    // the strike so a second consecutive timeout tears down the
+                    // whole pooled connection (issue #65).
+                    try { sftp.end() } catch { /* already gone */ }
+                    this._noteSftpTimeout()
+                  },
+                }))
               })
             } catch (e) {
               clearAttempt()
@@ -699,6 +725,16 @@ export class SshPool {
     )
   }
 
+  /**
+   * Count a timed-out SFTP subchannel open. A second consecutive timeout means
+   * the pooled connection itself is wedged (issue #65): tear it down so the
+   * next sftp() call re-handshakes instead of queueing behind the dead one.
+   */
+  _noteSftpTimeout() {
+    this._sftpTimeouts = (this._sftpTimeouts || 0) + 1
+    if (this._sftpTimeouts >= 2) this.invalidate()
+  }
+
   /**
    * Drop the cached client and force a fresh connection on the next call.
    * Called when a channel open fails (e.g. "Channel open failure: open

package/lib/remote-fs.js

@@ -98,6 +98,17 @@ export async function removeRemoteTree(sftp, p, maxFiles = 2000) {
   return removed
 }
 
+/** MIME types for image formats the preview panel can render inline. */
+const IMAGE_MIME_TYPES = {
+  png: 'image/png',
+  jpg: 'image/jpeg',
+  jpeg: 'image/jpeg',
+  gif: 'image/gif',
+  webp: 'image/webp',
+  svg: 'image/svg+xml',
+  bmp: 'image/bmp',
+}
+
 function looksBinary(buf) {
   const n = Math.min(buf.length, 8192)
   for (let i = 0; i < n; i++) if (buf[i] === 0) return true
@@ -107,6 +118,14 @@ function looksBinary(buf) {
 /**
  * Read a remote file for the sidebar/editor. Oversized files use a range read
  * (`readPartial`) so we never `fastGet` the whole blob onto disk.
+ *
+ * Images are the exception (issue #66): a PREFIX of an image is a broken
+ * picture, not a preview, so for a recognised image extension the caller's
+ * text-oriented cap is skipped and the file is read whole up to the hard 2MB
+ * ceiling; the panel renders it inline as `<img src="data:…">`. An image past
+ * the ceiling degrades to the plain binary stub + download button rather than
+ * shipping a guaranteed-broken half render. (`<img>` is also the safe sink
+ * for SVG: unlike inline markup it cannot run the file's scripts.)
  */
 export async function previewRemoteFile(sftp, target, opts = {}) {
   const {
@@ -114,7 +133,10 @@ export async function previewRemoteFile(sftp, target, opts = {}) {
     encoding = 'utf-8',
     decodeBuf = (buf) => buf.toString('utf8'),
   } = opts
-  const cap = Math.min(Math.max(Number(maxBytes) || 256 * 1024, 1024), 2 * 1024 * 1024)
+  const hardCap = 2 * 1024 * 1024
+  const name = String(target).split(/[\\/]/).pop() || ''
+  const imageMime = IMAGE_MIME_TYPES[(name.split('.').pop() || '').toLowerCase()]
+  const cap = imageMime ? hardCap : Math.min(Math.max(Number(maxBytes) || 256 * 1024, 1024), hardCap)
   const st = await sftp.stat(target)
   const mtime = st && typeof st.mtime === 'number' ? st.mtime : 0
   const size = st && typeof st.size === 'number' ? st.size : 0
@@ -131,6 +153,9 @@ export async function previewRemoteFile(sftp, target, opts = {}) {
   } else {
     buf = await sftp.readFile(target)
   }
+  if (imageMime && !truncated) {
+    return { ok: true, binary: false, image: true, mime: imageMime, content: buf.toString('base64'), truncated, size, mtime }
+  }
   if (looksBinary(buf)) {
     return {
       ok: true, binary: true, size, mtime,

package/lib/sftp-surface.js

@@ -26,7 +26,7 @@ import { toSftpPath } from './paths.js'
  * @param {number} opts.commandTimeoutMs - per-operation timeout.
  * @returns {object} promisified sftp surface.
  */
-export function buildSftpSurface(sftp, { commandTimeoutMs }) {
+export function buildSftpSurface(sftp, { commandTimeoutMs, onTimeout }) {
   // A dead channel must fail fast (see the header). ssh2's SFTP instance and the
   // system-OpenSSH engine both emit these, so one hook covers both backends.
   let dead = false
@@ -39,12 +39,19 @@ export function buildSftpSurface(sftp, { commandTimeoutMs }) {
   const withTimeout = (fn) => (...args) =>
     new Promise((resolve, reject) => {
       if (dead) return reject(new Error('sftp channel closed'))
-      const timer = setTimeout(() => reject(new Error('sftp operation timed out')), commandTimeoutMs)
+      let timedOut = false
+      const timer = setTimeout(() => {
+        timedOut = true
+        markDead()
+        if (typeof onTimeout === 'function') { try { onTimeout() } catch { /* best effort */ } }
+        reject(new Error('sftp operation timed out'))
+      }, commandTimeoutMs)
       const finish = (err, value) => {
         clearTimeout(timer)
+        if (timedOut) return
         err ? reject(err) : resolve(value)
       }
-      try { fn(...args, finish) } catch (err) { clearTimeout(timer); reject(err) }
+      try { fn(...args, finish) } catch (err) { clearTimeout(timer); if (!timedOut) reject(err) }
     })
   const P = (p) => toSftpPath(p)
   return {
@@ -55,7 +62,43 @@ export function buildSftpSurface(sftp, { commandTimeoutMs }) {
     rmdir: (dir) => withTimeout((d, cb) => sftp.rmdir(d, cb))(P(dir)),
     unlink: (p) => withTimeout((d, cb) => sftp.unlink(d, cb))(P(p)),
     rename: (p, d) => withTimeout((a, b, cb) => sftp.rename(a, b, cb))(P(p), P(d)),
+    // POSIX rename(2) semantics: atomically REPLACE an existing destination.
+    // Plain SSH_FXP_RENAME fails when the target exists (OpenSSH's sftp-server
+    // enforces that even though it advertises posix-rename@openssh.com — ssh2
+    // only sends the extension when asked explicitly, verified against
+    // OpenSSH_9.6 in issue #65). Servers with the extension get one atomic
+    // request; servers without it get the move-aside dance, whose every hop
+    // targets a path that does not exist, which plain RENAME always permits.
+    // rw_edit's atomic write depends on this — without it every edit of an
+    // existing file fails with a bare "Failure".
+    renameOverwrite: (p, d) => withTimeout((a, b, cb) => {
+      const ext = sftp._extensions && sftp._extensions['posix-rename@openssh.com']
+      if (ext === '1' && typeof sftp.ext_openssh_rename === 'function') {
+        return sftp.ext_openssh_rename(a, b, cb)
+      }
+      const bak = `${b}.dsh-remote-bak-${Date.now()}-${Math.random().toString(36).slice(2, 8)}.tmp`
+      sftp.rename(b, bak, (e1) => {
+        if (e1) {
+          // Destination absent → a plain rename is already overwrite-safe.
+          if (/no such/i.test(String((e1 && e1.message) || e1))) return sftp.rename(a, b, cb)
+          return cb(e1)
+        }
+        sftp.rename(a, b, (e2) => {
+          if (e2) {
+            // Roll the original back into place before reporting the failure.
+            return sftp.rename(bak, b, () => cb(e2))
+          }
+          // Best effort: a leftover backup must not fail the operation.
+          sftp.unlink(bak, () => cb(null))
+        })
+      })
+    })(P(p), P(d)),
     realpath: (p) => withTimeout((d, cb) => sftp.realpath(d, cb))(P(p)),
+    // Attribute write (chmod semantics live in setstat at the protocol level,
+    // so BOTH backends — ssh2's SFTPWrapper and its raw protocol SFTP — answer
+    // this one shape). Used by rw_edit to restore the original mode after an
+    // atomic rename replace (issue #65).
+    setstat: (p, attrs) => withTimeout((d, a, cb) => sftp.setstat(d, a, cb))(P(p), attrs),
     readFile: (p) => withTimeout((d, cb) => sftp.readFile(d, cb))(P(p)),
     writeFile: (p, data) => withTimeout((d, data2, cb) => sftp.writeFile(d, data2, cb))(P(p), data),
     fastGet: (p, lp) => withTimeout((d, l, cb) => sftp.fastGet(d, l, cb))(P(p), lp),

package/lib/sshconfig.js

@@ -32,11 +32,21 @@ import { existsSync, readFileSync, readdirSync, statSync, mkdirSync, writeFileSy
 import { homedir } from 'node:os'
 import path from 'node:path'
 
-/** Default location of the user's ssh config. */
-export const sshConfigPath = () => path.join(homedir(), '.ssh', 'config')
+/** Default location of the user's ssh config. An env override exists so tests
+ *  (and any deployment that isolates its home directory) can point the plugin
+ *  at a substitute file instead of the real ~/.ssh/config. */
+export const sshConfigPath = () => {
+  const env = process.env.DSH_REMOTE_SSH_CONFIG
+  if (env && String(env).trim()) return path.resolve(String(env).trim())
+  return path.join(homedir(), '.ssh', 'config')
+}
 
 /** Directory `Include` paths are resolved against (ssh_config(5)). */
-export const sshConfigDir = () => path.join(homedir(), '.ssh')
+export const sshConfigDir = () => {
+  const env = process.env.DSH_REMOTE_SSH_CONFIG
+  if (env && String(env).trim()) return path.dirname(path.resolve(String(env).trim()))
+  return path.join(homedir(), '.ssh')
+}
 
 /** Parameters the resolver cares about, lowercase (as parsed). */
 const KNOWN_PARAMS = new Set([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-remote",
-  "version": "0.8.51",
+  "version": "0.8.53",
   "description": "Remote-work assistant for DeepSeek Harness: connect SSH (password/key/agent/keyboard-interactive/proxy jump), pick a remote workspace, operate on it with 22 rw_* tools (incl. rw_edit/rw_stat/rw_mkdir/rw_remove/rw_move/rw_forward), conflict-aware mirror sync, one-click remote dsh deploy + web UI attach, port forwarding, optional side-bar remote file editing, audit log, keychain passwords.",
   "license": "MIT",
   "author": "flymysql <flyphp@outlook.com>",