@zz1996/dbhub-dameng 0.1.7 → 1.2.5-dameng.621

package/dist/{chunk-2A2QF3CS.js → chunk-HGU7ILEZ.js}

@@ -2,21 +2,30 @@ import {
   isDriverNotInstalled
 } from "./chunk-WVVMH6FJ.js";
 import {
-  ConnectorRegistry,
-  SafeURL,
   getDatabaseTypeFromDSN,
   getDefaultPortForType,
-  parseConnectionInfoFromDSN,
+  parseConnectionInfoFromDSN
+} from "./chunk-3RJRH3CN.js";
+import {
+  ConnectorRegistry,
+  SafeURL,
   stripCommentsAndStrings
-} from "./chunk-SQA2ISDE.js";
+} from "./chunk-2JL4KCP5.js";
 
 // src/tools/builtin-tools.ts
 var BUILTIN_TOOL_EXECUTE_SQL = "execute_sql";
 var BUILTIN_TOOL_SEARCH_OBJECTS = "search_objects";
+var BUILTIN_TOOL_EXPLAIN_SQL = "explain_sql";
+var BUILTIN_TOOL_HEALTH_CHECK = "health_check";
 var BUILTIN_TOOLS = [
   BUILTIN_TOOL_EXECUTE_SQL,
   BUILTIN_TOOL_SEARCH_OBJECTS
 ];
+var ALL_BUILTIN_TOOL_NAMES = [
+  ...BUILTIN_TOOLS,
+  BUILTIN_TOOL_EXPLAIN_SQL,
+  BUILTIN_TOOL_HEALTH_CHECK
+];
 
 // src/utils/ssh-tunnel.ts
 import { Client } from "ssh2";
@@ -580,55 +589,59 @@ function parseCommandLineArgs() {
   }
   return parsedManually;
 }
-function loadEnvFiles() {
+function findEnvFile() {
   const isDevelopment = process.env.NODE_ENV === "development" || process.argv[1]?.includes("tsx");
   const envFileNames = isDevelopment ? [".env.local", ".env"] : [".env"];
   const envPaths = [];
   for (const fileName of envFileNames) {
     envPaths.push(
-      fileName,
+      path.join(process.cwd(), fileName),
       // Current working directory
-      path.join(__dirname, "..", "..", fileName),
+      path.join(__dirname, "..", "..", fileName)
       // Two levels up (src/config -> src -> root)
-      path.join(process.cwd(), fileName)
-      // Explicit current working directory
     );
   }
   for (const envPath of envPaths) {
-    console.error(`Checking for env file: ${envPath}`);
     if (fs.existsSync(envPath)) {
-      dotenv.config({ path: envPath });
-      if (process.env.READONLY !== void 0) {
-        console.error("\nERROR: READONLY environment variable is no longer supported.");
-        console.error("Use dbhub.toml with [[tools]] configuration instead:\n");
-        console.error("  [[sources]]");
-        console.error('  id = "default"');
-        console.error('  dsn = "..."\n');
-        console.error("  [[tools]]");
-        console.error('  name = "execute_sql"');
-        console.error('  source = "default"');
-        console.error("  readonly = true\n");
-        console.error("See https://dbhub.ai/tools/execute-sql#read-only-mode for details.\n");
-        process.exit(1);
-      }
-      if (process.env.MAX_ROWS !== void 0) {
-        console.error("\nERROR: MAX_ROWS environment variable is no longer supported.");
-        console.error("Use dbhub.toml with [[tools]] configuration instead:\n");
-        console.error("  [[sources]]");
-        console.error('  id = "default"');
-        console.error('  dsn = "..."\n');
-        console.error("  [[tools]]");
-        console.error('  name = "execute_sql"');
-        console.error('  source = "default"');
-        console.error("  max_rows = 1000\n");
-        console.error("See https://dbhub.ai/tools/execute-sql#row-limiting for details.\n");
-        process.exit(1);
-      }
-      return path.basename(envPath);
+      return envPath;
     }
   }
   return null;
 }
+function loadEnvFiles() {
+  const envPath = findEnvFile();
+  if (envPath) {
+    dotenv.config({ path: envPath });
+    if (process.env.READONLY !== void 0) {
+      console.error("\nERROR: READONLY environment variable is no longer supported.");
+      console.error("Use dbhub.toml with [[tools]] configuration instead:\n");
+      console.error("  [[sources]]");
+      console.error('  id = "default"');
+      console.error('  dsn = "..."\n');
+      console.error("  [[tools]]");
+      console.error('  name = "execute_sql"');
+      console.error('  source = "default"');
+      console.error("  readonly = true\n");
+      console.error("See https://dbhub.ai/tools/execute-sql#read-only-mode for details.\n");
+      process.exit(1);
+    }
+    if (process.env.MAX_ROWS !== void 0) {
+      console.error("\nERROR: MAX_ROWS environment variable is no longer supported.");
+      console.error("Use dbhub.toml with [[tools]] configuration instead:\n");
+      console.error("  [[sources]]");
+      console.error('  id = "default"');
+      console.error('  dsn = "..."\n');
+      console.error("  [[tools]]");
+      console.error('  name = "execute_sql"');
+      console.error('  source = "default"');
+      console.error("  max_rows = 1000\n");
+      console.error("See https://dbhub.ai/tools/execute-sql#row-limiting for details.\n");
+      process.exit(1);
+    }
+    return path.basename(envPath);
+  }
+  return null;
+}
 function isDemoMode() {
   const args = parseCommandLineArgs();
   return args.demo === "true";
@@ -649,7 +662,7 @@ function buildDSNFromEnvParams() {
       return null;
     }
   }
-  const supportedTypes = ["postgres", "postgresql", "mysql", "mariadb", "sqlserver", "sqlite", "dameng", "dm"];
+  const supportedTypes = ["postgres", "postgresql", "mysql", "mariadb", "sqlserver", "sqlite", "dameng"];
   if (!supportedTypes.includes(dbType.toLowerCase())) {
     throw new Error(`Unsupported DB_TYPE: ${dbType}. Supported types: ${supportedTypes.join(", ")}`);
   }
@@ -668,7 +681,6 @@ function buildDSNFromEnvParams() {
         port = "1433";
         break;
       case "dameng":
-      case "dm":
         port = "5236";
         break;
       case "sqlite":
@@ -686,8 +698,7 @@ function buildDSNFromEnvParams() {
   const encodedUser = encodeURIComponent(user);
   const encodedPassword = encodeURIComponent(password);
   const encodedDbName = encodeURIComponent(dbNameStr);
-  const normalizedType = dbType.toLowerCase();
-  const protocol = normalizedType === "postgresql" ? "postgres" : normalizedType === "dm" ? "dameng" : normalizedType;
+  const protocol = dbType.toLowerCase() === "postgresql" ? "postgres" : dbType.toLowerCase();
   const dsn = `${protocol}://${encodedUser}:${encodedPassword}@${dbHost}:${port}/${encodedDbName}`;
   return {
     dsn,
@@ -799,6 +810,21 @@ function resolveAllowedHosts() {
 function splitHostList(value) {
   return value.split(",").map((h) => h.trim()).filter((h) => h.length > 0);
 }
+function resolveAuthTokens() {
+  const args = parseCommandLineArgs();
+  const cliValue = requireFlagValue("auth-token", args, "secret1,secret2");
+  if (cliValue !== void 0) {
+    return { tokens: splitTokenList(cliValue), source: "command line argument" };
+  }
+  const envValue = process.env.DBHUB_AUTH_TOKEN?.trim();
+  if (envValue) {
+    return { tokens: splitTokenList(envValue), source: "environment variable" };
+  }
+  return { tokens: [], source: "default" };
+}
+function splitTokenList(value) {
+  return value.split(",").map((t) => t.trim()).filter((t) => t.length > 0);
+}
 function redactDSN(dsn) {
   try {
     const url = new URL(dsn);
@@ -928,6 +954,9 @@ function resolveSSHConfig() {
   };
 }
 async function resolveSourceConfigs() {
+  if (parseCommandLineArgs().config) {
+    loadEnvFiles();
+  }
   if (!isDemoMode()) {
     const tomlConfig = loadTomlConfig();
     if (tomlConfig) {
@@ -937,6 +966,11 @@ async function resolveSourceConfigs() {
           "The --id flag cannot be used with TOML configuration. TOML config defines source IDs directly. Either remove the --id flag or use command-line DSN configuration instead."
         );
       }
+      if (parseCommandLineArgs().dsn) {
+        throw new Error(
+          `The --dsn flag cannot be used with TOML configuration (${tomlConfig.source}). TOML config defines database sources directly and supports multiple databases, while a DSN configures a single database. Either remove the --dsn flag or drop the --config flag.`
+        );
+      }
       return tomlConfig;
     }
   }
@@ -960,6 +994,8 @@ async function resolveSourceConfigs() {
       dbType = "mariadb";
     } else if (protocol === "sqlserver") {
       dbType = "sqlserver";
+    } else if (protocol === "dameng") {
+      dbType = "dameng";
     } else if (protocol === "sqlite") {
       dbType = "sqlite";
     } else {
@@ -1044,8 +1080,9 @@ function loadTomlConfig() {
 }
 function resolveTomlConfigPath() {
   const args = parseCommandLineArgs();
-  if (args.config) {
-    const configPath = expandHomeDir(args.config);
+  const configValue = requireFlagValue("config", args, "./dbhub.toml");
+  if (configValue) {
+    const configPath = expandHomeDir(configValue);
     if (!fs2.existsSync(configPath)) {
       throw new Error(
         `Configuration file specified by --config flag not found: ${configPath}`
@@ -1053,10 +1090,6 @@ function resolveTomlConfigPath() {
     }
     return configPath;
   }
-  const defaultConfigPath = path2.join(process.cwd(), "dbhub.toml");
-  if (fs2.existsSync(defaultConfigPath)) {
-    return defaultConfigPath;
-  }
   return null;
 }
 function validateTomlConfig(config, configPath) {
@@ -1126,7 +1159,7 @@ function validateToolsConfig(tools, sources, configPath) {
         `Configuration file ${configPath}: tool '${tool.name}' references unknown source '${tool.source}'`
       );
     }
-    const isBuiltin = BUILTIN_TOOLS.includes(tool.name);
+    const isBuiltin = ALL_BUILTIN_TOOL_NAMES.includes(tool.name);
     const isExecuteSql = tool.name === BUILTIN_TOOL_EXECUTE_SQL;
     if (isBuiltin) {
       if (tool.description || tool.statement || tool.parameters) {
@@ -1211,6 +1244,11 @@ function validateDSNFieldConflicts(source, configPath) {
     if (source.database && info.database && source.database !== info.database) {
       conflict("database", source.database, info.database);
     }
+    if (source.database && !info.database) {
+      throw new Error(
+        `Configuration file ${configPath}: source '${source.id}' has a 'database' field but the DSN names no database. The field is ignored at connection time \u2014 add the database to the DSN, or use individual connection parameters instead of a DSN.`
+      );
+    }
     if (source.user && info.user && source.user !== info.user) {
       conflict("user", source.user, info.user);
     }
@@ -1276,6 +1314,18 @@ function validateSourceConfig(source, configPath) {
       );
     }
   }
+  if (source.aws_profile !== void 0) {
+    if (typeof source.aws_profile !== "string" || source.aws_profile.trim().length === 0) {
+      throw new Error(
+        `Configuration file ${configPath}: source '${source.id}' has invalid aws_profile. Must be a non-empty string.`
+      );
+    }
+    if (source.aws_iam_auth !== true) {
+      throw new Error(
+        `Configuration file ${configPath}: source '${source.id}' aws_profile requires aws_iam_auth = true.`
+      );
+    }
+  }
   if (source.aws_iam_auth === true) {
     const validIamTypes = ["postgres", "mysql", "mariadb"];
     if (!source.type || !validIamTypes.includes(source.type)) {
@@ -1303,6 +1353,18 @@ function validateSourceConfig(source, configPath) {
       );
     }
   }
+  if (source.pool_max_connections !== void 0) {
+    if (source.type !== "postgres") {
+      throw new Error(
+        `Configuration file ${configPath}: source '${source.id}' has 'pool_max_connections' but it is only supported for PostgreSQL sources.`
+      );
+    }
+    if (!Number.isInteger(source.pool_max_connections) || source.pool_max_connections < 1 || source.pool_max_connections > 1e3) {
+      throw new Error(
+        `Configuration file ${configPath}: source '${source.id}' has invalid pool_max_connections. Must be an integer between 1 and 1000.`
+      );
+    }
+  }
   if (source.ssh_port !== void 0) {
     if (typeof source.ssh_port !== "number" || source.ssh_port <= 0 || source.ssh_port > 65535) {
       throw new Error(
@@ -1418,6 +1480,30 @@ function validateSourceConfig(source, configPath) {
       );
     }
   }
+  if (source.charset !== void 0) {
+    if (source.type !== "mysql" && source.type !== "mariadb") {
+      throw new Error(
+        `Configuration file ${configPath}: source '${source.id}' has 'charset' but it is only supported for MySQL and MariaDB sources.`
+      );
+    }
+    if (typeof source.charset !== "string" || source.charset.trim() === "") {
+      throw new Error(
+        `Configuration file ${configPath}: source '${source.id}' has invalid charset '${source.charset}'. Must be a non-empty string naming a character set (e.g. "utf8mb4").`
+      );
+    }
+  }
+  if (source.collation !== void 0) {
+    if (source.type !== "mysql" && source.type !== "mariadb") {
+      throw new Error(
+        `Configuration file ${configPath}: source '${source.id}' has 'collation' but it is only supported for MySQL and MariaDB sources.`
+      );
+    }
+    if (typeof source.collation !== "string" || source.collation.trim() === "") {
+      throw new Error(
+        `Configuration file ${configPath}: source '${source.id}' has invalid collation '${source.collation}'. Must be a non-empty string naming a collation (e.g. "utf8mb4_0900_ai_ci").`
+      );
+    }
+  }
   if (source.readonly !== void 0) {
     throw new Error(
       `Configuration file ${configPath}: source '${source.id}' has 'readonly' field, but readonly must be configured per-tool, not per-source. Move 'readonly' to [[tools]] configuration instead.`
@@ -1429,6 +1515,20 @@ function validateSourceConfig(source, configPath) {
     );
   }
 }
+function resolveSqliteDatabasePath(database, configPath) {
+  if (database === ":memory:") {
+    return database;
+  }
+  const expanded = expandHomeDir(database);
+  const absolute = path2.isAbsolute(expanded) ? expanded : path2.resolve(path2.dirname(configPath), expanded);
+  return absolute.replace(/\\/g, "/");
+}
+function buildSqliteDSN(database) {
+  if (database === ":memory:") {
+    return "sqlite:///:memory:";
+  }
+  return `sqlite://${database.startsWith("/") ? database : `/${database}`}`;
+}
 function processSourceConfigs(sources, configPath) {
   return sources.map((source) => {
     const processed = { ...source };
@@ -1439,7 +1539,7 @@ function processSourceConfigs(sources, configPath) {
       processed.sslrootcert = expandHomeDir(processed.sslrootcert);
     }
     if (processed.type === "sqlite" && processed.database) {
-      processed.database = expandHomeDir(processed.database);
+      processed.database = resolveSqliteDatabasePath(processed.database, configPath);
     }
     if (processed.dsn && processed.dsn.startsWith("sqlite:///~")) {
       processed.dsn = `sqlite:///${expandHomeDir(processed.dsn.substring(11))}`;
@@ -1562,7 +1662,7 @@ function buildDSNFromSource(source) {
         `Source '${source.id}': 'database' field is required for SQLite`
       );
     }
-    return `sqlite:///${source.database}`;
+    return buildSqliteDSN(source.database);
   }
   const isAwsIamPasswordless = source.aws_iam_auth === true && ["postgres", "mysql", "mariadb"].includes(source.type);
   const passwordRequired = source.authentication !== "azure-active-directory-access-token" && !isAwsIamPasswordless;
@@ -1622,12 +1722,17 @@ async function generateRdsAuthToken(params) {
     }
     throw error;
   }
-  const signer = new Signer({
+  const signerConfig = {
     hostname: params.hostname,
     port: params.port,
     username: params.username,
     region: params.region
-  });
+  };
+  if (params.profile) {
+    const { fromIni } = await import("@aws-sdk/credential-providers");
+    signerConfig.credentials = fromIni({ profile: params.profile });
+  }
+  const signer = new Signer(signerConfig);
   return signer.getAuthToken();
 }
 
@@ -1646,9 +1751,10 @@ var AUTH_CODES = {
   mysql: ["ER_ACCESS_DENIED_ERROR", 1045, 1698],
   mariadb: ["ER_ACCESS_DENIED_ERROR", 1045, 1698],
   sqlserver: ["ELOGIN"],
-  sqlite: [],
+  dameng: [-2501],
+  // Invalid username or password
+  sqlite: []
   // no network/auth layer
-  dameng: [-2501, -2504, "ELOGIN"]
 };
 function unreachableMessage(sourceId) {
   return `Source '${sourceId}' is unreachable. Verify the database is running and reachable (host, port, network), then retry.`;
@@ -1747,7 +1853,7 @@ var ConnectorManager = class {
     if (!lazySource) {
       if (sourceId) {
         throw new Error(
-          `Source '${sourceId}' not found. Available sources: ${this.sourceIds.join(", ")}`
+          `Source '${sourceId}' not found. Available sources: ${this.getAvailableSourceIds().join(", ")}`
         );
       } else {
         throw new Error("No sources configured. Call connectWithSources() first.");
@@ -1786,6 +1892,7 @@ var ConnectorManager = class {
     const dsn = await this.buildConnectionDSN(source);
     console.error(`  - ${sourceId}: ${redactDSN(dsn)}`);
     let actualDSN = dsn;
+    let tunnel;
     if (source.ssh_host) {
       const sshConfigPath = getDefaultSSHConfigPath();
       let resolvedSSHConfig = null;
@@ -1829,7 +1936,7 @@ var ConnectorManager = class {
       const url = new URL(dsn);
       const targetHost = url.hostname;
       const targetPort = parseInt(url.port) || this.getDefaultPort(dsn);
-      const tunnel = new SSHTunnel();
+      tunnel = new SSHTunnel();
       let tunnelInfo;
       try {
         tunnelInfo = await tunnel.establish(sshConfig, {
@@ -1865,13 +1972,34 @@ var ConnectorManager = class {
     if (source.query_timeout !== void 0 && connector.id !== "sqlite") {
       config.queryTimeoutSeconds = source.query_timeout;
     }
+    if (source.pool_max_connections !== void 0) {
+      config.poolMaxConnections = source.pool_max_connections;
+    }
     if (source.search_path) {
       config.searchPath = source.search_path;
     }
     if (source.timezone) {
       config.timezone = source.timezone;
     }
-    await connector.connect(actualDSN, source.init_script, config);
+    if (source.charset) {
+      config.charset = source.charset;
+    }
+    if (source.collation) {
+      config.collation = source.collation;
+    }
+    try {
+      await connector.connect(actualDSN, source.init_script, config);
+    } catch (error) {
+      if (tunnel) {
+        this.sshTunnels.delete(sourceId);
+        try {
+          await tunnel.close();
+        } catch (closeError) {
+          console.error(`Error closing SSH tunnel for source '${sourceId}':`, closeError);
+        }
+      }
+      throw error;
+    }
     this.connectors.set(sourceId, connector);
     if (!this.sourceIds.includes(sourceId)) {
       this.sourceIds.push(sourceId);
@@ -1921,7 +2049,7 @@ var ConnectorManager = class {
     if (!connector) {
       if (sourceId) {
         throw new Error(
-          `Source '${sourceId}' not found. Available sources: ${this.sourceIds.join(", ")}`
+          `Source '${sourceId}' not found. Available sources: ${this.getAvailableSourceIds().join(", ")}`
         );
       } else {
         throw new Error("No sources connected. Call connectWithSources() first.");
@@ -1958,6 +2086,14 @@ var ConnectorManager = class {
   getSourceIds() {
     return [...this.sourceIds];
   }
+  /**
+   * Source IDs that can actually serve a request: connected, or registered for
+   * lazy (re)connection on first use. Used for error messages so a source that
+   * is neither is not reported as available.
+   */
+  getAvailableSourceIds() {
+    return this.sourceIds.filter((id) => this.connectors.has(id) || this.lazySources.has(id));
+  }
   /** Get all available source IDs */
   static getAvailableSourceIds() {
     if (!managerInstance) {
@@ -2035,7 +2171,7 @@ var ConnectorManager = class {
           error
         );
       } finally {
-        if (!this.isDisconnecting && this.sourceConfigs.has(sourceId)) {
+        if (!this.isDisconnecting && this.connectors.has(sourceId)) {
           this.scheduleIamRefresh(source);
         }
       }
@@ -2062,7 +2198,14 @@ var ConnectorManager = class {
     if (this.isDisconnecting) {
       return;
     }
-    await this.connectSource(source);
+    try {
+      await this.connectSource(source);
+    } catch (error) {
+      if (!this.isDisconnecting && this.sourceConfigs.has(sourceId)) {
+        this.lazySources.set(sourceId, source);
+      }
+      throw error;
+    }
   }
   /**
    * Build a connection DSN, optionally replacing password with
@@ -2098,7 +2241,8 @@ var ConnectorManager = class {
       hostname,
       port,
       username,
-      region: source.aws_region
+      region: source.aws_region,
+      profile: source.aws_profile
     });
     const queryParams = new Map(parsed.searchParams);
     const currentSslMode = queryParams.get("sslmode");
@@ -2118,6 +2262,8 @@ var ConnectorManager = class {
 
 // src/utils/parameter-mapper.ts
 var PARAMETER_STYLES = {
+  dameng: "positional",
+  // ?, ?, ? (native dmdb binds)
   postgres: "numbered",
   // $1, $2, $3
   mysql: "positional",
@@ -2126,10 +2272,8 @@ var PARAMETER_STYLES = {
   // ?, ?, ?
   sqlserver: "named",
   // @p1, @p2, @p3
-  sqlite: "positional",
+  sqlite: "positional"
   // ?, ?, ?
-  dameng: "positional"
-  // ?, ?, ? (translated to :1, :2, :3 by the connector)
 };
 function detectParameterStyle(statement) {
   const cleanedSQL = stripCommentsAndStrings(statement);
@@ -2242,7 +2386,7 @@ var ToolRegistry = class {
    * Check if a tool name is a built-in tool
    */
   isBuiltinTool(toolName) {
-    return BUILTIN_TOOLS.includes(toolName);
+    return ALL_BUILTIN_TOOL_NAMES.includes(toolName);
   }
   /**
    * Validate a custom tool parameter definition
@@ -2314,10 +2458,10 @@ var ToolRegistry = class {
         `Tool '${toolConfig.name}' references unknown source '${toolConfig.source}'. Available sources: ${availableSources.join(", ")}`
       );
     }
-    for (const builtinName of BUILTIN_TOOLS) {
+    for (const builtinName of ALL_BUILTIN_TOOL_NAMES) {
       if (toolConfig.name === builtinName || toolConfig.name.startsWith(`${builtinName}_`)) {
         throw new Error(
-          `Tool name '${toolConfig.name}' conflicts with built-in tool naming pattern. Custom tools cannot use names starting with: ${BUILTIN_TOOLS.join(", ")}`
+          `Tool name '${toolConfig.name}' conflicts with built-in tool naming pattern. Custom tools cannot use names starting with: ${ALL_BUILTIN_TOOL_NAMES.join(", ")}`
         );
       }
     }
@@ -2449,9 +2593,12 @@ export {
   resolvePort,
   resolveHost,
   resolveAllowedHosts,
+  resolveAuthTokens,
   resolveSourceConfigs,
   BUILTIN_TOOL_EXECUTE_SQL,
   BUILTIN_TOOL_SEARCH_OBJECTS,
+  BUILTIN_TOOL_EXPLAIN_SQL,
+  BUILTIN_TOOL_HEALTH_CHECK,
   loadTomlConfig,
   resolveTomlConfigPath,
   classifyConnectionError,

package/dist/{chunk-IPK7BYBL.js → chunk-JFWX35TB.js}

@@ -9,7 +9,6 @@ function quoteIdentifier(identifier, dbType) {
   switch (dbType) {
     case "postgres":
     case "sqlite":
-    case "dameng":
       return `"${identifier.replace(/"/g, '""')}"`;
     case "mysql":
     case "mariadb":