@zz1996/dbhub-dameng 0.1.3 → 0.1.5

package/dist/{dameng-JYMTC4HE.js → dameng-DTI47UV6.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)) {
@@ -74,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;
@@ -88,14 +100,22 @@ var DamengConnector = class _DamengConnector {
       connectionConfig.poolAlias = this.buildPoolAlias();
       this.defaultSchema = connectionConfig.schema ?? null;
       this.poolAlias = connectionConfig.poolAlias;
+      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()
@@ -104,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);
@@ -116,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;
     }
@@ -129,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(`
@@ -185,6 +217,64 @@ var DamengConnector = class _DamengConnector {
     );
     return rows.map((row) => this.rowValue(row, "TABLE_NAME")).filter(this.isPresent).map((name) => ({ name, schema: owner }));
   }
+  async searchColumns(pattern, schema, table, limit = 100) {
+    const owner = await this.resolveSchema(schema);
+    const rowLimit = this.normalizeLimit(limit);
+    const bindValues = [
+      owner,
+      this.normalizeLikePattern(pattern),
+      ...table ? [this.normalizeIdentifier(table)] : []
+    ];
+    const tablePredicate = table ? "AND c.TABLE_NAME = :3" : "";
+    const rows = await this.queryRows(
+      `
+      SELECT COLUMN_NAME,
+             TABLE_NAME,
+             DATA_TYPE,
+             DATA_LENGTH,
+             DATA_PRECISION,
+             DATA_SCALE,
+             NULLABLE,
+             DATA_DEFAULT,
+             COMMENTS
+      FROM (
+        SELECT c.COLUMN_NAME,
+               c.TABLE_NAME,
+               c.DATA_TYPE,
+               c.DATA_LENGTH,
+               c.DATA_PRECISION,
+               c.DATA_SCALE,
+               c.NULLABLE,
+               c.DATA_DEFAULT,
+               cc.COMMENTS,
+               c.COLUMN_ID
+        FROM ALL_TAB_COLUMNS c
+        LEFT JOIN ALL_COL_COMMENTS cc
+          ON cc.OWNER = c.OWNER
+         AND cc.TABLE_NAME = c.TABLE_NAME
+         AND cc.COLUMN_NAME = c.COLUMN_NAME
+        WHERE c.OWNER = :1
+          AND c.COLUMN_NAME LIKE :2
+          ${tablePredicate}
+        ORDER BY c.TABLE_NAME, c.COLUMN_ID
+      )
+      WHERE ROWNUM <= ${rowLimit}
+      `,
+      bindValues
+    );
+    return rows.map((row) => {
+      const description = this.rowValue(row, "COMMENTS");
+      return {
+        name: this.rowValue(row, "COLUMN_NAME") ?? "",
+        table: this.rowValue(row, "TABLE_NAME") ?? "",
+        schema: owner,
+        type: this.formatDataType(row),
+        nullable: this.rowValue(row, "NULLABLE") === "Y",
+        default: this.rowValue(row, "DATA_DEFAULT") ?? null,
+        ...description ? { description } : {}
+      };
+    });
+  }
   async getViews(schema) {
     const owner = await this.resolveSchema(schema);
     const rows = await this.queryRows(
@@ -379,7 +469,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 })
@@ -393,25 +484,136 @@ 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 {
-      if (conn.release) {
-        await conn.release();
-      } else {
-        await conn.close();
+      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 (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,
@@ -430,15 +632,19 @@ var DamengConnector = class _DamengConnector {
         queueTimeout,
         ...directConfig
       } = config;
-      const directConn = await dmdb.getConnection({
-        ...directConfig,
-        connectString: directConnectString ?? config.connectString
-      });
+      const directConn = await this.withTimeout(
+        dmdb.getConnection({
+          ...directConfig,
+          connectString: directConnectString ?? config.connectString
+        }),
+        this.connectionTimeoutMs,
+        "Dameng direct connection"
+      );
       conn = directConn;
-      await conn.execute("SELECT 1 AS OK", [], this.executeOptions());
+      await this.executeWithTimeout(conn, "SELECT 1 AS OK", [], this.executeOptions());
     } finally {
       if (conn) {
-        await conn.close();
+        await this.releaseConnectionQuietly(conn);
       }
     }
   }
@@ -456,7 +662,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);

package/dist/index.js

@@ -586,6 +586,36 @@ async function searchColumns(connector, pattern, schemaFilter, tableFilter, deta
   for (const schemaName of schemasToSearch) {
     if (results.length >= limit) break;
     try {
+      const searchableConnector = connector;
+      if (searchableConnector.searchColumns) {
+        const matchedColumns = await searchableConnector.searchColumns(
+          pattern,
+          schemaName,
+          tableFilter,
+          limit - results.length
+        );
+        for (const column of matchedColumns) {
+          if (results.length >= limit) break;
+          if (detailLevel === "names") {
+            results.push({
+              name: column.name,
+              table: column.table,
+              schema: column.schema
+            });
+          } else {
+            results.push({
+              name: column.name,
+              table: column.table,
+              schema: column.schema,
+              type: column.type,
+              nullable: column.nullable,
+              default: column.default,
+              ...column.description ? { description: column.description } : {}
+            });
+          }
+        }
+        continue;
+      }
       let tablesToSearch;
       if (tableFilter) {
         tablesToSearch = [tableFilter];
@@ -1835,7 +1865,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-JYMTC4HE.js"), name: "Dameng", driver: "dmdb" }
+  { load: () => import("./dameng-DTI47UV6.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.3",
+  "version": "0.1.5",
   "mcpName": "io.github.zuozh11/dbhub-dameng",
   "description": "Local fork of DBHub with Dameng/DM8 database connector support",
   "repository": {