@yejiming/dsh-data-agent 0.0.11 → 0.0.13

package/lib/{command-DuCpwVbl.js → command-utC5MHd9.js}

@@ -1,14 +1,18 @@
-import { r as redactSecretText } from "./connections-5sfdEDsG.js";
+import { d as defaultDatabasePort$1, l as DATABASE_TYPES, p as isDatabaseType, u as databaseTypeLabel$1 } from "./defaults-Cngd8Tf8.js";
+import { i as validatePasswordRef, r as redactSecretText } from "./connections-CHY4uB6z.js";
 import { RUN_CODE_NAME } from "@deepseek-ai/dsh-tools";
 //#region src/tui-connection-form.ts
-const TUI_DATABASE_TYPES = [
-	"mysql",
-	"postgres",
-	"sqlite",
-	"oracle",
-	"hive",
-	"impala"
-];
+/**
+* Short-lived ANSI connection form used by `/database connect` in dsh-tui.
+*
+* dsh-tui 0.6.x exposes commands but no public custom-form/sensitive-input
+* slot. This adapter therefore owns a small terminal form and only activates
+* for an interactive `dsh-tui` profile. It snapshots the host's `readable`
+* listeners, consumes input for the lifetime of the form, then restores the
+* listeners exactly. It never imports dsh-tui, React, or Ink.
+* @module @yejiming/dsh-data-agent/tui-connection-form
+*/
+const TUI_DATABASE_TYPES = DATABASE_TYPES;
 /** Initial form intentionally leaves host/port empty so placeholders are real defaults. */
 function createTuiConnectionFormState(initialDraft) {
 	return {
@@ -18,6 +22,8 @@ function createTuiConnectionFormState(initialDraft) {
 		user: initialDraft?.user ?? "",
 		database: initialDraft?.database ?? "",
 		password: "",
+		passwordRef: initialDraft?.passwordRef ?? "",
+		secure: initialDraft?.secure ?? false,
 		readonly: initialDraft?.readonly ?? false,
 		focus: "type",
 		cursor: 0
@@ -31,38 +37,39 @@ function connectionFormDraft(state) {
 		port: state.port,
 		user: state.user,
 		database: state.database,
-		readonly: state.readonly
+		readonly: state.readonly,
+		...state.type === "clickhouse" ? { secure: state.secure } : {}
 	};
 }
 /** Relevant focus order for the selected database kind. */
 function tuiConnectionFields(type) {
-	return type === "sqlite" ? [
+	if (type === "sqlite") return [
 		"type",
 		"database",
 		"readonly",
 		"confirm",
 		"cancel"
-	] : [
+	];
+	const fields = [
 		"type",
 		"host",
 		"port",
 		"user",
 		"database",
 		"password",
+		"passwordRef"
+	];
+	if (type === "clickhouse") fields.push("secure");
+	return [
+		...fields,
 		"readonly",
 		"confirm",
 		"cancel"
 	];
 }
 /** Default network port shown as a placeholder and applied only at submit time. */
-function defaultDatabasePort(type) {
-	switch (type) {
-		case "mysql": return 3306;
-		case "postgres": return 5432;
-		case "oracle": return 1521;
-		case "hive": return 1e4;
-		case "impala": return 21050;
-	}
+function defaultDatabasePort(type, secure = false) {
+	return defaultDatabasePort$1(type, secure);
 }
 /** Detect the supported host without coupling to dsh-tui modules. */
 function isDshTuiTerminal(argv = process.argv, input = process.stdin, output = process.stdout) {
@@ -130,12 +137,12 @@ function updateTuiConnectionForm(current, key) {
 			state
 		};
 	}
-	if (state.focus === "readonly") {
+	if (state.focus === "readonly" || state.focus === "secure") {
 		if (key.name === "enter" || key.name === "space") state = {
 			...state,
 			selector: {
-				field: "readonly",
-				index: state.readonly ? 1 : 0
+				field: state.focus,
+				index: state[state.focus] ? 1 : 0
 			}
 		};
 		return {
@@ -163,7 +170,7 @@ function renderTuiConnectionForm(state, columns = 80) {
 	];
 	for (const field of tuiConnectionFields(state.type)) lines.push(...renderField(state, field, width));
 	if (state.error !== void 0) lines.push("", red(`! ${state.error}`));
-	lines.push("", dim("密码仅在当前进程内使用，不写入命令、会话或持久化配置。"));
+	lines.push("", dim(state.type === "sqlite" ? "SQLite 连接不收集数据库凭据。" : "临时密码不持久化；凭据引用可随非敏感连接 profile 恢复。"));
 	return lines.join("\n");
 }
 /**
@@ -322,7 +329,7 @@ function validateTuiConnectionForm(state) {
 		readonly: state.readonly
 	} };
 	const portText = state.port.trim();
-	const port = portText === "" ? defaultDatabasePort(state.type) : Number(portText);
+	const port = portText === "" ? defaultDatabasePort(state.type, state.secure) : Number(portText);
 	if (!Number.isInteger(port) || port < 1 || port > 65535) return { error: "端口必须是 1–65535 的整数，或留空使用默认值" };
 	const input = {
 		type: state.type,
@@ -331,9 +338,19 @@ function validateTuiConnectionForm(state) {
 		database,
 		readonly: state.readonly
 	};
+	if (state.type === "clickhouse") input.secure = state.secure;
 	const user = state.user.trim();
 	if (user !== "") input.user = user;
-	if (state.password !== "") input.password = state.password;
+	const passwordRef = state.passwordRef.trim();
+	if (state.password !== "" && passwordRef !== "") return { error: "临时密码与凭据引用不能同时填写" };
+	if (passwordRef !== "") {
+		try {
+			validatePasswordRef(passwordRef);
+		} catch (error) {
+			return { error: error instanceof Error ? error.message : String(error) };
+		}
+		input.passwordRef = passwordRef;
+	} else if (state.password !== "") input.password = state.password;
 	return { input };
 }
 function editTextField(state, key) {
@@ -370,7 +387,7 @@ function replaceField(state, value, cursor) {
 	};
 }
 function isTextField(field) {
-	return field === "host" || field === "port" || field === "user" || field === "database" || field === "password";
+	return field === "host" || field === "port" || field === "user" || field === "database" || field === "password" || field === "passwordRef";
 }
 function moveFocus(state, delta) {
 	const fields = tuiConnectionFields(state.type);
@@ -395,16 +412,37 @@ function updateOpenSelector(state, key) {
 		kind: "editing",
 		state: closeSelector(state)
 	};
-	if (key.name === "enter") return {
-		kind: "editing",
-		state: closeSelector(selector.field === "type" ? {
-			...state,
-			type: TUI_DATABASE_TYPES[selector.index]
-		} : {
+	if (key.name === "enter") {
+		let selected;
+		if (selector.field === "type") {
+			const type = TUI_DATABASE_TYPES[selector.index];
+			const previousDefault = state.type === "sqlite" ? "" : String(defaultDatabasePort(state.type, state.secure));
+			const secure = type === "clickhouse" && state.secure;
+			const port = state.port === "" || state.port === previousDefault ? type === "sqlite" ? "" : String(defaultDatabasePort(type, secure)) : state.port;
+			selected = {
+				...state,
+				type,
+				secure,
+				port
+			};
+		} else if (selector.field === "secure") {
+			const secure = selector.index === 1;
+			const previousDefault = String(defaultDatabasePort("clickhouse", state.secure));
+			const port = state.port === "" || state.port === previousDefault ? String(defaultDatabasePort("clickhouse", secure)) : state.port;
+			selected = {
+				...state,
+				secure,
+				port
+			};
+		} else selected = {
 			...state,
 			readonly: selector.index === 1
-		})
-	};
+		};
+		return {
+			kind: "editing",
+			state: closeSelector(selected)
+		};
+	}
 	let delta = 0;
 	if (key.name === "up" || key.name === "left") delta = -1;
 	if (key.name === "down" || key.name === "right") delta = 1;
@@ -440,19 +478,20 @@ function renderField(state, field, width) {
 	let placeholder = false;
 	if (field === "type") value = databaseTypeLabel(state.type);
 	else if (field === "readonly") value = state.readonly ? "是" : "否";
+	else if (field === "secure") value = state.secure ? "是" : "否";
 	else {
 		const raw = state[field];
 		if (field === "password") value = "*".repeat([...raw].length);
 		else value = raw;
 		if (value === "") {
 			placeholder = true;
-			value = field === "host" ? "127.0.0.1（默认）" : field === "port" ? `${defaultDatabasePort(state.type)}（默认）` : field === "password" ? "可留空" : field === "user" ? "可留空" : "请输入";
+			value = field === "host" ? "127.0.0.1（默认）" : field === "port" ? `${defaultDatabasePort(state.type, state.secure)}（默认）` : field === "password" ? "可留空" : field === "passwordRef" ? "例如 DB_PASSWORD，可留空" : field === "user" ? "可留空" : "请输入";
 		}
 	}
 	const maxValue = Math.max(8, width - 20);
 	const shown = truncate(value.replace(/[\r\n\u001B]/g, " "), maxValue);
 	const content = placeholder ? dim(shown) : shown;
-	const expandable = field === "type" || field === "readonly";
+	const expandable = field === "type" || field === "readonly" || field === "secure";
 	const line = `${pointer} ${label.padEnd(8, "　")} [ ${focused ? cyan(content) : content}${expandable ? " ▾" : ""} ]`;
 	if (state.selector?.field !== field) return [line];
 	return [line, ...renderSelectorOptions(state)];
@@ -460,20 +499,13 @@ function renderField(state, field, width) {
 function renderSelectorOptions(state) {
 	const selector = state.selector;
 	const labels = selector.field === "type" ? TUI_DATABASE_TYPES.map(databaseTypeLabel) : ["否", "是"];
-	const selectedIndex = selector.field === "type" ? TUI_DATABASE_TYPES.indexOf(state.type) : state.readonly ? 1 : 0;
+	const selectedIndex = selector.field === "type" ? TUI_DATABASE_TYPES.indexOf(state.type) : state[selector.field] ? 1 : 0;
 	return labels.map((label, index) => {
 		return `    ${index === selector.index ? cyan("›") : " "} ${index === selectedIndex ? cyan("●") : dim("○")} ${index === selector.index ? cyan(bold(label)) : label}`;
 	});
 }
 function databaseTypeLabel(type) {
-	switch (type) {
-		case "mysql": return "MySQL";
-		case "postgres": return "PostgreSQL";
-		case "sqlite": return "SQLite";
-		case "oracle": return "Oracle";
-		case "hive": return "Hive";
-		case "impala": return "Impala";
-	}
+	return databaseTypeLabel$1(type);
 }
 function fieldLabel(field, type) {
 	switch (field) {
@@ -483,6 +515,8 @@ function fieldLabel(field, type) {
 		case "user": return "数据库用户";
 		case "database": return type === "sqlite" ? "文件路径" : "数据库名";
 		case "password": return "密码";
+		case "passwordRef": return "凭据引用";
+		case "secure": return "HTTPS";
 		case "readonly": return "只读模式";
 	}
 }
@@ -513,7 +547,7 @@ const inject = [
 const DATABASE_COMMAND_USAGE = [
 	"用法：",
 	"  /database status",
-	"  /database connect --type <mysql|postgres|sqlite|oracle|hive|impala> --database <name|path> [--host <host>] [--port <port>] [--user <user>] [--password-ref <REF>] [--readonly]",
+	`  /database connect --type <${DATABASE_TYPES.join("|")}> --database <name|path> [--host <host>] [--port <port>] [--user <user>] [--password-ref <REF>] [--readonly] [--secure]`,
 	"  /database test",
 	"  /database disconnect",
 	"安全提示：TUI 无参数 connect 可输入掩码临时密码；命令参数不接受 --password，请使用 --password-ref。"
@@ -625,6 +659,7 @@ function parseDatabaseAction(rawInput) {
 function parseConnectArguments(tokens) {
 	const values = /* @__PURE__ */ new Map();
 	let readonly;
+	let secure;
 	for (let index = 0; index < tokens.length; index += 1) {
 		const token = tokens[index];
 		if (token === "--password" || token.startsWith("--password=") || token.startsWith("password=")) throw new Error("安全限制：/database 不接受明文密码参数；请改用 --password-ref <REF>。");
@@ -636,6 +671,14 @@ function parseConnectArguments(tokens) {
 			readonly = false;
 			continue;
 		}
+		if (token === "--secure") {
+			secure = true;
+			continue;
+		}
+		if (token === "--insecure") {
+			secure = false;
+			continue;
+		}
 		const assignment = token.startsWith("--") ? token.slice(2).split("=", 2) : token.split("=", 2);
 		let key;
 		let value;
@@ -684,6 +727,7 @@ function parseConnectArguments(tokens) {
 		input.port = number;
 	}
 	if (readonly !== void 0) input.readonly = readonly;
+	if (type === "clickhouse" && secure !== void 0) input.secure = secure;
 	return input;
 }
 /** Render a public summary; no password-bearing field exists in the type. */
@@ -697,6 +741,7 @@ function formatConnectionStatus(summary) {
 		`数据库：${summary.database}`,
 		`只读：${summary.readonly === true ? "是" : "否"}`
 	];
+	if (summary.type === "clickhouse") lines.push(`HTTPS：${summary.secure === true ? "是" : "否"}`);
 	if (summary.user !== void 0) lines.push(`用户：${summary.user}`);
 	if (summary.profileId !== void 0) lines.push(`Profile：${summary.name ?? summary.profileId}`);
 	if (summary.passwordRef !== void 0) lines.push(`凭据引用：${summary.passwordRef}`);
@@ -749,7 +794,7 @@ async function askForConnection(ctx, invocation, interaction) {
 			{
 				id: "port",
 				header: "端口",
-				question: `数据库端口（留空使用 ${defaultDatabasePort(typeValue)}）`
+				question: typeValue === "clickhouse" ? `数据库端口（留空使用HTTP ${defaultDatabasePort$1("clickhouse")}；HTTPS ${defaultDatabasePort$1("clickhouse", true)}）` : `数据库端口（留空使用 ${defaultDatabasePort$1(typeValue)}）`
 			},
 			{
 				id: "user",
@@ -766,6 +811,12 @@ async function askForConnection(ctx, invocation, interaction) {
 				header: "凭据引用",
 				question: "DSH credential reference（可留空）"
 			},
+			...typeValue === "clickhouse" ? [{
+				id: "secure",
+				header: "HTTPS",
+				question: "是否使用HTTPS并验证服务器证书？",
+				options: [{ label: "是" }, { label: "否" }]
+			}] : [],
 			{
 				id: "readonly",
 				header: "只读",
@@ -787,8 +838,9 @@ async function askForConnection(ctx, invocation, interaction) {
 		};
 		if (typeValue !== "sqlite") {
 			input.host = answerValue(details, "host")?.trim() || "127.0.0.1";
+			if (typeValue === "clickhouse") input.secure = answerValue(details, "secure") === "是";
 			const portText = answerValue(details, "port")?.trim();
-			input.port = portText === void 0 || portText === "" ? defaultDatabasePort(typeValue) : Number(portText);
+			input.port = portText === void 0 || portText === "" ? defaultDatabasePort$1(typeValue, input.secure === true) : Number(portText);
 			const user = answerValue(details, "user")?.trim();
 			if (user !== void 0 && user !== "") input.user = user;
 			const passwordRef = answerValue(details, "passwordRef")?.trim();
@@ -800,14 +852,6 @@ async function askForConnection(ctx, invocation, interaction) {
 		throw error;
 	}
 }
-const DATABASE_TYPES = [
-	"mysql",
-	"postgres",
-	"sqlite",
-	"oracle",
-	"hive",
-	"impala"
-];
 const CONNECT_ARGUMENTS = /* @__PURE__ */ new Set([
 	"type",
 	"host",
@@ -818,9 +862,6 @@ const CONNECT_ARGUMENTS = /* @__PURE__ */ new Set([
 	"profileId",
 	"name"
 ]);
-function isDatabaseType(value) {
-	return typeof value === "string" && DATABASE_TYPES.includes(value);
-}
 function normalizeArgumentName(value) {
 	return value.replace(/-([a-z])/g, (_match, letter) => letter.toUpperCase());
 }

package/lib/command.js

@@ -1,2 +1,2 @@
-import { a as formatConnectionStatus, c as parseConnectArguments, i as executeDatabaseCommand, l as parseDatabaseAction, n as DATA_AGENT_TOOL_NAMES, o as inject, r as apply, s as name, t as DATABASE_COMMAND_USAGE } from "./command-DuCpwVbl.js";
+import { a as formatConnectionStatus, c as parseConnectArguments, i as executeDatabaseCommand, l as parseDatabaseAction, n as DATA_AGENT_TOOL_NAMES, o as inject, r as apply, s as name, t as DATABASE_COMMAND_USAGE } from "./command-utC5MHd9.js";
 export { DATABASE_COMMAND_USAGE, DATA_AGENT_TOOL_NAMES, apply, executeDatabaseCommand, formatConnectionStatus, inject, name, parseConnectArguments, parseDatabaseAction };