[misc] deno correction

Author: rusher

deno.json

@@ -11,7 +11,7 @@
     "vitest": "npm:[email protected]"
   },
   "tasks": {
-    "test": "deno run -A npm:vitest test/**/*.js"
+    "test": "deno run -A npm:vitest --no-file-parallelism --isolate --reporter=verbose test/**/*.test.js"
   },
   "fmt": {
     "files": {

lib/connection.js

@@ -1326,6 +1326,7 @@ class Connection extends EventEmitter {
    */
   authFailHandler(err) {
     clearTimeout(this.timeout);
+    this.timeout = null;
     if (this.connectRejectFct) {
       if (this.opts.logger.error) this.opts.logger.error(err);
       //remove handshake command
@@ -1350,7 +1351,12 @@ class Connection extends EventEmitter {
       (this.opts.ssl && (this.opts.ssl.rejectUnauthorized === undefined || this.opts.ssl.rejectUnauthorized === true));
 
     const baseConf = { socket: this.socket };
-    if (info.isMariaDB()) {
+
+    // deno will use standard validation, since checkServerIdentity cannot be used for now :
+    // https://github.com/denoland/deno/issues/30892
+    if (typeof Deno !== 'undefined') {
+      info.requireValidCert = false;
+    } else if (info.isMariaDB()) {
       // for MariaDB servers, permit self-signed certificated
       // this will be replaced by fingerprint validation with ending OK_PACKET
       baseConf['rejectUnauthorized'] = false;

lib/pool.js

@@ -21,8 +21,8 @@ class Pool extends EventEmitter {
   #requestTimeoutId;
   #connErrorNumber = 0;
   #initialized = false;
-  _managePoolSizeTask;
-  _connectionCreationTask;
+  #managePoolSizeTask;
+  #connectionCreationTask;
 
   constructor(options) {
     super();
@@ -42,7 +42,7 @@ class Pool extends EventEmitter {
    */
   _managePoolSize() {
     // Only create new connections if conditions are met and no creation is in progress
-    if (!this._shouldCreateMoreConnections() || this._managePoolSizeTask) {
+    if (!this._shouldCreateMoreConnections() || this.#managePoolSizeTask) {
       return;
     }
 
@@ -73,7 +73,7 @@ class Pool extends EventEmitter {
     this.#initialized = true;
     this.#errorCreatingConnection = null;
     this.#connErrorNumber = 0;
-    this._connectionCreationTask = null;
+    this.#connectionCreationTask = null;
 
     // Check if we need more connections
     if (this._shouldCreateMoreConnections()) {
@@ -138,8 +138,8 @@ class Pool extends EventEmitter {
     if (this.#closed) {
       return;
     }
-    this._managePoolSizeTask = setTimeout(() => {
-      this._managePoolSizeTask = null;
+    this.#managePoolSizeTask = setTimeout(() => {
+      this.#managePoolSizeTask = null;
       if (!this.#requests.isEmpty()) {
         this._managePoolSize();
       }
@@ -153,12 +153,21 @@ class Pool extends EventEmitter {
    * @param {number} timeoutEnd - Timestamp when connection attempt should time out
    */
   _createPoolConnection(onSuccess, onError, timeoutEnd) {
-    const minTimeout = timeoutEnd - Date.now();
+    if (this.#closed) {
+      this.#connectionCreationTask = null;
+      return;
+    }
+
     const connectionOpts = Object.assign({}, this.opts.connOptions, {
-      connectTimeout: Math.max(1, Math.min(minTimeout, this.opts.connOptions.connectTimeout || Number.MAX_SAFE_INTEGER))
+      connectTimeout: Math.max(
+        1,
+        Math.min(timeoutEnd - Date.now(), this.opts.connOptions.connectTimeout || Number.MAX_SAFE_INTEGER)
+      )
     });
+
     const conn = new Connection(connectionOpts);
-    this._connectionCreationTask = null;
+    this.#connectionCreationTask = null;
+
     // Use direct callback approach instead of Promise
     conn
       .connect()
@@ -288,13 +297,13 @@ class Pool extends EventEmitter {
     if (isFatalError) {
       // Fatal error - call error callback with additional pool info
       err.message = err.message + this._errorMsgAddon();
-      this._connectionCreationTask = null;
+      this.#connectionCreationTask = null;
       onError(err);
       return;
     }
 
     // Retry connection after delay
-    this._connectionCreationTask = setTimeout(
+    this.#connectionCreationTask = setTimeout(
       () => this._createPoolConnection(onSuccess, onError, timeoutEnd),
       Math.min(500, timeoutEnd - Date.now())
     );
@@ -341,21 +350,35 @@ class Pool extends EventEmitter {
     // Determine the cause of the timeout
     const timeoutCause = this.activeConnections() === 0 ? this.#errorCreatingConnection : null;
     const waitTime = Math.abs(currentTime - (request.timeout - this.opts.acquireTimeout));
+    let error;
+    if (timeoutCause) {
+      error = Errors.createError(
+        `pool failed to retrieve a connection from pool${this._errorMsgAddon()}`,
+        Errors.client.ER_GET_CONNECTION_TIMEOUT,
+        null,
+        'HY000',
+        null,
+        false,
+        request.stack,
+        null,
+        timeoutCause
+      );
+    } else {
+      // Create an appropriate error message with pool state information
+      error = Errors.createError(
+        `pool timeout: failed to retrieve a connection from pool after ${waitTime}ms${this._errorMsgAddon()}`,
+        Errors.client.ER_GET_CONNECTION_TIMEOUT,
+        null,
+        'HY000',
+        null,
+        false,
+        request.stack,
+        null,
+        null
+      );
+    }
 
-    // Create an appropriate error message with pool state information
-    const timeoutError = Errors.createError(
-      `pool timeout: failed to retrieve a connection from pool after ${waitTime}ms${this._errorMsgAddon()}`,
-      Errors.client.ER_GET_CONNECTION_TIMEOUT,
-      null,
-      'HY000',
-      null,
-      false,
-      request.stack,
-      null,
-      timeoutCause
-    );
-
-    request.reject(timeoutError);
+    request.reject(error);
   }
 
   /**
@@ -391,17 +414,18 @@ class Pool extends EventEmitter {
     }
 
     this._endLeak(conn);
-    this.#activeConnections[conn.threadId] = null;
     conn.lastUse = Date.now();
 
     if (this.#closed) {
+      delete this.#activeConnections[conn.threadId];
       this._cleanupConnection(conn, 'pool_closed');
       return;
     }
 
     // Only basic validation here - full validation happens when acquiring
     if (conn.isValid()) {
       this.emit('release', conn);
+      delete this.#activeConnections[conn.threadId];
       this.#idleConnections.push(conn);
       process.nextTick(this.emit.bind(this, '_idle'));
     } else {
@@ -661,11 +685,7 @@ class Pool extends EventEmitter {
    * @return {number}
    */
   activeConnections() {
-    let counter = 0;
-    for (const connection of Object.values(this.#activeConnections)) {
-      if (connection) counter++;
-    }
-    return counter;
+    return Object.keys(this.#activeConnections).length;
   }
 
   /**
@@ -784,9 +804,13 @@ class Pool extends EventEmitter {
 
     this.#closed = true;
     clearInterval(this.#unusedConnectionRemoverId);
-    clearInterval(this._managePoolSizeTask);
-    clearTimeout(this._connectionCreationTask);
+    clearInterval(this.#managePoolSizeTask);
+    clearTimeout(this.#connectionCreationTask);
     clearTimeout(this.#requestTimeoutId);
+    this.#unusedConnectionRemoverId = null;
+    this.#managePoolSizeTask = null;
+    this.#connectionCreationTask = null;
+    this.#requestTimeoutId = null;
 
     const cmdParam = {};
     if (this.opts.trace) Error.captureStackTrace(cmdParam);
@@ -797,9 +821,6 @@ class Pool extends EventEmitter {
       idleConnectionsEndings.push(new Promise(conn.forceEnd.bind(conn, cmdParam)));
     }
 
-    clearTimeout(this.#requestTimeoutId);
-    this.#requestTimeoutId = null;
-
     //reject all waiting tasks
     if (!this.#requests.isEmpty()) {
       const err = Errors.createError(
@@ -816,6 +837,7 @@ class Pool extends EventEmitter {
         task.reject(err);
       }
     }
+    this.removeAllListeners();
     const pool = this;
     return Promise.all(idleConnectionsEndings).then(async () => {
       if (pool.activeConnections() > 0) {

test/base.js

@@ -121,6 +121,12 @@ export function getEnv(key) {
   return undefined;
 }
 
+export function isDeno() {
+  if (typeof Deno !== 'undefined') {
+    return true;
+  }
+  return false;
+}
 export function isWindows() {
   if (typeof Deno !== 'undefined') {
     return 'windows' === Deno.build.os;