dsh-db-tool 1.8.4 → 1.8.8

package/dist/store/grants.js

@@ -3,14 +3,46 @@
  * 键是 normalizeProjectKey 归一化后的项目路径。
  */
 import * as path from 'node:path';
+import { normalizeProjectKey } from './normalize.js';
 import { readJson, writeJsonAtomic } from './io.js';
+/** 迁移合并：同键两条授权列表按连接去重，rw 胜出（rw > ro，对齐 check），grantedAt 取较新 */
+function mergeGrantLists(a, b) {
+    const map = new Map();
+    for (const g of [...a, ...b]) {
+        const prev = map.get(g.connId);
+        if (!prev) {
+            map.set(g.connId, { ...g });
+            continue;
+        }
+        const mode = prev.mode === 'rw' || g.mode === 'rw' ? 'rw' : g.mode;
+        map.set(g.connId, { connId: g.connId, mode, grantedAt: prev.grantedAt > g.grantedAt ? prev.grantedAt : g.grantedAt });
+    }
+    return [...map.values()];
+}
+/** 绝对路径形态的键（盘符开头或 POSIX 根开头）：仅这类键参与迁移归一 */
+const PATH_KEY = /^(?:[a-z]:\/|\/)/i;
 export class GrantStore {
     file;
     constructor(dir) {
         this.file = path.join(dir, 'grants.json');
     }
+    /**
+     * 读入 + 兼容迁移：修复前的 grants.json 键未做 Windows 全路径小写归一
+     * （仅盘符小写），同一目录可能存在多个大小写变体键。读入时把「绝对路径
+     * 形态」的键统一归一化，变体合并为同一键（同连接多模式时 rw 胜出、
+     * grantedAt 取最新，与 check 语义一致），下次 save 自然落盘为新键。
+     * 非路径形态的键（历史遗留/测试桩，非 normalizeProjectKey 产出物）
+     * 原样保留——resolve 会把它们误改写为绝对路径。归一化幂等，对新格式文件零开销。
+     */
     load() {
-        return readJson(this.file, { grants: {} });
+        const raw = readJson(this.file, { grants: {} });
+        const grants = {};
+        for (const [k, list] of Object.entries(raw.grants ?? {})) {
+            const key = PATH_KEY.test(k) ? normalizeProjectKey(k) : k;
+            const prev = grants[key];
+            grants[key] = prev ? mergeGrantLists(prev, list) : list;
+        }
+        return { grants };
     }
     save(data) {
         // 0600 对齐 dsh-ssh-tunnel：授权关系本身也是敏感面（泄露项目↔库映射）
@@ -18,12 +50,14 @@ export class GrantStore {
     }
     /** 某项目的全部授权（不含 grantedAt，展示层无需时间戳） */
     grantsFor(projectKey) {
-        return (this.load().grants[projectKey] ?? []).map(({ connId, mode }) => ({ connId, mode }));
+        const key = normalizeProjectKey(projectKey);
+        return (this.load().grants[key] ?? []).map(({ connId, mode }) => ({ connId, mode }));
     }
-    /** 授权或改授权（同连接重复授权视为更新模式） */
+    /** 授权或改授权（同连接重复授权视为更新模式）。键在入口归一化，调用方传原始路径亦可 */
     grant(projectKey, connId, mode) {
+        const key = normalizeProjectKey(projectKey);
         const data = this.load();
-        const list = data.grants[projectKey] ?? [];
+        const list = data.grants[key] ?? [];
         const existing = list.find((g) => g.connId === connId);
         if (existing) {
             existing.mode = mode;
@@ -32,27 +66,29 @@ export class GrantStore {
         else {
             list.push({ connId, mode, grantedAt: new Date().toISOString() });
         }
-        data.grants[projectKey] = list;
+        data.grants[key] = list;
         this.save(data);
     }
     /** 撤销某项目对某连接的授权。不存在时静默返回 */
     revoke(projectKey, connId) {
+        const key = normalizeProjectKey(projectKey);
         const data = this.load();
-        const list = data.grants[projectKey];
+        const list = data.grants[key];
         if (!list)
             return;
         const next = list.filter((g) => g.connId !== connId);
         if (next.length === list.length)
             return;
         if (next.length === 0)
-            delete data.grants[projectKey];
+            delete data.grants[key];
         else
-            data.grants[projectKey] = next;
+            data.grants[key] = next;
         this.save(data);
     }
-    /** 检查授权模式；未授权返回 undefined（ro < rw，rw 覆盖 ro） */
+    /** 检查授权模式；未授权返回 undefined（ro < rw，rw 覆盖 ro）。键在入口归一化 */
     check(projectKey, connId) {
-        const modes = (this.load().grants[projectKey] ?? [])
+        const key = normalizeProjectKey(projectKey);
+        const modes = (this.load().grants[key] ?? [])
             .filter((g) => g.connId === connId)
             .map((g) => g.mode);
         if (modes.includes('rw'))

package/dist/store/normalize.js

@@ -10,12 +10,21 @@
  *  1. path.resolve → 转为绝对路径（相对路径基于 cwd 解析）
  *  2. 分隔符统一为 '/'
  *  3. Windows 盘符小写（'C:/' 与 'c:/' 是同一目录）
- *  4. 去尾分隔符（'c:/code/proj/' → 'c:/code/proj'）
+ *  4. Windows 全路径小写（NTFS 默认大小写不敏感：'E:/Code/App' 与
+ *     'e:/code/app' 是同一目录。修复前仅盘符小写，路径段大小写保留，
+ *     会话 cwd 大小写与授权时不一致（重启/不同入口的常见现象）即授权
+ *     错位 → 「项目未授权该连接」，数据浏览树展开后无库无表）
+ *  5. 去尾分隔符（'c:/code/proj/' → 'c:/code/proj'）
+ *
+ * platform 参数仅供测试注入（默认 process.platform）；非 Windows 文件
+ * 系统大小写敏感，路径段保持原样。
  */
 import * as path from 'node:path';
-export function normalizeProjectKey(p) {
+export function normalizeProjectKey(p, platform = process.platform) {
     let key = path.resolve(p).replace(/\\/g, '/');
     key = key.replace(/^([A-Z]):/, (_m, drive) => `${drive.toLowerCase()}:`);
+    if (platform === 'win32')
+        key = key.toLowerCase();
     if (key.length > 1)
         key = key.replace(/\/+$/, '');
     return key;

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "dsh-db-tool",
-  "version": "1.8.4",
+  "version": "1.8.8",
   "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",
+  "license": "Apache-2.0",
+  "author": "mengqi1436",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/mengqi1436/dsh-db-tool.git"
@@ -13,8 +14,8 @@
   },
   "homepage": "https://github.com/mengqi1436/dsh-db-tool#readme",
   "engines": {
-    "node": ">=20",
-    "dsh": ">=0.1.0-rc.6 <0.2.0-0 || 0.1.7-rc.2 || >=0.2.0-rc.1 <0.3.0-0"
+    "node": ">=22",
+    "dsh": ">=0.1.0-rc.6 <0.2.0-0 || 0.1.7-rc.2 || >=0.2.0-rc.1 <0.3.0-0 || >=0.2.1-rc.2 <0.3.0-0"
   },
   "main": "dist/index.js",
   "exports": {
@@ -74,6 +75,7 @@
     "esbuild": "^0.28.0",
     "mongodb": "^7.6.0",
     "mssql": "12.7.4",
+    "semver": "^7.7.0",
     "sql-formatter": "^15.9.0",
     "stryker-cli": "^1.1.0",
     "typescript": "^5.9.3",

package/patches/dsh-app-boot-route-scoped-hotfix-0.2.1-rc.3.patch

@@ -0,0 +1,44 @@
+# DSH dsh-app-boot resolve.paths hotfix (upstream bug: createRequire(parent).resolve.paths(name)
+# returns null for core-module names like "punycode", breaking hoisted profile installs).
+# Covers BOTH unguarded for..of sites in 0.2.1-rc.3 lib/index.js (extracted from the
+# shipped asar; CR=0, 4566 lines):
+#   nativePackageDir()  for-line at 1371  -> hunk @@ -1368,7 +1368,10 @@
+#   routeScoped()       for-line at 1628  -> hunk @@ -1625,7 +1628,14 @@
+# Anchor lines are byte-identical to the 0.2.0-rc.2 patch (whole-file line shift only);
+# hunk bodies are shared verbatim with 0.2.0-rc.1/rc.2.
+# Target-Version: 0.2.1-rc.3
+# Apply manually:  git apply -p1 -d <dsh-app-boot package root> <this file>
+# Or one command:  npm run patch:dsh    (scripts/apply-dsh-hotfix.ps1)
+# Generated from @deepseek-ai/dsh-app-boot@0.2.1-rc.3 (asar) vs patched local copy.
+diff --git a/lib/index.js b/lib/index.js
+index 39401ea..8c053c3 100644
+--- a/lib/index.js
++++ b/lib/index.js
+@@ -1368,7 +1368,10 @@ function profileChild(path, treePrefix) {
+ 	return treePrefix + (end < 0 ? rest : rest.slice(0, end));
+ }
+ function nativePackageDir(parent, name) {
+-	for (const searchPath of createRequire(parent).resolve.paths(name)) {
++	/* local hotfix: nativePackageDir: resolve.paths returns null for core-module names
++	   (fs, node:fs, ...); an empty list means no local candidate, matching the
++	   guard in profile.ts:596. */
++	for (const searchPath of createRequire(parent).resolve.paths(name) ?? []) {
+ 		const candidate = join(searchPath, name);
+ 		if (existsSync(join(candidate, "package.json"))) return candidate;
+ 	}
+@@ -1625,7 +1628,14 @@ var ResolutionRouter = class {
+ 		const target = resolution.entries.get(name);
+ 		const candidates = [];
+ 		const localSearchPaths = [];
+-		for (const searchPath of createRequire(parent).resolve.paths(name)) {
++		/* local hotfix: resolve.paths returns null for core-module names (e.g. "punycode"),
++		   which made the for..of throw TypeError and broke every hoisted profile install
++		   whose dependency tree requires such an npm package. Fall back to the standard
++		   node_modules search chain so the local candidate can still be found. */
++		const _hotReq = createRequire(parent);
++		const _hotPaths = _hotReq.resolve.paths(name)
++			?? _hotReq("node:module")._nodeModulePaths(_hotReq("node:path").dirname(parent));
++		for (const searchPath of _hotPaths) {
+ 			if (!searchPath.startsWith(layer.localPrefix)) break;
+ 			localSearchPaths.push(searchPath);
+ 			const candidate = localPackageCandidate(searchPath, name, flavor);

package/scripts/hotfix-core.mjs

@@ -23,13 +23,15 @@ import { fileURLToPath, pathToFileURL } from 'node:url';
 
 /** 补丁文件里的目标版本声明行（patches/*.patch 注释头）。 */
 export const TARGET_VERSION = '0.1.7-rc.2';
-/** 锚点行逐字节一致的受支持版本列表（仅整体行号偏移；0.2.0-rc.1/0.2.0-rc.2 的 lib/index.js 逐字节相同）。 */
-export const TARGET_VERSIONS = ['0.1.7-rc.2', '0.2.0-rc.1', '0.2.0-rc.2'];
+/** 锚点行逐字节一致的受支持版本列表（仅整体行号偏移；0.2.0-rc.1/0.2.0-rc.2 的 lib/index.js 逐字节相同；
+ * 0.2.1-rc.3 锚点内容同样逐字节一致，仅整体行号偏移（npd +123 / routeScoped +205）。 */
+export const TARGET_VERSIONS = ['0.1.7-rc.2', '0.2.0-rc.1', '0.2.0-rc.2', '0.2.1-rc.3'];
 /** 各受支持版本对应的默认补丁文件名（patches/ 下；git-apply 路径按版本选择）。 */
 export const PATCH_BY_VERSION = {
 	'0.1.7-rc.2': 'dsh-app-boot-route-scoped-hotfix.patch',
 	'0.2.0-rc.1': 'dsh-app-boot-route-scoped-hotfix-0.2.0-rc.1.patch',
 	'0.2.0-rc.2': 'dsh-app-boot-route-scoped-hotfix-0.2.0-rc.2.patch',
+	'0.2.1-rc.3': 'dsh-app-boot-route-scoped-hotfix-0.2.1-rc.3.patch',
 };
 /** 判断目标文件是否已打补丁的标识串（hotfix 注释首行片段）。 */
 export const HOTFIX_MARKER = 'local hotfix: resolve.paths returns null';