@zz1996/dbhub-dameng 0.1.2 → 0.1.4

package/dist/{dameng-UJELBZ5R.js → dameng-SOGGZUEW.js}

@@ -8,6 +8,14 @@ import {
 
 // src/connectors/dameng/index.ts
 import dmdb from "dmdb";
+var DEFAULT_OPERATION_TIMEOUT_MS = 11e4;
+var RESOURCE_CLEANUP_TIMEOUT_MS = 2e3;
+var DamengOperationTimeoutError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "DamengOperationTimeoutError";
+  }
+};
 var DamengDSNParser = class {
   async parse(dsn, config) {
     if (!this.isValidDSN(dsn)) {
@@ -23,22 +31,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(
@@ -66,6 +82,10 @@ var DamengConnector = class _DamengConnector {
     this.sourceId = "default";
     this.defaultSchema = null;
     this.poolAlias = null;
+    this.connectionConfig = null;
+    this.connectionTimeoutMs = 5e3;
+    this.operationTimeoutMs = DEFAULT_OPERATION_TIMEOUT_MS;
+    this.reconnectingPool = null;
   }
   getId() {
     return this.sourceId;
@@ -80,18 +100,22 @@ var DamengConnector = class _DamengConnector {
       connectionConfig.poolAlias = this.buildPoolAlias();
       this.defaultSchema = connectionConfig.schema ?? null;
       this.poolAlias = connectionConfig.poolAlias;
-      this.queryTimeoutMs = void 0;
-      if (config?.queryTimeoutSeconds !== void 0) {
-        this.queryTimeoutMs = config.queryTimeoutSeconds * 1e3;
-      }
+      this.connectionTimeoutMs = config?.connectionTimeoutSeconds !== void 0 ? config.connectionTimeoutSeconds * 1e3 : 5e3;
+      this.operationTimeoutMs = config?.queryTimeoutSeconds !== void 0 ? config.queryTimeoutSeconds * 1e3 : DEFAULT_OPERATION_TIMEOUT_MS;
       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());
+        await this.executeWithTimeout(
+          conn,
+          "SELECT 1 AS OK",
+          [],
+          this.executeOptions()
+        );
         if (!this.defaultSchema) {
-          const result = await conn.execute(
+          const result = await this.executeWithTimeout(
+            conn,
             "SELECT USER AS SCHEMA_NAME FROM DUAL",
             [],
             this.executeOptions()
@@ -100,10 +124,17 @@ var DamengConnector = class _DamengConnector {
         }
         if (initScript) {
           for (const statement of splitSQLStatements(initScript, "dameng")) {
-            await conn.execute(statement, [], this.executeOptions({ autoCommit: true }));
+            await this.executeWithTimeout(
+              conn,
+              statement,
+              [],
+              this.executeOptions({ autoCommit: true })
+            );
           }
         }
       });
+      this.connectionConfig = connectionConfig;
+      this.initScript = initScript;
     } catch (error) {
       if (createdPool) {
         await this.closePoolQuietly(createdPool);
@@ -112,6 +143,8 @@ var DamengConnector = class _DamengConnector {
       }
       this.pool = null;
       this.poolAlias = null;
+      this.connectionConfig = null;
+      this.initScript = void 0;
       console.error("Failed to connect to Dameng database:", error);
       throw error;
     }
@@ -125,6 +158,9 @@ var DamengConnector = class _DamengConnector {
       await this.closeRegisteredPool(this.poolAlias);
       this.poolAlias = null;
     }
+    this.connectionConfig = null;
+    this.initScript = void 0;
+    this.reconnectingPool = null;
   }
   async getSchemas() {
     const rows = await this.queryRows(`
@@ -135,6 +171,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;
   }
@@ -151,6 +198,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(
@@ -345,7 +411,8 @@ var DamengConnector = class _DamengConnector {
           processedSQL,
           index === 0 ? parameters ?? [] : []
         );
-        const result = await conn.execute(
+        const result = await this.executeWithTimeout(
+          conn,
           boundSQL,
           this.toBindParams(bindValues),
           this.executeOptions({ autoCommit: true, maxRows: options.maxRows })
@@ -359,40 +426,167 @@ var DamengConnector = class _DamengConnector {
   }
   async queryRows(sql, bindValues = []) {
     return this.withConnection(async (conn) => {
-      const result = await conn.execute(sql, this.toBindParams(bindValues), this.executeOptions());
+      const result = await this.executeWithTimeout(
+        conn,
+        sql,
+        this.toBindParams(bindValues),
+        this.executeOptions()
+      );
       return this.normalizeRows(result.rows ?? []);
     });
   }
   async withConnection(fn) {
-    if (!this.pool) {
+    await this.ensurePool();
+    const pool = this.pool;
+    if (!pool) {
       throw new Error("Not connected to Dameng database");
     }
-    const conn = await this.pool.getConnection();
+    let conn = null;
+    let shouldRelease = true;
     try {
+      conn = await this.withTimeout(
+        pool.getConnection(),
+        this.connectionTimeoutMs,
+        "Dameng connection acquisition"
+      );
       return await fn(conn);
+    } catch (error) {
+      if (error instanceof DamengOperationTimeoutError) {
+        shouldRelease = false;
+        this.markPoolUnhealthy(error.message);
+      }
+      throw error;
+    } finally {
+      if (conn && shouldRelease) {
+        await this.releaseConnectionQuietly(conn);
+      }
+    }
+  }
+  async ensurePool() {
+    if (this.pool) {
+      return;
+    }
+    if (!this.connectionConfig) {
+      throw new Error("Not connected to Dameng database");
+    }
+    if (!this.reconnectingPool) {
+      this.reconnectingPool = this.reconnectPool();
+    }
+    try {
+      await this.reconnectingPool;
+    } finally {
+      this.reconnectingPool = null;
+    }
+  }
+  async reconnectPool() {
+    const config = this.connectionConfig;
+    if (!config) {
+      throw new Error("Not connected to Dameng database");
+    }
+    console.error(`Reconnecting Dameng source '${this.sourceId}' after pool reset...`);
+    await this.closeRegisteredPool(config.poolAlias ?? this.buildPoolAlias());
+    await this.validateDirectConnection(config);
+    const createdPool = await dmdb.createPool(config);
+    this.pool = createdPool;
+    this.poolAlias = config.poolAlias ?? null;
+    try {
+      await this.withConnection(async (conn) => {
+        await this.executeWithTimeout(conn, "SELECT 1 AS OK", [], this.executeOptions());
+        if (this.initScript) {
+          for (const statement of splitSQLStatements(this.initScript, "dameng")) {
+            await this.executeWithTimeout(
+              conn,
+              statement,
+              [],
+              this.executeOptions({ autoCommit: true })
+            );
+          }
+        }
+      });
+    } catch (error) {
+      await this.closePoolQuietly(createdPool);
+      this.pool = null;
+      throw error;
+    }
+  }
+  executeWithTimeout(conn, sql, bindParams, options) {
+    return this.withTimeout(
+      conn.execute(sql, bindParams, options),
+      this.operationTimeoutMs,
+      "Dameng SQL execution"
+    );
+  }
+  async withTimeout(promise, timeoutMs, label) {
+    if (!Number.isFinite(timeoutMs) || timeoutMs <= 0) {
+      return promise;
+    }
+    let timer;
+    const timeout = new Promise((_, reject) => {
+      timer = setTimeout(() => {
+        reject(new DamengOperationTimeoutError(`${label} timed out after ${timeoutMs}ms`));
+      }, timeoutMs);
+    });
+    try {
+      return await Promise.race([promise, timeout]);
     } finally {
-      if (conn.release) {
-        await conn.release();
-      } else {
-        await conn.close();
+      if (timer) {
+        clearTimeout(timer);
       }
     }
   }
+  markPoolUnhealthy(reason) {
+    const pool = this.pool;
+    this.pool = null;
+    console.error(`Resetting Dameng source '${this.sourceId}' pool: ${reason}`);
+    if (pool) {
+      void this.closePoolQuietly(pool);
+    }
+  }
+  async releaseConnectionQuietly(conn) {
+    try {
+      const release = conn.release ? conn.release() : conn.close();
+      await this.withTimeout(
+        release,
+        RESOURCE_CLEANUP_TIMEOUT_MS,
+        "Dameng connection release"
+      );
+    } catch (error) {
+      this.markPoolUnhealthy(
+        `failed to release connection: ${error instanceof Error ? error.message : String(error)}`
+      );
+    }
+  }
   executeOptions(extra = {}) {
     return {
       outFormat: dmdb.OUT_FORMAT_OBJECT,
-      ...this.queryTimeoutMs !== void 0 && { queryTimeout: this.queryTimeoutMs },
       ...extra
     };
   }
   async validateDirectConnection(config) {
     let conn = null;
     try {
-      conn = await dmdb.getConnection(config.connectString);
-      await conn.execute("SELECT 1 AS OK", [], this.executeOptions());
+      const {
+        directConnectString,
+        poolAlias,
+        poolMin,
+        poolMax,
+        queueRequests,
+        queueTimeout,
+        ...directConfig
+      } = config;
+      const directConn = await this.withTimeout(
+        dmdb.getConnection({
+          ...directConfig,
+          connectString: directConnectString ?? config.connectString
+        }),
+        this.connectionTimeoutMs,
+        "Dameng direct connection"
+      );
+      conn = directConn;
+      await this.executeWithTimeout(conn, "SELECT 1 AS OK", [], this.executeOptions());
     } finally {
       if (conn) {
-        await conn.close();
+        await this.releaseConnectionQuietly(conn);
       }
     }
   }
@@ -410,7 +604,7 @@ var DamengConnector = class _DamengConnector {
   }
   async closePoolQuietly(pool) {
     try {
-      await pool.close(0);
+      await this.withTimeout(pool.close(0), RESOURCE_CLEANUP_TIMEOUT_MS, "Dameng pool close");
     } catch {
       if (pool.poolAlias) {
         dmdb.pools?.delete?.(pool.poolAlias);
@@ -427,6 +621,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-UJELBZ5R.js"), name: "Dameng", driver: "dmdb" }
+  { load: () => import("./dameng-SOGGZUEW.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.2",
+  "version": "0.1.4",
   "mcpName": "io.github.zuozh11/dbhub-dameng",
   "description": "Local fork of DBHub with Dameng/DM8 database connector support",
   "repository": {