@bytebase/dbhub 0.22.3 → 0.22.4

package/dist/{chunk-MEBWJMLY.js → chunk-DN45LGY4.js}

@@ -1094,6 +1094,92 @@ function validateToolsConfig(tools, sources, configPath) {
     }
   }
 }
+function getRawDSNQueryParam(dsn, key) {
+  const queryStart = dsn.indexOf("?");
+  if (queryStart === -1) {
+    return null;
+  }
+  for (const pair of dsn.substring(queryStart + 1).split("&")) {
+    if (pair === "") {
+      continue;
+    }
+    const eq = pair.indexOf("=");
+    const rawKey = eq === -1 ? pair : pair.substring(0, eq);
+    if (rawKey === key) {
+      const rawValue = eq === -1 ? "" : pair.substring(eq + 1);
+      try {
+        return decodeURIComponent(rawValue);
+      } catch {
+        return rawValue;
+      }
+    }
+  }
+  return null;
+}
+function validateDSNFieldConflicts(source, configPath) {
+  const conflict = (field, fieldValue, dsnValue) => {
+    throw new Error(
+      `Configuration file ${configPath}: source '${source.id}' has conflicting ${field}: the DSN specifies '${dsnValue}' but the ${field} field is '${fieldValue}'. Set ${field} in only one place, or make the two values match.`
+    );
+  };
+  const info = parseConnectionInfoFromDSN(source.dsn);
+  if (source.type && info?.type && source.type !== info.type) {
+    conflict("type", source.type, info.type);
+  }
+  if (info?.type === "sqlite") {
+    return;
+  }
+  let url;
+  try {
+    url = new SafeURL(source.dsn);
+  } catch {
+    return;
+  }
+  if (info) {
+    if (source.host && info.host && source.host.toLowerCase() !== info.host.toLowerCase()) {
+      conflict("host", source.host, info.host);
+    }
+    if (source.port !== void 0 && info.port !== void 0 && source.port !== info.port) {
+      conflict("port", String(source.port), String(info.port));
+    }
+    if (source.database && info.database && source.database !== info.database) {
+      conflict("database", source.database, info.database);
+    }
+    if (source.user && info.user && source.user !== info.user) {
+      conflict("user", source.user, info.user);
+    }
+  }
+  if (source.password && source.password !== url.password) {
+    if (!url.password) {
+      throw new Error(
+        `Configuration file ${configPath}: source '${source.id}' has a 'password' field but the DSN has no password. The field is ignored at connection time \u2014 add the password to the DSN, or use individual connection parameters instead of a DSN.`
+      );
+    }
+    throw new Error(
+      `Configuration file ${configPath}: source '${source.id}' has a 'password' field that conflicts with the password in the DSN. Set the password in only one place.`
+    );
+  }
+  const dsnSslmode = getRawDSNQueryParam(source.dsn, "sslmode");
+  if (source.sslmode && dsnSslmode !== null && dsnSslmode !== source.sslmode) {
+    conflict("sslmode", source.sslmode, dsnSslmode);
+  }
+  const dsnSslrootcert = getRawDSNQueryParam(source.dsn, "sslrootcert");
+  if (source.sslrootcert && dsnSslrootcert !== null && expandHomeDir(source.sslrootcert) !== expandHomeDir(dsnSslrootcert)) {
+    conflict("sslrootcert", expandHomeDir(source.sslrootcert), expandHomeDir(dsnSslrootcert));
+  }
+  const dsnInstanceName = getRawDSNQueryParam(source.dsn, "instanceName");
+  if (source.instanceName && dsnInstanceName !== null && dsnInstanceName !== source.instanceName) {
+    conflict("instanceName", source.instanceName, dsnInstanceName);
+  }
+  const dsnAuthentication = getRawDSNQueryParam(source.dsn, "authentication");
+  if (source.authentication && dsnAuthentication !== null && dsnAuthentication !== source.authentication) {
+    conflict("authentication", source.authentication, dsnAuthentication);
+  }
+  const dsnDomain = getRawDSNQueryParam(source.dsn, "domain");
+  if (source.domain && dsnDomain !== null && dsnDomain !== source.domain) {
+    conflict("domain", source.domain, dsnDomain);
+  }
+}
 function validateSourceConfig(source, configPath) {
   const hasConnectionParams = source.type && (source.type === "sqlite" ? source.database : source.host);
   if (!source.dsn && !hasConnectionParams) {
@@ -1176,6 +1262,9 @@ function validateSourceConfig(source, configPath) {
       );
     }
   }
+  if (source.dsn) {
+    validateDSNFieldConflicts(source, configPath);
+  }
   if (source.sslrootcert !== void 0) {
     if (source.sslmode !== "verify-ca" && source.sslmode !== "verify-full") {
       throw new Error(
@@ -1350,9 +1439,51 @@ function expandHomeDir(filePath) {
   }
   return filePath;
 }
+function mergeSourceFieldsIntoDSN(dsn, source) {
+  if (source.type === "sqlite") {
+    return dsn;
+  }
+  try {
+    new SafeURL(dsn);
+  } catch {
+    return dsn;
+  }
+  const hasParam = (key) => getRawDSNQueryParam(dsn, key) !== null;
+  const additions = [];
+  if (source.type === "sqlserver") {
+    if (source.instanceName && !hasParam("instanceName")) {
+      additions.push(`instanceName=${encodeURIComponent(source.instanceName)}`);
+    }
+    if (source.authentication && !hasParam("authentication")) {
+      additions.push(`authentication=${encodeURIComponent(source.authentication)}`);
+    }
+    if (source.domain && !hasParam("domain")) {
+      additions.push(`domain=${encodeURIComponent(source.domain)}`);
+    }
+  }
+  if (source.sslmode && !hasParam("sslmode")) {
+    additions.push(`sslmode=${source.sslmode}`);
+  }
+  if (source.sslrootcert && source.type === "postgres" && (source.sslmode === "verify-ca" || source.sslmode === "verify-full") && !hasParam("sslrootcert")) {
+    const expandedCertPath = expandHomeDir(source.sslrootcert);
+    additions.push(`sslrootcert=${encodeURIComponent(expandedCertPath)}`);
+  }
+  if (additions.length === 0) {
+    return dsn;
+  }
+  let separator;
+  if (!dsn.includes("?")) {
+    separator = "?";
+  } else if (dsn.endsWith("?") || dsn.endsWith("&")) {
+    separator = "";
+  } else {
+    separator = "&";
+  }
+  return `${dsn}${separator}${additions.join("&")}`;
+}
 function buildDSNFromSource(source) {
   if (source.dsn) {
-    return source.dsn;
+    return mergeSourceFieldsIntoDSN(source.dsn, source);
   }
   if (!source.type) {
     throw new Error(
@@ -1434,6 +1565,53 @@ async function generateRdsAuthToken(params) {
   return signer.getAuthToken();
 }
 
+// src/utils/error-classifier.ts
+var TUNNEL_ERROR_MARKER = "__dbhubSSHTunnelError";
+var NETWORK_CODES = /* @__PURE__ */ new Set([
+  "ECONNREFUSED",
+  "ETIMEDOUT",
+  "ENOTFOUND",
+  "EHOSTUNREACH",
+  "ENETUNREACH",
+  "ECONNRESET"
+]);
+var AUTH_CODES = {
+  postgres: ["28P01", "28000"],
+  mysql: ["ER_ACCESS_DENIED_ERROR", 1045, 1698],
+  mariadb: ["ER_ACCESS_DENIED_ERROR", 1045, 1698],
+  sqlserver: ["ELOGIN"],
+  sqlite: []
+  // no network/auth layer
+};
+function unreachableMessage(sourceId) {
+  return `Source '${sourceId}' is unreachable. Verify the database is running and reachable (host, port, network), then retry.`;
+}
+function authMessage(sourceId) {
+  return `Authentication failed for source '${sourceId}'. Verify the credentials/access for this source are valid, then retry.`;
+}
+function tunnelMessage(sourceId) {
+  return `SSH tunnel for source '${sourceId}' failed to establish. Verify SSH host/credentials and bastion reachability, then retry.`;
+}
+function classifyConnectionError(error, connectorType, sourceId) {
+  if (!error || typeof error !== "object") {
+    return null;
+  }
+  const err = error;
+  if (err[TUNNEL_ERROR_MARKER] === true) {
+    return { code: "TUNNEL_FAILED", message: tunnelMessage(sourceId) };
+  }
+  const code = err.code;
+  if (typeof code === "string" && NETWORK_CODES.has(code)) {
+    return { code: "SOURCE_UNREACHABLE", message: unreachableMessage(sourceId) };
+  }
+  const authCodes = AUTH_CODES[connectorType];
+  const errno = err.errno;
+  if (typeof code === "string" && authCodes.includes(code) || typeof errno === "number" && authCodes.includes(errno)) {
+    return { code: "AUTH_FAILED", message: authMessage(sourceId) };
+  }
+  return null;
+}
+
 // src/connectors/manager.ts
 var managerInstance = null;
 var AWS_IAM_TOKEN_REFRESH_MS = 14 * 60 * 1e3;
@@ -1574,10 +1752,18 @@ var ConnectorManager = class {
       const targetHost = url.hostname;
       const targetPort = parseInt(url.port) || this.getDefaultPort(dsn);
       const tunnel = new SSHTunnel();
-      const tunnelInfo = await tunnel.establish(sshConfig, {
-        targetHost,
-        targetPort
-      });
+      let tunnelInfo;
+      try {
+        tunnelInfo = await tunnel.establish(sshConfig, {
+          targetHost,
+          targetPort
+        });
+      } catch (error) {
+        if (error && typeof error === "object") {
+          error[TUNNEL_ERROR_MARKER] = true;
+        }
+        throw error;
+      }
       url.hostname = "127.0.0.1";
       url.port = tunnelInfo.localPort.toString();
       actualDSN = url.toString();
@@ -2190,6 +2376,7 @@ export {
   BUILTIN_TOOL_SEARCH_OBJECTS,
   loadTomlConfig,
   resolveTomlConfigPath,
+  classifyConnectionError,
   ConnectorManager,
   mapArgumentsToArray,
   ToolRegistry,

package/dist/index.js

@@ -3,6 +3,7 @@ import {
   BUILTIN_TOOL_EXECUTE_SQL,
   BUILTIN_TOOL_SEARCH_OBJECTS,
   ConnectorManager,
+  classifyConnectionError,
   getToolRegistry,
   initializeToolRegistry,
   isDemoMode,
@@ -13,7 +14,7 @@ import {
   resolveSourceConfigs,
   resolveTomlConfigPath,
   resolveTransport
-} from "./chunk-MEBWJMLY.js";
+} from "./chunk-DN45LGY4.js";
 import {
   loadConnectors
 } from "./chunk-WVVMH6FJ.js";
@@ -248,6 +249,20 @@ function trackToolRequest(metadata, startTime, extra, success, error) {
     error
   });
 }
+function tryClassifyConnectionError(error, rawSourceId, displaySourceId) {
+  let connectorType;
+  try {
+    connectorType = ConnectorManager.getSourceConfig(rawSourceId)?.type;
+  } catch {
+    return null;
+  }
+  if (!connectorType) return null;
+  const classified = classifyConnectionError(error, connectorType, displaySourceId);
+  if (!classified) return null;
+  return createToolErrorResponse(classified.message, classified.code, {
+    source_id: displaySourceId
+  });
+}
 
 // src/tools/execute-sql.ts
 var executeSqlSchema = {
@@ -292,6 +307,8 @@ function createExecuteSqlToolHandler(sourceId) {
     } catch (error) {
       success = false;
       errorMessage = error.message;
+      const classified = tryClassifyConnectionError(error, sourceId, effectiveSourceId);
+      if (classified) return classified;
       return createToolErrorResponse(errorMessage, "EXECUTION_ERROR");
     } finally {
       trackToolRequest(
@@ -313,11 +330,11 @@ function createExecuteSqlToolHandler(sourceId) {
 import { z as z2 } from "zod";
 var searchDatabaseObjectsSchema = {
   object_type: z2.enum(["schema", "table", "view", "column", "procedure", "function", "index"]).describe("Object type to search"),
-  pattern: z2.string().optional().default("%").describe("LIKE pattern (% = any chars, _ = one char). Default: %"),
+  pattern: z2.string().optional().default("%").describe("LIKE pattern (% = any chars, _ = one char)"),
   schema: z2.string().optional().describe("Filter to schema"),
   table: z2.string().optional().describe("Filter to table (requires schema; column/index only)"),
   detail_level: z2.enum(["names", "summary", "full"]).default("names").describe("Detail: names (minimal), summary (metadata), full (all)"),
-  limit: z2.number().int().positive().max(1e3).default(100).describe("Max results (default: 100, max: 1000)")
+  limit: z2.number().int().positive().max(1e3).default(100).describe("Max results")
 };
 function likePatternToRegex(pattern) {
   const escaped = pattern.replace(/[.*+?^${}()|[\]\\]/g, "\\$&").replace(/%/g, ".*").replace(/_/g, ".");
@@ -771,6 +788,8 @@ function createSearchDatabaseObjectsToolHandler(sourceId) {
     } catch (error) {
       success = false;
       errorMessage = error.message;
+      const classified = tryClassifyConnectionError(error, sourceId, effectiveSourceId);
+      if (classified) return classified;
       return createToolErrorResponse(
         `Error searching database objects: ${errorMessage}`,
         "SEARCH_ERROR"
@@ -875,7 +894,7 @@ function getSearchObjectsMetadata(sourceId) {
   const toolName = isSingleSource ? "search_objects" : `search_objects_${normalizeSourceId(sourceId)}`;
   const title = isSingleSource ? `Search Database Objects (${dbType})` : `Search Database Objects on ${sourceId} (${dbType})`;
   const userDescPrefix = buildSourceDescriptionPrefix(sourceConfig.description);
-  const description = isSingleSource ? `${userDescPrefix}Search and list database objects (schemas, tables, columns, procedures, functions, indexes) on the ${dbType} database` : `${userDescPrefix}Search and list database objects (schemas, tables, columns, procedures, functions, indexes) on the '${sourceId}' ${dbType} database`;
+  const description = isSingleSource ? `${userDescPrefix}Search and list database objects on the ${dbType} database` : `${userDescPrefix}Search and list database objects on the '${sourceId}' ${dbType} database`;
   return {
     name: toolName,
     description,
@@ -916,7 +935,7 @@ function buildSearchObjectsTool(sourceId) {
         name: "object_type",
         type: "string",
         required: true,
-        description: "Object type to search"
+        description: "Object type to search: schema, table, view, column, procedure, function, index"
       },
       {
         name: "pattern",
@@ -1064,6 +1083,8 @@ function createCustomToolHandler(toolConfig) {
     } catch (error) {
       success = false;
       errorMessage = error.message;
+      const classified = tryClassifyConnectionError(error, toolConfig.source, toolConfig.source);
+      if (classified) return classified;
       if (error instanceof z4.ZodError) {
         const issues = error.issues.map((i) => `${i.path.join(".")}: ${i.message}`).join("; ");
         errorMessage = `Parameter validation failed: ${issues}`;
@@ -1557,7 +1578,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-FZPB5LRL.js");
+    const { initializeToolRegistry: initializeToolRegistry2 } = await import("./registry-OF5GPCBK.js");
     initializeToolRegistry2({
       sources: sourceConfigsData.sources,
       tools: sourceConfigsData.tools

package/dist/{registry-FZPB5LRL.js → registry-OF5GPCBK.js}

@@ -2,7 +2,7 @@ import {
   ToolRegistry,
   getToolRegistry,
   initializeToolRegistry
-} from "./chunk-MEBWJMLY.js";
+} from "./chunk-DN45LGY4.js";
 import "./chunk-WVVMH6FJ.js";
 import "./chunk-C7WEAPX4.js";
 export {

package/package.json

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