@linxin666/dsh-ssh 0.4.3 → 0.4.4

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

@@ -7,6 +7,33 @@ import { type ClusterResult, type ExecResult, type HostPayload, type ImportResul
 export declare class SshApiError extends Error {
     constructor(message: string);
 }
+/** The location facts a terminal socket URL is built from. */
+interface PageLocation {
+    /** Page scheme with its colon (for example `https:` or `dsh-app:`). */
+    protocol: string;
+    /** Page authority, empty for a scheme that carries none. */
+    host: string;
+}
+/**
+ * The WebSocket URL the terminal route is reached at, or undefined when this
+ * page cannot carry one.
+ *
+ * A page delivered by an application on this machine (the official DSH
+ * Desktop shell serves its Web GUI from `dsh-app://app/`) has no WebSocket
+ * transport: its scheme handler forwards HTTP requests to the local host but
+ * cannot upgrade a socket, so `ws://app/...` never connects and the terminal
+ * reports "connection error" (issue #1744). Every other page is a web page and
+ * resolves the socket against its own origin, exactly as before.
+ *
+ * A blank authority is treated the same as an application scheme: there is
+ * nothing to dial, and the caller gets the actionable reason instead of a
+ * socket that can only fail.
+ *
+ * @param location - the page location to read.
+ * @param search - the query string carrying `alias` or `session`.
+ * @returns the absolute `ws:`/`wss:` URL, or undefined when the page cannot carry one.
+ */
+export declare function terminalSocketUrl(location: PageLocation, search: string): string | undefined;
 /** One open terminal connection (WebSocket JSON frames). */
 export interface TerminalConnection {
     /** Fired on the ready frame (shell is up); carries the host session id and alias. */
@@ -100,3 +127,4 @@ export declare class SshApi {
     /** One terminal socket over either an alias (open) or a session id (attach). */
     private terminalSocket;
 }
+export {};

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

@@ -89,6 +89,7 @@ export declare const zh: {
     readonly 'terminal.ready': "终端已连接（{alias}）";
     readonly 'terminal.exited': "终端已退出（{alias}）";
     readonly 'terminal.error': "终端错误：{error}";
+    readonly 'terminal.noWebSocket': "当前页面不支持 WebSocket（应用外壳只转发 HTTP），请改用浏览器打开的 Web 界面使用终端。";
     readonly 'terminal.auth.title': "二次身份验证 (2FA / 交互式认证)";
     readonly 'terminal.auth.submit': "提交验证码";
     readonly 'terminal.auth.cancel': "取消";

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.4.3",
+  "version": "0.4.4",
   "icon": "icon.svg",
   "type": "module",
   "engines": {
@@ -27,7 +27,7 @@
   },
   "dsh": {
     "engines": {
-      "dsh": ">=0.1.7-rc.2"
+      "dsh": ">=0.2.0-rc.1"
     },
     "bundle": {
       "patch": "./cordis.patch.yml"
@@ -50,26 +50,26 @@
     "ws": "^8.18.0"
   },
   "peerDependencies": {
-    "@deepseek-ai/dsh": ">=0.1.7-rc.2",
+    "@deepseek-ai/dsh": ">=0.2.0-rc.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "^4.0.4",
-    "@deepseek-ai/dsh-client-connection": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-client-locale": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-client-ui-renderer": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-client-ui-layout": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-client-ui-settings": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-client-ui-sidebar": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-host-webserver": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-llm": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-scope": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-settings": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-system-prompt": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-timeout": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-tools": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-client-connection": "^0.2.0-rc.1",
+    "@deepseek-ai/dsh-client-locale": "^0.2.0-rc.1",
+    "@deepseek-ai/dsh-client-ui-renderer": "^0.2.0-rc.1",
+    "@deepseek-ai/dsh-client-ui-layout": "^0.2.0-rc.1",
+    "@deepseek-ai/dsh-client-ui-settings": "^0.2.0-rc.1",
+    "@deepseek-ai/dsh-client-ui-sidebar": "^0.2.0-rc.1",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.2.0-rc.1",
+    "@deepseek-ai/dsh-host-webserver": "^0.2.0-rc.1",
+    "@deepseek-ai/dsh-llm": "^0.2.0-rc.1",
+    "@deepseek-ai/dsh-scope": "^0.2.0-rc.1",
+    "@deepseek-ai/dsh-settings": "^0.2.0-rc.1",
+    "@deepseek-ai/dsh-system-prompt": "^0.2.0-rc.1",
+    "@deepseek-ai/dsh-timeout": "^0.2.0-rc.1",
+    "@deepseek-ai/dsh-tools": "^0.2.0-rc.1",
     "@types/node": "^22.20.0",
     "@types/react": "~18.3.1",
     "@types/react-dom": "^18.3.5",

package/src/client/api.ts

@@ -76,6 +76,79 @@ function query(params: Record<string, string | number | undefined>): string {
   return text === '' ? '' : '?' + text
 }
 
+/** The location facts a terminal socket URL is built from. */
+interface PageLocation {
+  /** Page scheme with its colon (for example `https:` or `dsh-app:`). */
+  protocol: string
+  /** Page authority, empty for a scheme that carries none. */
+  host: string
+}
+
+/**
+ * The WebSocket URL the terminal route is reached at, or undefined when this
+ * page cannot carry one.
+ *
+ * A page delivered by an application on this machine (the official DSH
+ * Desktop shell serves its Web GUI from `dsh-app://app/`) has no WebSocket
+ * transport: its scheme handler forwards HTTP requests to the local host but
+ * cannot upgrade a socket, so `ws://app/...` never connects and the terminal
+ * reports "connection error" (issue #1744). Every other page is a web page and
+ * resolves the socket against its own origin, exactly as before.
+ *
+ * A blank authority is treated the same as an application scheme: there is
+ * nothing to dial, and the caller gets the actionable reason instead of a
+ * socket that can only fail.
+ *
+ * @param location - the page location to read.
+ * @param search - the query string carrying `alias` or `session`.
+ * @returns the absolute `ws:`/`wss:` URL, or undefined when the page cannot carry one.
+ */
+export function terminalSocketUrl(location: PageLocation, search: string): string | undefined {
+  if (WEB_PAGE_PROTOCOLS.includes(location.protocol)) {
+    const scheme = location.protocol === 'https:' ? 'wss' : 'ws'
+    return scheme + '://' + location.host + SSH_API.terminal + search
+  }
+  return undefined
+}
+
+/**
+ * Schemes a network page can be delivered with. Every other scheme belongs to
+ * an application on this machine, which is the same classification the remote
+ * channel and the update seat use (`isWebPageProtocol` / `isApplicationDeliveredPage`).
+ */
+const WEB_PAGE_PROTOCOLS: readonly string[] = [
+  'http:',
+  'https:',
+  'blob:',
+  'data:',
+  'about:',
+  'filesystem:',
+]
+
+/**
+ * A terminal connection that never opened: it reports one failure once the
+ * view has attached its `onExit`, so the tab shows why instead of sitting on a
+ * spinner, and every later frame is a no-op.
+ */
+function failedTerminal(reason: string): TerminalConnection {
+  const connection: TerminalConnection = {
+    onReady: undefined,
+    onOutput: undefined,
+    onExit: undefined,
+    onAuthPrompt: undefined,
+    send: () => undefined,
+    resize: () => undefined,
+    sendAuthResponse: () => undefined,
+    detach: () => undefined,
+    close: () => undefined,
+  }
+  // The view binds onExit after the open() call returns, so the failure is
+  // delivered on the next microtask - never synchronously, which would race
+  // the handler the caller is about to assign.
+  queueMicrotask(() => { connection.onExit?.(null, reason) })
+  return connection
+}
+
 /** One open terminal connection (WebSocket JSON frames). */
 export interface TerminalConnection {
   /** Fired on the ready frame (shell is up); carries the host session id and alias. */
@@ -375,9 +448,19 @@ export class SshApi {
 
   /** One terminal socket over either an alias (open) or a session id (attach). */
   private terminalSocket(search: string): TerminalConnection {
-    const scheme = window.location.protocol === 'https:' ? 'wss' : 'ws'
-    const url = scheme + '://' + window.location.host + SSH_API.terminal + search
-    const socket = new WebSocket(url)
+    const target = terminalSocketUrl(window.location, search)
+    if (target === undefined) {
+      // This page has no WebSocket transport at all (the desktop shell's
+      // custom scheme forwards HTTP only). Say so plainly instead of opening
+      // a socket that can only report "connection error".
+      return failedTerminal(tt('terminal.noWebSocket'))
+    }
+    let socket: WebSocket
+    try {
+      socket = new WebSocket(target)
+    } catch (error) {
+      return failedTerminal(error instanceof Error ? error.message : String(error))
+    }
     // A deliberate detach/close must not surface as a transport error: the
     // view tears down silently, and only an UNEXPECTED close reports exit.
     let leaving = false

package/src/client/index.ts

@@ -54,7 +54,7 @@ declare module '@deepseek-ai/dsh-client-ui-slots' {
 }
 
 /** Required services (fiber inject waiting — the runtime must be up first). */
-export const inject = ['slots', 'locale', 'configForms']
+export const inject = ['slots', 'locale', 'configForms', 'layout']
 
 /** Type-only surface (export discipline: no value exports beyond the plugin contract). */
 export type { PanelControllerSnapshot } from './panel/controller.ts'
@@ -98,7 +98,7 @@ export function apply(ctx: ClientContext): void {
   const controller = new PanelController({
     panel: {
       select: panelId => {
-        const layout = ctx.get('layout') as { selectPanel?: (id: string | null) => void } | undefined
+        const layout = (ctx as unknown as { get?(name: string): unknown }).get?.('layout') as { selectPanel?: (id: string | null) => void } | undefined
         layout?.selectPanel?.(panelId)
       },
     },
@@ -122,7 +122,7 @@ export function apply(ctx: ClientContext): void {
     disposers.push(registerSshPanel(ctx, controller, api, terminalFont))
     // The layout's panel selection is reconciled back into the controller, so
     // the panel follows the user clicking another panel row.
-    const layoutFace = ctx.get('layout') as { panelInfo?: { subscribe(listener: () => void): () => void; getSnapshot(): { activePanelId: unknown } } } | undefined
+    const layoutFace = (ctx as unknown as { get?(name: string): unknown }).get?.('layout') as { panelInfo?: { subscribe(listener: () => void): () => void; getSnapshot(): { activePanelId: unknown } } } | undefined
     if (layoutFace?.panelInfo !== undefined) {
       const sync = (): void => {
         const active = layoutFace.panelInfo!.getSnapshot().activePanelId

package/src/client/locales.ts

@@ -93,6 +93,7 @@ export const zh = {
   'terminal.ready': '终端已连接（{alias}）',
   'terminal.exited': '终端已退出（{alias}）',
   'terminal.error': '终端错误：{error}',
+  'terminal.noWebSocket': '当前页面不支持 WebSocket（应用外壳只转发 HTTP），请改用浏览器打开的 Web 界面使用终端。',
   'terminal.auth.title': '二次身份验证 (2FA / 交互式认证)',
   'terminal.auth.submit': '提交验证码',
   'terminal.auth.cancel': '取消',
@@ -253,6 +254,7 @@ export const en: Record<keyof typeof zh, string> = {
   'terminal.ready': 'Terminal connected ({alias})',
   'terminal.exited': 'Terminal exited ({alias})',
   'terminal.error': 'Terminal error: {error}',
+  'terminal.noWebSocket': 'This page cannot carry a WebSocket (the application shell forwards HTTP only). Open the Web UI in a browser to use the terminal.',
   'terminal.auth.title': 'Two-Factor Authentication (2FA)',
   'terminal.auth.submit': 'Submit Code',
   'terminal.auth.cancel': 'Cancel',