@linxin666/dsh-ssh 0.1.20 → 0.2.0

package/lib/index.js

@@ -2553,13 +2553,22 @@ function makeRoutes(deps) {
 							ok: false,
 							error: error instanceof Error ? error.message : String(error)
 						});
-						try {
-							sink.destroy();
-						} catch {}
-						unlink(tmp).catch(() => void 0);
-						try {
-							res.end();
-						} catch {}
+						const cleanup = () => {
+							unlink(tmp).catch(() => void 0).finally(() => {
+								try {
+									res.end();
+								} catch {}
+							});
+						};
+						if (sink.destroyed) cleanup();
+						else {
+							sink.once("close", cleanup);
+							try {
+								sink.destroy();
+							} catch {
+								cleanup();
+							}
+						}
 					};
 					const done = () => {
 						if (settled) return;
@@ -2576,13 +2585,18 @@ function makeRoutes(deps) {
 						if (!res.writableEnded) fail("connection closed");
 					});
 					let received = 0;
+					let capped = false;
 					req.on("data", (chunk) => {
 						received += chunk.byteLength;
-						if (received > maxUploadBytes) {
+						if (received > maxUploadBytes && !capped) {
+							capped = true;
 							fail("upload body too large");
-							try {
-								req.destroy();
-							} catch {}
+							res.on("finish", () => {
+								try {
+									req.destroy();
+								} catch {}
+							});
+							req.resume();
 						}
 					});
 					req.pipe(sink);

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

@@ -2,133 +2,141 @@
  * dsh-ssh surface copy: zh is the key source, en mirrors every key.
  */
 export declare const zh: {
-    readonly 'entry.label': 'SSH';
-    readonly 'entry.tooltip': '远程 SSH 运维面板';
-    readonly 'panel.title': '远程 SSH';
-    readonly 'panel.backToConversation': '返回会话';
-    readonly 'tab.hosts': '主机';
-    readonly 'tab.terminal': '终端';
-    readonly 'tab.transfer': '传输';
-    readonly 'tab.tunnels': '隧道';
-    readonly 'tab.cluster': '集群';
-    readonly 'hosts.empty': '尚未配置主机。点击「新增主机」添加，或从 ~/.ssh/config 导入。';
-    readonly 'hosts.add': '新增主机';
-    readonly 'hosts.import': '导入 ~/.ssh/config';
-    readonly 'hosts.search': '搜索别名 / 描述 / 标签…';
-    readonly 'hosts.col.alias': '别名';
-    readonly 'hosts.col.host': '主机';
-    readonly 'hosts.col.user': '用户';
-    readonly 'hosts.col.auth': '认证';
-    readonly 'hosts.col.environment': '环境';
-    readonly 'hosts.col.tags': '标签';
-    readonly 'hosts.col.description': '备注';
-    readonly 'hosts.col.actions': '操作';
-    readonly 'hosts.test': '测试';
-    readonly 'hosts.edit': '编辑';
-    readonly 'hosts.delete': '删除';
-    readonly 'hosts.deleteConfirm': '确定删除主机「{alias}」？将同时停止其隧道。';
-    readonly 'hosts.imported': '解析 {parsed} 个配置块，新增 {added} 台主机，跳过 {skipped} 个。';
-    readonly 'hosts.testing': '连接测试中…';
-    readonly 'hosts.testOk': '连接成功（{latency} ms）';
-    readonly 'hosts.testFail': '连接失败：{error}';
-    readonly 'hosts.connected': '连接';
-    readonly 'hosts.notConnected': '未连接';
-    readonly 'form.title.create': '新增主机';
-    readonly 'form.title.edit': '编辑主机 {alias}';
-    readonly 'form.alias': '别名';
-    readonly 'form.aliasHint': '小写字母、数字与单连字符，操作时使用';
-    readonly 'form.host': '主机地址';
-    readonly 'form.port': '端口';
-    readonly 'form.user': '用户名';
-    readonly 'form.auth': '认证方式';
-    readonly 'form.auth.key': '密钥';
-    readonly 'form.auth.password': '密码';
-    readonly 'form.authKeepHint': '编辑时密钥/密码留空将保留原认证方式与已存凭据；如需更换认证方式请填写新凭据。';
-    readonly 'form.keyPath': '私钥路径';
-    readonly 'form.keyPathHint': '如 ~/.ssh/id_ed25519';
-    readonly 'form.passphrase': '密钥口令';
-    readonly 'form.password': '密码';
-    readonly 'form.passwordHint': '明文保存在 ~/.dsh/dsh-ssh.json（本机私有文件）';
-    readonly 'form.proxyJump': '跳板机别名';
-    readonly 'form.proxyJumpHint': '逗号分隔的本地主机别名，按顺序连接';
-    readonly 'form.description': '备注';
-    readonly 'form.environment': '环境';
-    readonly 'form.environmentHint': '如 development / production';
-    readonly 'form.tags': '标签';
-    readonly 'form.tagsHint': '逗号分隔';
-    readonly 'form.location': '位置';
-    readonly 'form.save': '保存';
-    readonly 'form.cancel': '取消';
-    readonly 'form.required': '请填写必填字段：别名、主机地址、用户名。';
-    readonly 'form.portInvalid': '端口必须是 1-65535 之间的整数。';
-    readonly 'terminal.selectHost': '选择主机';
-    readonly 'terminal.connect': '连接';
-    readonly 'terminal.disconnect': '断开';
-    readonly 'terminal.placeholder': '选择主机后点击「连接」打开远程终端。';
-    readonly 'terminal.connecting': '正在连接…';
-    readonly 'terminal.ready': '终端已连接（{alias}）';
-    readonly 'terminal.exited': '终端已退出（{alias}）';
-    readonly 'terminal.error': '终端错误：{error}';
-    readonly 'transfer.selectHost': '选择主机';
-    readonly 'transfer.remotePath': '远程路径';
-    readonly 'transfer.remotePathHint': '如 /tmp/ 或 /home/user/app.tar.gz';
-    readonly 'transfer.upload': '上传';
-    readonly 'transfer.uploading': '正在上传 {file}…';
-    readonly 'transfer.download': '下载';
-    readonly 'transfer.downloading': '正在下载…';
-    readonly 'transfer.done': '完成：{bytes} 字节';
-    readonly 'transfer.failed': '传输失败：{error}';
-    readonly 'transfer.browseRemote': '浏览远程目录';
-    readonly 'transfer.refresh': '刷新';
-    readonly 'transfer.name': '名称';
-    readonly 'transfer.upLevel': '上级目录';
-    readonly 'transfer.size': '大小';
-    readonly 'transfer.modified': '修改时间';
-    readonly 'transfer.bytes': '{value} B';
-    readonly 'transfer.kib': '{value} KB';
-    readonly 'transfer.mib': '{value} MB';
-    readonly 'transfer.gib': '{value} GB';
-    readonly 'transfer.percent': '{value}%';
-    readonly 'transfer.speed': '{value}/s';
-    readonly 'transfer.dir': '目录';
-    readonly 'transfer.file': '文件';
-    readonly 'tunnel.empty': '没有活跃的隧道。';
-    readonly 'tunnel.start': '新建隧道';
-    readonly 'tunnel.alias': '主机别名';
-    readonly 'tunnel.remotePort': '远程端口';
-    readonly 'tunnel.remoteHost': '远程主机';
-    readonly 'tunnel.remoteHostHint': '默认 127.0.0.1（服务器自身）';
-    readonly 'tunnel.localPort': '本地端口';
-    readonly 'tunnel.localPortHint': '留空自动分配';
-    readonly 'tunnel.stop': '停止';
-    readonly 'tunnel.stopAll': '全部停止';
-    readonly 'tunnel.stopAllConfirm': '确定停止全部隧道吗？';
-    readonly 'tunnel.row': '{alias}: 127.0.0.1:{localPort} -> {remoteHost}:{remotePort}';
-    readonly 'tunnel.started': '隧道已建立：127.0.0.1:{localPort}';
-    readonly 'tunnel.failed': '隧道启动失败：{error}';
-    readonly 'cluster.command': '命令';
-    readonly 'cluster.run': '执行';
-    readonly 'cluster.confirm': '确定在匹配的主机上执行该命令吗？该操作会真实运行在远程服务器上。';
-    readonly 'cluster.aliases': '主机别名（逗号分隔，留空为全部）';
-    readonly 'cluster.environment': '环境过滤';
-    readonly 'cluster.tags': '标签过滤（逗号分隔）';
-    readonly 'cluster.results': '执行结果';
-    readonly 'cluster.empty': '输入命令后点击「执行」。';
-    readonly 'cluster.noMatch': '没有匹配的主机。';
-    readonly 'cluster.ok': '成功';
-    readonly 'cluster.fail': '失败';
-    readonly 'cluster.timeout': '超时';
-    readonly 'cluster.col.alias': '主机';
-    readonly 'cluster.col.status': '状态';
-    readonly 'cluster.col.exit': '退出码';
-    readonly 'cluster.col.stdout': '标准输出';
-    readonly 'cluster.col.stderr': '标准错误';
-    readonly 'cluster.col.error': '错误';
-    readonly 'cluster.col.duration': '耗时';
-    readonly 'common.loading': '加载中…';
-    readonly 'common.error': '出错：{error}';
-    readonly 'common.refresh': '刷新';
-    readonly 'common.confirm': '确定';
+    readonly 'entry.label': "SSH";
+    readonly 'entry.tooltip': "远程 SSH 运维面板";
+    readonly 'panel.title': "远程 SSH";
+    readonly 'panel.backToConversation': "返回会话";
+    readonly 'tab.hosts': "主机";
+    readonly 'tab.terminal': "终端";
+    readonly 'tab.transfer': "传输";
+    readonly 'tab.tunnels': "隧道";
+    readonly 'tab.cluster': "集群";
+    readonly 'hosts.empty': "尚未配置主机。点击「新增主机」添加，或从 ~/.ssh/config 导入。";
+    readonly 'hosts.add': "新增主机";
+    readonly 'hosts.import': "导入 ~/.ssh/config";
+    readonly 'hosts.search': "搜索别名 / 描述 / 标签…";
+    readonly 'hosts.groupBy.label': "分组方式";
+    readonly 'hosts.groupBy.none': "不分组";
+    readonly 'hosts.groupBy.environment': "按环境分组";
+    readonly 'hosts.groupBy.tags': "按标签分组";
+    readonly 'hosts.group.ungrouped': "未设置环境";
+    readonly 'hosts.group.noTags': "无标签";
+    readonly 'hosts.group.count': "{count} 台";
+    readonly 'hosts.group.testAll': "测试全部";
+    readonly 'hosts.col.alias': "别名";
+    readonly 'hosts.col.host': "主机";
+    readonly 'hosts.col.user': "用户";
+    readonly 'hosts.col.auth': "认证";
+    readonly 'hosts.col.environment': "环境";
+    readonly 'hosts.col.tags': "标签";
+    readonly 'hosts.col.description': "备注";
+    readonly 'hosts.col.actions': "操作";
+    readonly 'hosts.test': "测试";
+    readonly 'hosts.edit': "编辑";
+    readonly 'hosts.delete': "删除";
+    readonly 'hosts.deleteConfirm': "确定删除主机「{alias}」？将同时停止其隧道。";
+    readonly 'hosts.imported': "解析 {parsed} 个配置块，新增 {added} 台主机，跳过 {skipped} 个。";
+    readonly 'hosts.testing': "连接测试中…";
+    readonly 'hosts.testOk': "连接成功（{latency} ms）";
+    readonly 'hosts.testFail': "连接失败：{error}";
+    readonly 'hosts.connected': "连接";
+    readonly 'hosts.notConnected': "未连接";
+    readonly 'form.title.create': "新增主机";
+    readonly 'form.title.edit': "编辑主机 {alias}";
+    readonly 'form.alias': "别名";
+    readonly 'form.aliasHint': "小写字母、数字与单连字符，操作时使用";
+    readonly 'form.host': "主机地址";
+    readonly 'form.port': "端口";
+    readonly 'form.user': "用户名";
+    readonly 'form.auth': "认证方式";
+    readonly 'form.auth.key': "密钥";
+    readonly 'form.auth.password': "密码";
+    readonly 'form.authKeepHint': "编辑时密钥/密码留空将保留原认证方式与已存凭据；如需更换认证方式请填写新凭据。";
+    readonly 'form.keyPath': "私钥路径";
+    readonly 'form.keyPathHint': "如 ~/.ssh/id_ed25519";
+    readonly 'form.passphrase': "密钥口令";
+    readonly 'form.password': "密码";
+    readonly 'form.passwordHint': "明文保存在 ~/.dsh/dsh-ssh.json（本机私有文件）";
+    readonly 'form.proxyJump': "跳板机别名";
+    readonly 'form.proxyJumpHint': "逗号分隔的本地主机别名，按顺序连接";
+    readonly 'form.description': "备注";
+    readonly 'form.environment': "环境";
+    readonly 'form.environmentHint': "如 development / production";
+    readonly 'form.tags': "标签";
+    readonly 'form.tagsHint': "逗号分隔";
+    readonly 'form.location': "位置";
+    readonly 'form.save': "保存";
+    readonly 'form.cancel': "取消";
+    readonly 'form.required': "请填写必填字段：别名、主机地址、用户名。";
+    readonly 'form.portInvalid': "端口必须是 1-65535 之间的整数。";
+    readonly 'terminal.selectHost': "选择主机";
+    readonly 'terminal.connect': "连接";
+    readonly 'terminal.disconnect': "断开";
+    readonly 'terminal.placeholder': "选择主机后点击「连接」打开远程终端。";
+    readonly 'terminal.connecting': "正在连接…";
+    readonly 'terminal.ready': "终端已连接（{alias}）";
+    readonly 'terminal.exited': "终端已退出（{alias}）";
+    readonly 'terminal.error': "终端错误：{error}";
+    readonly 'transfer.selectHost': "选择主机";
+    readonly 'transfer.remotePath': "远程路径";
+    readonly 'transfer.remotePathHint': "如 /tmp/ 或 /home/user/app.tar.gz";
+    readonly 'transfer.upload': "上传";
+    readonly 'transfer.uploading': "正在上传 {file}…";
+    readonly 'transfer.download': "下载";
+    readonly 'transfer.downloading': "正在下载…";
+    readonly 'transfer.done': "完成：{bytes} 字节";
+    readonly 'transfer.failed': "传输失败：{error}";
+    readonly 'transfer.browseRemote': "浏览远程目录";
+    readonly 'transfer.refresh': "刷新";
+    readonly 'transfer.name': "名称";
+    readonly 'transfer.upLevel': "上级目录";
+    readonly 'transfer.size': "大小";
+    readonly 'transfer.modified': "修改时间";
+    readonly 'transfer.bytes': "{value} B";
+    readonly 'transfer.kib': "{value} KB";
+    readonly 'transfer.mib': "{value} MB";
+    readonly 'transfer.gib': "{value} GB";
+    readonly 'transfer.percent': "{value}%";
+    readonly 'transfer.speed': "{value}/s";
+    readonly 'transfer.dir': "目录";
+    readonly 'transfer.file': "文件";
+    readonly 'tunnel.empty': "没有活跃的隧道。";
+    readonly 'tunnel.start': "新建隧道";
+    readonly 'tunnel.alias': "主机别名";
+    readonly 'tunnel.remotePort': "远程端口";
+    readonly 'tunnel.remoteHost': "远程主机";
+    readonly 'tunnel.remoteHostHint': "默认 127.0.0.1（服务器自身）";
+    readonly 'tunnel.localPort': "本地端口";
+    readonly 'tunnel.localPortHint': "留空自动分配";
+    readonly 'tunnel.stop': "停止";
+    readonly 'tunnel.stopAll': "全部停止";
+    readonly 'tunnel.stopAllConfirm': "确定停止全部隧道吗？";
+    readonly 'tunnel.row': "{alias}: 127.0.0.1:{localPort} -> {remoteHost}:{remotePort}";
+    readonly 'tunnel.started': "隧道已建立：127.0.0.1:{localPort}";
+    readonly 'tunnel.failed': "隧道启动失败：{error}";
+    readonly 'cluster.command': "命令";
+    readonly 'cluster.run': "执行";
+    readonly 'cluster.confirm': "确定在匹配的主机上执行该命令吗？该操作会真实运行在远程服务器上。";
+    readonly 'cluster.aliases': "主机别名（逗号分隔，留空为全部）";
+    readonly 'cluster.environment': "环境过滤";
+    readonly 'cluster.tags': "标签过滤（逗号分隔）";
+    readonly 'cluster.results': "执行结果";
+    readonly 'cluster.empty': "输入命令后点击「执行」。";
+    readonly 'cluster.noMatch': "没有匹配的主机。";
+    readonly 'cluster.ok': "成功";
+    readonly 'cluster.fail': "失败";
+    readonly 'cluster.timeout': "超时";
+    readonly 'cluster.col.alias': "主机";
+    readonly 'cluster.col.status': "状态";
+    readonly 'cluster.col.exit': "退出码";
+    readonly 'cluster.col.stdout': "标准输出";
+    readonly 'cluster.col.stderr': "标准错误";
+    readonly 'cluster.col.error': "错误";
+    readonly 'cluster.col.duration': "耗时";
+    readonly 'common.loading': "加载中…";
+    readonly 'common.error': "出错：{error}";
+    readonly 'common.refresh': "刷新";
+    readonly 'common.confirm': "确定";
 };
 export declare const en: Record<keyof typeof zh, string>;
 /** Locale key union. */

package/lib/types/client/panel/HostsTab.d.ts

@@ -1,9 +1,25 @@
 import type { SshApi } from '../api.ts';
+import type { SshHostSummary } from '../../protocol.ts';
 /** Hosts tab props. */
 export interface HostsTabProps {
     api: SshApi;
     /** Connect the given alias in the terminal tab. */
     onConnect: (alias: string) => void;
 }
+/** Host list grouping modes (#379). */
+export type HostGroupBy = 'none' | 'environment' | 'tags';
+/** One collapsible group section of the grouped host list. */
+export interface HostGroup {
+    /** Group key: the environment name, one tag, or '' for the ungrouped bucket. */
+    key: string;
+    hosts: SshHostSummary[];
+}
+/**
+ * Bucket hosts into collapsible groups (#379). Grouping by tags places a
+ * multi-tag host in every one of its tag groups (folder view); hosts without
+ * the grouping key land in the '' bucket, which always sorts last. Groups
+ * sort alphabetically; host order inside a group follows the API listing.
+ */
+export declare function groupHosts(hosts: SshHostSummary[], groupBy: HostGroupBy): HostGroup[];
 /** The hosts table plus its toolbar and dialogs. */
 export declare function HostsTab({ api, onConnect }: HostsTabProps): import("react").JSX.Element;

package/lib/types/protocol.d.ts

@@ -164,7 +164,7 @@ export type TerminalClientFrame = {
     rows: number;
 };
 /** Route paths the client calls (shared literals). */
-export declare const SSH_API_BASE: '/api/dsh-ssh';
+export declare const SSH_API_BASE: "/api/dsh-ssh";
 export declare const SSH_API: {
     readonly hosts: string;
     readonly importSshConfig: string;

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.1.20",
+  "version": "0.2.0",
   "type": "module",
   "engines": {
     "node": "^22.19.0 || >=24.0.0"
@@ -49,17 +49,17 @@
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-client-connection": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-locale": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-runtime": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-settings": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-sidebar": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-host-webserver": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-llm": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-settings": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-system-prompt": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-tools": "^0.1.0-rc.6",
+    "@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-sidebar": "^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-settings": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-system-prompt": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-tools": "^0.1.0-rc.7",
     "@types/node": "^22.20.0",
     "@types/react": "~18.3.1",
     "@types/react-dom": "^18.3.5",

package/src/client/locales.ts

@@ -17,6 +17,14 @@ export const zh = {
   'hosts.add': '新增主机',
   'hosts.import': '导入 ~/.ssh/config',
   'hosts.search': '搜索别名 / 描述 / 标签…',
+  'hosts.groupBy.label': '分组方式',
+  'hosts.groupBy.none': '不分组',
+  'hosts.groupBy.environment': '按环境分组',
+  'hosts.groupBy.tags': '按标签分组',
+  'hosts.group.ungrouped': '未设置环境',
+  'hosts.group.noTags': '无标签',
+  'hosts.group.count': '{count} 台',
+  'hosts.group.testAll': '测试全部',
   'hosts.col.alias': '别名',
   'hosts.col.host': '主机',
   'hosts.col.user': '用户',
@@ -153,6 +161,14 @@ export const en: Record<keyof typeof zh, string> = {
   'hosts.add': 'Add host',
   'hosts.import': 'Import ~/.ssh/config',
   'hosts.search': 'Search alias / description / tags…',
+  'hosts.groupBy.label': 'Group by',
+  'hosts.groupBy.none': 'No grouping',
+  'hosts.groupBy.environment': 'Group by environment',
+  'hosts.groupBy.tags': 'Group by tags',
+  'hosts.group.ungrouped': 'No environment',
+  'hosts.group.noTags': 'No tags',
+  'hosts.group.count': '{count} hosts',
+  'hosts.group.testAll': 'Test all',
   'hosts.col.alias': 'Alias',
   'hosts.col.host': 'Host',
   'hosts.col.user': 'User',