dsh-db-tool 0.1.6 → 0.1.7

package/client/client.js

@@ -38,6 +38,7 @@ window.__ModuleLoader__.load({
 			fieldsPort: "端口",
 			fieldsUser: "用户名",
 			fieldsPassword: "密码",
+			passwordSaved: "已保存（留空保持不变）",
 			fieldsDatabase: "数据库名",
 			ssl: "启用 SSL",
 			test: "测试",
@@ -126,6 +127,7 @@ window.__ModuleLoader__.load({
 			fieldsPort: "Port",
 			fieldsUser: "User",
 			fieldsPassword: "Password",
+			passwordSaved: "Saved (leave blank to keep)",
 			fieldsDatabase: "Database",
 			ssl: "Enable SSL",
 			test: "Test",
@@ -486,6 +488,8 @@ window.__ModuleLoader__.load({
 			}
 			function draftBody() {
 				const body = { kind: form.kind, ssl: !!form.ssl };
+				// 编辑已有连接：透传 connId，服务端测试草稿时拼回已存机密（密码留空/url 未改动语义）
+				if (props.initial) body.connId = form.id;
 				// 编辑保存语义：url 模式未改动（仍等于回填的脱敏 url）→ 不发 url，保留 secrets 原值
 				const origUrl = props.initial && props.initial.mode === "url" ? props.initial.url : undefined;
 				if (form.mode === "url") {
@@ -547,7 +551,7 @@ window.__ModuleLoader__.load({
 							React.createElement("input", { placeholder: t("fieldsDatabase"), value: form.database, onChange: (e) => patch({ database: e.target.value }) })),
 						React.createElement("div", { className: "dbt-row" },
 							React.createElement("input", { placeholder: t("fieldsUser"), value: form.user, onChange: (e) => patch({ user: e.target.value }) }),
-							React.createElement("input", { type: "password", placeholder: t("fieldsPassword"), value: form.password, onChange: (e) => patch({ password: e.target.value }) })),
+							React.createElement("input", { type: "password", placeholder: props.initial && props.initial.hasPassword ? t("passwordSaved") : t("fieldsPassword"), value: form.password, onChange: (e) => patch({ password: e.target.value }) })),
 					),
 				// 分组 3：操作
 				React.createElement(

package/dist/http/index.js

@@ -160,6 +160,8 @@ async function route(req, res, service, path, q, opts) {
             ...(b['url'] !== undefined ? { url: str(b['url']) } : {}),
             ...(b['fields'] !== undefined ? { fields: b['fields'] } : {}),
             ...(ssl !== undefined ? { ssl } : {}),
+            // 编辑已有连接时透传：服务端拼回已存机密（留空密码/url 未改动的测试语义）
+            ...(b['connId'] !== undefined ? { connId: optStr(b['connId']) } : {}),
         }));
     }
     const connMatch = /^\/api\/connections\/([^/]+)(\/test)?$/.exec(path);

package/dist/manager.js

@@ -75,15 +75,28 @@ export class DbToolService {
     /**
      * 测试未保存的连接草稿（侧边栏「保存前测试」）。不落库、不写审计，
      * 一次性适配器用完即关。url/fields 校验交给适配器层（与保存后测试同口径）。
+     * 编辑已有连接时传 connId：密码留空/url 未改动时自动拼回已存机密
+     * （仅注入本次测试，绝不回传客户端）。
      */
     async testDraft(input) {
         const rc = {
-            meta: { id: '(draft)', kind: input.kind, name: '(draft)' },
+            meta: { id: input.connId ?? '(draft)', kind: input.kind, name: '(draft)' },
         };
-        if (input.url !== undefined)
-            rc.url = input.url;
-        if (input.fields !== undefined)
-            rc.fields = { ...input.fields };
+        let url = input.url;
+        let fields = input.fields !== undefined ? { ...input.fields } : undefined;
+        if (input.connId) {
+            // 已存连接：编辑时客户端不发旧机密（留空语义），这里从 secrets 拼回
+            const sec = this.store.secrets.get(input.connId);
+            if (url === undefined && sec?.url !== undefined)
+                url = sec.url;
+            if (fields !== undefined && sec?.password !== undefined && fields.password === undefined) {
+                fields.password = sec.password;
+            }
+        }
+        if (url !== undefined)
+            rc.url = url;
+        if (fields !== undefined)
+            rc.fields = fields;
         if (input.ssl !== undefined)
             rc.ssl = input.ssl;
         try {

package/dist/store/connections.js

@@ -35,8 +35,9 @@ function splitPassword(fields) {
     const { [PASSWORD_KEY]: password, ...clean } = fields;
     return { clean, password: password };
 }
-/** ConnRecord → 用户可见的 ConnectionMeta（契约见 lib/adapters/types.ts） */
-function toMeta(rec) {
+/** ConnRecord → 用户可见的 ConnectionMeta（契约见 lib/adapters/types.ts）。
+ *  hasPassword 只回布尔指示，明文绝不出库。 */
+function toMeta(rec, hasPassword = false) {
     const meta = { id: rec.id, kind: rec.kind };
     if (rec.name !== undefined)
         meta.name = rec.name;
@@ -47,6 +48,8 @@ function toMeta(rec) {
     else {
         meta.mode = 'fields';
     }
+    if (hasPassword)
+        meta.hasPassword = true;
     if (rec.fields) {
         const { host, port, user, database } = rec.fields;
         if (typeof host === 'string')
@@ -78,12 +81,16 @@ export class ConnectionStore {
     findRec(data, id) {
         return data.connections.find((c) => c.id === id);
     }
+    /** 该连接是否已存密码（布尔指示，不读明文） */
+    hasPassword(id) {
+        return this.secrets.get(id)?.password !== undefined;
+    }
     list() {
-        return this.load().connections.map(toMeta);
+        return this.load().connections.map((r) => toMeta(r, this.hasPassword(r.id)));
     }
     get(id) {
         const rec = this.findRec(this.load(), id);
-        return rec ? toMeta(rec) : undefined;
+        return rec ? toMeta(rec, this.hasPassword(id)) : undefined;
     }
     /** 新建连接；id 已存在时抛错 */
     create(input) {
@@ -110,7 +117,7 @@ export class ConnectionStore {
             this.secrets.set(input.id, secretPatch);
         data.connections.push(rec);
         this.save(data);
-        return toMeta(rec);
+        return toMeta(rec, this.hasPassword(input.id));
     }
     /** 部分更新；不存在返回 undefined。url/fields 变更时同步拆分 secrets */
     update(id, patch) {
@@ -134,11 +141,24 @@ export class ConnectionStore {
         }
         if (patch.clearUrl && rec.urlSafe !== undefined) {
             delete rec.urlSafe;
+            // 密码迁移：原 url 内嵌密码 → fields 密码（切方式后保持可连，编辑留空即保留）
+            const secUrl = this.secrets.get(id)?.url;
+            if (secUrl !== undefined) {
+                try {
+                    const u = new URL(secUrl);
+                    if (u.password && this.secrets.get(id)?.password === undefined) {
+                        this.secrets.set(id, { password: decodeURIComponent(u.password) });
+                    }
+                }
+                catch {
+                    /* 非 URL 形态，忽略迁移 */
+                }
+            }
             // set 为合并写；显式置 undefined 经 JSON 序列化后等效删除该键
             this.secrets.set(id, { url: undefined });
         }
         this.save(data);
-        return toMeta(rec);
+        return toMeta(rec, this.hasPassword(id));
     }
     /** 删除连接，级联删除 secrets 与该连接的所有项目授权。
      *  顺序按"失败开放"原则：先删权限（grants），再删机密（secrets），最后改
@@ -162,7 +182,7 @@ export class ConnectionStore {
         const rec = this.findRec(this.load(), id);
         if (!rec)
             throw new Error(`连接不存在: ${id}`);
-        const meta = toMeta(rec);
+        const meta = toMeta(rec, this.secrets.get(id)?.password !== undefined);
         const rc = { meta };
         const sec = this.secrets.get(id);
         if (sec?.url !== undefined)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-db-tool",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "DSH community plugin: chat-operated multi-database admin tool with sidebar management, project-scoped grants, ro/rw modes and dangerous-operation confirmation",
   "type": "module",
   "license": "MIT",