@linxin666/dsh-ssh 0.2.3 → 0.2.5

package/lib/index.js

@@ -2137,11 +2137,11 @@ var SshEngine = class {
 		stopAllTunnels(this, alias);
 		disposeRecord(this, alias);
 	}
-	/** Probe connectivity: connect, run `true`, close. */
+	/** Probe connectivity with a cross-platform shell command. */
 	async test(alias) {
 		const started = Date.now();
 		try {
-			const result = await this.exec(alias, "true", 1e4);
+			const result = await this.exec(alias, "echo ok", 1e4);
 			return result.success ? {
 				ok: true,
 				latencyMs: result.durationMs

package/lib/types/client/locales.d.ts

@@ -57,6 +57,7 @@ export declare const zh: {
     readonly 'form.passphrase': "密钥口令";
     readonly 'form.password': "密码";
     readonly 'form.passwordHint': "明文保存在 ~/.dsh/dsh-ssh.json（本机私有文件）";
+    readonly 'form.passwordRequired': "密码认证需要填写密码。";
     readonly 'form.proxyJump': "跳板机别名";
     readonly 'form.proxyJumpHint': "逗号分隔的本地主机别名，按顺序连接";
     readonly 'form.description': "备注";

package/lib/types/engine.d.ts

@@ -81,7 +81,7 @@ export declare class SshEngine {
      * connection — the next operation re-connects from the current config.
      */
     dropAlias(alias: string): void;
-    /** Probe connectivity: connect, run `true`, close. */
+    /** Probe connectivity with a cross-platform shell command. */
     test(alias: string): Promise<TestResult>;
     /** Close every pooled connection and tunnel. */
     dispose(): void;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@linxin666/dsh-ssh",
   "description": "Remote SSH operations for the dsh web GUI: host config store (~/.dsh/dsh-ssh.json, import from ~/.ssh/config), a persistent ssh2 connection pool with jump-host support, exec / PTY web terminal / SFTP transfer / local port-forward tunnels / cluster execution, plus agent tools (ssh_list, ssh_exec, ssh_upload, ssh_download, ssh_tunnel, ssh_cluster). Hot-pluggable — mounted via ~/.dsh/cordis.patch.yml + a profile node_modules symlink, no dsh source changes.",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "type": "module",
   "engines": {
     "node": "^22.19.0 || >=24.0.0"
@@ -49,18 +49,18 @@
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-client-connection": "^0.1.0-rc.7",
-    "@deepseek-ai/dsh-client-locale": "^0.1.0-rc.7",
-    "@deepseek-ai/dsh-client-runtime": "^0.1.0-rc.7",
-    "@deepseek-ai/dsh-client-ui-settings": "^0.1.0-rc.7",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.1.0-rc.7",
-    "@deepseek-ai/dsh-host-webserver": "^0.1.0-rc.7",
-    "@deepseek-ai/dsh-llm": "^0.1.0-rc.7",
-    "@deepseek-ai/dsh-scope": "^0.1.0-rc.7",
-    "@deepseek-ai/dsh-settings": "^0.1.0-rc.7",
-    "@deepseek-ai/dsh-system-prompt": "^0.1.0-rc.7",
-    "@deepseek-ai/dsh-timeout": "^0.1.0-rc.7",
-    "@deepseek-ai/dsh-tools": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-connection": "^0.1.0-rc.8",
+    "@deepseek-ai/dsh-client-locale": "^0.1.0-rc.8",
+    "@deepseek-ai/dsh-client-runtime": "^0.1.0-rc.8",
+    "@deepseek-ai/dsh-client-ui-settings": "^0.1.0-rc.8",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.1.0-rc.8",
+    "@deepseek-ai/dsh-host-webserver": "^0.1.0-rc.8",
+    "@deepseek-ai/dsh-llm": "^0.1.0-rc.8",
+    "@deepseek-ai/dsh-scope": "^0.1.0-rc.8",
+    "@deepseek-ai/dsh-settings": "^0.1.0-rc.8",
+    "@deepseek-ai/dsh-system-prompt": "^0.1.0-rc.8",
+    "@deepseek-ai/dsh-timeout": "^0.1.0-rc.8",
+    "@deepseek-ai/dsh-tools": "^0.1.0-rc.8",
     "@types/node": "^22.20.0",
     "@types/react": "~18.3.1",
     "@types/react-dom": "^18.3.5",

package/src/client/api.ts

@@ -34,6 +34,17 @@ export class SshApiError extends Error {
   }
 }
 
+/** Extract the `.error` message from a JSON error body; undefined when absent. */
+function extractError(text: string): string | undefined {
+  if (text === '') return undefined
+  try {
+    const parsed = JSON.parse(text) as { error?: unknown } | null
+    return typeof parsed?.error === 'string' ? parsed.error : undefined
+  } catch {
+    return undefined
+  }
+}
+
 /** Parse a JSON response or throw an SshApiError. */
 async function readJson<T>(response: Response): Promise<T> {
   let body: unknown
@@ -219,7 +230,9 @@ export class SshApi {
       body: file,
     })
     if (!response.ok || response.body === null) {
-      throw new SshApiError(`upload failed: HTTP ${response.status}`)
+      const text = await response.text().catch(() => '')
+      const error = extractError(text)
+      throw new SshApiError(error ?? `upload failed: HTTP ${response.status}`)
     }
     const reader = response.body.getReader()
     const decoder = new TextDecoder()
@@ -268,7 +281,8 @@ export class SshApi {
     const response = await fetch(SSH_API.download + query({ alias, remotePath }))
     if (!response.ok || response.body === null) {
       const text = await response.text().catch(() => '')
-      throw new SshApiError(text !== '' && text.startsWith('{') ? text : `download failed: HTTP ${response.status}`)
+      const error = extractError(text)
+      throw new SshApiError(error ?? `download failed: HTTP ${response.status}`)
     }
     const total = Number(response.headers.get('content-length') ?? '0')
     const disposition = response.headers.get('content-disposition') ?? ''

package/src/client/locales.ts

@@ -60,6 +60,7 @@ export const zh = {
   'form.passphrase': '密钥口令',
   'form.password': '密码',
   'form.passwordHint': '明文保存在 ~/.dsh/dsh-ssh.json（本机私有文件）',
+  'form.passwordRequired': '密码认证需要填写密码。',
   'form.proxyJump': '跳板机别名',
   'form.proxyJumpHint': '逗号分隔的本地主机别名，按顺序连接',
   'form.description': '备注',
@@ -203,6 +204,7 @@ export const en: Record<keyof typeof zh, string> = {
   'form.passphrase': 'Key passphrase',
   'form.password': 'Password',
   'form.passwordHint': 'Stored in plaintext in ~/.dsh/dsh-ssh.json (private local file)',
+  'form.passwordRequired': 'Password auth requires a password.',
   'form.proxyJump': 'Jump host aliases',
   'form.proxyJumpHint': 'Comma-separated local aliases, chained in order',
   'form.description': 'Description',

package/src/client/panel/HostFormDialog.tsx

@@ -92,6 +92,12 @@ export function HostFormDialog({ api, editing, onClose, onSaved }: HostFormDialo
       setError(tt('form.portInvalid'))
       return
     }
+    // A password-auth host needs a password on create; when editing, a blank
+    // secret field preserves the stored credential instead.
+    if (editing == null && form.authKind === 'password' && form.password === '') {
+      setError(tt('form.passwordRequired'))
+      return
+    }
     // Secrets are never echoed back by the API: when editing and the secret
     // fields are left empty, the auth block is omitted so the stored
     // authentication is preserved.

package/src/client/panel/TerminalTab.tsx

@@ -124,17 +124,38 @@ export function TerminalTab({ api, presetAlias, requestId, terminalFont }: Termi
   // Unmount cleanup (never touches state on an unmounting component).
   useEffect(() => () => { teardown() }, [])
 
-  // Keep the terminal fitted to its container while connected.
+  // Keep the terminal fitted to its container. A window resize is only one
+  // trigger: the status banner appearing after connect, panel resizes, and
+  // sidebar toggles all change the container without a window resize, so the
+  // container itself is observed (otherwise the viewport keeps the pre-banner
+  // height and the last line is clipped below the fold). ResizeObserver may
+  // be absent (jsdom tests); the window listener then remains the only path.
   useEffect(() => {
-    const onResize = (): void => {
+    let lastCols = -1
+    let lastRows = -1
+    const sync = (): void => {
       const term = termRef.current
       const fit = fitRef.current
       if (term === null || fit === null) return
       fit.fit()
-      connRef.current?.resize(term.cols, term.rows)
+      const conn = connRef.current
+      if (conn !== null && (term.cols !== lastCols || term.rows !== lastRows)) {
+        lastCols = term.cols
+        lastRows = term.rows
+        conn.resize(term.cols, term.rows)
+      }
+    }
+    window.addEventListener('resize', sync)
+    const container = containerRef.current
+    if (container === null || typeof ResizeObserver === 'undefined') {
+      return () => { window.removeEventListener('resize', sync) }
+    }
+    const observer = new ResizeObserver(() => { sync() })
+    observer.observe(container)
+    return () => {
+      observer.disconnect()
+      window.removeEventListener('resize', sync)
     }
-    window.addEventListener('resize', onResize)
-    return () => { window.removeEventListener('resize', onResize) }
   }, [])
 
   const connect = (): void => {

package/src/client/panel/panel.module.css

@@ -703,8 +703,10 @@ html[data-dsh-ssh-active]:not([data-dsh-taskboard-active]) [class*='centerCol']
 
 .termContainer {
   position: absolute;
-  inset: 0;
-  padding: 8px 10px;
+  /* Inset offsets, not padding: FitAddon measures this element's height as
+     the drawable area, so padding here would be measured as terminal space
+     and clip the bottom line under a global border-box reset. */
+  inset: 8px 10px;
 }
 
 .termPlaceholder {

package/src/engine.ts

@@ -148,11 +148,11 @@ export class SshEngine {
 
   // ------------------------------------------------------------- misc
 
-  /** Probe connectivity: connect, run `true`, close. */
+  /** Probe connectivity with a cross-platform shell command. */
   async test(alias: string): Promise<TestResult> {
     const started = Date.now()
     try {
-      const result = await this.exec(alias, 'true', 10_000)
+      const result = await this.exec(alias, 'echo ok', 10_000)
       return result.success
         ? { ok: true, latencyMs: result.durationMs }
         : { ok: false, latencyMs: result.durationMs, error: 'remote exit code ' + result.exitCode }
@@ -167,4 +167,4 @@ export class SshEngine {
     for (const id of [...this.tunnels.keys()]) stopTunnel(this, id)
     for (const alias of [...this.pool.keys()]) disposeRecord(this, alias)
   }
-}
+}