@zz1996/dbhub-dameng 0.1.4 → 0.1.6

package/dist/{dameng-SOGGZUEW.js → dameng-27LNS5MO.js}

@@ -11,8 +11,9 @@ import dmdb from "dmdb";
 var DEFAULT_OPERATION_TIMEOUT_MS = 11e4;
 var RESOURCE_CLEANUP_TIMEOUT_MS = 2e3;
 var DamengOperationTimeoutError = class extends Error {
-  constructor(message) {
+  constructor(message, label) {
     super(message);
+    this.label = label;
     this.name = "DamengOperationTimeoutError";
   }
 };
@@ -102,6 +103,8 @@ var DamengConnector = class _DamengConnector {
       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;
+      connectionConfig.connectTimeout ?? (connectionConfig.connectTimeout = this.connectionTimeoutMs);
+      connectionConfig.queueTimeout ?? (connectionConfig.queueTimeout = this.connectionTimeoutMs);
       await this.closeRegisteredPool(connectionConfig.poolAlias);
       await this.validateDirectConnection(connectionConfig);
       createdPool = await dmdb.createPool(connectionConfig);
@@ -217,6 +220,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(
@@ -436,6 +497,20 @@ var DamengConnector = class _DamengConnector {
     });
   }
   async withConnection(fn) {
+    try {
+      return await this.withConnectionAttempt(fn);
+    } catch (error) {
+      if (!this.isConnectionAcquisitionFailure(error)) {
+        throw error;
+      }
+      console.error(
+        `Retrying Dameng source '${this.sourceId}' after connection acquisition failure: ${error instanceof Error ? error.message : String(error)}`
+      );
+      await this.ensurePool();
+      return this.withConnectionAttempt(fn);
+    }
+  }
+  async withConnectionAttempt(fn) {
     await this.ensurePool();
     const pool = this.pool;
     if (!pool) {
@@ -444,16 +519,15 @@ var DamengConnector = class _DamengConnector {
     let conn = null;
     let shouldRelease = true;
     try {
-      conn = await this.withTimeout(
-        pool.getConnection(),
-        this.connectionTimeoutMs,
-        "Dameng connection acquisition"
-      );
+      conn = await this.acquireConnectionWithTimeout(pool);
       return await fn(conn);
     } catch (error) {
       if (error instanceof DamengOperationTimeoutError) {
         shouldRelease = false;
         this.markPoolUnhealthy(error.message);
+      } else if (!conn && this.isConnectionAcquisitionFailure(error)) {
+        shouldRelease = false;
+        this.markPoolUnhealthy(error instanceof Error ? error.message : String(error));
       }
       throw error;
     } finally {
@@ -462,6 +536,21 @@ var DamengConnector = class _DamengConnector {
       }
     }
   }
+  async acquireConnectionWithTimeout(pool) {
+    const acquisition = pool.getConnection();
+    try {
+      return await this.withTimeout(
+        acquisition,
+        this.connectionTimeoutMs,
+        "Dameng connection acquisition"
+      );
+    } catch (error) {
+      if (error instanceof DamengOperationTimeoutError) {
+        void acquisition.then((conn) => this.releaseConnectionQuietly(conn)).catch(() => void 0);
+      }
+      throw error;
+    }
+  }
   async ensurePool() {
     if (this.pool) {
       return;
@@ -523,7 +612,7 @@ var DamengConnector = class _DamengConnector {
     let timer;
     const timeout = new Promise((_, reject) => {
       timer = setTimeout(() => {
-        reject(new DamengOperationTimeoutError(`${label} timed out after ${timeoutMs}ms`));
+        reject(new DamengOperationTimeoutError(`${label} timed out after ${timeoutMs}ms`, label));
       }, timeoutMs);
     });
     try {
@@ -556,6 +645,18 @@ var DamengConnector = class _DamengConnector {
       );
     }
   }
+  isConnectionAcquisitionFailure(error) {
+    if (error instanceof DamengOperationTimeoutError) {
+      return error.label === "Dameng connection acquisition";
+    }
+    const message = error instanceof Error ? error.message : String(error);
+    return [
+      "Connection request timeout in queue",
+      "Pool cannot open more connections",
+      "\u83B7\u53D6\u8FDE\u63A5\u8BF7\u6C42\u7B49\u5F85\u8D85\u65F6",
+      "\u8FDE\u63A5\u6C60\u5DF2\u8FBE\u5230\u6700\u5927\u8FDE\u63A5\u6570"
+    ].some((item) => message.includes(item));
+  }
   executeOptions(extra = {}) {
     return {
       outFormat: dmdb.OUT_FORMAT_OBJECT,

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-SOGGZUEW.js"), name: "Dameng", driver: "dmdb" }
+  { load: () => import("./dameng-27LNS5MO.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.4",
+  "version": "0.1.6",
   "mcpName": "io.github.zuozh11/dbhub-dameng",
   "description": "Local fork of DBHub with Dameng/DM8 database connector support",
   "repository": {