@bytebase/dbhub 0.18.0 → 0.19.0

package/dist/{chunk-WCXOWHL3.js → chunk-LUNM7TUY.js}

@@ -70,6 +70,9 @@ import { readFileSync, realpathSync, statSync } from "fs";
 import { homedir } from "os";
 import { join } from "path";
 import SSHConfig from "ssh-config";
+function getDefaultSSHConfigPath() {
+  return join(homedir(), ".ssh", "config");
+}
 var DEFAULT_SSH_KEYS = [
   "~/.ssh/id_rsa",
   "~/.ssh/id_ed25519",
@@ -503,7 +506,7 @@ var SSHTunnel = class {
 // src/config/toml-loader.ts
 import fs2 from "fs";
 import path2 from "path";
-import { homedir as homedir3 } from "os";
+import { homedir as homedir2 } from "os";
 import toml from "@iarna/toml";
 
 // src/config/env.ts
@@ -511,7 +514,6 @@ import dotenv from "dotenv";
 import path from "path";
 import fs from "fs";
 import { fileURLToPath } from "url";
-import { homedir as homedir2 } from "os";
 
 // src/utils/safe-url.ts
 var SafeURL = class {
@@ -970,7 +972,7 @@ function resolveSSHConfig() {
     sources.push("SSH_HOST from environment");
   }
   if (sshConfigHost && looksLikeSSHAlias(sshConfigHost)) {
-    const sshConfigPath = path.join(homedir2(), ".ssh", "config");
+    const sshConfigPath = getDefaultSSHConfigPath();
     console.error(`Attempting to parse SSH config for host '${sshConfigHost}' from: ${sshConfigPath}`);
     const sshConfigData = parseSSHConfig(sshConfigHost, sshConfigPath);
     if (sshConfigData) {
@@ -1150,7 +1152,8 @@ function loadTomlConfig() {
   }
   try {
     const fileContent = fs2.readFileSync(configPath, "utf-8");
-    const parsedToml = toml.parse(fileContent);
+    const rawToml = toml.parse(fileContent);
+    const parsedToml = interpolateEnvVars(rawToml);
     if (!Array.isArray(parsedToml.sources)) {
       throw new Error(
         `Configuration file ${configPath}: must contain a [[sources]] array. Use [[sources]] syntax for array of tables in TOML.`
@@ -1460,9 +1463,29 @@ function processSourceConfigs(sources, configPath) {
     return processed;
   });
 }
+var ENV_VAR_PATTERN = /\$\{([^}]+)\}/g;
+function interpolateEnvVars(value) {
+  if (typeof value === "string") {
+    return value.replace(ENV_VAR_PATTERN, (match, varName) => {
+      const envValue = process.env[varName];
+      return envValue !== void 0 ? envValue : match;
+    });
+  }
+  if (Array.isArray(value)) {
+    return value.map((item) => interpolateEnvVars(item));
+  }
+  if (value !== null && typeof value === "object" && Object.getPrototypeOf(value) === Object.prototype) {
+    const result = {};
+    for (const [key, val] of Object.entries(value)) {
+      result[key] = interpolateEnvVars(val);
+    }
+    return result;
+  }
+  return value;
+}
 function expandHomeDir(filePath) {
   if (filePath.startsWith("~/")) {
-    return path2.join(homedir3(), filePath.substring(2));
+    return path2.join(homedir2(), filePath.substring(2));
   }
   return filePath;
 }
@@ -1644,25 +1667,32 @@ var ConnectorManager = class {
     console.error(`  - ${sourceId}: ${redactDSN(dsn)}`);
     let actualDSN = dsn;
     if (source.ssh_host) {
-      if (!source.ssh_user) {
-        throw new Error(
-          `Source '${sourceId}': SSH tunnel requires ssh_user`
-        );
+      let resolvedSSHConfig = null;
+      if (looksLikeSSHAlias(source.ssh_host)) {
+        const sshConfigPath = getDefaultSSHConfigPath();
+        console.error(`  Resolving SSH config for host '${source.ssh_host}' from: ${sshConfigPath}`);
+        resolvedSSHConfig = parseSSHConfig(source.ssh_host, sshConfigPath);
       }
+      const username = source.ssh_user || resolvedSSHConfig?.username;
       const sshConfig = {
-        host: source.ssh_host,
-        port: source.ssh_port || 22,
-        username: source.ssh_user,
+        host: resolvedSSHConfig?.host || source.ssh_host,
+        port: source.ssh_port || resolvedSSHConfig?.port || 22,
+        username: username || "",
         password: source.ssh_password,
-        privateKey: source.ssh_key,
+        privateKey: source.ssh_key || resolvedSSHConfig?.privateKey,
         passphrase: source.ssh_passphrase,
-        proxyJump: source.ssh_proxy_jump,
+        proxyJump: source.ssh_proxy_jump || resolvedSSHConfig?.proxyJump,
         keepaliveInterval: source.ssh_keepalive_interval,
         keepaliveCountMax: source.ssh_keepalive_count_max
       };
+      if (!username) {
+        throw new Error(
+          `Source '${sourceId}': SSH tunnel requires ssh_user (or a matching Host entry in ~/.ssh/config with User)`
+        );
+      }
       if (!sshConfig.password && !sshConfig.privateKey) {
         throw new Error(
-          `Source '${sourceId}': SSH tunnel requires either ssh_password or ssh_key`
+          `Source '${sourceId}': SSH tunnel requires either ssh_password or ssh_key (or a matching Host entry in ~/.ssh/config with IdentityFile)`
         );
       }
       const url = new URL(dsn);

package/dist/index.js

@@ -20,7 +20,7 @@ import {
   resolveTransport,
   splitSQLStatements,
   stripCommentsAndStrings
-} from "./chunk-WCXOWHL3.js";
+} from "./chunk-LUNM7TUY.js";
 
 // src/connectors/postgres/index.ts
 import pg from "pg";
@@ -3697,7 +3697,7 @@ See documentation for more details on configuring database connections.
     const sources = sourceConfigsData.sources;
     console.error(`Configuration source: ${sourceConfigsData.source}`);
     await connectorManager.connectWithSources(sources);
-    const { initializeToolRegistry: initializeToolRegistry2 } = await import("./registry-NTKAVQCA.js");
+    const { initializeToolRegistry: initializeToolRegistry2 } = await import("./registry-6VNMKD6G.js");
     initializeToolRegistry2({
       sources: sourceConfigsData.sources,
       tools: sourceConfigsData.tools

package/dist/{registry-NTKAVQCA.js → registry-6VNMKD6G.js}

@@ -2,7 +2,7 @@ import {
   ToolRegistry,
   getToolRegistry,
   initializeToolRegistry
-} from "./chunk-WCXOWHL3.js";
+} from "./chunk-LUNM7TUY.js";
 export {
   ToolRegistry,
   getToolRegistry,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytebase/dbhub",
-  "version": "0.18.0",
+  "version": "0.19.0",
   "mcpName": "io.github.bytebase/dbhub",
   "description": "Minimal, token-efficient Database MCP Server for PostgreSQL, MySQL, SQL Server, SQLite, MariaDB",
   "repository": {