@yejiming/dsh-data-agent 0.0.11 → 0.0.13

package/lib/defaults-Cngd8Tf8.js

@@ -0,0 +1,131 @@
+//#region src/database-types.ts
+/**
+* Browser-safe database type descriptors shared by every DSH surface.
+* Keep this module dependency-free: server-only client/process details belong
+* in the database adapters, not in Web or persistence bundles.
+*/
+const DATABASE_TYPES = [
+	"mysql",
+	"postgres",
+	"sqlite",
+	"oracle",
+	"hive",
+	"impala",
+	"clickhouse",
+	"doris",
+	"sqlserver"
+];
+const DATABASE_TYPE_DESCRIPTORS = {
+	mysql: {
+		type: "mysql",
+		label: "MySQL",
+		localeKey: "type.mysql",
+		defaultPort: 3306,
+		defaultUser: "root",
+		fileBased: false
+	},
+	postgres: {
+		type: "postgres",
+		label: "PostgreSQL",
+		localeKey: "type.postgres",
+		defaultPort: 5432,
+		defaultUser: "postgres",
+		fileBased: false
+	},
+	sqlite: {
+		type: "sqlite",
+		label: "SQLite",
+		localeKey: "type.sqlite",
+		defaultPort: 0,
+		defaultUser: "",
+		fileBased: true
+	},
+	oracle: {
+		type: "oracle",
+		label: "Oracle",
+		localeKey: "type.oracle",
+		defaultPort: 1521,
+		defaultUser: "",
+		fileBased: false
+	},
+	hive: {
+		type: "hive",
+		label: "Hive",
+		localeKey: "type.hive",
+		defaultPort: 1e4,
+		defaultUser: "",
+		fileBased: false
+	},
+	impala: {
+		type: "impala",
+		label: "Impala",
+		localeKey: "type.impala",
+		defaultPort: 21050,
+		defaultUser: "",
+		fileBased: false
+	},
+	clickhouse: {
+		type: "clickhouse",
+		label: "ClickHouse",
+		localeKey: "type.clickhouse",
+		defaultPort: 8123,
+		securePort: 8443,
+		defaultUser: "default",
+		fileBased: false
+	},
+	doris: {
+		type: "doris",
+		label: "Apache Doris",
+		localeKey: "type.doris",
+		defaultPort: 9030,
+		defaultUser: "root",
+		fileBased: false
+	},
+	sqlserver: {
+		type: "sqlserver",
+		label: "SQL Server",
+		localeKey: "type.sqlserver",
+		defaultPort: 1433,
+		defaultUser: "sa",
+		fileBased: false
+	}
+};
+function isDatabaseType(value) {
+	return typeof value === "string" && DATABASE_TYPES.includes(value);
+}
+function defaultDatabasePort(type, secure = false) {
+	const descriptor = DATABASE_TYPE_DESCRIPTORS[type];
+	return secure && descriptor.securePort !== void 0 ? descriptor.securePort : descriptor.defaultPort;
+}
+function defaultDatabaseUser(type) {
+	return DATABASE_TYPE_DESCRIPTORS[type].defaultUser;
+}
+function databaseTypeLabel(type) {
+	return DATABASE_TYPE_DESCRIPTORS[type].label;
+}
+//#endregion
+//#region src/defaults.ts
+/**
+* Package-wide defaults shared by the server half (`src/index.ts`) and the
+* database tool half (`src/tool.ts`). Loader schemas carry these as their
+* defaults so a deployment may override every one of them in cordis.yml.
+* @module @yejiming/dsh-data-agent/defaults
+*/
+/** Preset directory name installed into `$DSH_HOME/.agent-presets/`. */
+const DEFAULT_PRESET_ID = "data-agent";
+/** End-to-end deadline for one `/connect` connectivity check, milliseconds. */
+const DEFAULT_CONNECT_TIMEOUT_MS = 1e4;
+/** End-to-end deadline for one database-tool query, milliseconds. */
+const DEFAULT_QUERY_TIMEOUT_MS = 3e4;
+/** In-memory cap on database-tool captured output (stdout and stderr each). */
+const DEFAULT_MAX_RESULT_CHARS = 2e4;
+/** Hard row cap for one structured Web workbench result/export. */
+const WORKBENCH_MAX_EXPORT_ROWS = 5e4;
+/** Bounded capture size for the larger structured Web workbench result. */
+const WORKBENCH_MAX_RESULT_CHARS = 33554432;
+/** Cap on one /query SQL text length (abuse guard; the wire body stays small). */
+const DEFAULT_MAX_QUERY_CHARS = 65536;
+/** Grace period for the subprocess terminate escalation. */
+const DEFAULT_GRACE_MS = 5e3;
+//#endregion
+export { DEFAULT_PRESET_ID as a, WORKBENCH_MAX_RESULT_CHARS as c, defaultDatabasePort as d, defaultDatabaseUser as f, DEFAULT_MAX_RESULT_CHARS as i, DATABASE_TYPES as l, DEFAULT_GRACE_MS as n, DEFAULT_QUERY_TIMEOUT_MS as o, isDatabaseType as p, DEFAULT_MAX_QUERY_CHARS as r, WORKBENCH_MAX_EXPORT_ROWS as s, DEFAULT_CONNECT_TIMEOUT_MS as t, databaseTypeLabel as u };

package/lib/ecosystem.js

@@ -0,0 +1,19 @@
+import { defineFacet } from "@dsh-std/sdk";
+//#region src/ecosystem.ts
+/**
+* Community v0.15 host facet.
+*
+* This facet intentionally publishes no commands, tools, UI, routes, storage,
+* credentials, or database effects. The existing Cordis bundle remains the
+* sole functional runtime so hosts may discover the ecosystem declaration
+* without double-registering data-agent behavior.
+*/
+/** Stable degraded snapshot for declaration-only ecosystem discovery. */
+const ECOSYSTEM_SNAPSHOT = Object.freeze({
+	state: "degraded",
+	message: "Native Cordis runtime owns all data-agent effects; this facet publishes declarations only.",
+	extensions: Object.freeze([])
+});
+const ecosystemFacet = defineFacet(() => void 0, () => void 0, () => ECOSYSTEM_SNAPSHOT);
+//#endregion
+export { ECOSYSTEM_SNAPSHOT, ecosystemFacet as default };

package/lib/index.js

@@ -1,7 +1,7 @@
-import { o as clientsSchema, t as createConnectionService } from "./connections-5sfdEDsG.js";
-import { a as DEFAULT_PRESET_ID, i as DEFAULT_MAX_RESULT_CHARS, o as DEFAULT_QUERY_TIMEOUT_MS, r as DEFAULT_MAX_QUERY_CHARS, t as DEFAULT_CONNECT_TIMEOUT_MS } from "./defaults-DP4RyRh1.js";
-import { r as apply$1 } from "./command-DuCpwVbl.js";
-import { n as apply$2 } from "./tool-DVh61An-.js";
+import { a as DEFAULT_PRESET_ID, i as DEFAULT_MAX_RESULT_CHARS, l as DATABASE_TYPES, o as DEFAULT_QUERY_TIMEOUT_MS, r as DEFAULT_MAX_QUERY_CHARS, t as DEFAULT_CONNECT_TIMEOUT_MS } from "./defaults-Cngd8Tf8.js";
+import { c as clientsSchema, t as createConnectionService } from "./connections-CHY4uB6z.js";
+import { r as apply$1 } from "./command-utC5MHd9.js";
+import { n as apply$2 } from "./tool-ZTOS4B33.js";
 import { createHash } from "node:crypto";
 import { access, cp, mkdir, readFile, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
@@ -29,19 +29,13 @@ const CONNECTION_STORAGE_DOMAIN = "data_agent_connections";
 /** Durable profile schema. There is deliberately no `password` field. */
 const persistedConnectionProfileSchema = z$1.object({
 	name: z$1.string().min(1).optional(),
-	type: z$1.enum([
-		"mysql",
-		"postgres",
-		"sqlite",
-		"oracle",
-		"hive",
-		"impala"
-	]),
+	type: z$1.enum(DATABASE_TYPES),
 	host: z$1.string().optional(),
 	port: z$1.number().int().min(1).max(65535).optional(),
 	user: z$1.string().optional(),
 	database: z$1.string().min(1),
 	readonly: z$1.boolean().optional(),
+	secure: z$1.boolean().optional(),
 	passwordRef: z$1.string().regex(/^[A-Za-z_][A-Za-z0-9_]*$/).optional(),
 	credentialMode: z$1.enum([
 		"none",
@@ -57,19 +51,13 @@ const sessionConnectionBindingSchema = z$1.object({
 }).strict();
 /** Session form draft schema. Secret-shaped fields are rejected by strict mode. */
 const persistedConnectionFormDraftSchema = z$1.object({
-	type: z$1.enum([
-		"mysql",
-		"postgres",
-		"sqlite",
-		"oracle",
-		"hive",
-		"impala"
-	]),
+	type: z$1.enum(DATABASE_TYPES),
 	host: z$1.string(),
 	port: z$1.string(),
 	user: z$1.string(),
 	database: z$1.string(),
 	readonly: z$1.boolean(),
+	secure: z$1.boolean().optional(),
 	updatedAt: z$1.string().min(1)
 }).strict();
 /** Single source of truth for the storage layout and durable validation. */
@@ -82,6 +70,15 @@ const connectionStorageSpec = defineDomain({
 		drafts: domainTable(persistedConnectionFormDraftSchema)
 	}
 });
+/** Select the newest successful profile with a deterministic id tie-break. */
+function latestConnectionProfile(entries) {
+	let latest;
+	for (const [profileId, profile] of entries) if (latest === void 0 || profile.updatedAt > latest.profile.updatedAt || profile.updatedAt === latest.profile.updatedAt && profileId > latest.profileId) latest = {
+		profileId,
+		profile
+	};
+	return latest;
+}
 /** Project a typed DSH domain handle onto the service's persistence seam. */
 function createDomainConnectionPersistence(domain) {
 	const profiles = domain.table("profiles");
@@ -91,6 +88,9 @@ function createDomainConnectionPersistence(domain) {
 		getProfile(profileId) {
 			return profiles.get(profileId);
 		},
+		getLatestProfile() {
+			return latestConnectionProfile(profiles.entries());
+		},
 		putProfile(profileId, profile) {
 			return profiles.put(profileId, profile);
 		},
@@ -111,6 +111,9 @@ function createDomainConnectionPersistence(domain) {
 		},
 		putDraft(sessionId, draft) {
 			return drafts.put(sessionId, draft);
+		},
+		deleteDraft(sessionId) {
+			return drafts.delete(sessionId);
 		}
 	};
 }
@@ -163,13 +166,17 @@ const Config = z.object({
 			z.const("sqlite"),
 			z.const("oracle"),
 			z.const("hive"),
-			z.const("impala")
+			z.const("impala"),
+			z.const("clickhouse"),
+			z.const("doris"),
+			z.const("sqlserver")
 		]),
 		host: z.string(),
 		port: z.natural(),
 		user: z.string(),
 		database: z.string(),
 		readonly: z.boolean(),
+		secure: z.boolean(),
 		passwordRef: z.string().pattern(/^[A-Za-z_][A-Za-z0-9_]*$/),
 		password: z.never().hidden()
 	})).default({})
@@ -186,12 +193,11 @@ function resolveDshHome(env = process.env) {
 /**
 * Install the packaged `preset/data-agent/` directory into
 * `$DSH_HOME/.agent-presets/<presetId>/`. Idempotent: an existing target is
-* normally left untouched. The exact package-owned 0.0.9 composition is
-* migrated once because its two dynamic package rows are incompatible with
-* DSH Desktop's unpacked-ASAR loader; user-edited compositions are never
-* overwritten. `installPreset: false` never calls this. Best-effort — a
-* failure logs a warning with manual install instructions instead of failing
-* the boot.
+* normally left untouched. Exact package-owned legacy compositions are
+* migrated once when their runtime contract changes; user-edited compositions
+* are never overwritten. `installPreset: false` never calls this. Best-effort
+* — a failure logs a warning with manual install instructions instead of
+* failing the boot.
 */
 async function installPreset(ctx, presetId) {
 	const targetDir = join(resolveDshHome(), ".agent-presets", presetId);
@@ -210,13 +216,13 @@ async function installPreset(ctx, presetId) {
 		return false;
 	}
 }
-/** SHA-256 of the unmodified 0.0.9 composition that imported /tool and /command dynamically. */
-const LEGACY_PRESET_0_0_9_SHA256 = "bae875a90d638ea78715030246b0f8a9f1a2c3359ca61febb6ceb59d0fcd930a";
+/** SHA-256 values of unmodified package-owned compositions safe to migrate. */
+const LEGACY_MANAGED_PRESET_SHA256 = /* @__PURE__ */ new Set(["bae875a90d638ea78715030246b0f8a9f1a2c3359ca61febb6ceb59d0fcd930a", "d3c6f4049580069eec1c6b7de101f12c7fb30482ad317434afb69afb08a91fc6"]);
 /** Public for regression tests of the non-destructive preset migration gate. */
 function isLegacyManagedPreset(source) {
-	return createHash("sha256").update(source).digest("hex") === LEGACY_PRESET_0_0_9_SHA256;
+	return LEGACY_MANAGED_PRESET_SHA256.has(createHash("sha256").update(source).digest("hex"));
 }
-/** Upgrade only the exact package-owned legacy composition; preserve every edited preset. */
+/** Upgrade only exact package-owned legacy compositions; preserve every edited preset. */
 async function synchronizeExistingPreset(ctx, targetDir, sourceDir, presetId) {
 	const composition = join(targetDir, "agent.cordis.yml");
 	try {
@@ -224,7 +230,7 @@ async function synchronizeExistingPreset(ctx, targetDir, sourceDir, presetId) {
 		if (isLegacyManagedPreset(current)) {
 			const replacement = await readFile(join(sourceDir, "agent.cordis.yml"), "utf8");
 			await writeFile(composition, replacement, "utf8");
-			ctx.logger.info("data-agent: migrated preset at %s to profile-preloaded tools (removed dynamic /tool and /command rows)", composition);
+			ctx.logger.info("data-agent: migrated package-owned preset at %s to the current runtime contract", composition);
 			return true;
 		}
 		if (current.includes("@yejiming/dsh-data-agent/tool") || current.includes("@yejiming/dsh-data-agent/command")) {
@@ -307,7 +313,8 @@ async function apply(ctx, config) {
 				...spec.port !== void 0 ? { port: spec.port } : {},
 				...spec.user !== void 0 ? { user: spec.user } : {},
 				...spec.passwordRef !== void 0 ? { passwordRef: spec.passwordRef } : {},
-				...spec.readonly !== void 0 ? { readonly: spec.readonly } : {}
+				...spec.readonly !== void 0 ? { readonly: spec.readonly } : {},
+				...spec.secure !== void 0 ? { secure: spec.secure } : {}
 			};
 			store.set(sessionId, connection);
 		}

package/lib/routes.js

@@ -1,4 +1,4 @@
-import { i as DEFAULT_MAX_RESULT_CHARS, o as DEFAULT_QUERY_TIMEOUT_MS, r as DEFAULT_MAX_QUERY_CHARS, t as DEFAULT_CONNECT_TIMEOUT_MS } from "./defaults-DP4RyRh1.js";
+import { i as DEFAULT_MAX_RESULT_CHARS, l as DATABASE_TYPES, o as DEFAULT_QUERY_TIMEOUT_MS, p as isDatabaseType, r as DEFAULT_MAX_QUERY_CHARS, t as DEFAULT_CONNECT_TIMEOUT_MS } from "./defaults-Cngd8Tf8.js";
 import { resolve } from "node:path";
 import z from "schemastery";
 //#region src/routes.ts
@@ -20,12 +20,13 @@ function validateConnectBody(value, cwd = process.cwd()) {
 	const candidate = value;
 	const sessionId = requireString(candidate.sessionId, "sessionId");
 	const type = candidate.type;
-	if (!isDatabaseType(type)) throw new Error("type 必须是 \"mysql\"、\"postgres\"、\"sqlite\"、\"oracle\"、\"hive\" 或 \"impala\"");
+	if (!isDatabaseType(type)) throw new Error(`type 必须是受支持的数据库类型：${DATABASE_TYPES.join("、")}`);
 	const database = requireString(candidate.database, "database");
 	const password = optionalString(candidate.password, "password");
 	const passwordRef = optionalString(candidate.passwordRef, "passwordRef");
 	if (password !== void 0 && passwordRef !== void 0) throw new Error("password 与 passwordRef 不能同时提供");
 	const readonly = optionalBoolean(candidate.readonly, "readonly");
+	const secure = optionalBoolean(candidate.secure, "secure");
 	const profileId = optionalString(candidate.profileId, "profileId");
 	const profileName = optionalString(candidate.name, "name");
 	const request = {
@@ -34,6 +35,7 @@ function validateConnectBody(value, cwd = process.cwd()) {
 		database: type === "sqlite" ? resolve(cwd, database) : database
 	};
 	if (readonly !== void 0) request.readonly = readonly;
+	if (type === "clickhouse" && secure !== void 0) request.secure = secure;
 	if (profileId !== void 0) request.profileId = profileId;
 	if (profileName !== void 0) request.name = profileName;
 	if (type === "sqlite") return request;
@@ -133,7 +135,7 @@ function apply(ctx, _config) {
 							const sql = requireString(body.sql, "sql");
 							writeJson(200, {
 								ok: true,
-								result: await scope.dataAgentConnections.query(sessionId, sql, signal)
+								result: await scope.dataAgentConnections.executeInteractive(sessionId, sql, signal)
 							});
 							return;
 						}
@@ -177,8 +179,5 @@ function optionalBoolean(value, label) {
 	if (typeof value !== "boolean") throw new Error(`${label} 必须是布尔值`);
 	return value;
 }
-function isDatabaseType(value) {
-	return value === "mysql" || value === "postgres" || value === "sqlite" || value === "oracle" || value === "hive" || value === "impala";
-}
 //#endregion
 export { Config, DATA_AGENT_PATH, apply, inject, name, validateConnectBody };