@depup/mysql2 3.19.0-depup.0 → 3.20.0-depup.0

package/README.md

@@ -1,114 +1,25 @@
-[npm-image]: https://img.shields.io/npm/v/mysql2.svg
-[npm-url]: https://npmjs.com/package/mysql2
-[node-version-image]: https://img.shields.io/node/v/mysql2.svg
-[node-version-url]: https://nodejs.org/en/download
-[downloads-image]: https://img.shields.io/npm/dm/mysql2.svg
-[downloads-url]: https://npmjs.com/package/mysql2
-[license-url]: https://github.com/sidorares/node-mysql2/blob/master/License
-[license-image]: https://img.shields.io/npm/l/mysql2.svg?maxAge=2592000
-[node-mysql]: https://github.com/mysqljs/mysql
-[mysqljs]: https://github.com/mysqljs
-[mysql-native]: https://github.com/sidorares/nodejs-mysql-native
-[sidorares]: https://github.com/sidorares
-[TooTallNate]: https://gist.github.com/TooTallNate
-[starttls.js]: https://gist.github.com/TooTallNate/848444
-[node-mariasql]: https://github.com/mscdex/node-mariasql
-[contributors]: https://github.com/sidorares/node-mysql2/graphs/contributors
-[contributing]: https://github.com/sidorares/node-mysql2/blob/master/Contributing.md
-[docs-base]: https://sidorares.github.io/node-mysql2/docs
-[docs-base-zh-CN]: https://sidorares.github.io/node-mysql2/zh-CN/docs
-[docs-base-pt-BR]: https://sidorares.github.io/node-mysql2/pt-BR/docs
-[docs-prepared-statements]: https://sidorares.github.io/node-mysql2/docs/documentation/prepared-statements
-[docs-mysql-server]: https://sidorares.github.io/node-mysql2/docs/documentation/mysql-server
-[docs-promise-wrapper]: https://sidorares.github.io/node-mysql2/docs/documentation/promise-wrapper
-[docs-authentication-switch]: https://sidorares.github.io/node-mysql2/docs/documentation/authentication-switch
-[docs-streams]: https://sidorares.github.io/node-mysql2/docs/documentation/extras
-[docs-typescript-docs]: https://sidorares.github.io/node-mysql2/docs/documentation/typescript-examples
-[docs-qs-pooling]: https://sidorares.github.io/node-mysql2/docs#using-connection-pools
-[docs-qs-first-query]: https://sidorares.github.io/node-mysql2/docs#first-query
-[docs-qs-using-prepared-statements]: https://sidorares.github.io/node-mysql2/docs#using-prepared-statements
-[docs-examples]: https://sidorares.github.io/node-mysql2/docs/examples
-[docs-faq]: https://sidorares.github.io/node-mysql2/docs/faq
-[docs-documentation]: https://sidorares.github.io/node-mysql2/docs/documentation
-[docs-contributing]: https://sidorares.github.io/node-mysql2/docs/contributing/website
-[coverage]: https://img.shields.io/codecov/c/github/sidorares/node-mysql2
-[coverage-url]: https://app.codecov.io/github/sidorares/node-mysql2
-[ci-url]: https://github.com/sidorares/node-mysql2/actions/workflows/ci-coverage.yml?query=branch%3Amaster
-[ci-image]: https://img.shields.io/github/actions/workflow/status/sidorares/node-mysql2/ci-coverage.yml?event=push&style=flat&label=CI&branch=master
+# @depup/mysql2
 
-# MySQL2
+> Dependency-bumped version of [mysql2](https://www.npmjs.com/package/mysql2)
 
-[![NPM Version][npm-image]][npm-url]
-[![NPM Downloads][downloads-image]][downloads-url]
-[![Node.js Version][node-version-image]][node-version-url]
-[![GitHub Workflow Status (with event)][ci-image]][ci-url]
-[![Codecov][coverage]][coverage-url]
-[![License][license-image]][license-url]
-
-[English][docs-base] | [简体中文][docs-base-zh-CN] | [Português (BR)][docs-base-pt-BR]
-
-> MySQL client for Node.js with focus on performance. Supports prepared statements, non-utf8 encodings, binary log protocol, compression, ssl [much more][docs-documentation].
-
-**Table of Contents**
-
-- [History and Why MySQL2](#history-and-why-mysql2)
-- [Installation](#installation)
-- [Documentation](#documentation)
-- [Acknowledgements](#acknowledgements)
-- [Contributing](#contributing)
-
-## History and Why MySQL2
-
-MySQL2 project is a continuation of [MySQL-Native][mysql-native]. Protocol parser code was rewritten from scratch and api changed to match popular [Node MySQL][node-mysql]. MySQL2 team is working together with [Node MySQL][node-mysql] team to factor out shared code and move it under [mysqljs][mysqljs] organization.
-
-MySQL2 is mostly API compatible with [Node MySQL][node-mysql] and supports majority of features. MySQL2 also offers these additional features:
-
-- Faster / Better Performance
-- [Prepared Statements][docs-prepared-statements]
-- MySQL Binary Log Protocol
-- [MySQL Server][docs-mysql-server]
-- Extended support for Encoding and Collation
-- [Promise Wrapper][docs-promise-wrapper]
-- Compression
-- SSL and [Authentication Switch][docs-authentication-switch]
-- [Custom Streams][docs-streams]
-- [Pooling][docs-qs-pooling]
+Generated by [DepUp](https://github.com/depup/npm) -- all production
+dependencies bumped to latest versions.
 
 ## Installation
 
-MySQL2 is free from native bindings and can be installed on Linux, Mac OS or Windows without any issues.
-
 ```bash
-npm install --save mysql2
+npm install @depup/mysql2
 ```
 
-If you are using TypeScript, you will need to install `@types/node`.
-
-```bash
-npm install --save-dev @types/node
-```
-
-> For TypeScript documentation and examples, see [here][docs-typescript-docs].
-
-## Documentation
-
-- [Quickstart][docs-base]
-  - [First Query][docs-qs-first-query], [Using Prepared Statements][docs-qs-using-prepared-statements], [Using Connection Pools][docs-qs-pooling] and more.
-- [Documentation][docs-documentation]
-- [Examples][docs-examples]
-- [FAQ][docs-faq]
-
-## Acknowledgements
-
-- Internal protocol is written by [@sidorares][sidorares] [MySQL-Native][mysql-native].
-- Constants, SQL parameters interpolation, Pooling, `ConnectionConfig` class taken from [Node MySQL][node-mysql].
-- SSL upgrade code based on [@TooTallNate][TooTallNate] [code][starttls.js].
-- Secure connection / compressed connection api flags compatible to [MariaSQL][node-mariasql] client.
-- [Contributors][contributors].
+| Field | Value |
+|-------|-------|
+| Original | [mysql2](https://www.npmjs.com/package/mysql2) @ 3.20.0 |
+| Processed | 2026-03-16 |
+| Smoke test | passed |
+| Deps updated | 0 |
 
-## Contributing
+---
 
-Want to improve something in **MySQL2**?
-Please check [Contributing.md][contributing] for detailed instruction on how to get started.
+Source: https://github.com/depup/npm | Original: https://www.npmjs.com/package/mysql2
 
-To contribute in **MySQL2 Documentation**, please visit the [Website Contributing Guidelines][docs-contributing] for detailed instruction on how to get started.
+License inherited from the original package.

package/lib/auth_plugins/caching_sha2_password.js

@@ -36,6 +36,7 @@ function encrypt(password, scramble, key) {
   return crypto.publicEncrypt(
     {
       key,
+      oaepHash: 'sha1',
       padding: crypto.constants.RSA_PKCS1_OAEP_PADDING,
     },
     stage1

package/lib/auth_plugins/sha256_password.js

@@ -13,7 +13,13 @@ const STATE_FINAL = -1;
 
 function encrypt(password, scramble, key) {
   const stage1 = xorRotating(Buffer.from(`${password}\0`, 'utf8'), scramble);
-  return crypto.publicEncrypt(key, stage1);
+  return crypto.publicEncrypt(
+    {
+      key,
+      oaepHash: 'sha1',
+    },
+    stage1
+  );
 }
 
 module.exports =

package/lib/base/connection.js

@@ -28,6 +28,15 @@ const Packets = require('../packets/index.js');
 const Commands = require('../commands/index.js');
 const ConnectionConfig = require('../connection_config.js');
 const CharsetToEncoding = require('../constants/charset_encodings.js');
+const {
+  traceCallback,
+  tracePromise,
+  getServerContext,
+  shouldTrace,
+  queryChannel,
+  executeChannel,
+  connectChannel,
+} = require('../tracing.js');
 
 let _connectionId = 0;
 
@@ -141,6 +150,41 @@ class BaseConnection extends EventEmitter {
         this._notifyError(err);
       });
       this.addCommand(handshakeCommand);
+
+      // Trace the connection handshake
+      if (shouldTrace(connectChannel)) {
+        const config = this.config;
+        tracePromise(
+          connectChannel,
+          () =>
+            new Promise((resolve, reject) => {
+              /* eslint-disable prefer-const */
+              let onConnect, onError;
+              onConnect = (param) => {
+                this.removeListener('error', onError);
+                resolve(param);
+              };
+              onError = (err) => {
+                this.removeListener('connect', onConnect);
+                reject(err);
+              };
+              /* eslint-enable prefer-const */
+              this.once('connect', onConnect);
+              this.once('error', onError);
+            }),
+          () => {
+            const server = getServerContext(config);
+            return {
+              database: config.database || '',
+              serverAddress: server.serverAddress,
+              serverPort: server.serverPort,
+              user: config.user || '',
+            };
+          }
+        ).catch(() => {
+          // errors are already handled by the handshake error listener
+        });
+      }
     }
     // in case there was no initial handshake but we need to read sting, assume it utf-8
     // most common example: "Too many connections" error ( packet is sent immediately on connection attempt, we don't know server encoding yet)
@@ -601,7 +645,57 @@ class BaseConnection extends EventEmitter {
       cmdQuery.values !== undefined ? cmdQuery.values : []
     );
     cmdQuery.sql = rawSql;
-    return this.addCommand(cmdQuery);
+
+    if (cmdQuery.onResult) {
+      // Callback mode: traceCallback wraps the callback with tracing lifecycle, or calls through directly when no subscribers are registered
+      traceCallback(
+        queryChannel,
+        (wrappedCb) => {
+          cmdQuery.onResult = wrappedCb;
+          this.addCommand(cmdQuery);
+        },
+        0,
+        () => {
+          const server = getServerContext(this.config);
+          return {
+            query: cmdQuery.sql,
+            values: cmdQuery.values,
+            database: this.config.database || '',
+            serverAddress: server.serverAddress,
+            serverPort: server.serverPort,
+          };
+        },
+        null,
+        cmdQuery.onResult
+      );
+    } else if (shouldTrace(queryChannel)) {
+      // Event-emitter mode: tracePromise wraps the async lifecycle
+      tracePromise(
+        queryChannel,
+        () =>
+          new Promise((resolve, reject) => {
+            cmdQuery.once('error', reject);
+            cmdQuery.once('end', () => resolve());
+            this.addCommand(cmdQuery);
+          }),
+        () => {
+          const server = getServerContext(this.config);
+          return {
+            query: cmdQuery.sql,
+            values: cmdQuery.values,
+            database: this.config.database || '',
+            serverAddress: server.serverAddress,
+            serverPort: server.serverPort,
+          };
+        }
+      ).catch(() => {
+        // errors are already emitted on the command
+      });
+    } else {
+      this.addCommand(cmdQuery);
+    }
+
+    return cmdQuery;
   }
 
   pause() {
@@ -702,25 +796,78 @@ class BaseConnection extends EventEmitter {
       });
     }
     const executeCommand = new Commands.Execute(options, cb);
-    const prepareCommand = new Commands.Prepare(options, (err, stmt) => {
-      if (err) {
-        // skip execute command if prepare failed, we have main
-        // combined callback here
-        executeCommand.start = function () {
-          return null;
-        };
-        if (cb) {
-          cb(err);
-        } else {
-          executeCommand.emit('error', err);
+
+    const prepareAndExecute = (errorCb) => {
+      const prepareCommand = new Commands.Prepare(options, (err, stmt) => {
+        if (err) {
+          // skip execute command if prepare failed
+          executeCommand.start = function () {
+            return null;
+          };
+          errorCb(err);
+          executeCommand.emit('end');
+          return;
         }
-        executeCommand.emit('end');
-        return;
-      }
-      executeCommand.statement = stmt;
-    });
-    this.addCommand(prepareCommand);
-    this.addCommand(executeCommand);
+        executeCommand.statement = stmt;
+      });
+      this.addCommand(prepareCommand);
+      this.addCommand(executeCommand);
+    };
+
+    if (executeCommand.onResult) {
+      // Callback mode: traceCallback wraps the callback with tracing lifecycle, or calls through directly when no subscribers are registered
+      const origExecCb = executeCommand.onResult;
+      traceCallback(
+        executeChannel,
+        (wrappedCb) => {
+          executeCommand.onResult = wrappedCb;
+          prepareAndExecute(wrappedCb);
+        },
+        0,
+        () => {
+          const server = getServerContext(this.config);
+          return {
+            query: options.sql,
+            values: options.values,
+            database: this.config.database || '',
+            serverAddress: server.serverAddress,
+            serverPort: server.serverPort,
+          };
+        },
+        null,
+        origExecCb
+      );
+    } else if (shouldTrace(executeChannel)) {
+      // Event-emitter mode: tracePromise wraps the async lifecycle
+      tracePromise(
+        executeChannel,
+        () =>
+          new Promise((resolve, reject) => {
+            prepareAndExecute((err) => {
+              executeCommand.emit('error', err);
+            });
+            executeCommand.once('error', reject);
+            executeCommand.once('end', () => resolve());
+          }),
+        () => {
+          const server = getServerContext(this.config);
+          return {
+            query: options.sql,
+            values: options.values,
+            database: this.config.database || '',
+            serverAddress: server.serverAddress,
+            serverPort: server.serverPort,
+          };
+        }
+      ).catch(() => {
+        // errors are already emitted on the command
+      });
+    } else {
+      prepareAndExecute((err) => {
+        executeCommand.emit('error', err);
+      });
+    }
+
     return executeCommand;
   }
 

package/lib/base/pool.js

@@ -7,6 +7,11 @@ const PoolConnection = require('../pool_connection.js');
 const Queue = require('denque');
 const BaseConnection = require('./connection.js');
 const Errors = require('../constants/errors.js');
+const {
+  traceCallback,
+  getServerContext,
+  poolConnectChannel,
+} = require('../tracing.js');
 
 // Source: https://github.com/go-sql-driver/mysql/blob/76c00e35a8d48f8f70f0e7dffe584692bd3fa612/packets.go#L598-L613
 function isReadOnlyError(err) {
@@ -49,46 +54,69 @@ class BasePool extends EventEmitter {
   }
 
   getConnection(cb) {
-    if (this._closed) {
-      return process.nextTick(() => cb(new Error('Pool is closed.')));
-    }
-    let connection;
-    if (this._freeConnections.length > 0) {
-      connection = this._freeConnections.pop();
-      this.emit('acquire', connection);
-      return process.nextTick(() => cb(null, connection));
-    }
-    if (
-      this.config.connectionLimit === 0 ||
-      this._allConnections.length < this.config.connectionLimit
-    ) {
-      connection = new PoolConnection(this, {
-        config: this.config.connectionConfig,
-      });
-      this._allConnections.push(connection);
-      return connection.connect((err) => {
-        if (this._closed) {
-          return cb(new Error('Pool is closed.'));
-        }
-        if (err) {
-          return cb(err);
-        }
-        this.emit('connection', connection);
+    const _getConnection = (cb) => {
+      if (this._closed) {
+        return process.nextTick(() => cb(new Error('Pool is closed.')));
+      }
+      let connection;
+      if (this._freeConnections.length > 0) {
+        connection = this._freeConnections.pop();
         this.emit('acquire', connection);
-        return cb(null, connection);
-      });
-    }
-    if (!this.config.waitForConnections) {
-      return process.nextTick(() => cb(new Error('No connections available.')));
-    }
-    if (
-      this.config.queueLimit &&
-      this._connectionQueue.length >= this.config.queueLimit
-    ) {
-      return cb(new Error('Queue limit reached.'));
-    }
-    this.emit('enqueue');
-    return this._connectionQueue.push(cb);
+        return process.nextTick(() => {
+          connection._released = false;
+          cb(null, connection);
+        });
+      }
+      if (
+        this.config.connectionLimit === 0 ||
+        this._allConnections.length < this.config.connectionLimit
+      ) {
+        connection = new PoolConnection(this, {
+          config: this.config.connectionConfig,
+        });
+        this._allConnections.push(connection);
+        return connection.connect((err) => {
+          if (this._closed) {
+            return cb(new Error('Pool is closed.'));
+          }
+          if (err) {
+            return cb(err);
+          }
+          this.emit('connection', connection);
+          this.emit('acquire', connection);
+          return cb(null, connection);
+        });
+      }
+      if (!this.config.waitForConnections) {
+        return process.nextTick(() =>
+          cb(new Error('No connections available.'))
+        );
+      }
+      if (
+        this.config.queueLimit &&
+        this._connectionQueue.length >= this.config.queueLimit
+      ) {
+        return cb(new Error('Queue limit reached.'));
+      }
+      this.emit('enqueue');
+      return this._connectionQueue.push(cb);
+    };
+    const config = this.config.connectionConfig;
+    traceCallback(
+      poolConnectChannel,
+      _getConnection,
+      0,
+      () => {
+        const server = getServerContext(config);
+        return {
+          database: config.database || '',
+          serverAddress: server.serverAddress,
+          serverPort: server.serverPort,
+        };
+      },
+      null,
+      cb
+    );
   }
 
   releaseConnection(connection) {
@@ -101,7 +129,10 @@ class BasePool extends EventEmitter {
       }
     } else if (this._connectionQueue.length) {
       cb = this._connectionQueue.shift();
-      process.nextTick(cb.bind(null, null, connection));
+      process.nextTick(() => {
+        connection._released = false;
+        cb(null, connection);
+      });
     } else {
       this._freeConnections.push(connection);
       this.emit('release', connection);

package/lib/connection_config.js

@@ -277,7 +277,10 @@ class ConnectionConfig {
       user: decodeURIComponent(parsedUrl.username),
       password: decodeURIComponent(parsedUrl.password),
     };
-    parsedUrl.searchParams.forEach((value, key) => {
+    for (const [key, value] of parsedUrl.searchParams) {
+      if (key in options) {
+        continue;
+      }
       try {
         // Try to parse this as a JSON expression first
         options[key] = JSON.parse(value);
@@ -285,7 +288,7 @@ class ConnectionConfig {
         // Otherwise assume it is a plain string
         options[key] = value;
       }
-    });
+    }
     return options;
   }
 }

package/lib/packets/packet.js

@@ -406,8 +406,8 @@ class Packet {
   readNullTerminatedString(encoding) {
     const start = this.offset;
     let end = this.offset;
-    while (this.buffer[end]) {
-      end = end + 1; // TODO: handle OOB check
+    while (end < this.end && this.buffer[end] !== 0x00) {
+      end = end + 1;
     }
     this.offset = end + 1;
     return StringParser.decode(this.buffer, encoding, start, end);
@@ -516,16 +516,20 @@ class Packet {
     return result * sign;
   }
 
-  // copy-paste from https://github.com/mysqljs/mysql/blob/master/lib/protocol/Parser.js
+  // adapted from https://github.com/mysqljs/mysql/blob/dc9c152a87ec51a1f647447268917243d2eab1fd/lib/protocol/Parser.js
   parseGeometryValue() {
     const buffer = this.readLengthCodedBuffer();
     let offset = 4;
     if (buffer === null || !buffer.length) {
       return null;
     }
+    const bufferLength = buffer.length;
     function parseGeometry() {
-      let x, y, i, j, numPoints, line;
+      let x, y, i, j, numPoints, numRings, num, line;
       let result = null;
+      if (offset + 5 > bufferLength) {
+        return null;
+      }
       const byteOrder = buffer.readUInt8(offset);
       offset += 1;
       const wkbType = byteOrder
@@ -534,6 +538,9 @@ class Packet {
       offset += 4;
       switch (wkbType) {
         case 1: // WKBPoint
+          if (offset + 16 > bufferLength) {
+            return null;
+          }
           x = byteOrder
             ? buffer.readDoubleLE(offset)
             : buffer.readDoubleBE(offset);
@@ -545,12 +552,21 @@ class Packet {
           result = { x: x, y: y };
           break;
         case 2: // WKBLineString
+          if (offset + 4 > bufferLength) {
+            return null;
+          }
           numPoints = byteOrder
             ? buffer.readUInt32LE(offset)
             : buffer.readUInt32BE(offset);
           offset += 4;
+          if (numPoints > (bufferLength - offset) / 16) {
+            return null;
+          }
           result = [];
           for (i = numPoints; i > 0; i--) {
+            if (offset + 16 > bufferLength) {
+              break;
+            }
             x = byteOrder
               ? buffer.readDoubleLE(offset)
               : buffer.readDoubleBE(offset);
@@ -563,19 +579,30 @@ class Packet {
           }
           break;
         case 3: // WKBPolygon
-          // eslint-disable-next-line no-case-declarations
-          const numRings = byteOrder
+          if (offset + 4 > bufferLength) {
+            return null;
+          }
+          numRings = byteOrder
             ? buffer.readUInt32LE(offset)
             : buffer.readUInt32BE(offset);
           offset += 4;
+          if (numRings > (bufferLength - offset) / 4) {
+            return null;
+          }
           result = [];
           for (i = numRings; i > 0; i--) {
+            if (offset + 4 > bufferLength) {
+              break;
+            }
             numPoints = byteOrder
               ? buffer.readUInt32LE(offset)
               : buffer.readUInt32BE(offset);
             offset += 4;
             line = [];
             for (j = numPoints; j > 0; j--) {
+              if (offset + 16 > bufferLength) {
+                break;
+              }
               x = byteOrder
                 ? buffer.readDoubleLE(offset)
                 : buffer.readDoubleBE(offset);
@@ -593,11 +620,16 @@ class Packet {
         case 5: // WKBMultiLineString
         case 6: // WKBMultiPolygon
         case 7: // WKBGeometryCollection
-          // eslint-disable-next-line no-case-declarations
-          const num = byteOrder
+          if (offset + 4 > bufferLength) {
+            return null;
+          }
+          num = byteOrder
             ? buffer.readUInt32LE(offset)
             : buffer.readUInt32BE(offset);
           offset += 4;
+          if (num > (bufferLength - offset) / 9) {
+            return null;
+          }
           result = [];
           for (i = num; i > 0; i--) {
             result.push(parseGeometry());

package/lib/pool_connection.js

@@ -1,12 +1,81 @@
 'use strict';
 
-const BasePoolConnection = require('./base/pool_connection.js');
+const Connection = require('./connection.js');
+
+class PoolConnection extends Connection {
+  constructor(pool, options) {
+    super(options);
+    this._pool = pool;
+    this._released = false;
+    this.lastActiveTime = Date.now();
+    this.once('end', () => {
+      this._removeFromPool();
+    });
+    this.once('error', () => {
+      this._removeFromPool();
+    });
+  }
+
+  release() {
+    if (this._released) {
+      return;
+    }
+    if (!this._pool || this._pool._closed) {
+      return;
+    }
+    this._released = true;
+    this.lastActiveTime = Date.now();
+    this._pool.releaseConnection(this);
+  }
+
+  [Symbol.dispose]() {
+    this.release();
+  }
+
+  end(callback) {
+    if (this.config.gracefulEnd) {
+      this._removeFromPool();
+      super.end(callback);
+
+      return;
+    }
+
+    const err = new Error(
+      'Calling conn.end() to release a pooled connection is ' +
+        'deprecated. In next version calling conn.end() will be ' +
+        'restored to default conn.end() behavior. Use ' +
+        'conn.release() instead.'
+    );
+    this.emit('warn', err);
+    console.warn(err.message);
+    this.release();
+    if (typeof callback === 'function') {
+      callback();
+    }
+  }
+
+  destroy() {
+    this._removeFromPool();
+    super.destroy();
+  }
+
+  _removeFromPool() {
+    if (!this._pool || this._pool._closed) {
+      return;
+    }
+    const pool = this._pool;
+    this._pool = null;
+    pool._removeConnection(this);
+  }
 
-class PoolConnection extends BasePoolConnection {
   promise(promiseImpl) {
     const PromisePoolConnection = require('./promise/pool_connection.js');
     return new PromisePoolConnection(this, promiseImpl);
   }
 }
 
+PoolConnection.statementKey = Connection.statementKey;
 module.exports = PoolConnection;
+
+// TODO: Remove this when we are removing PoolConnection#end
+PoolConnection.prototype._realEnd = Connection.prototype.end;

package/lib/promise/pool_connection.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const PromiseConnection = require('./connection.js');
-const BasePoolConnection = require('../base/pool_connection.js');
 
 class PromisePoolConnection extends PromiseConnection {
   constructor(connection, promiseImpl) {
@@ -9,10 +8,7 @@ class PromisePoolConnection extends PromiseConnection {
   }
 
   destroy() {
-    return BasePoolConnection.prototype.destroy.apply(
-      this.connection,
-      arguments
-    );
+    return this.connection.destroy();
   }
 
   async [Symbol.asyncDispose]() {

package/lib/tracing.js

@@ -0,0 +1,81 @@
+'use strict';
+
+const process = require('process');
+
+// Safe load: use getBuiltinModule if available, fallback to require, catch if unavailable
+const dc = (() => {
+  try {
+    return 'getBuiltinModule' in process
+      ? process.getBuiltinModule('node:diagnostics_channel')
+      : require('node:diagnostics_channel');
+  } catch {
+    return undefined;
+  }
+})();
+
+const hasTracingChannel = typeof dc?.tracingChannel === 'function';
+
+const queryChannel = hasTracingChannel
+  ? dc.tracingChannel('mysql2:query')
+  : undefined;
+
+const executeChannel = hasTracingChannel
+  ? dc.tracingChannel('mysql2:execute')
+  : undefined;
+
+const connectChannel = hasTracingChannel
+  ? dc.tracingChannel('mysql2:connect')
+  : undefined;
+
+const poolConnectChannel = hasTracingChannel
+  ? dc.tracingChannel('mysql2:pool:connect')
+  : undefined;
+
+function getServerContext(config) {
+  if (config.socketPath) {
+    return { serverAddress: config.socketPath, serverPort: undefined };
+  }
+  return {
+    serverAddress: config.host || 'localhost',
+    serverPort: config.port || 3306,
+  };
+}
+
+// Node 20+: TracingChannel has an aggregated hasSubscribers getter.
+// Node 18.x: that getter is missing (undefined), fall back to start sub-channel.
+function shouldTrace(channel) {
+  if (channel === undefined || channel === null) {
+    return false;
+  }
+  return channel.hasSubscribers ?? channel.start?.hasSubscribers ?? false;
+}
+
+// Generic traceCallback wrapper — calls fn synchronously, wraps the callback
+// at args[position] to emit asyncStart/asyncEnd/error. No promises involved.
+function traceCallback(channel, fn, position, context, thisArg, ...args) {
+  if (shouldTrace(channel)) {
+    return channel.traceCallback(fn, position, context(), thisArg, ...args);
+  }
+  return fn.apply(thisArg, args);
+}
+
+// tracePromise for operations that are inherently async (connection handshake)
+function tracePromise(channel, fn, contextFactory) {
+  if (shouldTrace(channel)) {
+    return channel.tracePromise(fn, contextFactory());
+  }
+  return fn();
+}
+
+module.exports = {
+  dc,
+  hasTracingChannel,
+  shouldTrace,
+  queryChannel,
+  executeChannel,
+  connectChannel,
+  poolConnectChannel,
+  getServerContext,
+  traceCallback,
+  tracePromise,
+};

package/package.json

@@ -1,22 +1,16 @@
 {
   "name": "@depup/mysql2",
-  "version": "3.19.0-depup.0",
-  "description": "fast mysql driver. Implements core protocol, prepared statements, ssl and compression in native JS",
+  "version": "3.20.0-depup.0",
+  "description": "[DepUp] fast mysql driver. Implements core protocol, prepared statements, ssl and compression in native JS",
   "main": "index.js",
   "typings": "typings/mysql/index",
   "type": "commonjs",
   "scripts": {
     "lint": "eslint . && prettier --check .",
     "lint:fix": "eslint . --fix && prettier --write .",
-    "test": "npm run test:parallel && npm run test:global",
-    "test:parallel": "poku -c=\"poku.config.mjs\" test",
-    "test:global": "cross-env SUITE=global poku -c=\"poku.config.mjs\" test/global",
-    "test:bun": "npm run test:bun:parallel && npm run test:bun:global",
-    "test:bun:parallel": "bun poku -c=\"poku.config.mjs\" test",
-    "test:bun:global": "cross-env SUITE=global bun poku -c=\"poku.config.mjs\" test/global",
-    "test:deno": "npm run test:deno:parallel && npm run test:deno:global",
-    "test:deno:parallel": "deno run --allow-read --allow-env --allow-run npm:poku@canary -c=\"poku.config.mjs\" test",
-    "test:deno:global": "cross-env SUITE=global deno run --allow-read --allow-env --allow-run npm:poku@canary -c=\"poku.config.mjs\" test/global",
+    "test": "poku",
+    "test:bun": "bun poku",
+    "test:deno": "deno run -A npm:poku",
     "test:docker:up": "docker compose -f test/docker-compose.yml up --abort-on-container-exit --remove-orphans",
     "test:docker:down": "docker compose -f test/docker-compose.yml down",
     "test:docker:node": "npm run test:docker:up -- node && npm run test:docker:down",
@@ -24,6 +18,7 @@
     "test:docker:deno": "npm run test:docker:up -- deno && npm run test:docker:down",
     "test:docker:coverage": "npm run test:docker:up -- coverage && npm run test:docker:down",
     "test:coverage": "c8 npm test",
+    "test:build": "rollup -c",
     "typecheck": "cd \"test/tsc-build\" && tsc -p \"tsconfig.json\" && cd .. && tsc -p \"tsconfig.json\" --noEmit",
     "benchmark": "node ./benchmarks/benchmark.js",
     "wait-port": "wait-on"
@@ -34,6 +29,10 @@
   },
   "homepage": "https://sidorares.github.io/node-mysql2/docs",
   "keywords": [
+    "depup",
+    "dependency-bumped",
+    "updated-deps",
+    "mysql2",
     "mysql",
     "client",
     "server"
@@ -75,22 +74,34 @@
     "@eslint/js": "^9.39.2",
     "@eslint/markdown": "^7.5.1",
     "@ianvs/prettier-plugin-sort-imports": "^4.7.1",
+    "@pokujs/multi-suite": "^1.0.0",
+    "@rollup/plugin-commonjs": "^29.0.2",
+    "@rollup/plugin-json": "^6.1.0",
+    "@rollup/plugin-node-resolve": "^16.0.3",
     "@types/node": "^25.3.0",
     "@typescript-eslint/eslint-plugin": "^8.56.0",
     "@typescript-eslint/parser": "^8.56.0",
     "assert-diff": "^3.0.4",
     "benchmark": "^2.1.4",
     "c8": "^11.0.0",
-    "cross-env": "^10.1.0",
     "error-stack-parser": "^2.1.4",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-async-await": "^0.0.0",
     "eslint-plugin-prettier": "^5.5.5",
     "globals": "^17.3.0",
-    "poku": "^3.0.3-canary.8f374795",
+    "poku": "^4.1.0",
     "portfinder": "^1.0.38",
     "prettier": "^3.8.1",
+    "rollup": "^4.59.0",
     "tsx": "^4.21.0",
     "typescript": "^5.9.3"
+  },
+  "depup": {
+    "changes": {},
+    "depsUpdated": 0,
+    "originalPackage": "mysql2",
+    "originalVersion": "3.20.0",
+    "processedAt": "2026-03-16T00:39:43.420Z",
+    "smokeTest": "passed"
   }
 }

package/promise.d.ts

@@ -40,7 +40,7 @@ export interface PreparedStatementInfo {
   >;
 }
 
-export interface Connection extends QueryableAndExecutableBase {
+export declare class Connection extends QueryableAndExecutableBase {
   config: ConnectionOptions;
 
   threadId: number;
@@ -81,7 +81,7 @@ export interface Connection extends QueryableAndExecutableBase {
   format(sql: string, values?: any | any[] | { [param: string]: any }): string;
 }
 
-export interface PoolConnection extends Connection {
+export declare class PoolConnection extends Connection {
   release(): void;
   connection: Connection;
   [Symbol.asyncDispose](): Promise<void>;

package/promise.js

@@ -185,6 +185,8 @@ exports.escape = SqlString.escape;
 exports.escapeId = SqlString.escapeId;
 exports.format = SqlString.format;
 exports.raw = SqlString.raw;
+exports.Connection = PromiseConnection;
+exports.PoolConnection = PromisePoolConnection;
 exports.PromisePool = PromisePool;
 exports.PromiseConnection = PromiseConnection;
 exports.PromisePoolConnection = PromisePoolConnection;

package/typings/mysql/index.d.ts

@@ -14,7 +14,6 @@ import {
   PoolClusterOptions,
   PoolNamespace,
 } from './lib/PoolCluster.js';
-import { PoolConnection as BasePoolConnection } from './lib/PoolConnection.js';
 import {
   Prepare as BasePrepare,
   PrepareStatementInfo,
@@ -44,11 +43,10 @@ export * from './lib/Auth.js';
 export * from './lib/constants/index.js';
 export * from './lib/parsers/index.js';
 export * from './lib/Connection.js';
+export * from './lib/PoolConnection.js';
 
 // Expose class interfaces
-export interface Connection extends BaseConnection {}
 export interface Pool extends BasePool {}
-export interface PoolConnection extends BasePoolConnection {}
 export interface PoolCluster extends BasePoolCluster {}
 export interface Query extends BaseQuery {}
 export interface Prepare extends BasePrepare {}
@@ -82,3 +80,10 @@ export interface ConnectionConfig extends ConnectionOptions {
 }
 
 export function createServer(handler: (conn: BaseConnection) => any): Server;
+
+export type {
+  QueryTraceContext,
+  ExecuteTraceContext,
+  ConnectTraceContext,
+  PoolConnectTraceContext,
+} from './lib/Tracing.js';

package/typings/mysql/lib/Tracing.d.ts

@@ -0,0 +1,71 @@
+import type { TracingChannel } from 'node:diagnostics_channel';
+
+export interface QueryTraceContext {
+  query: string;
+  values: any;
+  database: string;
+  serverAddress: string;
+  serverPort: number | undefined;
+}
+
+export interface ExecuteTraceContext {
+  query: string;
+  values: any;
+  database: string;
+  serverAddress: string;
+  serverPort: number | undefined;
+}
+
+export interface ConnectTraceContext {
+  database: string;
+  serverAddress: string;
+  serverPort: number | undefined;
+  user: string;
+}
+
+export interface PoolConnectTraceContext {
+  database: string;
+  serverAddress: string;
+  serverPort: number | undefined;
+}
+
+export declare const dc: typeof import('node:diagnostics_channel') | undefined;
+export declare const hasTracingChannel: boolean;
+
+export declare function shouldTrace(
+  channel: TracingChannel<object> | undefined | null
+): boolean;
+
+export declare function traceCallback<T extends object>(
+  channel: TracingChannel<T> | undefined | null,
+  fn: (...args: any[]) => any,
+  position: number,
+  contextFactory: () => T,
+  thisArg: any,
+  ...args: any[]
+): any;
+
+export declare function tracePromise<T extends object, R>(
+  channel: TracingChannel<T> | undefined | null,
+  fn: () => Promise<R>,
+  contextFactory: () => T
+): Promise<R>;
+
+export declare const queryChannel:
+  | TracingChannel<QueryTraceContext>
+  | undefined;
+export declare const executeChannel:
+  | TracingChannel<ExecuteTraceContext>
+  | undefined;
+export declare const connectChannel:
+  | TracingChannel<ConnectTraceContext>
+  | undefined;
+export declare const poolConnectChannel:
+  | TracingChannel<PoolConnectTraceContext>
+  | undefined;
+
+export declare function getServerContext(config: {
+  socketPath?: string;
+  host?: string;
+  port?: number;
+}): { serverAddress: string; serverPort: number | undefined };

package/lib/base/pool_connection.js

@@ -1,77 +0,0 @@
-'use strict';
-
-const BaseConnection = require('./connection.js');
-
-class BasePoolConnection extends BaseConnection {
-  constructor(pool, options) {
-    super(options);
-    this._pool = pool;
-    // The last active time of this connection
-    this.lastActiveTime = Date.now();
-    // When a fatal error occurs the connection's protocol ends, which will cause
-    // the connection to end as well, thus we only need to watch for the end event
-    // and we will be notified of disconnects.
-    // REVIEW: Moved to `once`
-    this.once('end', () => {
-      this._removeFromPool();
-    });
-    this.once('error', () => {
-      this._removeFromPool();
-    });
-  }
-
-  release() {
-    if (!this._pool || this._pool._closed) {
-      return;
-    }
-    // update last active time
-    this.lastActiveTime = Date.now();
-    this._pool.releaseConnection(this);
-  }
-
-  [Symbol.dispose]() {
-    this.release();
-  }
-
-  end(callback) {
-    if (this.config.gracefulEnd) {
-      this._removeFromPool();
-      super.end(callback);
-
-      return;
-    }
-
-    const err = new Error(
-      'Calling conn.end() to release a pooled connection is ' +
-        'deprecated. In next version calling conn.end() will be ' +
-        'restored to default conn.end() behavior. Use ' +
-        'conn.release() instead.'
-    );
-    this.emit('warn', err);
-    console.warn(err.message);
-    this.release();
-    if (typeof callback === 'function') {
-      callback();
-    }
-  }
-
-  destroy() {
-    this._removeFromPool();
-    super.destroy();
-  }
-
-  _removeFromPool() {
-    if (!this._pool || this._pool._closed) {
-      return;
-    }
-    const pool = this._pool;
-    this._pool = null;
-    pool._removeConnection(this);
-  }
-}
-
-BasePoolConnection.statementKey = BaseConnection.statementKey;
-module.exports = BasePoolConnection;
-
-// TODO: Remove this when we are removing PoolConnection#end
-BasePoolConnection.prototype._realEnd = BaseConnection.prototype.end;