@zz1996/dbhub-dameng 0.1.5 → 0.1.7

package/dist/{dameng-DTI47UV6.js → dameng-5KYI5JBK.js}

@@ -10,9 +10,12 @@ import {
 import dmdb from "dmdb";
 var DEFAULT_OPERATION_TIMEOUT_MS = 11e4;
 var RESOURCE_CLEANUP_TIMEOUT_MS = 2e3;
+var CONNECT_RETRY_ATTEMPTS = 3;
+var CONNECT_RETRY_DELAY_MS = 500;
 var DamengOperationTimeoutError = class extends Error {
-  constructor(message) {
+  constructor(message, label) {
     super(message);
+    this.label = label;
     this.name = "DamengOperationTimeoutError";
   }
 };
@@ -94,59 +97,73 @@ 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;
-      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) => {
+    for (let attempt = 1; attempt <= CONNECT_RETRY_ATTEMPTS; attempt += 1) {
+      let createdPool = null;
+      try {
+        const connectionConfig = await this.dsnParser.parse(dsn, config);
+        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;
+        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);
+        this.pool = createdPool;
+        await this.withConnection((conn) => this.initializeSession(conn, initScript));
+        this.connectionConfig = connectionConfig;
+        this.initScript = initScript;
+        return;
+      } catch (error) {
+        if (createdPool) {
+          await this.closePoolQuietly(createdPool);
+        } else if (this.poolAlias) {
+          await this.closeRegisteredPool(this.poolAlias);
+        }
+        this.pool = null;
+        this.poolAlias = null;
+        this.connectionConfig = null;
+        this.initScript = void 0;
+        if (attempt < CONNECT_RETRY_ATTEMPTS && this.isRetryableConnectFailure(error)) {
+          console.error(
+            `Retrying Dameng source '${this.sourceId}' connection after transient failure (${attempt}/${CONNECT_RETRY_ATTEMPTS}): ${error instanceof Error ? error.message : String(error)}`
+          );
+          await this.delay(CONNECT_RETRY_DELAY_MS * attempt);
+          continue;
+        }
+        console.error("Failed to connect to Dameng database:", error);
+        throw error;
+      }
+    }
+    throw new Error("Failed to connect to Dameng database");
+  }
+  async initializeSession(conn, initScript) {
+    await this.executeWithTimeout(
+      conn,
+      "SELECT 1 AS OK",
+      [],
+      this.executeOptions()
+    );
+    if (!this.defaultSchema) {
+      const result = await this.executeWithTimeout(
+        conn,
+        "SELECT USER AS SCHEMA_NAME FROM DUAL",
+        [],
+        this.executeOptions()
+      );
+      this.defaultSchema = this.rowValue(result.rows?.[0], "SCHEMA_NAME") ?? null;
+    }
+    if (initScript) {
+      for (const statement of splitSQLStatements(initScript, "dameng")) {
         await this.executeWithTimeout(
           conn,
-          "SELECT 1 AS OK",
+          statement,
           [],
-          this.executeOptions()
+          this.executeOptions({ autoCommit: true })
         );
-        if (!this.defaultSchema) {
-          const result = await this.executeWithTimeout(
-            conn,
-            "SELECT USER AS SCHEMA_NAME FROM DUAL",
-            [],
-            this.executeOptions()
-          );
-          this.defaultSchema = this.rowValue(result.rows?.[0], "SCHEMA_NAME") ?? null;
-        }
-        if (initScript) {
-          for (const statement of splitSQLStatements(initScript, "dameng")) {
-            await this.executeWithTimeout(
-              conn,
-              statement,
-              [],
-              this.executeOptions({ autoCommit: true })
-            );
-          }
-        }
-      });
-      this.connectionConfig = connectionConfig;
-      this.initScript = initScript;
-    } catch (error) {
-      if (createdPool) {
-        await this.closePoolQuietly(createdPool);
-      } else if (this.poolAlias) {
-        await this.closeRegisteredPool(this.poolAlias);
       }
-      this.pool = null;
-      this.poolAlias = null;
-      this.connectionConfig = null;
-      this.initScript = void 0;
-      console.error("Failed to connect to Dameng database:", error);
-      throw error;
     }
   }
   async disconnect() {
@@ -494,6 +511,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) {
@@ -502,16 +533,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 {
@@ -520,6 +550,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;
@@ -581,7 +626,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 {
@@ -614,6 +659,46 @@ 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));
+  }
+  isRetryableConnectFailure(error) {
+    if (error instanceof DamengOperationTimeoutError) {
+      return [
+        "Dameng direct connection",
+        "Dameng connection acquisition",
+        "Dameng SQL execution"
+      ].includes(error.label);
+    }
+    const message = error instanceof Error ? error.message : String(error);
+    return [
+      "ECONNRESET",
+      "ETIMEDOUT",
+      "ECONNREFUSED",
+      "socket hang up",
+      "Socket timeout",
+      "connect timeout",
+      "Connection request timeout in queue",
+      "Pool cannot open more connections",
+      "\u7F51\u7EDC\u901A\u8BAF\u8D85\u65F6",
+      "\u7F51\u7EDC\u901A\u4FE1\u5F02\u5E38",
+      "\u8FDE\u63A5\u8D85\u65F6",
+      "\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));
+  }
+  delay(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+  }
   executeOptions(extra = {}) {
     return {
       outFormat: dmdb.OUT_FORMAT_OBJECT,

package/dist/index.js

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