@zintrust/db-mysql 1.8.7 → 1.8.8

package/dist/index.js

@@ -4,6 +4,66 @@ const getInjectedMysqlModule = () => {
     const globalAny = globalThis;
     return globalAny.__zintrustMysqlModule;
 };
+const getNodeMysqlSslConfig = (tlsEnabled) => {
+    if (!tlsEnabled) {
+        return false;
+    }
+    return {
+        rejectUnauthorized: false,
+        minVersion: 'TLSv1.2',
+    };
+};
+const getSocketTimeoutMs = (config) => {
+    if (typeof config.socketTimeoutMs === 'number' && config.socketTimeoutMs > 0) {
+        return config.socketTimeoutMs;
+    }
+    return 30000;
+};
+const createWorkersPool = async ({ mysql, host, port, database, user, password, tlsEnabled, timeoutMs, }) => {
+    if (!Cloudflare.isCloudflareSocketsEnabled()) {
+        throw ErrorFactory.createConfigError('Cloudflare sockets are disabled. Set ENABLE_CLOUDFLARE_SOCKETS=true to use MySQL sockets on Workers.');
+    }
+    const createSocket = await loadCloudflareSocketFactory();
+    return mysql.createPool({
+        host,
+        port,
+        database,
+        user,
+        password,
+        waitForConnections: true,
+        connectionLimit: 10,
+        namedPlaceholders: false,
+        disableEval: true,
+        stream: () => createSocket({ host, port, tls: tlsEnabled, timeoutMs }),
+    });
+};
+const createNodePool = (mysql, host, port, database, user, password, nodeMysqlSslConfig) => {
+    return mysql.createPool({
+        host,
+        port,
+        database,
+        user,
+        password,
+        ssl: nodeMysqlSslConfig,
+        waitForConnections: true,
+        connectionLimit: 10,
+        namedPlaceholders: false,
+    });
+};
+const describeDriverError = (error) => {
+    if (error === null || typeof error !== 'object') {
+        return undefined;
+    }
+    const details = error;
+    const parts = [
+        typeof details.code === 'string' ? `code=${details.code}` : undefined,
+        typeof details.errno === 'number' ? `errno=${details.errno}` : undefined,
+        typeof details.sqlState === 'string' ? `sqlState=${details.sqlState}` : undefined,
+        typeof details.sqlMessage === 'string' ? `sqlMessage=${details.sqlMessage}` : undefined,
+        typeof details.fatal === 'boolean' ? `fatal=${details.fatal}` : undefined,
+    ].filter((part) => part !== undefined);
+    return parts.length > 0 ? parts.join(', ') : undefined;
+};
 function isMissingEsmPackage(error, packageName) {
     if (error === null || typeof error !== 'object')
         return false;
@@ -97,43 +157,23 @@ async function connect(state, config) {
         const { host, port, database, user, password } = getConnectionParams(config);
         const isWorkersRuntime = Cloudflare.getWorkersEnv() !== null;
         const tlsEnabled = Boolean(config.ssl);
-        let timeoutMs;
-        if (typeof config.socketTimeoutMs === 'number' && config.socketTimeoutMs > 0) {
-            timeoutMs = config.socketTimeoutMs;
-        }
-        else {
-            timeoutMs = 30000; // default 30s
-        }
+        const nodeMysqlSslConfig = getNodeMysqlSslConfig(tlsEnabled);
+        Logger.info(`[db-mysql] Effective connection params: host=${host}, port=${port}, database=${database}, user=${user}, password_len=${password.length}, ssl=${tlsEnabled}`);
+        const timeoutMs = getSocketTimeoutMs(config);
         if (isWorkersRuntime) {
-            if (!Cloudflare.isCloudflareSocketsEnabled()) {
-                throw ErrorFactory.createConfigError('Cloudflare sockets are disabled. Set ENABLE_CLOUDFLARE_SOCKETS=true to use MySQL sockets on Workers.');
-            }
-            const createSocket = await loadCloudflareSocketFactory();
-            state.pool = mysql.createPool({
+            state.pool = await createWorkersPool({
+                mysql,
                 host,
                 port,
                 database,
                 user,
                 password,
-                waitForConnections: true,
-                connectionLimit: 10,
-                namedPlaceholders: false,
-                disableEval: true,
-                stream: () => createSocket({ host, port, tls: tlsEnabled, timeoutMs }),
+                tlsEnabled,
+                timeoutMs,
             });
         }
         else {
-            state.pool = mysql.createPool({
-                host,
-                port,
-                database,
-                user,
-                password,
-                ssl: tlsEnabled ? {} : undefined,
-                waitForConnections: true,
-                connectionLimit: 10,
-                namedPlaceholders: false,
-            });
+            state.pool = createNodePool(mysql, host, port, database, user, password, nodeMysqlSslConfig);
         }
         // Probe.
         await state.pool.execute('SELECT 1');
@@ -144,6 +184,13 @@ async function connect(state, config) {
         if (isMissingEsmPackage(error, 'mysql2')) {
             throw ErrorFactory.createConfigError("MySQL adapter requires the 'mysql2' package (run `npm install mysql2` or `zin add db:mysql`).");
         }
+        const driverError = describeDriverError(error);
+        if (driverError !== undefined) {
+            Logger.error(`[db-mysql] MySQL driver error: ${driverError}`);
+        }
+        if (error instanceof Error && typeof error.stack === 'string' && error.stack.trim() !== '') {
+            Logger.error(`[db-mysql] MySQL driver stack: ${error.stack}`);
+        }
         throw ErrorFactory.createTryCatchError('Failed to connect to MySQL', error);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zintrust/db-mysql",
-  "version": "1.8.7",
+  "version": "1.8.8",
   "description": "MySQL and MariaDB database adapter for ZinTrust.",
   "private": false,
   "type": "module",