dsh-db-tool 1.3.2 → 1.4.1

package/README.md

@@ -1,11 +1,13 @@
 # dsh-db-tool
 
+[English](README_EN.md) | 简体中文
+
 DSH 社区插件：在聊天中安全操作数据库，配套侧边栏管理台与 `db-admin` skill。架构与交互模式对齐 [dsh-ssh-tunnel](https://github.com/thirsty5034/dsh-ssh-tunnel)。
 
 ## 功能
 
-- **8 种数据库**：MySQL、PostgreSQL、GaussDB（openGauss 官方驱动）、SQLite、Redis、MongoDB、Oracle、达梦（DM）
-- **DatabaseManager 单工具多 action**：`list_connections / query / execute / schema / preview / run_script`
+- **8 种数据库**：MySQL、PostgreSQL、GaussDB、SQLite、Redis、MongoDB、Oracle、达梦（DM）
+- **DatabaseManager 单工具多 action**：`list_connections / query / execute / schema / preview / run_script`（`run_script` 在 node:vm 沙箱中执行，60s 超时，仅注入受限 `db.{query,execute}` 句柄）
 - **分级权限**：连接级只读（ro）/读写（rw）+ 项目级授权（`grants.json`：projectPathKey → 连接 → 模式）；未授权项目一律拒绝
 - **危险操作确认**：DDL / FLUSHALL / dropDatabase 等先返回 `NEEDS_CONFIRMATION`，对话内（模型经 ask）或 SQL 控制台（弹窗）确认后携一次性 `challengeId`（绑定语句 SHA256、5 分钟过期）重试
 - **审计**：全部执行落 `audit.jsonl`（语句、危险级、是否确认、结果）
@@ -25,6 +27,10 @@ DSH 社区插件：在聊天中安全操作数据库，配套侧边栏管理台
 
 ## 安装
 
+8 种数据库驱动全部随 npm 包分发（SQLite 优先用 Node 内置 `node:sqlite`，可选 `better-sqlite3`；GaussDB 驱动为华为云官方 npm 包 `gaussdb-node`），无需任何构建步骤。GaussDB 认证支持 sha256 与 md5，md5-sha256 混合与 SM3 暂不支持。
+
+唯一的一次性交互来自 oracledb：其 install 脚本会被 pnpm 默认拦截并使首次安装报告失败——在 DSH 插件安装界面点 **"Allow these scripts and retry"** 即可完成安装（该脚本仅做 Node 版本检查与横幅打印，批准无风险；批准持久化到 profile，后续升级不再提示）。
+
 ```bash
 # npm（推荐）
 dsh plugin --profile web add dsh-db-tool
@@ -36,8 +42,6 @@ dsh plugin --profile web add "dsh-db-tool@github:mengqi1436/dsh-db-tool"
 dsh plugin --profile web add "link:E:\path\to\dsh-db-tool"
 ```
 
-GaussDB 官方驱动未发布 npm，需先构建 vendor：`npm run build:gaussdb`（PowerShell）或 `bash scripts/build-gaussdb.sh`；运行要求 Node ≥ 22.12（产物依赖 p-limit@7 纯 ESM）。oracledb 安装脚本需 `npm approve-scripts oracledb`。mongodb 驱动已 bundle 进发布包（`vendor/mongodb-driver.cjs`，esbuild 构建，`npm run build:mongodb` 可重建），依赖树中不含 mongodb/punycode（守卫见「Troubleshooting」免补丁路径说明）。
-
 ### 桌面端安装
 
 DSH 桌面端 0.2.0-rc.2+ 捆绑了 `dsh` 命令，全程无需另装 Node 或 pnpm：
@@ -46,64 +50,13 @@ DSH 桌面端 0.2.0-rc.2+ 捆绑了 `dsh` 命令，全程无需另装 Node 或 p
 2. **安装插件**（必须钉精确版本：`@latest` 会因 release-age 校验回落到旧版）：
 
    ```bash
-   dsh plugin --profile desktop add dsh-db-tool@1.3.1 --registry=https://registry.npmjs.org/
+   dsh plugin --profile desktop add dsh-db-tool@1.4.0 --registry=https://registry.npmjs.org/
    ```
 
    已有 npm 镜像源偏好的用户，可把 `--registry` 替换为自己的镜像地址。
 3. **重启桌面端**生效。
 
-桌面端补充说明：
-
-- **免补丁路径**：桌面端宿主代码打包在 `app.asar` 内，无法应用 `patch:dsh` 热补丁；但本插件 0.1.9+ 走免补丁路径（mongodb 驱动已 bundle 为 `vendor/mongodb-driver.cjs` 随包发布，依赖树不含 punycode），桌面端可直接安装加载，无需任何补丁。
-- **GaussDB**：npm 发布包不含 GaussDB vendor 驱动。需要 GaussDB 的用户请改从源码安装（`dsh plugin --profile desktop add "dsh-db-tool@github:mengqi1436/dsh-db-tool"`），并在插件目录自行 `npm run build:gaussdb`（要求 Node ≥ 22.12）。
-- **Oracle**：安装后需 `npm approve-scripts oracledb` 放行 oracledb 安装脚本（或按 DSH 插件安装界面的脚本审批提示放行）。
-
-### 离线环境安装
-
-**症状（≤ 1.3.1）**：受限代理/无公网 + 无编译工具链的机器上，安装卡死在 `better-sqlite3`（原生 C++ 模块）后整体回滚（`ERR_PNPM_EXECOR_LIFECYCLE_SCRIPT_FAILED`）——官方未发布 Node 24（ABI v137）的 Windows 预构建（release 下载 404），本地编译又同时缺 Node 头文件（nodejs.org 经代理 TLS 异常）与 MSVC 工具链。
-
-**1.3.2 起的行为**：
-
-1. `better-sqlite3` 移入 `optionalDependencies`——构建失败时 pnpm 自动排除该包，**插件整体安装不再回滚**（pnpm 11.7 实测：`is an optional dependency and failed … Excluding it from installation`，exit 0）。
-2. SQLite 改走**双驱动**：优先 `node:sqlite`（Node ≥ 22.5 内置，零原生依赖、离线环境直接可用；DSH 桌面端 runtime Node 24.x 自带），降级 `better-sqlite3`（存在则自动使用）。两者皆无时给出明确指引，**其余 7 种数据库不受任何影响**（MySQL/PG/GaussDB/Redis/Mongo/Oracle/DM 均为纯 JS 驱动）。
-3. 可用环境变量 `DBT_SQLITE_DRIVER=node|better` 强制单一路径（默认自动选择）。
-
-SQLite 支持矩阵：
-
-| 环境 | SQLite 可用性 |
-|---|---|
-| Node ≥ 22.5（含 DSH 桌面端 runtime 24.x） | ✅ `node:sqlite` 内置，零依赖 |
-| Node < 22.5 且 better-sqlite3 可安装/编译 | ✅ 自动用 `better-sqlite3` |
-| Node < 22.5 且离线（better-sqlite3 构建失败被排除） | ❌ SQLite 不可用，其余 7 库正常 |
-
-老版本（≤ 1.3.1）离线机的应急路径：有外网窗口时重试、装 VS Build Tools 后 `pnpm rebuild better-sqlite3`、或直接升级到 ≥ 1.3.2（推荐）。
-
-## 安全模型
-
-- HTTP API 仅同源（`ctx.webServer` prefix `/dsh-db-tool/api`）+ 宿主 Connection 栅栏（`ctx.connection.requestRejection`：Host/Origin + 浏览器 token 鉴权。0.2.0-rc.1 起插件前缀路由不经宿主栅栏，故在 handler 顶层显式应用；宿主无 connection 服务时回退 loopback/Origin trust 校验，等价 ssh-tunnel `http-trust`），body 限 2MB
-- ro 双保险：服务层拦截 + 驱动会话级 `SET SESSION CHARACTERISTICS AS TRANSACTION READ ONLY`（pg/gaussdb）、readonly 打开（SQLite）
-- SQL 参数绑定 + 标识符白名单（`[A-Za-z0-9_$]+` + 引用包裹）；MySQL `multipleStatements:false`；Redis 元数据走 `SCAN`（禁 `KEYS`）；Mongo 递归拒 `$where`
-- `run_script`：node:vm 独立 context、60s 超时、无 require/process/网络/文件系统，仅注入受限 `db.{query,execute}` 句柄
-- 已知边界：对话内确认为提示级强制 + 审计兜底；DSH 无硬中断通道前，恶意对话仍可能诱导用户确认，请配合最小权限数据库账号使用
-
-## Troubleshooting
-
-### npm 安装插件导入失败（punycode / resolve.paths）
-
-症状：DSH 启动后插件加载报 `failed to import`，伴随 `TypeError: Cannot read properties of null (reading 'Symbol(Symbol.iterator)')`，栈指向 `dsh-app-boot` 的 `routeScoped`。
-
-根因：上游 `@deepseek-ai/dsh-app-boot` 对 `createRequire(parent).resolve.paths(name)` 直接做 `for..of`，而 Node 对 core-module 同名包（`punycode` 等）返回 `null`，hoisted profile 下凡依赖树含此类 npm 包的插件都会炸。`0.1.7-rc.2`、`0.2.0-rc.1` 与 `0.2.0-rc.2` 中同型缺陷两处（`0.2.0-rc.2` 的 `lib/index.js` 与 `0.2.0-rc.1` 逐字节相同，尚未修复；锚点行均与 `0.1.7-rc.2` 一致，仅整体行号偏移 1 行）：`routeScoped()` 与 `nativePackageDir()`，本补丁一并修复（两处分别独立判定，已打过旧版单处补丁的机器只会补上缺的那处）。
-
-一键修复（幂等，应用前自动备份为 `index.js.bak-hotfix`；`--revert` 可还原）：
-
-```bash
-npm run patch:dsh        # Windows（PowerShell）
-npm run patch:dsh:sh     # macOS / Linux
-```
-
-脚本自动探测 DSH 安装根（`--dsh-root` 可显式指定）；补丁文件按安装版本自动选择：`patches/dsh-app-boot-route-scoped-hotfix.patch`（`0.1.7-rc.2`）、`patches/dsh-app-boot-route-scoped-hotfix-0.2.0-rc.1.patch`（`0.2.0-rc.1`）、`patches/dsh-app-boot-route-scoped-hotfix-0.2.0-rc.2.patch`（`0.2.0-rc.2`，其 `lib/index.js` 与 `0.2.0-rc.1` 逐字节相同，故 hunk 完全一致；均与内建替换路径逐字节等价已验证）；不支持的版本会警告（`--force` 覆盖）。上游 issue：<https://github.com/mengqi1436/dsh-db-tool/issues>（占位，待上游仓库开放后替换）。
-
-**本插件的免补丁路径（0.1.9+）**：该 bug 的触发条件是依赖树中出现 core-module 同名包，mongodb 链（`mongodb-connection-string-url → whatwg-url → tr46 → punycode`）正是元凶。0.1.9 起 mongodb 驱动经 esbuild bundle 为 `vendor/mongodb-driver.cjs` 随包发布，生产依赖树不再含 mongodb 与 punycode——在**未修复宿主**（含桌面版 app.asar，无法打补丁）上也能正常安装加载。守卫测试 `tests/guard/deps-core-collision.spec.ts` 断言依赖树永不回退（dependencies 白名单 + lockfile 生产树 core 同名包零交集）。`patch:dsh` 仍保留，用于修复**其他**含同类依赖的插件或宿主自身报错。
+mongodb 驱动已 bundle 进发布包（`vendor/mongodb-driver.cjs`），依赖树不含 mongodb/punycode——桌面端宿主打包在 `app.asar` 内、无法应用宿主补丁，本插件免补丁可直接安装加载。
 
 ## 测试
 
@@ -115,14 +68,19 @@ npx stryker run # 变异测试（范围 lib/guard + lib/manager + lib/store，
 
 真机冒烟（设了才跑）：`DBT_TEST_MYSQL_URL / DBT_TEST_PG_URL / DBT_TEST_REDIS_URL / DBT_TEST_DM_CONNECT / DBT_TEST_MONGO_URL / DBT_TEST_ORACLE_CONNECT`。GaussDB 与 Oracle/Mongo 官方要求均按官方文档实现，未真机验证处以代码内标注为准。
 
-## 目录
+## 目录结构
 
 ```
 lib/        host 插件（store / adapters×8 / guard / manager / http / index）
 client/     侧边栏单文件产物（client.js，即源码）
 skills/     db-admin skill
-scripts/    GaussDB vendor 构建、mongodb 驱动 bundle（build:mongodb）、DSH dsh-app-boot 热修复（patch:dsh）
-docs/       安装、HTTP 契约（api-contract.md）、skill 说明
+scripts/    构建与工具脚本（mongodb 驱动 bundle、DSH 宿主热修复 patch:dsh 等）
+patches/    DSH 宿主 dsh-app-boot 热修复补丁（patch:dsh 按宿主版本选用）
+docs/       预留（当前为空）
 tests/      vitest（离线 mock + DBT_TEST_* 门控真机）
-vendor/     gaussdb 构建源/产物与 mongodb-driver.cjs bundle（gitignore，发布经 files 白名单收录 bundle）
+vendor/     mongodb-driver.cjs bundle（gitignore，发布经 files 白名单收录）
 ```
+
+## 许可证
+
+MIT

package/README_EN.md

@@ -0,0 +1,86 @@
+# dsh-db-tool
+
+[简体中文](README.md) | English
+
+A DSH community plugin for operating databases safely from chat, with a sidebar management console and the `db-admin` skill. Architecture and interaction patterns follow [dsh-ssh-tunnel](https://github.com/thirsty5034/dsh-ssh-tunnel).
+
+## Features
+
+- **8 databases**: MySQL, PostgreSQL, GaussDB, SQLite, Redis, MongoDB, Oracle, and DM (Dameng)
+- **One tool, six actions**: `DatabaseManager` exposes `list_connections / query / execute / schema / preview / run_script` (`run_script` executes in a `node:vm` sandbox with a 60s timeout and only restricted `db.{query,execute}` handles)
+- **Tiered permissions**: per-connection read-only (ro) / read-write (rw) plus project-scoped grants (`grants.json`: projectPathKey → connection → mode); unauthorized projects are always rejected
+- **Dangerous-operation confirmation**: DDL / FLUSHALL / dropDatabase and the like first return `NEEDS_CONFIRMATION`; after confirmation in chat (model via ask) or in the SQL console (dialog), the retry carries a one-time `challengeId` (bound to the statement SHA256, 5-minute TTL)
+- **Auditing**: every execution is appended to `audit.jsonl` (statement, danger level, confirmed or not, outcome)
+- **Sidebar with 4 panels** (dsh-better-sidebar, zh/en): connections, project grants, data browser, SQL console
+- **db-admin skill**: shipped with the plugin, covering dialect cheat sheets for all 8 databases, safety rules, and the confirmation flow
+
+## Data Layout
+
+`$DSH_HOME/db-tool/` (0700):
+
+| File | Contents |
+|---|---|
+| `connections.json` | connection definitions (passwords masked as `***` in `urlSafe`) |
+| `secrets.json` | 0600; password/URL credentials, never returned to the model |
+| `grants.json` | project grants (normalized path → connId → ro/rw) |
+| `audit.jsonl` | append-only audit log |
+
+## Installation
+
+Drivers for all 8 databases ship with the npm package (SQLite prefers the built-in `node:sqlite`, optionally `better-sqlite3`; the GaussDB driver is the official Huawei Cloud npm package `gaussdb-node`) — no build steps of any kind. GaussDB authentication supports sha256 and md5; md5-sha256 hybrid and SM3 are not supported yet.
+
+The only one-time interaction comes from oracledb: pnpm blocks its install script by default, which makes the first install report a failure — click **"Allow these scripts and retry"** in the DSH plugin installation UI to finish (the script only checks the Node version and prints a banner, so approving is risk-free; the approval is persisted to the profile and upgrades won't prompt again).
+
+```bash
+# npm (recommended)
+dsh plugin --profile web add dsh-db-tool
+
+# From GitHub source
+dsh plugin --profile web add "dsh-db-tool@github:mengqi1436/dsh-db-tool"
+
+# Local development
+dsh plugin --profile web add "link:E:\path\to\dsh-db-tool"
+```
+
+### Desktop installation
+
+DSH Desktop 0.2.0-rc.2+ bundles the `dsh` command — no separate Node or pnpm required:
+
+1. **First use**: open the desktop menu bar, click **"Manage dsh command"**, and install the bundled CLI, which registers `dsh` on the system PATH.
+2. **Install the plugin** (always pin an exact version: `@latest` falls back to an older release due to release-age checks):
+
+   ```bash
+   dsh plugin --profile desktop add dsh-db-tool@1.4.0 --registry=https://registry.npmjs.org/
+   ```
+
+   If you prefer an npm mirror, replace `--registry` with your mirror URL.
+3. **Restart** the desktop app.
+
+The MongoDB driver is bundled into the published package (`vendor/mongodb-driver.cjs`), so the dependency tree contains no mongodb/punycode — the desktop host is packed inside `app.asar` and cannot be host-patched, yet this plugin installs and loads there without any patch.
+
+## Testing
+
+```bash
+npm test        # full offline mock suite (incl. e2e-mock end-to-end and adversarial cases)
+npx tsc --noEmit
+npx stryker run # mutation testing (lib/guard + lib/manager + lib/store, reports in reports/mutation/)
+```
+
+Live-database smoke tests (run only when set): `DBT_TEST_MYSQL_URL / DBT_TEST_PG_URL / DBT_TEST_REDIS_URL / DBT_TEST_DM_CONNECT / DBT_TEST_MONGO_URL / DBT_TEST_ORACLE_CONNECT`. GaussDB, Oracle, and Mongo official requirements are implemented per their official docs; anything not verified against live databases is annotated in code.
+
+## Project Structure
+
+```
+lib/        host plugin (store / adapters×8 / guard / manager / http / index)
+client/     sidebar single-file artifact (client.js — this is the source)
+skills/     db-admin skill
+scripts/    build & tooling scripts (MongoDB driver bundle, DSH host hotfix patch:dsh, etc.)
+patches/    DSH host dsh-app-boot hotfix patches (selected by host version for patch:dsh)
+docs/       reserved (currently empty)
+tests/      vitest (offline mocks + DBT_TEST_*-gated live runs)
+vendor/     mongodb-driver.cjs bundle (gitignored; shipped via the files whitelist)
+```
+
+## License
+
+MIT

package/client/client.js

@@ -34,6 +34,8 @@ window.__ModuleLoader__.load({
 			urlMode: "URL 方式",
 			fieldsMode: "分字段方式",
 			url: "连接 URL（密码将自动拆入密钥存储）",
+			urlUser: "用户名（可选，自动注入 URL）",
+			urlPassword: "密码（可选，自动注入 URL；留空保持已存）",
 			fieldsHost: "主机地址",
 			fieldsPort: "端口",
 			fieldsUser: "用户名",
@@ -123,6 +125,8 @@ window.__ModuleLoader__.load({
 			urlMode: "URL",
 			fieldsMode: "Fields",
 			url: "Connection URL (password moved to secrets automatically)",
+			urlUser: "Username (optional, injected into URL)",
+			urlPassword: "Password (optional, injected into URL; blank keeps saved)",
 			fieldsHost: "Host",
 			fieldsPort: "Port",
 			fieldsUser: "User",
@@ -375,7 +379,7 @@ window.__ModuleLoader__.load({
 		}
 
 		/* ---------------- 连接管理 ---------------- */
-		const EMPTY_FORM = { id: "", kind: "mysql", name: "", mode: "url", url: "", host: "", port: "", user: "", password: "", database: "", ssl: false };
+		const EMPTY_FORM = { id: "", kind: "mysql", name: "", mode: "url", url: "", urlUser: "", urlPassword: "", host: "", port: "", user: "", password: "", database: "", ssl: false };
 
 		// 通用表格渲染：columns + rows（审计列表与查询结果共用）
 		function resultTable(columns, rows, cellTitles) {
@@ -457,6 +461,7 @@ window.__ModuleLoader__.load({
 				...EMPTY_FORM,
 				id: c.id, kind: c.kind, name: c.name || "", mode,
 				url: c.safeUrl || "",
+				urlUser: "", urlPassword: "",
 				host: c.host || "", port: c.port != null ? String(c.port) : "",
 				user: c.user || "", database: c.database || "",
 				ssl: !!c.ssl,
@@ -496,6 +501,11 @@ window.__ModuleLoader__.load({
 					if (form.url && form.url !== origUrl) body.url = form.url;
 					// 新建 url 连接必须发
 					if (!props.initial && form.url) body.url = form.url;
+					// URL 模式独立凭据：trim 后非空才发（服务端注入 userinfo；url 未发时以已存 URL 为基底）
+					const uu = (form.urlUser || "").trim();
+					const up = (form.urlPassword || "").trim();
+					if (uu) body.urlUser = uu;
+					if (up) body.urlPassword = up;
 				} else {
 					body.fields = { host: form.host, user: form.user, database: form.database || undefined };
 					if (form.port) body.fields.port = Number(form.port);
@@ -541,7 +551,14 @@ window.__ModuleLoader__.load({
 					React.createElement("button", { className: form.mode === "fields" ? "active" : "", onClick: reenterFields }, t("fieldsMode")),
 				),
 				form.mode === "url"
-					? React.createElement("input", { placeholder: t("url"), value: form.url, onChange: (e) => patch({ url: e.target.value }) })
+					? React.createElement(
+						"div",
+						{ style: { display: "flex", flexDirection: "column", gap: 6 } },
+						React.createElement("input", { placeholder: t("url"), value: form.url, onChange: (e) => patch({ url: e.target.value }) }),
+						React.createElement("div", { className: "dbt-row" },
+							React.createElement("input", { placeholder: t("urlUser"), value: form.urlUser, onChange: (e) => patch({ urlUser: e.target.value }) }),
+							React.createElement("input", { type: "password", placeholder: t("urlPassword"), value: form.urlPassword, onChange: (e) => patch({ urlPassword: e.target.value }) })),
+					)
 					: React.createElement(
 						"div",
 						{ style: { display: "flex", flexDirection: "column", gap: 6 } },

package/dist/adapters/gaussdb/index.js

@@ -1,14 +1,21 @@
 /**
  * GaussDB（openGauss）适配器。
  *
- * ⚠️ 官方驱动 openGauss-connector-nodejs 未发布 npm（华为云 HCS 26.861.0 官方文档
- * 应用程序接口清单仅 JDBC/ODBC/libpq/Psycopg/Go/ECPG，无 Node 驱动），Node 接入基于
- * PostgreSQL 协议兼容自行验证。使用 vendor/gaussdb-pg 构建产物（fork 自 pg 8.6.0，
- * API 与 pg 完全兼容），未真机验证。
+ * 驱动：npm 包 gaussdb-node（华为云官方组织 HuaweiCloudDeveloper/gaussdb-node，
+ * pg 兼容 fork，导出结构同 pg：Pool/Client）。npm 安装即含 GaussDB 支持，无需
+ * 额外构建；依赖树（gaussdb-connection-string/gaussdb-pool/gaussdb-protocol/
+ * pg-types/pgpass/gaussdb-cloudflare）无 p-limit 等高版本要求，Node ≥ 20 即可。
+ *
+ * 认证支持（依包内实现核对，未真机验证）：
+ * - sha256（RFC5802，password_encryption_type=2 默认）：已实现——
+ *   gaussdb-node/lib/crypto/rfc5802.js + client.js _handleAuthSHA256Password、
+ *   gaussdb-protocol parser AuthenticationSHA256Password（case 10）分支；
+ * - md5（标准 PG 形态 md5(md5(password+user)+salt)）：已实现（gaussdbMd5PasswordHash）；
+ * - md5-sha256 混合（type=1）与 SM3（type=3）：包内未提供（rfc5802 仅支持 sha256
+ *   method、无 gm-crypto 依赖）——sha256/md5 已证，md5-sha256 混合与 SM3 未证，
+ *   服务端要求这两种认证方式时会握手失败。
  *
  * 已按官方文档对齐（证据见 skills/db-admin/SKILL.md GaussDB 节）：
- * - 认证：驱动实现 openGauss SHA256 / MD5-SHA256 / SM3 握手（vendor pg-protocol parser.ts:335-357、
- *   rfc5802.js:44），对应服务端 password_encryption_type 默认 2 (sha256)；
  * - 默认端口 8000（集中式 DN / 分布式 CN）、ro 会话 `SET SESSION CHARACTERISTICS AS
  *   TRANSACTION READ ONLY` 两形态官方支持（rf-dist/gaussdb-08-0400、rf-cent/gaussdb-38-0416）；
  * - 已知限制：SERIALIZABLE 功能不支持（等价 REPEATABLE READ，与 PG 的 SSI 行为不同）；
@@ -16,25 +23,20 @@
  *   information_schema.tables/columns 集中式有官方视图文档、分布式参考无原生视图文档
  *   （仅 M-Compatibility 模式），跨库浏览在分布式实例上以真机行为为准。
  *
- * 构建方式：bash scripts/build-gaussdb.sh（或 npm run build:gaussdb）
  * 核心逻辑与 postgresql 适配器共享（sql-shared/pg-like.ts）。
  */
 import { createRequire } from 'node:module';
 import { createPgLikeAdapter, } from '../sql-shared/pg-like.js';
 const require = createRequire(import.meta.url);
-// packages 布局：pg lib 内 require('../../pg-protocol'/'../../pg-pool') 按 monorepo 假设向上两级解析
-// 相对 createRequire base（lib/adapters/gaussdb/）需三级到项目根：gaussdb/ → adapters/ → lib/ → root
-const VENDOR_PATH = '../../../vendor/gaussdb-pg/packages/pg';
 function loadGaussDriver() {
     try {
-        // vendor 为 CJS 产物，结构同 pg：module.exports = { Pool, Client, ... }
-        return require(VENDOR_PATH);
+        // gaussdb-node 为 CJS 包，结构同 pg：module.exports = { Pool, Client, ... }
+        return require('gaussdb-node');
     }
     catch (e) {
-        // 附原始错误：区分「vendor 未构建」与「构建产物损坏/依赖缺失」两类故障
+        // 附原始错误：区分「依赖未安装」与「安装产物损坏」两类故障
         const msg = e instanceof Error ? e.message : String(e);
-        throw new Error('GaussDB 驱动未找到：官方 openGauss-connector-nodejs 未发布 npm，' +
-            '请先执行 bash scripts/build-gaussdb.sh（或 npm run build:gaussdb）构建 vendor/gaussdb-pg。' +
+        throw new Error('GaussDB 驱动未找到：请重新安装插件（npm install gaussdb-node 或重装 dsh-db-tool）。' +
             `原始错误: ${msg}`);
     }
 }

package/dist/adapters/index.js

@@ -12,7 +12,7 @@ const LOADERS = {
 const INSTALL_HINTS = {
     mysql: 'npm install mysql2',
     postgresql: 'npm install pg',
-    gaussdb: 'npm run build:gaussdb（构建 vendor/gaussdb-pg）',
+    gaussdb: 'npm install gaussdb-node（或重装插件恢复依赖）',
     sqlite: '升级 Node ≥ 22.5（内置 node:sqlite），或 npm install better-sqlite3',
     redis: 'npm install redis',
     mongodb: 'npm run build:mongodb（构建 vendor/mongodb-driver.cjs；发布包已内置产物，仅在缺失时需要）',

package/dist/adapters/mongodb/index.js

@@ -166,7 +166,9 @@ export async function createMongoAdapter(conn, opts) {
     }
     const dbName = typeof conn.meta.database === 'string' && conn.meta.database !== ''
         ? conn.meta.database
-        : defaultDbName(conn.fields);
+        : conn.url
+            ? urlDbName(conn.url)
+            : defaultDbName(conn.fields);
     const db = client.db(dbName);
     function wrap(e) {
         const M = vendorOrNull();
@@ -524,15 +526,30 @@ function inferBsonType(v) {
         return 'object';
     return typeof v;
 }
-function buildUri(fields, ssl) {
+export function buildUri(fields, ssl) {
     const host = typeof fields?.host === 'string' && fields.host !== '' ? fields.host : '127.0.0.1';
     const port = typeof fields?.port === 'number' ? fields.port : 27017;
     const user = typeof fields?.user === 'string' ? encodeURIComponent(fields.user) : '';
     const pass = typeof fields?.password === 'string' ? `:${encodeURIComponent(fields.password)}` : '';
     const auth = user !== '' ? `${user}${pass}@` : '';
-    const scheme = ssl || fields?.ssl === true || fields?.tls === true ? 'mongodb+srv' : 'mongodb';
-    const authDb = typeof fields?.authDatabase === 'string' ? `?authSource=${fields.authDatabase}` : '';
-    return `${scheme}://${auth}${host}:${port}${authDb}`;
+    // tls 用查询参数表达：mongodb+srv 是 DNS seedlist 形态（禁止显式端口），与 TLS 无关，不可混用
+    const params = [];
+    if (typeof fields?.authDatabase === 'string' && fields.authDatabase !== '') {
+        params.push(`authSource=${fields.authDatabase}`);
+    }
+    if (ssl || fields?.ssl === true || fields?.tls === true)
+        params.push('tls=true');
+    const qs = params.length > 0 ? `?${params.join('&')}` : '';
+    return `mongodb://${auth}${host}:${port}${qs}`;
+}
+/** URL 模式库名：取 URL path 首段（percent 解码），无则 'test' 兜底（与 pg-like mainDb 同口径） */
+function urlDbName(url) {
+    try {
+        return decodeURIComponent(new URL(url).pathname.replace(/^\//, '')) || 'test';
+    }
+    catch {
+        return 'test';
+    }
 }
 function defaultDbName(fields) {
     return typeof fields?.database === 'string' && fields.database !== '' ? fields.database : 'test';

package/dist/http/index.js

@@ -141,6 +141,8 @@ async function route(req, res, service, path, q, opts) {
                 id, kind: kind,
                 ...(b['name'] !== undefined ? { name: str(b['name']) } : {}),
                 ...(b['url'] !== undefined ? { url: str(b['url']) } : {}),
+                ...(b['urlUser'] !== undefined ? { urlUser: str(b['urlUser']) } : {}),
+                ...(b['urlPassword'] !== undefined ? { urlPassword: str(b['urlPassword']) } : {}),
                 ...(b['fields'] !== undefined ? { fields: b['fields'] } : {}),
                 ...(ssl !== undefined ? { ssl } : {}),
             }));
@@ -158,6 +160,8 @@ async function route(req, res, service, path, q, opts) {
         return sendMaybeConfirm(res, service.testDraft({
             kind: kind,
             ...(b['url'] !== undefined ? { url: str(b['url']) } : {}),
+            ...(b['urlUser'] !== undefined ? { urlUser: str(b['urlUser']) } : {}),
+            ...(b['urlPassword'] !== undefined ? { urlPassword: str(b['urlPassword']) } : {}),
             ...(b['fields'] !== undefined ? { fields: b['fields'] } : {}),
             ...(ssl !== undefined ? { ssl } : {}),
             // 编辑已有连接时透传：服务端拼回已存机密（留空密码/url 未改动的测试语义）
@@ -178,6 +182,8 @@ async function route(req, res, service, path, q, opts) {
             return sendOk(res, service.updateConnection(id, {
                 ...(b['name'] !== undefined ? { name: str(b['name']) } : {}),
                 ...(b['url'] !== undefined ? { url: str(b['url']) } : {}),
+                ...(b['urlUser'] !== undefined ? { urlUser: str(b['urlUser']) } : {}),
+                ...(b['urlPassword'] !== undefined ? { urlPassword: str(b['urlPassword']) } : {}),
                 ...(b['fields'] !== undefined ? { fields: b['fields'] } : {}),
                 ...(b['clearUrl'] === true ? { clearUrl: true } : {}),
                 ...(ssl !== undefined ? { ssl } : {}),

package/dist/manager.js

@@ -1,6 +1,6 @@
 import { getAdapter } from './adapters/index.js';
 import { ChallengeStore, classifyStatement, } from './guard/index.js';
-import { normalizeProjectKey, } from './store/index.js';
+import { mergeUrlCredentials, normalizeProjectKey, } from './store/index.js';
 import { runScriptInChild } from './script/runner.js';
 /* ---------------- 错误与结果类型 ---------------- */
 /** 携带机器可读 code 的业务错误（HTTP 层直接映射 {ok:false,error,code}） */
@@ -84,15 +84,24 @@ export class DbToolService {
         };
         let url = input.url;
         let fields = input.fields !== undefined ? { ...input.fields } : undefined;
+        let secretsUrl;
         if (input.connId) {
             // 已存连接：编辑时客户端不发旧机密（留空语义），这里从 secrets 拼回
             const sec = this.store.secrets.get(input.connId);
-            if (url === undefined && sec?.url !== undefined)
-                url = sec.url;
+            secretsUrl = sec?.url;
+            if (url === undefined && secretsUrl !== undefined)
+                url = secretsUrl;
             if (fields !== undefined && sec?.password !== undefined && fields.password === undefined) {
                 fields.password = sec.password;
             }
         }
+        // URL 模式独立凭据注入（拼回已存 URL 之后；无凭据字段时 helper 原样返回，?? 保持不变）
+        url = mergeUrlCredentials({
+            url,
+            urlUser: input.urlUser,
+            urlPassword: input.urlPassword,
+            secretsUrl,
+        }) ?? url;
         if (url !== undefined)
             rc.url = url;
         if (fields !== undefined)

package/dist/store/connections.js

@@ -28,6 +28,45 @@ export function redactUrl(url) {
     const redacted = m[1] + userinfo.slice(0, colon + 1) + '***@' + authority.slice(at + 1);
     return redacted + url.slice(m[0].length);
 }
+/** URL 模式独立凭据注入：把 urlUser/urlPassword 合并进 URL userinfo（8 库 scheme 均为标准 URL 形态）。
+ *  - 两者均空 → 原样返回（url 可为 undefined，现状语义不变）；
+ *  - url 为 undefined → 有 secretsUrl（编辑场景已存真实 URL）以其为基底注入，否则凭据忽略返回 undefined；
+ *  - url 含脱敏标记 ':***@'（编辑回填值）→ 有 secretsUrl 以其为基底整体替换，否则报错；
+ *  - 注入用 WHATWG URL 的 username/password setter（自动 percent-encode '@:/?# ' 等特殊字符），
+ *    与适配器侧 decodeURIComponent / 驱动 RFC 3986 解码严格互逆；只填一项只覆盖一项
+ *    （redis 'redis://:pass@host' 无用户名形态、oracle 必填用户名校验均兼容）。 */
+export function mergeUrlCredentials(opts) {
+    const { url, urlUser, urlPassword, secretsUrl } = opts;
+    if (urlUser === undefined && urlPassword === undefined)
+        return url;
+    let base;
+    if (url === undefined) {
+        if (secretsUrl === undefined)
+            return undefined; // 无 URL 可注入，凭据忽略
+        base = secretsUrl;
+    }
+    else if (url.includes(':***@')) {
+        if (secretsUrl === undefined) {
+            throw new Error('URL 中含脱敏占位（***）且无已存真实 URL 可回退，请重新输入完整 URL 或清空用户名/密码框');
+        }
+        base = secretsUrl;
+    }
+    else {
+        base = url;
+    }
+    let u;
+    try {
+        u = new URL(base);
+    }
+    catch {
+        throw new Error('连接 URL 无效，无法注入用户名/密码');
+    }
+    if (urlUser !== undefined && urlUser !== '')
+        u.username = urlUser;
+    if (urlPassword !== undefined && urlPassword !== '')
+        u.password = urlPassword;
+    return u.toString();
+}
 function splitPassword(fields) {
     if (!fields || typeof fields[PASSWORD_KEY] !== 'string') {
         return { clean: fields, password: undefined };
@@ -107,9 +146,15 @@ export class ConnectionStore {
         if (clean !== undefined)
             rec.fields = clean;
         const secretPatch = {};
-        if (input.url !== undefined) {
-            rec.urlSafe = redactUrl(input.url);
-            secretPatch.url = input.url;
+        // URL 模式独立凭据注入（无凭据字段时 mergeUrlCredentials 原样返回，现状语义不变）
+        const finalUrl = mergeUrlCredentials({
+            url: input.url,
+            urlUser: input.urlUser,
+            urlPassword: input.urlPassword,
+        });
+        if (finalUrl !== undefined) {
+            rec.urlSafe = redactUrl(finalUrl);
+            secretPatch.url = finalUrl;
         }
         if (password !== undefined)
             secretPatch.password = password;
@@ -135,9 +180,17 @@ export class ConnectionStore {
             if (password !== undefined)
                 this.secrets.set(id, { password });
         }
-        if (patch.url !== undefined) {
-            rec.urlSafe = redactUrl(patch.url);
-            this.secrets.set(id, { url: patch.url });
+        // URL 模式独立凭据注入：url 未发/发脱敏回填值时以已存 secrets.url 为基底（update 场景）；
+        // 无 url 且无凭据字段时 mergeUrlCredentials 返回 undefined，自然跳过（无需外层守卫）
+        const finalUrl = mergeUrlCredentials({
+            url: patch.url,
+            urlUser: patch.urlUser,
+            urlPassword: patch.urlPassword,
+            secretsUrl: this.secrets.get(id)?.url,
+        });
+        if (finalUrl !== undefined) {
+            rec.urlSafe = redactUrl(finalUrl);
+            this.secrets.set(id, { url: finalUrl });
         }
         if (patch.clearUrl && rec.urlSafe !== undefined) {
             delete rec.urlSafe;

package/dist/store/index.js

@@ -18,7 +18,7 @@ import { GrantStore } from './grants.js';
 import { chmodBestEffort } from './io.js';
 import { SecretsBox } from './secrets.js';
 export { normalizeProjectKey } from './normalize.js';
-export { redactUrl } from './connections.js';
+export { mergeUrlCredentials, redactUrl } from './connections.js';
 export { AuditLog, ConnectionStore, GrantStore, SecretsBox };
 export class DbToolStore {
     /** 数据目录：$DSH_HOME/db-tool */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-db-tool",
-  "version": "1.3.2",
+  "version": "1.4.1",
   "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",
@@ -29,8 +29,6 @@
     "build": "tsc -p tsconfig.build.json && node -e \"const fs=require('fs'); fs.mkdirSync('dist/script',{recursive:true}); fs.copyFileSync('lib/script/worker.cjs','dist/script/worker.cjs'); console.log('build OK')\" && node scripts/build-mongodb.mjs",
     "build:mongodb": "node scripts/build-mongodb.mjs",
     "prepack": "npm run build",
-    "build:gaussdb": "powershell -NoProfile -ExecutionPolicy Bypass -File scripts/build-gaussdb.ps1",
-    "build:gaussdb:sh": "bash scripts/build-gaussdb.sh",
     "patch:dsh": "powershell -NoProfile -ExecutionPolicy Bypass -File scripts/apply-dsh-hotfix.ps1",
     "patch:dsh:sh": "bash scripts/apply-dsh-hotfix.sh"
   },
@@ -48,6 +46,7 @@
   "dependencies": {
     "bson": "^7.2.0",
     "dmdb": "^1.0.52452",
+    "gaussdb-node": "^0.2.2",
     "mysql2": "^3.24.4",
     "oracledb": "^7.0.1",
     "pg": "^8.23.0",
@@ -73,9 +72,6 @@
     "@deepseek-ai/cordis": "^4.0.1",
     "dsh-better-sidebar": ">=0.12.0"
   },
-  "allowScripts": {
-    "oracledb@7.0.1": true
-  },
   "files": [
     "cordis.patch.yml",
     "dist",
@@ -85,6 +81,7 @@
     "patches",
     "scripts",
     "vendor/mongodb-driver.cjs",
-    "README.md"
+    "README.md",
+    "README_EN.md"
   ]
 }

package/scripts/build-gaussdb.ps1

@@ -1,72 +0,0 @@
-# Build the official GaussDB (openGauss) Node driver into vendor/.
-# PowerShell version (use when bash/WSL is unavailable on Windows).
-#
-#   powershell -ExecutionPolicy Bypass -File scripts/build-gaussdb.ps1            # skip if built
-#   powershell -ExecutionPolicy Bypass -File scripts/build-gaussdb.ps1 -Force     # rebuild
-#
-# Equivalent to scripts/build-gaussdb.sh. Output: vendor/gaussdb-pg/packages/pg
-# (CJS, pg-like: { Pool, Client, ... }; pg lib requires '../../pg-protocol'/'../../pg-pool',
-#  so the monorepo packages/ layout must be preserved)
-# Requires Node >= 16, npm >= 7. Source: gitcode.com/opengauss/openGauss-connector-nodejs (master latest).
-# NOTE: keep this file ASCII-only so Windows PowerShell 5.1 (GBK codepage) can parse it.
-param(
-    [switch]$Force
-)
-$ErrorActionPreference = 'Stop'
-
-$RepoRoot = Split-Path -Parent $PSScriptRoot
-$Src = Join-Path $RepoRoot 'vendor\gaussdb-src'
-$Dst = Join-Path $RepoRoot 'vendor\gaussdb-pg'
-
-if (-not $Force -and (Test-Path (Join-Path $Dst 'packages\pg\package.json'))) {
-    Write-Host "[build-gaussdb] $Dst already built, skip (use -Force to rebuild)"
-    exit 0
-}
-
-if (Test-Path (Join-Path $Src '.git')) {
-    Write-Host "[build-gaussdb] source exists, updating..."
-    git -C $Src pull --ff-only
-    if ($LASTEXITCODE -ne 0) { throw "git pull failed (exit $LASTEXITCODE)" }
-} else {
-    Write-Host "[build-gaussdb] cloning openGauss-connector-nodejs..."
-    if (Test-Path $Src) { Remove-Item -Recurse -Force $Src }
-    New-Item -ItemType Directory -Force -Path (Join-Path $RepoRoot 'vendor') | Out-Null
-    git clone https://gitcode.com/opengauss/openGauss-connector-nodejs $Src
-    if ($LASTEXITCODE -ne 0) { throw "git clone failed (exit $LASTEXITCODE)" }
-}
-
-Write-Host "[build-gaussdb] npm install && npm run build..."
-Push-Location $Src
-try {
-    npm install
-    if ($LASTEXITCODE -ne 0) { throw "npm install failed (exit $LASTEXITCODE)" }
-    npm run build
-    if ($LASTEXITCODE -ne 0) { throw "npm run build failed (exit $LASTEXITCODE)" }
-} finally {
-    Pop-Location
-}
-
-Write-Host "[build-gaussdb] copying packages layout -> vendor/gaussdb-pg/packages ..."
-if (Test-Path $Dst) { Remove-Item -Recurse -Force $Dst }
-New-Item -ItemType Directory -Force (Join-Path $Dst 'packages') | Out-Null
-Copy-Item -Recurse (Join-Path $Src 'packages\pg') (Join-Path $Dst 'packages\pg')
-Copy-Item -Recurse (Join-Path $Src 'packages\pg-protocol') (Join-Path $Dst 'packages\pg-protocol')
-Copy-Item -Recurse (Join-Path $Src 'packages\pg-pool') (Join-Path $Dst 'packages\pg-pool')
-
-$PgDir = Join-Path $Dst 'packages\pg'
-Write-Host "[build-gaussdb] installing runtime deps (incl. undeclared p-limit used by fork)..."
-Push-Location $PgDir
-try {
-    npm install --omit=dev --no-audit --no-fund
-    if ($LASTEXITCODE -ne 0) { throw "npm install failed (exit $LASTEXITCODE)" }
-    npm install p-limit --omit=dev --no-audit --no-fund
-    if ($LASTEXITCODE -ne 0) { throw "npm install p-limit failed (exit $LASTEXITCODE)" }
-} finally {
-    Pop-Location
-}
-
-if (-not (Test-Path (Join-Path $PgDir 'package.json'))) {
-    throw "build output missing package.json, check $Src\packages\pg layout"
-}
-
-Write-Host "[build-gaussdb] done: $PgDir"

package/scripts/build-gaussdb.sh

@@ -1,53 +0,0 @@
-#!/usr/bin/env bash
-# 构建 GaussDB（openGauss）官方 Node 驱动 vendor 产物。
-#
-# 官方 openGauss-connector-nodejs 未发布 npm，需从源码构建：
-#   bash scripts/build-gaussdb.sh            # 已有产物则跳过（幂等）
-#   bash scripts/build-gaussdb.sh --force    # 强制重新拉取并构建
-#   npm run build:gaussdb                    # 等价入口
-#
-# 手动步骤（脚本因网络等失败时可手动执行）：
-#   git clone https://gitcode.com/opengauss/openGauss-connector-nodejs vendor/gaussdb-src
-#   cd vendor/gaussdb-src && npm install && npm run build
-#   rm -rf vendor/gaussdb-pg && cp -r packages/pg vendor/gaussdb-pg
-#   # 注意保留 vendor/gaussdb-pg/package.json 与 dist/
-#
-# 产物：vendor/gaussdb-pg/packages/pg（CJS，结构同 pg：{ Pool, Client, ... }；
-# pg lib 内 require('../../pg-protocol'/'../../pg-pool') 需 packages/ 布局）
-set -euo pipefail
-cd "$(dirname "$0")/.."
-
-SRC=vendor/gaussdb-src
-DST=vendor/gaussdb-pg
-FORCE=0
-if [ "${1:-}" = "--force" ]; then FORCE=1; fi
-
-if [ "$FORCE" != "1" ] && [ -f "$DST/packages/pg/package.json" ]; then
-  echo "[build-gaussdb] 已存在 $DST/packages/pg/package.json，跳过（--force 可强制重建）"
-  exit 0
-fi
-
-if [ -d "$SRC/.git" ]; then
-  echo "[build-gaussdb] 源码已存在，更新..."
-  git -C "$SRC" pull --ff-only
-else
-  echo "[build-gaussdb] 克隆 openGauss-connector-nodejs..."
-  rm -rf "$SRC"
-  mkdir -p vendor
-  git clone https://gitcode.com/opengauss/openGauss-connector-nodejs "$SRC"
-fi
-
-echo "[build-gaussdb] 安装依赖并构建..."
-(cd "$SRC" && npm install && npm run build)
-
-echo "[build-gaussdb] 拷贝 packages 布局 -> $DST"
-rm -rf "$DST"
-mkdir -p "$DST/packages"
-cp -r "$SRC/packages/pg" "$DST/packages/pg"
-# pg lib 内 require('../../pg-protocol'/'../../pg-pool') 按 monorepo packages/ 布局解析
-cp -r "$SRC/packages/pg-protocol" "$DST/packages/pg-protocol"
-cp -r "$SRC/packages/pg-pool" "$DST/packages/pg-pool"
-# 运行依赖（含 fork 源码已用但 package.json 未声明的 p-limit）
-(cd "$DST/packages/pg" && npm install --omit=dev --no-audit --no-fund && npm install p-limit --omit=dev --no-audit --no-fund)
-
-echo "[build-gaussdb] 构建完成 -> $DST/packages/pg"