ali-rds-fix - npm Package Compare versions

Comparing version 3.3.2 to 6.2.0

lib/client.js

@@ -1,154 +0,285 @@
-'use strict';
-
-const util = require('util');
-const mysql = require('mysql');
-const wrap = require('co-wrap-all');
-const Operator = require('./operator');
-const RDSConnection = require('./connection');
-const RDSTransaction = require('./transaction');
-const promisify = require('pify');
-
-module.exports = RDSClient;
-module.exports.literals = require('./literals');
-
-function RDSClient(options) {
-  if (!(this instanceof RDSClient)) {
-    return new RDSClient(options);
-  }
-  Operator.call(this);
-
-  this.pool = mysql.createPool(options);
-  [
-    'query',
-    'getConnection',
-  ].forEach(method => {
-    this.pool[method] = promisify(this.pool[method]);
-  });
-}
-
-util.inherits(RDSClient, Operator);
-
-const proto = RDSClient.prototype;
-
-proto._query = function(sql) {
-  return this.pool.query(sql);
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-
-proto.getConnection = function() {
-  return this.pool.getConnection().then(onConnection, onError);
-  function onConnection(conn) {
-    return new RDSConnection(conn);
-  }
-  function onError(err) {
-    if (err.name === 'Error') {
-      err.name = 'RDSClientGetConnectionError';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RDSClient = void 0;
+const node_async_hooks_1 = require("node:async_hooks");
+const node_util_1 = require("node:util");
+const mysql_1 = __importDefault(require("mysql"));
+const operator_1 = require("./operator");
+const connection_1 = require("./connection");
+const transaction_1 = require("./transaction");
+const PoolConfig_1 = require("./PoolConfig");
+const literals_1 = __importDefault(require("./literals"));
+const channels_1 = __importDefault(require("./channels"));
+class RDSClient extends operator_1.Operator {
+    static get literals() { return literals_1.default; }
+    static get escape() { return mysql_1.default.escape; }
+    static get escapeId() { return mysql_1.default.escapeId; }
+    static get format() { return mysql_1.default.format; }
+    static get raw() { return mysql_1.default.raw; }
+    static #DEFAULT_STORAGE_KEY = Symbol('RDSClient#storage#default');
+    static #TRANSACTION_NEST_COUNT = Symbol('RDSClient#transaction#nestCount');
+    #pool;
+    #connectionStorage;
+    #connectionStorageKey;
+    constructor(options) {
+        super();
+        const { connectionStorage, connectionStorageKey, ...mysqlOptions } = options;
+        // get connection options from getConnectionConfig method every time
+        if (mysqlOptions.getConnectionConfig) {
+            // eslint-disable-next-line @typescript-eslint/no-var-requires
+            const MySQLPool = require('mysql/lib/Pool');
+            this.#pool = new MySQLPool({
+                config: new PoolConfig_1.RDSPoolConfig(mysqlOptions, mysqlOptions.getConnectionConfig),
+            });
+            // override _needsChangeUser to return false
+            this.#pool._needsChangeUser = () => false;
+        }
+        else {
+            this.#pool = mysql_1.default.createPool(mysqlOptions);
+        }
+        [
+            'query',
+            'getConnection',
+            'end',
+        ].forEach(method => {
+            this.#pool[method] = (0, node_util_1.promisify)(this.#pool[method]);
+        });
+        this.#connectionStorage = connectionStorage || new node_async_hooks_1.AsyncLocalStorage();
+        this.#connectionStorageKey = connectionStorageKey || RDSClient.#DEFAULT_STORAGE_KEY;
+        // https://github.com/mysqljs/mysql#pool-events
+        this.#pool.on('connection', (connection) => {
+            channels_1.default.connectionNew.publish({
+                client: this,
+                connection,
+            });
+        });
+        this.#pool.on('enqueue', () => {
+            channels_1.default.connectionEnqueue.publish({
+                client: this,
+            });
+        });
+        this.#pool.on('acquire', (connection) => {
+            channels_1.default.connectionAcquire.publish({
+                client: this,
+                connection,
+            });
+        });
+        this.#pool.on('release', (connection) => {
+            channels_1.default.connectionRelease.publish({
+                client: this,
+                connection,
+            });
+        });
     }
-    throw err;
-  }
-};
-
-/**
- * Begin a transaction
- *
- * @return {Transaction} transaction instance
- */
-proto.beginTransaction = function* () {
-  const conn = yield this.getConnection();
-  try {
-    yield conn.beginTransaction();
-  } catch (err) {
-    conn.release();
-    throw err;
-  }
-
-  return new RDSTransaction(conn);
-};
-
-/**
- * Auto commit or rollback on a transaction scope
- *
- * @param {Function} scope - scope with code
- * @param {Object} [ctx] - transaction env context, like koa's ctx.
- *   To make sure only one active transaction on this ctx.
- * @return {Object} - scope return result
- */
-proto.beginTransactionScope = function* (scope, ctx) {
-  ctx = ctx || {};
-  if (!ctx._transactionConnection) {
-    ctx._transactionConnection = yield this.beginTransaction();
-    ctx._transactionScopeCount = 1;
-  } else {
-    ctx._transactionScopeCount++;
-  }
-  const tran = ctx._transactionConnection;
-  try {
-    const result = yield scope(tran);
-    ctx._transactionScopeCount--;
-    if (ctx._transactionScopeCount === 0) {
-      ctx._transactionConnection = null;
-      yield tran.commit();
+    async query(sql, values) {
+        const conn = await this.getConnection();
+        try {
+            return await conn.query(sql, values);
+        }
+        finally {
+            conn.release();
+        }
     }
-    return result;
-  } catch (err) {
-    if (ctx._transactionConnection) {
-      ctx._transactionConnection = null;
-      yield tran.rollback();
+    get pool() {
+        return this.#pool;
     }
-    throw err;
-  }
-};
-
-/**
- * doomed to be rollbacked after transaction scope
- * useful on writing test that depend on database
- *
- * @param {Function} scope - scope with code
- * @param {Object} [ctx] - transaction env context, like koa's ctx.
- *   To make sure only one active transaction on this ctx.
- * @return {Object} - scope return result
- */
-proto.beginDoomedTransactionScope = function* (scope, ctx) {
-  ctx = ctx || {};
-  if (!ctx._transactionConnection) {
-    ctx._transactionConnection = yield this.beginTransaction();
-    ctx._transactionScopeCount = 1;
-  } else {
-    ctx._transactionScopeCount++;
-  }
-  const tran = ctx._transactionConnection;
-  try {
-    const result = yield scope(tran);
-    ctx._transactionScopeCount--;
-    if (ctx._transactionScopeCount === 0) {
-      ctx._transactionConnection = null;
+    get stats() {
+        return {
+            acquiringConnections: this.#pool._acquiringConnections.length,
+            allConnections: this.#pool._allConnections.length,
+            freeConnections: this.#pool._freeConnections.length,
+            connectionQueue: this.#pool._connectionQueue.length,
+        };
     }
-    return result;
-  } catch (err) {
-    if (ctx._transactionConnection) {
-      ctx._transactionConnection = null;
+    async getConnection() {
+        try {
+            const _conn = await this.#pool.getConnection();
+            const conn = new connection_1.RDSConnection(_conn);
+            if (this.beforeQueryHandlers.length > 0) {
+                for (const handler of this.beforeQueryHandlers) {
+                    conn.beforeQuery(handler);
+                }
+            }
+            if (this.afterQueryHandlers.length > 0) {
+                for (const handler of this.afterQueryHandlers) {
+                    conn.afterQuery(handler);
+                }
+            }
+            return conn;
+        }
+        catch (err) {
+            if (err.name === 'Error') {
+                err.name = 'RDSClientGetConnectionError';
+            }
+            throw err;
+        }
     }
-    throw err;
-  } finally {
-    yield tran.rollback();
-  }
-};
-
-proto.end = function(callback) {
-  // callback style
-  if (callback) {
-    return this.pool.end(callback);
-  }
-
-  // promise style
-  const that = this;
-  return new Promise(function(resolve, reject) {
-    that.pool.end(function(err) {
-      if (err) {
-        return reject(err);
-      }
-      resolve();
-    });
-  });
-};
-
-wrap(proto);
+    /**
+     * Begin a transaction
+     *
+     * @return {RDSTransaction} transaction instance
+     */
+    async beginTransaction() {
+        const conn = await this.getConnection();
+        try {
+            await conn.beginTransaction();
+        }
+        catch (err) {
+            conn.release();
+            throw err;
+        }
+        const tran = new transaction_1.RDSTransaction(conn);
+        tran[RDSClient.#TRANSACTION_NEST_COUNT] = 1;
+        if (this.beforeQueryHandlers.length > 0) {
+            for (const handler of this.beforeQueryHandlers) {
+                tran.beforeQuery(handler);
+            }
+        }
+        if (this.afterQueryHandlers.length > 0) {
+            for (const handler of this.afterQueryHandlers) {
+                tran.afterQuery(handler);
+            }
+        }
+        return tran;
+    }
+    /**
+     * Auto commit or rollback on a transaction scope
+     *
+     * @param {Function} scope - scope with code
+     * @param {Object} [ctx] - transaction context
+     * @return {Object} - scope return result
+     */
+    async #beginTransactionScope(scope, ctx) {
+        let tran;
+        let shouldRelease = false;
+        if (!ctx[this.#connectionStorageKey]) {
+            // there is no transaction in ctx, create a new one
+            tran = await this.beginTransaction();
+            ctx[this.#connectionStorageKey] = tran;
+            shouldRelease = true;
+        }
+        else {
+            // use transaction in ctx
+            tran = ctx[this.#connectionStorageKey];
+            tran[RDSClient.#TRANSACTION_NEST_COUNT]++;
+        }
+        let result;
+        let scopeError;
+        let internalError;
+        try {
+            result = await scope(tran);
+        }
+        catch (err) {
+            scopeError = err;
+        }
+        tran[RDSClient.#TRANSACTION_NEST_COUNT]--;
+        // null connection means the nested scope has been rollback, we can do nothing here
+        if (tran.conn) {
+            try {
+                // execution error, should rollback
+                if (scopeError) {
+                    await tran.rollback();
+                }
+                else if (tran[RDSClient.#TRANSACTION_NEST_COUNT] < 1) {
+                    // nestedCount smaller than 1 means all the nested scopes have executed successfully
+                    await tran.commit();
+                }
+            }
+            catch (err) {
+                internalError = err;
+            }
+        }
+        // remove transaction in ctx
+        if (shouldRelease && tran[RDSClient.#TRANSACTION_NEST_COUNT] < 1) {
+            ctx[this.#connectionStorageKey] = null;
+        }
+        if (internalError) {
+            if (scopeError) {
+                internalError.cause = scopeError;
+            }
+            throw internalError;
+        }
+        if (scopeError) {
+            throw scopeError;
+        }
+        return result;
+    }
+    /**
+     * Auto commit or rollback on a transaction scope
+     *
+     * @param scope - scope with code
+     * @return {Object} - scope return result
+     */
+    async beginTransactionScope(scope) {
+        let ctx = this.#connectionStorage.getStore();
+        if (ctx) {
+            return await this.#beginTransactionScope(scope, ctx);
+        }
+        ctx = {};
+        return await this.#connectionStorage.run(ctx, async () => {
+            return await this.#beginTransactionScope(scope, ctx);
+        });
+    }
+    /**
+     * doomed to be rollbacked after transaction scope
+     * useful on writing tests which are related with database
+     *
+     * @param scope - scope with code
+     * @param ctx - transaction context
+     * @return {Object} - scope return result
+     */
+    async #beginDoomedTransactionScope(scope, ctx) {
+        let tran;
+        if (!ctx[this.#connectionStorageKey]) {
+            // there is no transaction in ctx, create a new one
+            tran = await this.beginTransaction();
+            ctx[this.#connectionStorageKey] = tran;
+        }
+        else {
+            // use transaction in ctx
+            tran = ctx[this.#connectionStorageKey];
+            tran[RDSClient.#TRANSACTION_NEST_COUNT]++;
+        }
+        try {
+            const result = await scope(tran);
+            tran[RDSClient.#TRANSACTION_NEST_COUNT]--;
+            if (tran[RDSClient.#TRANSACTION_NEST_COUNT] === 0) {
+                ctx[this.#connectionStorageKey] = null;
+                await tran.rollback();
+            }
+            return result;
+        }
+        catch (err) {
+            if (ctx[this.#connectionStorageKey]) {
+                ctx[this.#connectionStorageKey] = null;
+                await tran.rollback();
+            }
+            throw err;
+        }
+    }
+    /**
+     * doomed to be rollbacked after transaction scope
+     * useful on writing tests which are related with database
+     *
+     * @param scope - scope with code
+     * @return {Object} - scope return result
+     */
+    async beginDoomedTransactionScope(scope) {
+        let ctx = this.#connectionStorage.getStore();
+        if (ctx) {
+            return await this.#beginDoomedTransactionScope(scope, ctx);
+        }
+        ctx = {};
+        return await this.#connectionStorage.run(ctx, async () => {
+            return await this.#beginDoomedTransactionScope(scope, ctx);
+        });
+    }
+    async end() {
+        await this.#pool.end();
+    }
+}
+exports.RDSClient = RDSClient;
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}

lib/connection.js

@@ -1,51 +0,41 @@
-'use strict';
-
-/**
- * Module dependencies.
- */
-
-const util = require('util');
-const Operator = require('./operator');
-const promisify = require('pify');
-
-module.exports = RDSConnection;
-
-function RDSConnection(conn) {
-  Operator.call(this);
-  this.conn = conn;
-  if (!conn._wrapToRDS) {
-    [
-      'query',
-      'beginTransaction',
-      'commit',
-      'rollback',
-    ].forEach(key => {
-      this.conn[key] = promisify(this.conn[key]);
-    });
-    conn._wrapToRDS = true;
-  }
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RDSConnection = void 0;
+const node_util_1 = require("node:util");
+const operator_1 = require("./operator");
+const kWrapToRDS = Symbol('kWrapToRDS');
+class RDSConnection extends operator_1.Operator {
+    conn;
+    constructor(conn) {
+        super(conn);
+        this.conn = conn;
+        if (!this.conn[kWrapToRDS]) {
+            [
+                'query',
+                'beginTransaction',
+                'commit',
+                'rollback',
+            ].forEach(key => {
+                this.conn[key] = (0, node_util_1.promisify)(this.conn[key]);
+            });
+            this.conn[kWrapToRDS] = true;
+        }
+    }
+    release() {
+        return this.conn.release();
+    }
+    async _query(sql) {
+        return await this.conn.query(sql);
+    }
+    async beginTransaction() {
+        return await this.conn.beginTransaction();
+    }
+    async commit() {
+        return await this.conn.commit();
+    }
+    async rollback() {
+        return await this.conn.rollback();
+    }
 }
-
-util.inherits(RDSConnection, Operator);
-
-const proto = RDSConnection.prototype;
-
-proto.release = function() {
-  this.conn.release();
-};
-
-proto._query = function(sql) {
-  return this.conn.query(sql);
-};
-
-proto.beginTransaction = function() {
-  return this.conn.beginTransaction();
-};
-
-proto.commit = function() {
-  return this.conn.commit();
-};
-
-proto.rollback = function() {
-  return this.conn.rollback();
-};
+exports.RDSConnection = RDSConnection;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29ubmVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25uZWN0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHlDQUFzQztBQUN0Qyx5Q0FBc0M7QUFHdEMsTUFBTSxVQUFVLEdBQUcsTUFBTSxDQUFDLFlBQVksQ0FBQyxDQUFDO0FBRXhDLE1BQWEsYUFBYyxTQUFRLG1CQUFRO0lBQ3pDLElBQUksQ0FBMEI7SUFDOUIsWUFBWSxJQUE2QjtRQUN2QyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDWixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQztRQUNqQixJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsRUFBRTtZQUMxQjtnQkFDRSxPQUFPO2dCQUNQLGtCQUFrQjtnQkFDbEIsUUFBUTtnQkFDUixVQUFVO2FBQ1gsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLEVBQUU7Z0JBQ2QsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsR0FBRyxJQUFBLHFCQUFTLEVBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO1lBQzdDLENBQUMsQ0FBQyxDQUFDO1lBQ0gsSUFBSSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxJQUFJLENBQUM7U0FDOUI7SUFDSCxDQUFDO0lBRUQsT0FBTztRQUNMLE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUM3QixDQUFDO0lBRUQsS0FBSyxDQUFDLE1BQU0sQ0FBQyxHQUFXO1FBQ3RCLE9BQU8sTUFBTSxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUNwQyxDQUFDO0lBRUQsS0FBSyxDQUFDLGdCQUFnQjtRQUNwQixPQUFPLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDO0lBQzVDLENBQUM7SUFFRCxLQUFLLENBQUMsTUFBTTtRQUNWLE9BQU8sTUFBTSxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO0lBQ2xDLENBQUM7SUFFRCxLQUFLLENBQUMsUUFBUTtRQUNaLE9BQU8sTUFBTSxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO0lBQ3BDLENBQUM7Q0FDRjtBQXJDRCxzQ0FxQ0MifQ==

lib/literals.js

@@ -1,20 +0,18 @@
-'use strict';
-
-/**
- * Module dependencies.
- */
-
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Literal = void 0;
+class Literal {
+    #text;
+    constructor(text) {
+        this.#text = text;
+    }
+    toString() {
+        return this.#text;
+    }
+}
 exports.Literal = Literal;
-
-function Literal(text) {
-  if (!(this instanceof Literal)) {
-    return new Literal(text);
-  }
-  this.text = text;
-}
-
-Literal.prototype.toString = function() {
-  return this.text;
+exports.default = {
+    now: new Literal('now()'),
+    Literal,
 };
-
-exports.now = new Literal('now()');
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGl0ZXJhbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvbGl0ZXJhbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsTUFBYSxPQUFPO0lBQ2xCLEtBQUssQ0FBUztJQUNkLFlBQVksSUFBWTtRQUN0QixJQUFJLENBQUMsS0FBSyxHQUFHLElBQUksQ0FBQztJQUNwQixDQUFDO0lBRUQsUUFBUTtRQUNOLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQztJQUNwQixDQUFDO0NBQ0Y7QUFURCwwQkFTQztBQUVELGtCQUFlO0lBQ2IsR0FBRyxFQUFFLElBQUksT0FBTyxDQUFDLE9BQU8sQ0FBQztJQUN6QixPQUFPO0NBQ1IsQ0FBQyJ9

lib/operator.js

@@ -1,392 +0,497 @@
-'use strict';
-
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Operator = void 0;
+const node_util_1 = require("node:util");
+const sqlstring_1 = require("./sqlstring");
+const literals_1 = __importDefault(require("./literals"));
+const channels_1 = __importDefault(require("./channels"));
+const debug = (0, node_util_1.debuglog)('ali-rds:operator');
 /**
- * Module dependencies.
- */
-
-const debug = require('debug')('ali-rds:operator');
-const SqlString = require('./sqlstring');
-const literals = require('./literals');
-const wrap = require('co-wrap-all');
-
-module.exports = Operator;
-
-/**
  * Operator Interface
  */
-function Operator() {}
-
-const proto = Operator.prototype;
-
-proto.literals = literals;
-
-proto.escape = function(value, stringifyObjects, timeZone) {
-  return SqlString.escape(value, stringifyObjects, timeZone);
-};
-
-proto.escapeId = function(value, forbidQualified) {
-  return SqlString.escapeId(value, forbidQualified);
-};
-
-proto.format = function(sql, values, stringifyObjects, timeZone) {
-  // if values is object, not null, not Array;
-  if (!Array.isArray(values) && typeof values === 'object' && values !== null) {
-    // object not support replace column like ??;
-    return sql.replace(/\:(\w+)/g, function(txt, key) {
-      if (values.hasOwnProperty(key)) {
-        return SqlString.escape(values[key]);
-      }
-      // if values don't hasOwnProperty, return origin txt;
-      return txt;
-    });
-  }
-  return SqlString.format(sql, values, stringifyObjects, timeZone);
-
-};
-
-proto.query = function* (sql, values) {
-  // query(sql, values)
-  if (arguments.length >= 2) {
-    sql = this.format(sql, values);
-  }
-  debug('query %j', sql);
-  try {
-    const rows = yield this._query(sql);
-    debug('query get %d rows', rows.length);
-    return rows;
-  } catch (err) {
-    err.stack = err.stack + '\n    sql: ' + sql;
-    debug('query error: %s', err);
-    throw err;
-  }
-};
-
-proto.queryOne = function* (sql, values) {
-  const rows = yield this.query(sql, values);
-  return rows && rows[0] || null;
-};
-
-proto._query = function(/* sql */) {
-  throw new Error('SubClass must impl this');
-};
-
-proto.count = function* (table, where) {
-  const sql = this.format('SELECT COUNT(*) as count FROM ??', [ table ]) +
-    this._where(where);
-  debug('count(%j, %j) \n=> %j', table, where, sql);
-  const rows = yield this.query(sql);
-  return rows[0].count;
-};
-
-/**
- * Select rows from a table
- *
- * @param  {String} table     table name
- * @param  {Object} [options] optional params
- *  - {Object} where          query condition object
- *  - {Array|String} columns  select columns, default is `'*'`
- *  - {Array|String} orders   result rows sort condition
- *  - {Number} limit          result limit count, default is no limit
- *  - {Number} offset         result offset, default is `0`
- * @return {Array} result rows
- */
-proto.select = function* (table, options) {
-  options = options || {};
-  const sql = this._selectColumns(table, options.columns) +
-    this._where(options.where) +
-    this._orders(options.orders) +
-    this._limit(options.limit, options.offset);
-  debug('select(%j, %j) \n=> %j', table, options, sql);
-  return yield this.query(sql);
-};
-
-proto.get = function* (table, where, options) {
-  options = options || {};
-  options.where = where;
-  options.limit = 1;
-  options.offset = 0;
-  const rows = yield this.select(table, options);
-  return rows && rows[0] || null;
-};
-
-proto.insert = function* (table, rows, options) {
-  options = options || {};
-  let firstObj;
-  // insert(table, rows)
-  if (Array.isArray(rows)) {
-    firstObj = rows[0];
-  } else {
-    // insert(table, row)
-    firstObj = rows;
-    rows = [ rows ];
-  }
-  if (!options.columns) {
-    options.columns = Object.keys(firstObj);
-  }
-
-  const params = [ table, options.columns ];
-  const strs = [];
-  for (let i = 0; i < rows.length; i++) {
-    const values = [];
-    const row = rows[i];
-    for (let j = 0; j < options.columns.length; j++) {
-      values.push(row[options.columns[j]]);
+class Operator {
+    #connection;
+    constructor(connection) {
+        if (connection) {
+            this.#connection = connection;
+        }
     }
-    strs.push('(?)');
-    params.push(values);
-  }
-
-  const sql = this.format('INSERT INTO ??(??) VALUES' + strs.join(', '), params);
-  debug('insert(%j, %j, %j) \n=> %j', table, rows, options, sql);
-  return yield this.query(sql);
-};
-
-proto.update = function* (table, row, options) {
-  options = options || {};
-  if (!options.columns) {
-    options.columns = Object.keys(row);
-  }
-  if (!options.where) {
-    if (!('id' in row)) {
-      throw new Error('Can not auto detect update condition, please set options.where, or make sure obj.id exists');
+    beforeQueryHandlers = [];
+    afterQueryHandlers = [];
+    get literals() { return literals_1.default; }
+    get threadId() {
+        return this.#connection?.threadId;
     }
-    options.where = {
-      id: row.id,
-    };
-  }
-
-  const sets = [];
-  const values = [];
-  for (let i = 0; i < options.columns.length; i++) {
-    const column = options.columns[i];
-    sets.push('?? = ?');
-    values.push(column);
-    values.push(row[column]);
-  }
-  const sql = this.format('UPDATE ?? SET ', [ table ]) +
-    this.format(sets.join(', '), values) +
-    this._where(options.where);
-  debug('update(%j, %j, %j) \n=> %j', table, row, options, sql);
-  return yield this.query(sql);
-};
-
-/**
- *
- * Update multiple rows from a table
- *
- * UPDATE `table_name` SET
- *  `column1` CASE
- *     WHEN  condition1 THEN 'value11'
- *     WHEN  condition2 THEN 'value12'
- *     WHEN  condition3 THEN 'value13'
- *     ELSE `column1` END,
- *  `column2` CASE
- *     WHEN  condition1 THEN 'value21'
- *     WHEN  condition2 THEN 'value22'
- *     WHEN  condition3 THEN 'value23'
- *     ELSE `column2` END
- * WHERE condition
- *
- * See MySQL Case Syntax: https://dev.mysql.com/doc/refman/5.7/en/case.html
- *
- * @param {String} table table name
- * @param {Array<Object>} options Object Arrays
- *    each Object needs a primary key `id`, or each Object has `row` and `where` properties
- *    e.g.
- *      [{ id: 1, name: 'fengmk21' }]
- *      or [{ row: { name: 'fengmk21' }, where: { id: 1 } }]
- * @return {object} update result
- */
-proto.updateRows = function* (table, options) {
-  if (!Array.isArray(options)) {
-    throw new Error('Options should be array');
-  }
-
-  /**
-   * {
-   *  column: {
-   *    when: [ 'WHEN condition1 THEN ?', 'WHEN condition12 THEN ?' ],
-   *    then: [ value1, value1 ]
-   *  }
-   * }
-   */
-  const SQL_CASE = {};
-  // e.g. { id: [], column: [] }
-  const WHERE = {};
-
-  options.forEach(option => {
-
-    if (!option.hasOwnProperty('id') && !(option.row && option.where)) {
-      throw new Error('Can not auto detect updateRows condition, please set option.row and option.where, or make sure option.id exists');
+    beforeQuery(beforeQueryHandler) {
+        this.beforeQueryHandlers.push(beforeQueryHandler);
     }
-
-    // convert { id, column } to { row: { column }, where: { id } }
-    if (option.hasOwnProperty('id')) {
-      const where = { id: option.id };
-      const row = Object.keys(option).reduce((result, key) => {
-        if (key !== 'id') {
-          result[key] = option[key];
+    afterQuery(afterQueryHandler) {
+        this.afterQueryHandlers.push(afterQueryHandler);
+    }
+    escape(value, stringifyObjects, timeZone) {
+        return sqlstring_1.SqlString.escape(value, stringifyObjects, timeZone);
+    }
+    escapeId(value, forbidQualified) {
+        return sqlstring_1.SqlString.escapeId(value, forbidQualified);
+    }
+    format(sql, values, stringifyObjects, timeZone) {
+        // if values is object, not null, not Array;
+        if (!Array.isArray(values) && typeof values === 'object' && values !== null) {
+            // object not support replace column like ??;
+            return sql.replace(/\:(\w+)/g, (text, key) => {
+                if (values.hasOwnProperty(key)) {
+                    return sqlstring_1.SqlString.escape(values[key]);
+                }
+                // if values don't hasOwnProperty, return origin text;
+                return text;
+            });
         }
-        return result;
-      }, {});
-      option = { row, where };
+        return sqlstring_1.SqlString.format(sql, values, stringifyObjects, timeZone);
     }
-
-    let where = this._where(option.where);
-    where = where.indexOf('WHERE') === -1 ? where : where.substring(where.indexOf('WHERE') + 5);
-    for (const key in option.row) {
-      if (!SQL_CASE[key]) {
-        SQL_CASE[key] = { when: [], then: [] };
-      }
-      SQL_CASE[key].when.push(' WHEN ' + where + ' THEN ? ');
-      SQL_CASE[key].then.push(option.row[key]);
+    async query(sql, values) {
+        // query(sql, values)
+        if (values) {
+            sql = this.format(sql, values);
+        }
+        if (this.beforeQueryHandlers.length > 0) {
+            for (const beforeQueryHandler of this.beforeQueryHandlers) {
+                const newSql = beforeQueryHandler(sql);
+                if (newSql) {
+                    sql = newSql;
+                }
+            }
+        }
+        debug('[connection#%s] query %o', this.threadId, sql);
+        const queryStart = performance.now();
+        let rows;
+        let lastError;
+        channels_1.default.queryStart.publish({
+            sql,
+            connection: this.#connection,
+        });
+        try {
+            rows = await this._query(sql);
+            if (Array.isArray(rows)) {
+                debug('[connection#%s] query get %o rows', this.threadId, rows.length);
+            }
+            else {
+                debug('[connection#%s] query result: %o', this.threadId, rows);
+            }
+            return rows;
+        }
+        catch (err) {
+            lastError = err;
+            err.stack = `${err.stack}\n    sql: ${sql}`;
+            debug('[connection#%s] query error: %o', this.threadId, err);
+            throw err;
+        }
+        finally {
+            const duration = Math.floor((performance.now() - queryStart) * 1000) / 1000;
+            channels_1.default.queryEnd.publish({
+                sql,
+                connection: this.#connection,
+                duration,
+                error: lastError,
+            });
+            if (this.afterQueryHandlers.length > 0) {
+                for (const afterQueryHandler of this.afterQueryHandlers) {
+                    afterQueryHandler(sql, rows, duration, lastError);
+                }
+            }
+        }
     }
-
-    for (const key in option.where) {
-      if (!WHERE[key]) {
-        WHERE[key] = [];
-      }
-      if (WHERE[key].indexOf(option.where[key]) === -1) {
-        WHERE[key].push(option.where[key]);
-      }
+    async queryOne(sql, values) {
+        const rows = await this.query(sql, values);
+        return rows && rows[0] || null;
     }
-  });
-
-  let SQL = [ 'UPDATE ?? SET ' ];
-  let VALUES = [ table ];
-
-  const TEMPLATE = [];
-  for (const key in SQL_CASE) {
-    let templateSql = ' ?? = CASE ';
-    VALUES.push(key);
-    templateSql += SQL_CASE[key].when.join(' ');
-    VALUES = VALUES.concat(SQL_CASE[key].then);
-    templateSql += ' ELSE ?? END ';
-    TEMPLATE.push(templateSql);
-    VALUES.push(key);
-  }
-
-  SQL += TEMPLATE.join(' , ');
-  SQL += this._where(WHERE);
-
-  /**
-   * e.g.
-   *
-   * updateRows(table, [
-   *  {id: 1, name: 'fengmk21', email: '[e-mail]'},
-   *  {id: 2, name: 'fengmk22', email: '[e-mail]'},
-   *  {id: 3, name: 'fengmk23', email: '[e-mail]'},
-   * ])
-   *
-   * UPDATE `ali-sdk-test-user` SET
-   *  `name` =
-   *    CASE
-   *      WHEN  `id` = 1 THEN 'fengmk21'
-   *      WHEN  `id` = 2 THEN 'fengmk22'
-   *      WHEN  `id` = 3 THEN 'fengmk23'
-   *      ELSE `name` END,
-   *  `email` =
-   *    CASE
-   *      WHEN  `id` = 1 THEN '[e-mail]'
-   *      WHEN  `id` = 2 THEN '[e-mail]'
-   *      WHEN  `id` = 3 THEN '[e-mail]'
-   *      ELSE `email` END
-   *  WHERE `id` IN (1, 2, 3)
-   */
-  const sql = this.format(SQL, VALUES);
-  debug('updateRows(%j, %j) \n=> %j', table, options, sql);
-  return yield this.query(sql);
-};
-
-proto.delete = function* (table, where) {
-  const sql = this.format('DELETE FROM ??', [ table ]) +
-    this._where(where);
-  debug('delete(%j, %j) \n=> %j', table, where, sql);
-  return yield this.query(sql);
-};
-
-proto._where = function(where) {
-  if (!where) {
-    return '';
-  }
-
-  const wheres = [];
-  const values = [];
-  for (const key in where) {
-    let value = where[key];
-    if (Array.isArray(value)) {
-      wheres.push('?? IN (?)');
-    } else {
-      if (value === null || value === undefined) {
-        wheres.push('?? IS ?');
-      } else {
-        if(typeof value == 'object' && value.operator){
-          wheres.push('?? '+value.operator+' ?');
-          value = value.value;
-        }else{
-          wheres.push('?? = ?');
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    async _query(_sql) {
+        throw new Error('SubClass must impl this');
+    }
+    async count(table, where) {
+        const sql = this.format('SELECT COUNT(*) as count FROM ??', [table]) +
+            this._where(where);
+        debug('count(%j, %j) \n=> %j', table, where, sql);
+        const rows = await this.query(sql);
+        return rows[0].count;
+    }
+    /**
+     * Select rows from a table
+     *
+     * @param  {String} table     table name
+     * @param  {Object} [option] optional params
+     *  - {Object} where          query condition object
+     *  - {Array|String} columns  select columns, default is `'*'`
+     *  - {Array|String} orders   result rows sort condition
+     *  - {Number} limit          result limit count, default is no limit
+     *  - {Number} offset         result offset, default is `0`
+     * @return {Array} result rows
+     */
+    async select(table, option) {
+        option = option || {};
+        const sql = this._selectColumns(table, option.columns) +
+            this._where(option.where) +
+            this._orders(option.orders) +
+            this._limit(option.limit, option.offset);
+        debug('select(%o, %o) \n=> %o', table, option, sql);
+        return await this.query(sql);
+    }
+    async get(table, where, option) {
+        option = option || {};
+        option.where = where;
+        option.limit = 1;
+        option.offset = 0;
+        const rows = await this.select(table, option);
+        return rows && rows[0] || null;
+    }
+    async insert(table, rows, option) {
+        option = option || {};
+        let insertRows;
+        let firstObj;
+        // insert(table, rows)
+        if (Array.isArray(rows)) {
+            firstObj = rows[0];
+            insertRows = rows;
         }
-      }
+        else {
+            // insert(table, row)
+            firstObj = rows;
+            insertRows = [rows];
+        }
+        if (!option.columns) {
+            option.columns = Object.keys(firstObj);
+        }
+        const params = [table, option.columns];
+        const strs = [];
+        for (const row of insertRows) {
+            const values = [];
+            for (const column of option.columns) {
+                values.push(row[column]);
+            }
+            strs.push('(?)');
+            params.push(values);
+        }
+        const sql = this.format('INSERT INTO ??(??) VALUES' + strs.join(', '), params);
+        debug('insert(%o, %o, %o) \n=> %o', table, rows, option, sql);
+        return await this.query(sql);
     }
-    values.push(key);
-    values.push(value);
-  }
-  if (wheres.length > 0) {
-    return this.format(' WHERE ' + wheres.join(' AND '), values);
-  }
-  return '';
-
-};
-
-proto._selectColumns = function(table, columns) {
-  if (!columns) {
-    columns = '*';
-  }
-  let sql;
-  if (columns === '*') {
-    sql = this.format('SELECT * FROM ??', [ table ]);
-  } else {
-    sql = this.format('SELECT ?? FROM ??', [ columns, table ]);
-  }
-  return sql;
-};
-
-proto._orders = function(orders) {
-  if (!orders) {
-    return '';
-  }
-  if (typeof orders === 'string') {
-    orders = [ orders ];
-  }
-  const values = [];
-  for (let i = 0; i < orders.length; i++) {
-    const value = orders[i];
-    if (typeof value === 'string') {
-      values.push(this.escapeId(value));
-    } else if (Array.isArray(value)) {
-      // value format: ['name', 'desc'], ['name'], ['name', 'asc']
-      let sort = String(value[1]).toUpperCase();
-      if (sort !== 'ASC' && sort !== 'DESC') {
-        sort = null;
-      }
-      if (sort) {
-        values.push(this.escapeId(value[0]) + ' ' + sort);
-      } else {
-        values.push(this.escapeId(value[0]));
-      }
+    async update(table, row, option) {
+        option = option || {};
+        if (!option.columns) {
+            option.columns = Object.keys(row);
+        }
+        if (!option.where) {
+            if (!('id' in row)) {
+                throw new Error('Can not auto detect update condition, please set option.where, or make sure obj.id exists');
+            }
+            option.where = {
+                id: row.id,
+            };
+        }
+        const sets = [];
+        const values = [];
+        for (const column of option.columns) {
+            sets.push('?? = ?');
+            values.push(column);
+            values.push(row[column]);
+        }
+        const sql = this.format('UPDATE ?? SET ', [table]) +
+            this.format(sets.join(', '), values) +
+            this._where(option.where);
+        debug('update(%o, %o, %o) \n=> %o', table, row, option, sql);
+        return await this.query(sql);
     }
-  }
-  return ' ORDER BY ' + values.join(', ');
-};
-
-proto._limit = function(limit, offset) {
-  if (!limit || typeof limit !== 'number') {
-    return '';
-  }
-  if (typeof offset !== 'number') {
-    offset = 0;
-  }
-  return ' LIMIT ' + offset + ', ' + limit;
-};
-
-wrap(proto);
+    /**
+     * Update multiple rows from a table
+     *
+     * UPDATE `table_name` SET
+     *  `column1` CASE
+     *     WHEN  condition1 THEN 'value11'
+     *     WHEN  condition2 THEN 'value12'
+     *     WHEN  condition3 THEN 'value13'
+     *     ELSE `column1` END,
+     *  `column2` CASE
+     *     WHEN  condition1 THEN 'value21'
+     *     WHEN  condition2 THEN 'value22'
+     *     WHEN  condition3 THEN 'value23'
+     *     ELSE `column2` END
+     * WHERE condition
+     *
+     * See MySQL Case Syntax: https://dev.mysql.com/doc/refman/5.7/en/case.html
+     *
+     * @param {String} table table name
+     * @param {Array<Object>} updateRows Object Arrays
+     *    each Object needs a primary key `id`, or each Object has `row` and `where` properties
+     *    e.g.
+     *      [{ id: 1, name: 'fengmk21' }]
+     *      or [{ row: { name: 'fengmk21' }, where: { id: 1 } }]
+     * @return {object} update result
+     */
+    async updateRows(table, updateRows) {
+        if (!Array.isArray(updateRows)) {
+            throw new Error('updateRows should be array');
+        }
+        /**
+         * {
+         *  column: {
+         *    when: [ 'WHEN condition1 THEN ?', 'WHEN condition12 THEN ?' ],
+         *    then: [ value1, value1 ]
+         *  }
+         * }
+         */
+        const SQL_CASE = {};
+        // e.g. { id: [], column: [] }
+        const WHERE = {};
+        for (const updateRow of updateRows) {
+            const row = updateRow.row ?? updateRow;
+            let where = updateRow.where;
+            const hasId = 'id' in row;
+            if (!hasId && !where) {
+                throw new Error('Can not auto detect updateRows condition, please set updateRow.where, or make sure updateRow.id exists');
+            }
+            // convert { id, column } to { row: { column }, where: { id } }
+            if (hasId) {
+                where = { id: updateRow.id };
+            }
+            let whereString = this._where(where);
+            whereString = !whereString.includes('WHERE') ? whereString : whereString.substring(whereString.indexOf('WHERE') + 5);
+            for (const key in row) {
+                if (key === 'id')
+                    continue;
+                if (!SQL_CASE[key]) {
+                    SQL_CASE[key] = { when: [], then: [] };
+                }
+                SQL_CASE[key].when.push(' WHEN ' + whereString + ' THEN ? ');
+                SQL_CASE[key].then.push(row[key]);
+            }
+            for (const key in where) {
+                if (!WHERE[key]) {
+                    WHERE[key] = [];
+                }
+                if (!WHERE[key].includes(where[key])) {
+                    WHERE[key].push(where[key]);
+                }
+            }
+        }
+        let SQL = 'UPDATE ?? SET ';
+        let VALUES = [table];
+        const TEMPLATE = [];
+        for (const key in SQL_CASE) {
+            let templateSql = ' ?? = CASE ';
+            VALUES.push(key);
+            templateSql += SQL_CASE[key].when.join(' ');
+            VALUES = VALUES.concat(SQL_CASE[key].then);
+            templateSql += ' ELSE ?? END ';
+            TEMPLATE.push(templateSql);
+            VALUES.push(key);
+        }
+        SQL += TEMPLATE.join(' , ');
+        SQL += this._where(WHERE);
+        /**
+         * e.g.
+         *
+         * updateRows(table, [
+         *  {id: 1, name: 'fengmk21', email: '[e-mail]'},
+         *  {id: 2, name: 'fengmk22', email: '[e-mail]'},
+         *  {id: 3, name: 'fengmk23', email: '[e-mail]'},
+         * ])
+         *
+         * UPDATE `ali-sdk-test-user` SET
+         *  `name` =
+         *    CASE
+         *      WHEN  `id` = 1 THEN 'fengmk21'
+         *      WHEN  `id` = 2 THEN 'fengmk22'
+         *      WHEN  `id` = 3 THEN 'fengmk23'
+         *      ELSE `name` END,
+         *  `email` =
+         *    CASE
+         *      WHEN  `id` = 1 THEN '[e-mail]'
+         *      WHEN  `id` = 2 THEN '[e-mail]'
+         *      WHEN  `id` = 3 THEN '[e-mail]'
+         *      ELSE `email` END
+         *  WHERE `id` IN (1, 2, 3)
+         */
+        const sql = this.format(SQL, VALUES);
+        debug('updateRows(%o, %o) \n=> %o', table, updateRows, sql);
+        return await this.query(sql);
+    }
+    async delete(table, where) {
+        const sql = this.format('DELETE FROM ??', [table]) +
+            this._where(where);
+        debug('delete(%j, %j) \n=> %j', table, where, sql);
+        return await this.query(sql);
+    }
+    _where(where) {
+        if (!where) {
+            return '';
+        }
+        const wheres = [];
+        const values = [];
+        for (const key in where) {
+            const value = where[key];
+            if (Array.isArray(value)) {
+                wheres.push('?? IN (?)');
+            }
+            else if (typeof value === 'object' && !Array.isArray(value)) {
+                Object.keys(value).forEach(o => {
+                    o = o.toLowerCase();
+                    ((o === 'like') && wheres.push('?? LIKE ?')) ||
+                        ((o === 'gte' || o === '>=') && wheres.push('?? >= ?')) ||
+                        ((o === 'gt' || o === '>') && wheres.push('?? > ?')) ||
+                        ((o === 'lte' || o === '<=') && wheres.push('?? <= ?')) ||
+                        ((o === 'lt' || o === '<') && wheres.push('?? < ?')) ||
+                        ((o === 'sql') && wheres.push('??  ?'));
+                    values.push(key, value[o] || value);
+                });
+            }
+            else {
+                if (value === null || value === undefined) {
+                    wheres.push('?? IS ?');
+                }
+                else {
+                    wheres.push('?? = ?');
+                }
+            }
+            values.push(key);
+            values.push(value);
+        }
+        if (wheres.length > 0) {
+            return this.format(' WHERE ' + wheres.join(' AND '), values);
+        }
+        return '';
+    }
+    _selectColumns(table, columns) {
+        if (!columns || columns.length === 0) {
+            columns = '*';
+        }
+        if (columns === '*') {
+            return this.format('SELECT * FROM ??', [table]);
+        }
+        return this.format('SELECT ?? FROM ??', [columns, table]);
+    }
+    _orders(orders) {
+        if (!orders) {
+            return '';
+        }
+        if (typeof orders === 'string') {
+            orders = [orders];
+        }
+        const values = [];
+        for (const value of orders) {
+            if (typeof value === 'string') {
+                values.push(this.escapeId(value));
+            }
+            else if (Array.isArray(value)) {
+                // value format: ['name', 'desc'], ['name'], ['name', 'asc']
+                let sort = String(value[1]).toUpperCase();
+                if (sort !== 'ASC' && sort !== 'DESC') {
+                    sort = '';
+                }
+                if (sort) {
+                    values.push(this.escapeId(value[0]) + ' ' + sort);
+                }
+                else {
+                    values.push(this.escapeId(value[0]));
+                }
+            }
+        }
+        return ' ORDER BY ' + values.join(', ');
+    }
+    _limit(limit, offset) {
+        if (!limit || typeof limit !== 'number') {
+            return '';
+        }
+        if (typeof offset !== 'number') {
+            offset = 0;
+        }
+        return ' LIMIT ' + offset + ', ' + limit;
+    }
+    /**
+     * Lock tables.
+     * @param {object[]} lockTableOptions table lock descriptions.
+     * @description
+     * LOCK TABLES
+     *   tbl_name [[AS] alias] lock_type
+     *   [, tbl_name [[AS] alias] lock_type] ...
+     * lock_type: {
+     *   READ [LOCAL]
+     *   | [LOW_PRIORITY] WRITE
+     * }
+     * For more details:
+     * https://dev.mysql.com/doc/refman/8.0/en/lock-tables.html
+     * @example
+     * await locks([{ tableName: 'posts', lockType: 'READ', tableAlias: 't' }]);
+     */
+    async locks(lockTableOptions) {
+        const sql = this.#locks(lockTableOptions);
+        debug('lock tables \n=> %o', sql);
+        return await this.query(sql);
+    }
+    /**
+     * Lock a single table.
+     * @param {string} tableName table name
+     * @param {string} lockType lock type
+     * @param {string} tableAlias table alias
+     * @description
+     * LOCK TABLES
+     *   tbl_name [[AS] alias] lock_type
+     *   [, tbl_name [[AS] alias] lock_type] ...
+     * lock_type: {
+     *   READ [LOCAL]
+     *   | [LOW_PRIORITY] WRITE
+     * }
+     * For more details:
+     * https://dev.mysql.com/doc/refman/8.0/en/lock-tables.html
+     * @example
+     * await lockOne('posts_table', 'READ', 't'); // LOCK TABLS 'posts_table' AS t READ
+     */
+    async lockOne(tableName, lockType, tableAlias) {
+        const sql = this.#locks([{ tableName, lockType, tableAlias }]);
+        debug('lock one table \n=> %o', sql);
+        return await this.query(sql);
+    }
+    #locks(lockTableOptions) {
+        if (lockTableOptions.length === 0) {
+            throw new Error('Cannot lock empty tables.');
+        }
+        let sql = 'LOCK TABLES ';
+        for (const [index, lockTableOption] of lockTableOptions.entries()) {
+            const { tableName, lockType, tableAlias } = lockTableOption;
+            if (!tableName) {
+                throw new Error('No table_name provided while trying to lock table');
+            }
+            if (!lockType) {
+                throw new Error('No lock_type provided while trying to lock table `' + tableName + '`');
+            }
+            if (!['READ', 'WRITE', 'READ LOCAL', 'LOW_PRIORITY WRITE'].includes(lockType.toUpperCase())) {
+                throw new Error('lock_type provided while trying to lock table `' + tableName +
+                    '` must be one of the following(CASE INSENSITIVE):\n`READ` | `WRITE` | `READ LOCAL` | `LOW_PRIORITY WRITE`');
+            }
+            if (index > 0) {
+                sql += ', ';
+            }
+            sql += ' ' + this.escapeId(tableName) + ' ';
+            if (tableAlias) {
+                sql += ' AS ' + this.escapeId(tableAlias) + ' ';
+            }
+            sql += ' ' + lockType;
+        }
+        return sql + ';';
+    }
+    /**
+     * To unlock all tables locked in current session.
+     * For more details:
+     * https://dev.mysql.com/doc/refman/8.0/en/lock-tables.html
+     * @example
+     * await unlock(); // unlock all tables.
+     */
+    async unlock() {
+        debug('unlock tables');
+        return await this.query('UNLOCK TABLES;');
+    }
+}
+exports.Operator = Operator;
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"operator.js","sourceRoot":"","sources":["../src/operator.ts"],"names":[],"mappings":"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"}

lib/sqlstring.js

@@ -1,21 +0,20 @@
-'use strict';
-
-/**
- * Module dependencies.
- */
-
-const SqlString = require('mysql/lib/protocol/SqlString');
-const Literal = require('./literals').Literal;
-
-module.exports = SqlString;
-
-if (!SqlString.__escape) {
-  SqlString.__escape = SqlString.escape;
-
-  SqlString.escape = function(val, stringifyObjects, timeZone) {
-    if (val instanceof Literal) {
-      return val.toString();
-    }
-    return SqlString.__escape(val, stringifyObjects, timeZone);
-  };
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SqlString = void 0;
+const SqlString_1 = __importDefault(require("mysql/lib/protocol/SqlString"));
+exports.SqlString = SqlString_1.default;
+const literals_1 = require("./literals");
+const kEscape = Symbol('kEscape');
+if (!SqlString_1.default[kEscape]) {
+    SqlString_1.default[kEscape] = SqlString_1.default.escape;
+    SqlString_1.default.escape = (val, stringifyObjects, timeZone) => {
+        if (val instanceof literals_1.Literal) {
+            return val.toString();
+        }
+        return SqlString_1.default[kEscape](val, stringifyObjects, timeZone);
+    };
 }
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3Fsc3RyaW5nLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3NxbHN0cmluZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSw2RUFBcUQ7QUFnQjVDLG9CQWhCRixtQkFBUyxDQWdCRTtBQWZsQix5Q0FBcUM7QUFFckMsTUFBTSxPQUFPLEdBQUcsTUFBTSxDQUFDLFNBQVMsQ0FBQyxDQUFDO0FBRWxDLElBQUksQ0FBQyxtQkFBUyxDQUFDLE9BQU8sQ0FBQyxFQUFFO0lBQ3ZCLG1CQUFTLENBQUMsT0FBTyxDQUFDLEdBQUcsbUJBQVMsQ0FBQyxNQUFNLENBQUM7SUFFdEMsbUJBQVMsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxHQUFRLEVBQUUsZ0JBQTBCLEVBQUUsUUFBaUIsRUFBRSxFQUFFO1FBQzdFLElBQUksR0FBRyxZQUFZLGtCQUFPLEVBQUU7WUFDMUIsT0FBTyxHQUFHLENBQUMsUUFBUSxFQUFFLENBQUM7U0FDdkI7UUFDRCxPQUFPLG1CQUFTLENBQUMsT0FBTyxDQUFDLENBQUMsR0FBRyxFQUFFLGdCQUFnQixFQUFFLFFBQVEsQ0FBQyxDQUFDO0lBQzdELENBQUMsQ0FBQztDQUNIIn0=

lib/transaction.js

@@ -1,54 +0,46 @@
-'use strict';
-
-/**
- * Module dependencies.
- */
-
-const util = require('util');
-const wrap = require('co-wrap-all');
-const Operator = require('./operator');
-
-module.exports = RDSTransaction;
-
-function RDSTransaction(conn) {
-  Operator.call(this);
-  this.conn = conn;
-  this.isCommit = false;
-  this.isRollback = false;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RDSTransaction = void 0;
+const operator_1 = require("./operator");
+class RDSTransaction extends operator_1.Operator {
+    isCommit = false;
+    isRollback = false;
+    conn;
+    constructor(conn) {
+        super(conn.conn);
+        this.conn = conn;
+    }
+    async commit() {
+        this.#check();
+        try {
+            return await this.conn.commit();
+        }
+        finally {
+            this.isCommit = true;
+            this.conn.release();
+            this.conn = null;
+        }
+    }
+    async rollback() {
+        this.#check();
+        try {
+            return await this.conn.rollback();
+        }
+        finally {
+            this.isRollback = true;
+            this.conn.release();
+            this.conn = null;
+        }
+    }
+    async _query(sql) {
+        this.#check();
+        return await this.conn._query(sql);
+    }
+    #check() {
+        if (!this.conn) {
+            throw new Error('transaction was commit or rollback');
+        }
+    }
 }
-util.inherits(RDSTransaction, Operator);
-
-const proto = RDSTransaction.prototype;
-
-proto.commit = function* () {
-  this._check();
-  try {
-    return yield this.conn.commit();
-  } finally {
-    this.conn.release();
-    this.conn = null;
-  }
-};
-
-proto.rollback = function* () {
-  this._check();
-  try {
-    return yield this.conn.rollback();
-  } finally {
-    this.conn.release();
-    this.conn = null;
-  }
-};
-
-proto._query = function* (sql) {
-  this._check();
-  return yield this.conn._query(sql);
-};
-
-proto._check = function() {
-  if (!this.conn) {
-    throw new Error('transaction was commit or rollback');
-  }
-};
-
-wrap(proto);
+exports.RDSTransaction = RDSTransaction;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNhY3Rpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdHJhbnNhY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EseUNBQXNDO0FBRXRDLE1BQWEsY0FBZSxTQUFRLG1CQUFRO0lBQzFDLFFBQVEsR0FBRyxLQUFLLENBQUM7SUFDakIsVUFBVSxHQUFHLEtBQUssQ0FBQztJQUNuQixJQUFJLENBQXVCO0lBQzNCLFlBQVksSUFBbUI7UUFDN0IsS0FBSyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNqQixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQztJQUNuQixDQUFDO0lBRUQsS0FBSyxDQUFDLE1BQU07UUFDVixJQUFJLENBQUMsTUFBTSxFQUFFLENBQUM7UUFDZCxJQUFJO1lBQ0YsT0FBTyxNQUFNLElBQUksQ0FBQyxJQUFLLENBQUMsTUFBTSxFQUFFLENBQUM7U0FDbEM7Z0JBQVM7WUFDUixJQUFJLENBQUMsUUFBUSxHQUFHLElBQUksQ0FBQztZQUNyQixJQUFJLENBQUMsSUFBSyxDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQ3JCLElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDO1NBQ2xCO0lBQ0gsQ0FBQztJQUVELEtBQUssQ0FBQyxRQUFRO1FBQ1osSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO1FBQ2QsSUFBSTtZQUNGLE9BQU8sTUFBTSxJQUFJLENBQUMsSUFBSyxDQUFDLFFBQVEsRUFBRSxDQUFDO1NBQ3BDO2dCQUFTO1lBQ1IsSUFBSSxDQUFDLFVBQVUsR0FBRyxJQUFJLENBQUM7WUFDdkIsSUFBSSxDQUFDLElBQUssQ0FBQyxPQUFPLEVBQUUsQ0FBQztZQUNyQixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQztTQUNsQjtJQUNILENBQUM7SUFFUyxLQUFLLENBQUMsTUFBTSxDQUFDLEdBQVc7UUFDaEMsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO1FBQ2QsT0FBTyxNQUFNLElBQUksQ0FBQyxJQUFLLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ3RDLENBQUM7SUFFRCxNQUFNO1FBQ0osSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUU7WUFDZCxNQUFNLElBQUksS0FBSyxDQUFDLG9DQUFvQyxDQUFDLENBQUM7U0FDdkQ7SUFDSCxDQUFDO0NBQ0Y7QUF6Q0Qsd0NBeUNDIn0=

package.json

 {
   "name": "ali-rds-fix",
-  "version": "3.3.2",
+  "version": "6.2.0",
   "description": "Aliyun RDS client",
   "main": "lib/client.js",
+  "types": "lib/client.d.ts",
   "files": [
@@ -10,20 +11,24 @@ "lib"
   "scripts": {
-    "test": "mocha -R spec -t 15000 -r thunk-mocha test/*.test.js",
-    "ci": "npm run lint && istanbul cover node_modules/mocha/bin/_mocha -- -t 15000 -r thunk-mocha test/*.test.js",
-    "lint": "eslint ."
+    "contributor": "git-contributor",
+    "test": "egg-bin test",
+    "ci": "npm run lint && egg-bin cov && npm run prepublishOnly",
+    "lint": "eslint src test --cache",
+    "build": "tsc -p ./tsconfig.json",
+    "clean": "tsc --build --clean",
+    "prepublishOnly": "npm run clean && npm run build"
   },
   "dependencies": {
-    "co-wrap-all": "^1.0.0",
-    "debug": "^2.2.0",
-    "mysql": "^2.13.0",
-    "pify": "^2.3.0"
+    "@types/mysql": "^2.15.21",
+    "mysql": "^2.18.1"
   },
   "devDependencies": {
-    "autod": "*",
-    "co": "4",
-    "eslint": "^3.19.0",
-    "eslint-config-egg": "^3.2.0",
-    "istanbul": "*",
-    "mocha": "*",
-    "thunk-mocha": "*"
+    "@eggjs/tsconfig": "^1.3.2",
+    "@types/mocha": "^10.0.1",
+    "@types/node": "^20.2.5",
+    "egg-bin": "^6.1.2",
+    "eslint": "^8.29.0",
+    "eslint-config-egg": "^12.1.0",
+    "git-contributor": "^2.0.0",
+    "mm": "^3.3.0",
+    "typescript": "^5.1.3"
   },
@@ -33,17 +38,16 @@ "homepage": "https://github.com/ali-sdk/ali-rds",
     "type": "git",
-    "url": "git://github.com/reruin/ali-rds.git",
-    "web": "https://github.com/reruin/ali-rds"
+    "url": "git://github.com/ali-sdk/ali-rds.git"
   },
   "bugs": {
-    "url": "https://github.com/ali-rds/ali-rds/issues",
-    "email": "[e-mail]"
+    "url": "https://github.com/ali-sdk/ali-rds/issues"
   },
   "keywords": [
-    "ali-rds"
+    "ali-rds",
+    "mysql"
   ],
   "engines": {
-    "node": ">= 4.0.0"
+    "node": ">= 16.17.0"
   },
-  "author": "fengmk2 <[e-mail]> (https://fengmk2.com)",
+  "author": "fengmk2 <[e-mail]> (https://github.com/fengmk2)",
   "license": "MIT"
 }

README.md

@@ -1,8 +0,6 @@
-ali-rds
-=======
+# ali-rds
 
 [![NPM version][npm-image]][npm-url]
-[![build status][travis-image]][travis-url]
+[![Node.js CI](https://github.com/ali-sdk/ali-rds/actions/workflows/nodejs.yml/badge.svg)](https://github.com/ali-sdk/ali-rds/actions/workflows/nodejs.yml)
 [![Test coverage][codecov-image]][codecov-url]
-[![David deps][david-image]][david-url]
 [![npm download][download-image]][download-url]
@@ -12,26 +10,20 @@
 [npm-url]: https://npmjs.org/package/ali-rds
-[travis-image]: https://img.shields.io/travis/ali-sdk/ali-rds.svg?style=flat-square
-[travis-url]: https://travis-ci.org/ali-sdk/ali-rds
 [codecov-image]: https://codecov.io/github/ali-sdk/ali-rds/coverage.svg?branch=master
 [codecov-url]: https://codecov.io/github/ali-sdk/ali-rds?branch=master
-[david-image]: https://img.shields.io/david/ali-sdk/ali-rds.svg?style=flat-square
-[david-url]: https://david-dm.org/ali-sdk/ali-rds
 [download-image]: https://img.shields.io/npm/dm/ali-rds.svg?style=flat-square
 [download-url]: https://npmjs.org/package/ali-rds
 
-Aliyun RDS client. Sub module of [ali-sdk](https://github.com/ali-sdk/ali-sdk).
+Aliyun RDS client.
+RDS, Relational Database Service. Equal to well know Amazon [RDS](http://aws.amazon.com/rds/).
 
-# RDS Usage
+Support `MySQL` protocol only.
 
-RDS, Relational Database Service. Equal to well know Amazon [RDS](http://aws.amazon.com/rds/).
-Support `MySQL`, `SQL Server` and `PostgreSQL`.
+## Usage
 
-## MySQL Usage
-
 ### Create RDS instance
 
-```js
-const rds = require('ali-rds');
+```ts
+import { RDSClient } from 'ali-rds';
 
-const db = rds({
+const db = new RDSClient({
   host: 'your-rds-address.mysql.rds.aliyuncs.com',
@@ -42,3 +34,2 @@ port: 3306,
   database: 'your-database-name',
-
   // optional params
@@ -58,2 +49,6 @@ // The charset for the connection.
   // queueLimit: 0,
+  // Set asyncLocalStorage manually for transaction
+  // connectionStorage: new AsyncLocalStorage(),
+  // If create multiple RDSClient instances with the same connectionStorage, use this key to distinguish between the instances
+  // connectionStorageKey: 'datasource',
 });
@@ -67,3 +62,3 @@ ```
 ```js
-let row = {
+const row = {
   name: 'fengmk2',
@@ -74,3 +69,3 @@ otherField: 'other field value',
 };
-let result = yield db.insert('table-name', row);
+const result = await db.insert('table-name', row);
 console.log(result);
@@ -92,3 +87,3 @@ { fieldCount: 0,
 ```js
-let rows = [
+const rows = [
   {
@@ -109,3 +104,3 @@ name: 'fengmk1',
 
-let results = yield db.insert('table-name', rows);
+const results = await db.insert('table-name', rows);
 console.log(result);
@@ -127,3 +122,3 @@ { fieldCount: 0,
 ```js
-let row = {
+const row = {
   id: 123,
@@ -134,3 +129,3 @@ name: 'fengmk2',
 };
-let result = yield db.update('table-name', row);
+const result = await db.update('table-name', row);
 console.log(result);
@@ -150,3 +145,3 @@ { fieldCount: 0,
 ```js
-let row = {
+const row = {
   name: 'fengmk2',
@@ -156,3 +151,3 @@ otherField: 'other field value',
 };
-let result = yield db.update('table-name', row, {
+const result = await db.update('table-name', row, {
   where: { name: row.name },
@@ -174,6 +169,6 @@ columns: [ 'otherField', 'modifiedAt' ]
 
--  Update multiple rows with primary key: `id`
+- Update multiple rows with primary key: `id`
 
 ```js
-let options = [{
+const options = [{
   id: 123,
@@ -191,3 +186,3 @@ name: 'fengmk2',
 }]
-let result = yield db.updateRows('table-name', options);
+const result = await db.updateRows('table-name', options);
 console.log(result);
@@ -204,7 +199,6 @@ { fieldCount: 0,
 
--  Update multiple rows with `row` and `where` properties
+- Update multiple rows with `row` and `where` properties
 
-
 ```js
-let options = [{
+const options = [{
   row: {
@@ -230,3 +224,3 @@ email: '[e-mail]',
 }]
-let result = yield db.updateRows('table-name', options);
+const result = await db.updateRows('table-name', options);
 console.log(result);
@@ -243,3 +237,2 @@ { fieldCount: 0,
 
-
 ### Get
@@ -250,3 +243,3 @@
 ```js
-let row = yield db.get('table-name', { name: 'fengmk2' });
+const row = await db.get('table-name', { name: 'fengmk2' });
 
@@ -261,3 +254,3 @@ => SELECT * FROM `table-name` WHERE `name` = 'fengmk2'
 ```js
-let rows = yield db.select('table-name');
+const rows = await db.select('table-name');
 
@@ -270,3 +263,3 @@ => SELECT * FROM `table-name`
 ```js
-let rows = yield db.select('table-name', {
+const rows = await db.select('table-name', {
   where: {
@@ -288,3 +281,3 @@ type: 'javascript'
 ```js
-let result = yield db.delete('table-name', {
+const result = await db.delete('table-name', {
   name: 'fengmk2'
@@ -301,3 +294,3 @@ });
 ```js
-let count = yield db.count('table-name', {
+const count = await db.count('table-name', {
   type: 'javascript'
@@ -314,11 +307,11 @@ });
 ```js
-let tran = yield db.beginTransaction();
+const tran = await db.beginTransaction();
 
 try {
-  yield tran.insert(table, row1);
-  yield tran.update(table, row2);
-  yield tran.commit();
+  await tran.insert(table, row1);
+  await tran.update(table, row2);
+  await tran.commit();
 } catch (err) {
   // error, rollback
-  yield tran.rollback(); // rollback call won't throw err
+  await tran.rollback(); // rollback call won't throw err
   throw err;
@@ -330,3 +323,3 @@ }
 
-API: `*beginTransactionScope(scope)`
+API: `async beginTransactionScope(scope)`
 
@@ -337,6 +330,6 @@ All query run in scope will under a same transaction.
 ```js
-var result = yield db.beginTransactionScope(function* (conn) {
+const result = await db.beginTransactionScope(async conn => {
   // don't commit or rollback by yourself
-  yield conn.insert(table, row1);
-  yield conn.update(table, row2);
+  await conn.insert(table, row1);
+  await conn.update(table, row2);
   return { success: true };
@@ -347,24 +340,13 @@ });
 
-#### Transaction on koa
+In `Promise.all` case, Parallel beginTransactionScope will create isolated transactions.
 
-API: `*beginTransactionScope(scope, ctx)`
-
-Use koa's context to make sure only one active transaction on one ctx.
-
 ```js
-function* foo(ctx, data1) {
-  return yield db.beginTransactionScope(function* (conn) {
-    yield conn.insert(table1, data1);
-    return { success: true };
-  }, ctx);
-}
-
-function* bar(ctx, data2) {
-  return yield db.beginTransactionScope(function* (conn) {
-    // execute foo with the same transaction scope
-    yield foo(ctx, { foo: 'bar' });
-    yield conn.insert(table2, data2);
-    return { success: true };
-  }, ctx);
-}
+const result = await Promise.all([
+  db.beginTransactionScope(async conn => {
+    // commit and success
+  }),
+  db.beginTransactionScope(async conn => {
+    // throw err and rollback
+  }),
+])
 ```
@@ -377,3 +359,3 @@
 ```js
-let rows = yield db.query('SELECT * FROM your_table LIMIT 100');
+const rows = await db.query('SELECT * FROM your_table LIMIT 100');
 console.log(rows);
@@ -385,3 +367,3 @@ ```
 ```js
-let rows = yield db.query('SELECT * FROM your_table WHERE id=?', [ 123 ]);
+const rows = await db.query('SELECT * FROM your_table WHERE id=?', [ 123 ]);
 console.log(rows);
@@ -393,11 +375,18 @@ ```
 ```js
-let rows = yield db.query('SELECT * FROM your_table WHERE id=:id', { id: 123 });
+const rows = await db.query('SELECT * FROM your_table WHERE id=:id', { id: 123 });
 console.log(rows);
 ```
 
-## SQL Server Usage
+### Custom query lifecircle
 
-TBD
+```ts
+db.beforeQuery((sql: string) => {
+  // change sql string
+  return `/* add custom format here */ ${sql}`;
+});
 
----
+db.afterQuery((sql: string, result: any, execDuration: number, err?: Error) => {
+  // handle logger here
+});
+```
 
@@ -410,16 +399,16 @@ ## APIs
 
-- *query(sql[, values)
-- *queryOne(sql[, values)
-- *select(table, options)
-- *get(table, where, options)
-- *insert(table, row[s], options)
-- *update(table, row, options)
-- *updateRows(table, options)
-- *delete(table, where)
-- *count(table, where)
+- async query(sql[, values)
+- async queryOne(sql[, values)
+- async select(table, options)
+- async get(table, where, options)
+- async insert(table, row[s], options)
+- async update(table, row, options)
+- async updateRows(table, options)
+- async delete(table, where)
+- async count(table, where)
 
-#### Transactions
+### Transactions Helpers
 
-- *beginTransaction()
-- *beginTransactionScope(scope)
+- async beginTransaction()
+- async beginTransactionScope(scope)
 
@@ -435,3 +424,3 @@ ### Utils
 ```js
-yield db.insert('user', {
+await db.insert('user', {
   name: 'fengmk2',
@@ -449,12 +438,22 @@ createdAt: db.literals.now,
 ```js
-let session = new db.literals.Literal('session()');
+const session = new db.literals.Literal('session()');
 ```
 
-## TODO
+## Class Relation
 
-- [x] MySQL
-  - [x] Pool
-  - [ ] Cluster
-- [ ] SQL Server
-- [ ] PostgreSQL
+```txt
++-----------+                          +----------------+
+| RDSClient +-- beginTransaction() --> + RDSTransaction |
++--+----+---+                          +----+----+------+
+   |    | getConnection()            .conn  |    |
+   |    |         +---------------+         |    |
+   |    +-------->+ RDSConnection +<--------+    |
+   |              +-------+-------+              |
+   |                      | extends              |
+   |                      v                      |
+   |   extends    +-------+-------+    extends   |
+   +------------->+   Operator    +<-------------+
+                  |    query()    |
+                  +---------------+
+```
 
@@ -464,1 +463,13 @@ ## License
 [MIT](LICENSE)
+
+<!-- GITCONTRIBUTOR_START -->
+
+## Contributors
+
+|[<img src="https://avatars.githubusercontent.com/u/156269?v=4" width="100px;"/><br/><sub><b>fengmk2</b></sub>](https://github.com/fengmk2)<br/>|[<img src="https://avatars.githubusercontent.com/u/985607?v=4" width="100px;"/><br/><sub><b>dead-horse</b></sub>](https://github.com/dead-horse)<br/>|[<img src="https://avatars.githubusercontent.com/u/32174276?v=4" width="100px;"/><br/><sub><b>semantic-release-bot</b></sub>](https://github.com/semantic-release-bot)<br/>|[<img src="https://avatars.githubusercontent.com/u/6587734?v=4" width="100px;"/><br/><sub><b>AntiMoron</b></sub>](https://github.com/AntiMoron)<br/>|[<img src="https://avatars.githubusercontent.com/u/10287125?v=4" width="100px;"/><br/><sub><b>nodejh</b></sub>](https://github.com/nodejh)<br/>|[<img src="https://avatars.githubusercontent.com/u/4192962?v=4" width="100px;"/><br/><sub><b>fangk</b></sub>](https://github.com/fangk)<br/>|
+| :---: | :---: | :---: | :---: | :---: | :---: |
+[<img src="https://avatars.githubusercontent.com/u/1619030?v=4" width="100px;"/><br/><sub><b>xujihui1985</b></sub>](https://github.com/xujihui1985)<br/>|[<img src="https://avatars.githubusercontent.com/u/1468366?v=4" width="100px;"/><br/><sub><b>csbun</b></sub>](https://github.com/csbun)<br/>|[<img src="https://avatars.githubusercontent.com/u/360661?v=4" width="100px;"/><br/><sub><b>popomore</b></sub>](https://github.com/popomore)<br/>|[<img src="https://avatars.githubusercontent.com/u/12378108?v=4" width="100px;"/><br/><sub><b>hoythan</b></sub>](https://github.com/hoythan)<br/>|[<img src="https://avatars.githubusercontent.com/u/35927028?v=4" width="100px;"/><br/><sub><b>deadhorse123</b></sub>](https://github.com/deadhorse123)<br/>|[<img src="https://avatars.githubusercontent.com/u/6897780?v=4" width="100px;"/><br/><sub><b>killagu</b></sub>](https://github.com/killagu)<br/>
+
+This project follows the git-contributor [spec](https://github.com/xudafeng/git-contributor), auto updated at `Sat Mar 04 2023 18:57:33 GMT+0800`.
+
+<!-- GITCONTRIBUTOR_END -->

New alerts

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Fixed alerts

No bug tracker

Maintenance

Package does not have a linked bug tracker in package.json.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

91919

increased by191.66%

Dependency count

2

decreased by-50%

Number of package files

21

increased by110%

Lines of code

1245

increased by105.45%

Number of low maintenance alerts

0

decreased by-100%

Number of lines in readme file

444

increased by2.54%

Worsened metrics

Dev dependency count

9

increased by28.57%

Number of medium supply chain risk alerts

1

increased byInfinity%

Dependency changes

• + Added@types/mysql@^2.15.21

• + Added@types/mysql@2.15.26(transitive)

• + Added@types/node@22.13.1(transitive)

• + Addedundici-types@6.20.0(transitive)

• - Removedco-wrap-all@^1.0.0

• - Removeddebug@^2.2.0

• - Removedpify@^2.3.0

• - Removedco@4.6.0(transitive)

• - Removedco-wrap-all@1.0.0(transitive)

• - Removeddebug@2.6.9(transitive)

• - Removedms@2.0.0(transitive)

• - Removedpify@2.3.0(transitive)

• Updatedmysql@^2.18.1