@zz1996/dbhub-dameng 0.1.1 → 0.1.3

package/dbhub.dameng.toml.example

@@ -5,6 +5,7 @@
 id = "dm8_dev"
 description = "Dameng DM8 development database. Read-only access for agent schema discovery and SQL queries."
 dsn = "dameng://${DM8_USER}:${DM8_PASSWORD}@${DM8_HOST}:5236/${DM8_SCHEMA}"
+connection_timeout = 5
 query_timeout = 30
 lazy = true
 

package/dist/{dameng-DC7OP4VV.js → dameng-JYMTC4HE.js}

@@ -23,22 +23,30 @@ Expected: ${expectedFormat}`
       const url = new SafeURL(dsn);
       const schema = url.pathname ? decodeURIComponent(url.pathname.substring(1)) : void 0;
       const port = url.port ? parseInt(url.port, 10) : 5236;
-      const queryParams = [];
+      const queryParams = {};
+      const queryStringParts = [];
       url.forEachSearchParam((value, key) => {
-        queryParams.push(`${encodeURIComponent(key)}=${encodeURIComponent(value)}`);
+        queryParams[key] = value;
+        queryStringParts.push(`${encodeURIComponent(key)}=${encodeURIComponent(value)}`);
       });
-      const connectString = `dm://${encodeURIComponent(url.username)}:${encodeURIComponent(url.password)}@${url.hostname}:${port}${queryParams.length > 0 ? `?${queryParams.join("&")}` : ""}`;
       const connectionConfig = {
-        connectString,
+        connectString: `dm://${encodeURIComponent(url.username)}:${encodeURIComponent(url.password)}@${url.hostname}:${port}${queryStringParts.length > 0 ? `?${queryStringParts.join("&")}` : ""}`,
+        directConnectString: `${url.hostname}:${port}`,
         user: url.username,
         password: url.password,
         schema: schema || void 0,
         poolMin: 0,
-        poolMax: 4
+        poolMax: 4,
+        ...queryParams
       };
       if (config?.connectionTimeoutSeconds !== void 0) {
+        connectionConfig.connectTimeout = config.connectionTimeoutSeconds * 1e3;
         connectionConfig.queueTimeout = config.connectionTimeoutSeconds * 1e3;
       }
+      if (config?.queryTimeoutSeconds !== void 0) {
+        connectionConfig.sessionTimeout = config.queryTimeoutSeconds;
+        connectionConfig.socketTimeout = config.queryTimeoutSeconds * 1e3 + 1e3;
+      }
       return connectionConfig;
     } catch (error) {
       throw new Error(
@@ -65,6 +73,7 @@ var DamengConnector = class _DamengConnector {
     this.pool = null;
     this.sourceId = "default";
     this.defaultSchema = null;
+    this.poolAlias = null;
   }
   getId() {
     return this.sourceId;
@@ -73,13 +82,16 @@ var DamengConnector = class _DamengConnector {
     return new _DamengConnector();
   }
   async connect(dsn, initScript, config) {
+    let createdPool = null;
     try {
       const connectionConfig = await this.dsnParser.parse(dsn, config);
+      connectionConfig.poolAlias = this.buildPoolAlias();
       this.defaultSchema = connectionConfig.schema ?? null;
-      if (config?.queryTimeoutSeconds !== void 0) {
-        this.queryTimeoutMs = config.queryTimeoutSeconds * 1e3;
-      }
-      this.pool = await dmdb.createPool(connectionConfig);
+      this.poolAlias = connectionConfig.poolAlias;
+      await this.closeRegisteredPool(connectionConfig.poolAlias);
+      await this.validateDirectConnection(connectionConfig);
+      createdPool = await dmdb.createPool(connectionConfig);
+      this.pool = createdPool;
       await this.withConnection(async (conn) => {
         await conn.execute("SELECT 1 AS OK", [], this.executeOptions());
         if (!this.defaultSchema) {
@@ -97,15 +109,26 @@ var DamengConnector = class _DamengConnector {
         }
       });
     } catch (error) {
+      if (createdPool) {
+        await this.closePoolQuietly(createdPool);
+      } else if (this.poolAlias) {
+        await this.closeRegisteredPool(this.poolAlias);
+      }
+      this.pool = null;
+      this.poolAlias = null;
       console.error("Failed to connect to Dameng database:", error);
       throw error;
     }
   }
   async disconnect() {
     if (this.pool) {
-      await this.pool.close(0);
+      await this.closePoolQuietly(this.pool);
       this.pool = null;
     }
+    if (this.poolAlias) {
+      await this.closeRegisteredPool(this.poolAlias);
+      this.poolAlias = null;
+    }
   }
   async getSchemas() {
     const rows = await this.queryRows(`
@@ -116,6 +139,17 @@ var DamengConnector = class _DamengConnector {
     `);
     return rows.map((row) => this.rowValue(row, "SCHEMA_NAME")).filter(this.isPresent);
   }
+  async schemaExists(schema) {
+    const rows = await this.queryRows(
+      `
+      SELECT COUNT(*) AS CNT
+      FROM ALL_USERS
+      WHERE USERNAME = :1
+      `,
+      [this.normalizeIdentifier(schema)]
+    );
+    return Number(this.rowValue(rows[0], "CNT") ?? 0) > 0;
+  }
   async getDefaultSchema() {
     return this.defaultSchema;
   }
@@ -132,6 +166,25 @@ var DamengConnector = class _DamengConnector {
     );
     return rows.map((row) => this.rowValue(row, "TABLE_NAME")).filter(this.isPresent);
   }
+  async searchTables(pattern, schema, limit = 100) {
+    const owner = await this.resolveSchema(schema);
+    const rowLimit = this.normalizeLimit(limit);
+    const rows = await this.queryRows(
+      `
+      SELECT TABLE_NAME
+      FROM (
+        SELECT TABLE_NAME
+        FROM ALL_TABLES
+        WHERE OWNER = :1
+          AND TABLE_NAME LIKE :2
+        ORDER BY TABLE_NAME
+      )
+      WHERE ROWNUM <= ${rowLimit}
+      `,
+      [owner, this.normalizeLikePattern(pattern)]
+    );
+    return rows.map((row) => this.rowValue(row, "TABLE_NAME")).filter(this.isPresent).map((name) => ({ name, schema: owner }));
+  }
   async getViews(schema) {
     const owner = await this.resolveSchema(schema);
     const rows = await this.queryRows(
@@ -362,10 +415,54 @@ var DamengConnector = class _DamengConnector {
   executeOptions(extra = {}) {
     return {
       outFormat: dmdb.OUT_FORMAT_OBJECT,
-      ...this.queryTimeoutMs !== void 0 && { queryTimeout: this.queryTimeoutMs },
       ...extra
     };
   }
+  async validateDirectConnection(config) {
+    let conn = null;
+    try {
+      const {
+        directConnectString,
+        poolAlias,
+        poolMin,
+        poolMax,
+        queueRequests,
+        queueTimeout,
+        ...directConfig
+      } = config;
+      const directConn = await dmdb.getConnection({
+        ...directConfig,
+        connectString: directConnectString ?? config.connectString
+      });
+      conn = directConn;
+      await conn.execute("SELECT 1 AS OK", [], this.executeOptions());
+    } finally {
+      if (conn) {
+        await conn.close();
+      }
+    }
+  }
+  buildPoolAlias() {
+    const safeSourceId = this.sourceId.replace(/[^a-zA-Z0-9_-]/g, "_") || "default";
+    return `dbhub_dameng_${safeSourceId}`;
+  }
+  async closeRegisteredPool(poolAlias) {
+    if (!dmdb.pools?.has?.(poolAlias)) {
+      return;
+    }
+    const pool = dmdb.pools.get(poolAlias);
+    await this.closePoolQuietly(pool);
+    dmdb.pools?.delete?.(poolAlias);
+  }
+  async closePoolQuietly(pool) {
+    try {
+      await pool.close(0);
+    } catch {
+      if (pool.poolAlias) {
+        dmdb.pools?.delete?.(pool.poolAlias);
+      }
+    }
+  }
   async resolveSchema(schema) {
     const resolved = schema || this.defaultSchema || await this.getDefaultSchema();
     if (!resolved) {
@@ -376,6 +473,12 @@ var DamengConnector = class _DamengConnector {
   normalizeIdentifier(identifier) {
     return /[a-z]/.test(identifier) ? identifier.toUpperCase() : identifier;
   }
+  normalizeLikePattern(pattern) {
+    return /[a-z]/.test(pattern) ? pattern.toUpperCase() : pattern;
+  }
+  normalizeLimit(limit) {
+    return Math.max(1, Math.min(1e3, Math.floor(limit)));
+  }
   normalizeRows(rows) {
     return rows.map((row) => {
       if (!Array.isArray(row)) {

package/dist/index.js

@@ -431,23 +431,25 @@ async function searchTables(connector, pattern, schemaFilter, detailLevel, limit
   for (const schemaName of schemasToSearch) {
     if (results.length >= limit) break;
     try {
-      const tables = await connector.getTables(schemaName);
-      const matched = tables.filter((table) => regex.test(table));
-      for (const tableName of matched) {
+      const searchableConnector = connector;
+      const matched = searchableConnector.searchTables ? await searchableConnector.searchTables(pattern, schemaName, limit - results.length) : (await connector.getTables(schemaName)).filter((table) => regex.test(table)).map((name) => ({ name, schema: schemaName }));
+      for (const tableMatch of matched) {
         if (results.length >= limit) break;
+        const tableName = tableMatch.name;
+        const matchedSchema = tableMatch.schema;
         if (detailLevel === "names") {
           results.push({
             name: tableName,
-            schema: schemaName
+            schema: matchedSchema
           });
         } else if (detailLevel === "summary") {
           try {
-            const columns = await connector.getTableSchema(tableName, schemaName);
-            const rowCount = await getTableRowCount(connector, tableName, schemaName);
-            const comment = await getTableComment(connector, tableName, schemaName);
+            const columns = await connector.getTableSchema(tableName, matchedSchema);
+            const rowCount = await getTableRowCount(connector, tableName, matchedSchema);
+            const comment = await getTableComment(connector, tableName, matchedSchema);
             results.push({
               name: tableName,
-              schema: schemaName,
+              schema: matchedSchema,
               column_count: columns.length,
               row_count: rowCount,
               ...comment ? { comment } : {}
@@ -455,20 +457,20 @@ async function searchTables(connector, pattern, schemaFilter, detailLevel, limit
           } catch (error) {
             results.push({
               name: tableName,
-              schema: schemaName,
+              schema: matchedSchema,
               column_count: null,
               row_count: null
             });
           }
         } else {
           try {
-            const columns = await connector.getTableSchema(tableName, schemaName);
-            const indexes = await connector.getTableIndexes(tableName, schemaName);
-            const rowCount = await getTableRowCount(connector, tableName, schemaName);
-            const comment = await getTableComment(connector, tableName, schemaName);
+            const columns = await connector.getTableSchema(tableName, matchedSchema);
+            const indexes = await connector.getTableIndexes(tableName, matchedSchema);
+            const rowCount = await getTableRowCount(connector, tableName, matchedSchema);
+            const comment = await getTableComment(connector, tableName, matchedSchema);
             results.push({
               name: tableName,
-              schema: schemaName,
+              schema: matchedSchema,
               column_count: columns.length,
               row_count: rowCount,
               ...comment ? { comment } : {},
@@ -489,7 +491,7 @@ async function searchTables(connector, pattern, schemaFilter, detailLevel, limit
           } catch (error) {
             results.push({
               name: tableName,
-              schema: schemaName,
+              schema: matchedSchema,
               error: `Unable to fetch full details: ${error.message}`
             });
           }
@@ -759,10 +761,10 @@ function createSearchDatabaseObjectsToolHandler(sourceId) {
         }
       }
       if (schema) {
-        const schemas = await connector.getSchemas();
-        if (!schemas.includes(schema)) {
+        const exists = connector.schemaExists ? await connector.schemaExists(schema) : (await connector.getSchemas()).includes(schema);
+        if (!exists) {
           success = false;
-          errorMessage = `Schema '${schema}' does not exist. Available schemas: ${schemas.join(", ")}`;
+          errorMessage = `Schema '${schema}' does not exist`;
           return createToolErrorResponse(errorMessage, "SCHEMA_NOT_FOUND");
         }
       }
@@ -1833,7 +1835,7 @@ var connectorModules = [
   { load: () => import("./sqlite-IOUAYHGE.js"), name: "SQLite", driver: "node:sqlite" },
   { load: () => import("./mysql-A43SL7UM.js"), name: "MySQL", driver: "mysql2" },
   { load: () => import("./mariadb-7F72IRB4.js"), name: "MariaDB", driver: "mariadb" },
-  { load: () => import("./dameng-DC7OP4VV.js"), name: "Dameng", driver: "dmdb" }
+  { load: () => import("./dameng-JYMTC4HE.js"), name: "Dameng", driver: "dmdb" }
 ];
 loadConnectors(connectorModules).then(() => main()).catch((error) => {
   console.error("Fatal error:", error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zz1996/dbhub-dameng",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "mcpName": "io.github.zuozh11/dbhub-dameng",
   "description": "Local fork of DBHub with Dameng/DM8 database connector support",
   "repository": {