@maestro-js/db 1.0.0-alpha.2 → 1.0.0-alpha.21

package/dist/index.d.ts

@@ -63,6 +63,7 @@ interface MysqlDbDriverConfig {
     connectionLimit?: number;
     debug?: boolean;
     multipleStatements?: boolean;
+    maxExecutionTime?: number;
     ssl?: string | (tls.SecureContextOptions & {
         rejectUnauthorized?: boolean | undefined;
     }) | undefined;
@@ -84,6 +85,10 @@ interface MysqlDbDriverConfig {
             queryId: string;
             connectDurationMs: number;
             error: unknown;
+        } | {
+            event: 'poolError';
+            activeConnections: number;
+            error: unknown;
         }
     ]>;
     queryLogger?: Log.LogFunctions<MysqlDbDriverLogMessageData>;
@@ -93,6 +98,7 @@ declare function mysqlDbDriver(config: MysqlDbDriverConfig): DbDriver;
 type KeysWithFallback = keyof Db.Provider.Keys extends never ? {
     default: unknown;
 } : Db.Provider.Keys;
+type DbMysqlLogMessage = MysqlDbDriverLogMessageData;
 /**
  * Creates a new connection pool using the supplied options.
  */
@@ -207,7 +213,7 @@ declare namespace Db {
     namespace drivers {
         namespace mysql {
             /** Log event data emitted by the MySQL driver for query and transaction lifecycle events */
-            type MysqlDbDriverLogMessageData = MysqlDbDriverLogMessageData;
+            type MysqlDbDriverLogMessageData = DbMysqlLogMessage;
         }
     }
     namespace Provider {

package/dist/index.js

@@ -11,10 +11,9 @@ import { randomUUID } from "crypto";
 import "tls";
 import { Context } from "@maestro-js/context";
 import { Helpers } from "@maestro-js/helpers";
-import { Log } from "@maestro-js/log";
 function mysqlDbDriver(config) {
-  const connectionLogger = config?.connectionLogger ?? Log.create();
-  const queryLogger = config?.queryLogger ?? Log.create();
+  const connectionLogger = config?.connectionLogger;
+  const queryLogger = config?.queryLogger;
   const transactionContext = new AsyncLocalStorage();
   function getPoolConnection() {
     return new Promise((resolve, reject) => {
@@ -95,9 +94,13 @@ function mysqlDbDriver(config) {
     database: config.database,
     port: config.port,
     connectionLimit: config.connectionLimit ?? 10,
-    connectTimeout: 60 * 60 * 1e3,
+    connectTimeout: 1e4,
     waitForConnections: true,
-    queueLimit: 0,
+    queueLimit: 100,
+    maxIdle: 10,
+    idleTimeout: 6e4,
+    enableKeepAlive: true,
+    keepAliveInitialDelay: 1e4,
     timezone: "Z",
     debug: false,
     multipleStatements: config.multipleStatements,
@@ -110,13 +113,35 @@ function mysqlDbDriver(config) {
     decimalNumbers: true
   });
   let connectionCount = 0;
+  let activeConnections = 0;
+  pool.on("acquire", function() {
+    activeConnections++;
+  });
+  pool.on("release", function() {
+    activeConnections--;
+  });
   pool.on("connection", function(connection) {
     connectionCount++;
-    connectionLogger.info({
+    connectionLogger?.info({
       event: "newConnection",
       connectionCount,
       connectionThreadId: connection.threadId
     });
+    if (config.maxExecutionTime) {
+      connection.query(mysql.format("SET SESSION max_execution_time = ?", [config.maxExecutionTime]), (err) => {
+        if (err) {
+          console.error("Failed to set max_execution_time:", err);
+          connection.destroy();
+        }
+      });
+    }
+  });
+  pool.on("error", function(err) {
+    connectionLogger?.error({
+      event: "poolError",
+      activeConnections,
+      error: err
+    });
   });
   async function transaction(callback) {
     const connection = await _getConnection();
@@ -179,7 +204,7 @@ function mysqlDbDriver(config) {
       const transactionStartTime = (/* @__PURE__ */ new Date()).getTime();
       try {
         await connection.beginTransaction();
-        queryLogger.info({
+        queryLogger?.info({
           event: "transactionStarted",
           transactionId: contextValue.currentTransaction.id
         });
@@ -191,7 +216,7 @@ function mysqlDbDriver(config) {
         }
         await contextValue.commit();
         const duration = (/* @__PURE__ */ new Date()).getTime() - transactionStartTime;
-        queryLogger.info({
+        queryLogger?.info({
           event: "transactionCompleted",
           transactionId: contextValue.currentTransaction.id,
           durationMs: duration
@@ -204,7 +229,7 @@ function mysqlDbDriver(config) {
         );
         await connection.rollback();
         const duration = (/* @__PURE__ */ new Date()).getTime() - transactionStartTime;
-        queryLogger.info({
+        queryLogger?.info({
           event: "transactionFailed",
           transactionId: contextValue.currentTransaction.id,
           durationMs: duration,
@@ -222,13 +247,13 @@ function mysqlDbDriver(config) {
   }
   async function getConnectionForQuery(queryId) {
     const connectStartTime = (/* @__PURE__ */ new Date()).getTime();
-    connectionLogger.info({
+    connectionLogger?.info({
       event: "connectionAcquisitionStarted",
       queryId
     });
     try {
       const connection = await _getConnection();
-      connectionLogger.info({
+      connectionLogger?.info({
         event: "connectionAcquisitionCompleted",
         queryId,
         connectionId: connection.id,
@@ -236,7 +261,7 @@ function mysqlDbDriver(config) {
       });
       return connection;
     } catch (e) {
-      connectionLogger.error({
+      connectionLogger?.error({
         event: "connectionAcquisitionFailed",
         queryId,
         connectDurationMs: (/* @__PURE__ */ new Date()).getTime() - connectStartTime,
@@ -254,7 +279,7 @@ function mysqlDbDriver(config) {
     const formatted = mysql.format(query, params);
     const queryStartTime = (/* @__PURE__ */ new Date()).getTime();
     const context = Context.getStore();
-    queryLogger.info({
+    queryLogger?.info({
       event: "queryStarted",
       queryId,
       formattedQuery: formatted,
@@ -272,7 +297,7 @@ function mysqlDbDriver(config) {
       Context.runWith(context, () => {
         if (!streamError) {
           const duration = (/* @__PURE__ */ new Date()).getTime() - queryStartTime;
-          queryLogger.info({
+          queryLogger?.info({
             event: "queryCompleted",
             queryId,
             durationMs: duration,
@@ -288,7 +313,7 @@ function mysqlDbDriver(config) {
     queryStream.on("error", (error) => {
       Context.runWith(context, () => {
         streamError = error;
-        queryLogger.error({
+        queryLogger?.error({
           event: "queryFailed",
           queryId,
           durationMs: (/* @__PURE__ */ new Date()).getTime() - queryStartTime,
@@ -392,6 +417,9 @@ function mysqlDbDriver(config) {
       }
     };
   }
+  function isConnectionError(err) {
+    return "code" in err && err.code === "ECONNRESET" || "code" in err && err.code === "ECONNREFUSED" || "code" in err && err.code === "ETIMEDOUT" || "code" in err && err.code === "PROTOCOL_CONNECTION_LOST";
+  }
   async function execute(query, params = []) {
     const queryId = randomUUID();
     const isInTransaction = !!transactionContext.getStore();
@@ -427,7 +455,9 @@ function mysqlDbDriver(config) {
       {
         maxAttempts: 3,
         delay: 0,
-        shouldRetry: (err) => "code" in err && err.code === "ER_LOCK_DEADLOCK" && !isInTransaction || "code" in err && err.code === "ER_LOCK_WAIT_TIMEOUT" || err instanceof Error && err.message.includes("Please retry") || err instanceof Error && err.message.includes("Try restarting transaction") && !isInTransaction
+        shouldRetry: (err) => "code" in err && err.code === "ER_LOCK_DEADLOCK" && !isInTransaction || "code" in err && err.code === "ER_LOCK_WAIT_TIMEOUT" || // Retry on connection errors so queries can recover after a failover severs connections.
+        // Not safe inside a transaction — the whole transaction must be retried by the caller.
+        isConnectionError(err) && !isInTransaction || err instanceof Error && err.message.includes("Please retry") || err instanceof Error && err.message.includes("Try restarting transaction") && !isInTransaction
       }
     );
     return results;

package/package.json

@@ -11,15 +11,18 @@
   "dependencies": {
     "iso-fns2": "npm:iso-fns@2.0.0-alpha.26",
     "mysql2": "^3.15.3",
-    "@maestro-js/context": "1.0.0-alpha.2",
-    "@maestro-js/helpers": "1.0.0-alpha.2",
-    "@maestro-js/log": "1.0.0-alpha.2",
-    "@maestro-js/service-registry": "1.0.0-alpha.2"
+    "@maestro-js/context": "1.0.0-alpha.21",
+    "@maestro-js/helpers": "1.0.0-alpha.21",
+    "@maestro-js/service-registry": "1.0.0-alpha.21"
+  },
+  "peerDependencies": {
+    "@maestro-js/log": "1.0.0-alpha.21"
   },
   "devDependencies": {
-    "@types/node": "^22.19.11"
+    "@types/node": "^22.19.11",
+    "@maestro-js/log": "1.0.0-alpha.21"
   },
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-alpha.21",
   "publishConfig": {
     "access": "restricted"
   },