ali-rds - npm Package Compare versions

Comparing version 6.4.0 to 6.5.0

lib/client.d.ts

@@ -7,2 +7,3 @@ import mysql from 'mysql';
 import { RDSTransaction } from './transaction';
+export * from './types';
 interface PoolPromisify extends Omit<Pool, 'query'> {
@@ -37,2 +38,4 @@ query(sql: string): Promise<any>;
     };
+    waitPoolConnection(abortSignal: AbortSignal): Promise<number>;
+    getConnectionWithTimeout(): Promise<PoolConnectionPromisify>;
     getConnection(): Promise<RDSConnection>;
@@ -62,2 +65,1 @@ /**
 }
-export {};

lib/client.js

 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
@@ -10,2 +24,3 @@ return (mod && mod.__esModule) ? mod : { "default": mod };
 const node_util_1 = require("node:util");
+const promises_1 = require("node:timers/promises");
 const mysql_1 = __importDefault(require("mysql"));
@@ -18,8 +33,20 @@ const operator_1 = require("./operator");
 const channels_1 = __importDefault(require("./channels"));
+const PoolWaitTimeout_1 = require("./util/PoolWaitTimeout");
+__exportStar(require("./types"), exports);
 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 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');
@@ -30,4 +57,6 @@ static #TRANSACTION_NEST_COUNT = Symbol('RDSClient#transaction#nestCount');
     #connectionStorageKey;
+    #poolWaitTimeout;
     constructor(options) {
         super();
+        options.connectTimeout = options.connectTimeout ?? 500;
         const { connectionStorage, connectionStorageKey, ...mysqlOptions } = options;
@@ -56,2 +85,3 @@ // get connection options from getConnectionConfig method every time
         this.#connectionStorageKey = connectionStorageKey || _a.#DEFAULT_STORAGE_KEY;
+        this.#poolWaitTimeout = options.poolWaitTimeout ?? 500;
         // https://github.com/mysqljs/mysql#pool-events
@@ -108,5 +138,24 @@ this.#pool.on('connection', (connection) => {
     }
+    async waitPoolConnection(abortSignal) {
+        const now = performance.now();
+        await (0, promises_1.setTimeout)(this.#poolWaitTimeout, undefined, { signal: abortSignal });
+        return performance.now() - now;
+    }
+    async getConnectionWithTimeout() {
+        const connPromise = this.#pool.getConnection();
+        const timeoutAbortController = new AbortController();
+        const timeoutPromise = this.waitPoolConnection(timeoutAbortController.signal);
+        const connOrTimeout = await Promise.race([connPromise, timeoutPromise]);
+        if (typeof connOrTimeout === 'number') {
+            connPromise.then(conn => {
+                conn.release();
+            });
+            throw new PoolWaitTimeout_1.PoolWaitTimeoutError(`get connection timeout after ${connOrTimeout}ms`);
+        }
+        timeoutAbortController.abort();
+        return connPromise;
+    }
     async getConnection() {
         try {
-            const _conn = await this.#pool.getConnection();
+            const _conn = await this.getConnectionWithTimeout();
             const conn = new connection_1.RDSConnection(_conn);
@@ -298,2 +347,2 @@ if (this.beforeQueryHandlers.length > 0) {
 _a = RDSClient;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}

lib/connection.d.ts

 import { Operator } from './operator';
 import type { PoolConnectionPromisify } from './types';
 export declare class RDSConnection extends Operator {
+    #private;
     conn: PoolConnectionPromisify;
@@ -5,0 +6,0 @@ constructor(conn: PoolConnectionPromisify);

lib/connection.js

 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RDSConnection = void 0;
+const node_assert_1 = __importDefault(require("node:assert"));
 const node_util_1 = require("node:util");
@@ -9,4 +13,6 @@ const operator_1 = require("./operator");
     conn;
+    #released;
     constructor(conn) {
         super(conn);
+        this.#released = false;
         this.conn = conn;
@@ -26,2 +32,4 @@ if (!this.conn[kWrapToRDS]) {
     release() {
+        (0, node_assert_1.default)(!this.#released, 'connection was released');
+        this.#released = true;
         return this.conn.release();
@@ -43,2 +51,2 @@ }
 exports.RDSConnection = RDSConnection;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29ubmVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25uZWN0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHlDQUFzQztBQUN0Qyx5Q0FBc0M7QUFHdEMsTUFBTSxVQUFVLEdBQUcsTUFBTSxDQUFDLFlBQVksQ0FBQyxDQUFDO0FBRXhDLE1BQWEsYUFBYyxTQUFRLG1CQUFRO0lBQ3pDLElBQUksQ0FBMEI7SUFDOUIsWUFBWSxJQUE2QjtRQUN2QyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDWixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQztRQUNqQixJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDO1lBQzNCO2dCQUNFLE9BQU87Z0JBQ1Asa0JBQWtCO2dCQUNsQixRQUFRO2dCQUNSLFVBQVU7YUFDWCxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsRUFBRTtnQkFDZCxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxHQUFHLElBQUEscUJBQVMsRUFBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7WUFDN0MsQ0FBQyxDQUFDLENBQUM7WUFDSCxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxHQUFHLElBQUksQ0FBQztRQUMvQixDQUFDO0lBQ0gsQ0FBQztJQUVELE9BQU87UUFDTCxPQUFPLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDN0IsQ0FBQztJQUVELEtBQUssQ0FBQyxNQUFNLENBQUMsR0FBVztRQUN0QixPQUFPLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDcEMsQ0FBQztJQUVELEtBQUssQ0FBQyxnQkFBZ0I7UUFDcEIsT0FBTyxNQUFNLElBQUksQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQztJQUM1QyxDQUFDO0lBRUQsS0FBSyxDQUFDLE1BQU07UUFDVixPQUFPLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQztJQUNsQyxDQUFDO0lBRUQsS0FBSyxDQUFDLFFBQVE7UUFDWixPQUFPLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztJQUNwQyxDQUFDO0NBQ0Y7QUFyQ0Qsc0NBcUNDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29ubmVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25uZWN0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLDhEQUFpQztBQUNqQyx5Q0FBc0M7QUFDdEMseUNBQXNDO0FBR3RDLE1BQU0sVUFBVSxHQUFHLE1BQU0sQ0FBQyxZQUFZLENBQUMsQ0FBQztBQUV4QyxNQUFhLGFBQWMsU0FBUSxtQkFBUTtJQUN6QyxJQUFJLENBQTBCO0lBQzlCLFNBQVMsQ0FBVTtJQUVuQixZQUFZLElBQTZCO1FBQ3ZDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNaLElBQUksQ0FBQyxTQUFTLEdBQUcsS0FBSyxDQUFDO1FBQ3ZCLElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDO1FBQ2pCLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUM7WUFDM0I7Z0JBQ0UsT0FBTztnQkFDUCxrQkFBa0I7Z0JBQ2xCLFFBQVE7Z0JBQ1IsVUFBVTthQUNYLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxFQUFFO2dCQUNkLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEdBQUcsSUFBQSxxQkFBUyxFQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztZQUM3QyxDQUFDLENBQUMsQ0FBQztZQUNILElBQUksQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUcsSUFBSSxDQUFDO1FBQy9CLENBQUM7SUFDSCxDQUFDO0lBRUQsT0FBTztRQUNMLElBQUEscUJBQU0sRUFBQyxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUseUJBQXlCLENBQUMsQ0FBQztRQUNuRCxJQUFJLENBQUMsU0FBUyxHQUFHLElBQUksQ0FBQztRQUN0QixPQUFPLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDN0IsQ0FBQztJQUVELEtBQUssQ0FBQyxNQUFNLENBQUMsR0FBVztRQUN0QixPQUFPLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDcEMsQ0FBQztJQUVELEtBQUssQ0FBQyxnQkFBZ0I7UUFDcEIsT0FBTyxNQUFNLElBQUksQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQztJQUM1QyxDQUFDO0lBRUQsS0FBSyxDQUFDLE1BQU07UUFDVixPQUFPLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQztJQUNsQyxDQUFDO0lBRUQsS0FBSyxDQUFDLFFBQVE7UUFDWixPQUFPLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztJQUNwQyxDQUFDO0NBQ0Y7QUExQ0Qsc0NBMENDIn0=

lib/transaction.d.ts

@@ -8,2 +8,3 @@ import type { RDSConnection } from './connection';
     conn: RDSConnection | null;
+    id: number;
     constructor(conn: RDSConnection);
@@ -10,0 +11,0 @@ commit(): Promise<void>;

lib/transaction.js

@@ -5,2 +5,3 @@ "use strict";
 const operator_1 = require("./operator");
+let id = 0;
 class RDSTransaction extends operator_1.Operator {
@@ -10,4 +11,6 @@ isCommit = false;
     conn;
+    id;
     constructor(conn) {
         super(conn.conn);
+        this.id = id++;
         this.conn = conn;
@@ -48,2 +51,2 @@ }
 exports.RDSTransaction = RDSTransaction;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNhY3Rpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdHJhbnNhY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EseUNBQXNDO0FBRXRDLE1BQWEsY0FBZSxTQUFRLG1CQUFRO0lBQzFDLFFBQVEsR0FBRyxLQUFLLENBQUM7SUFDakIsVUFBVSxHQUFHLEtBQUssQ0FBQztJQUNuQixJQUFJLENBQXVCO0lBQzNCLFlBQVksSUFBbUI7UUFDN0IsS0FBSyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNqQixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQztJQUNuQixDQUFDO0lBRUQsS0FBSyxDQUFDLE1BQU07UUFDVixJQUFJLENBQUMsTUFBTSxFQUFFLENBQUM7UUFDZCxJQUFJLENBQUM7WUFDSCxPQUFPLE1BQU0sSUFBSSxDQUFDLElBQUssQ0FBQyxNQUFNLEVBQUUsQ0FBQztRQUNuQyxDQUFDO2dCQUFTLENBQUM7WUFDVCxJQUFJLENBQUMsUUFBUSxHQUFHLElBQUksQ0FBQztZQUNyQixJQUFJLENBQUMsSUFBSyxDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQ3JCLElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDO1FBQ25CLENBQUM7SUFDSCxDQUFDO0lBRUQsS0FBSyxDQUFDLFFBQVE7UUFDWixJQUFJLENBQUMsTUFBTSxFQUFFLENBQUM7UUFDZCxJQUFJLENBQUM7WUFDSCxPQUFPLE1BQU0sSUFBSSxDQUFDLElBQUssQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUNyQyxDQUFDO2dCQUFTLENBQUM7WUFDVCxJQUFJLENBQUMsVUFBVSxHQUFHLElBQUksQ0FBQztZQUN2QixJQUFJLENBQUMsSUFBSyxDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQ3JCLElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDO1FBQ25CLENBQUM7SUFDSCxDQUFDO0lBRVMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxHQUFXO1FBQ2hDLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQztRQUNkLE9BQU8sTUFBTSxJQUFJLENBQUMsSUFBSyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUN0QyxDQUFDO0lBRUQsTUFBTTtRQUNKLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDZixNQUFNLElBQUksS0FBSyxDQUFDLG9DQUFvQyxDQUFDLENBQUM7UUFDeEQsQ0FBQztJQUNILENBQUM7Q0FDRjtBQXpDRCx3Q0F5Q0MifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNhY3Rpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdHJhbnNhY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EseUNBQXNDO0FBRXRDLElBQUksRUFBRSxHQUFHLENBQUMsQ0FBQztBQUNYLE1BQWEsY0FBZSxTQUFRLG1CQUFRO0lBQzFDLFFBQVEsR0FBRyxLQUFLLENBQUM7SUFDakIsVUFBVSxHQUFHLEtBQUssQ0FBQztJQUNuQixJQUFJLENBQXVCO0lBQzNCLEVBQUUsQ0FBUztJQUVYLFlBQVksSUFBbUI7UUFDN0IsS0FBSyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNqQixJQUFJLENBQUMsRUFBRSxHQUFHLEVBQUUsRUFBRSxDQUFDO1FBQ2YsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUM7SUFDbkIsQ0FBQztJQUVELEtBQUssQ0FBQyxNQUFNO1FBQ1YsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO1FBQ2QsSUFBSSxDQUFDO1lBQ0gsT0FBTyxNQUFNLElBQUksQ0FBQyxJQUFLLENBQUMsTUFBTSxFQUFFLENBQUM7UUFDbkMsQ0FBQztnQkFBUyxDQUFDO1lBQ1QsSUFBSSxDQUFDLFFBQVEsR0FBRyxJQUFJLENBQUM7WUFDckIsSUFBSSxDQUFDLElBQUssQ0FBQyxPQUFPLEVBQUUsQ0FBQztZQUNyQixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQztRQUNuQixDQUFDO0lBQ0gsQ0FBQztJQUVELEtBQUssQ0FBQyxRQUFRO1FBQ1osSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO1FBQ2QsSUFBSSxDQUFDO1lBQ0gsT0FBTyxNQUFNLElBQUksQ0FBQyxJQUFLLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDckMsQ0FBQztnQkFBUyxDQUFDO1lBQ1QsSUFBSSxDQUFDLFVBQVUsR0FBRyxJQUFJLENBQUM7WUFDdkIsSUFBSSxDQUFDLElBQUssQ0FBQyxPQUFPLEVBQUUsQ0FBQztZQUNyQixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQztRQUNuQixDQUFDO0lBQ0gsQ0FBQztJQUVTLEtBQUssQ0FBQyxNQUFNLENBQUMsR0FBVztRQUNoQyxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUM7UUFDZCxPQUFPLE1BQU0sSUFBSSxDQUFDLElBQUssQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDdEMsQ0FBQztJQUVELE1BQU07UUFDSixJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDO1lBQ2YsTUFBTSxJQUFJLEtBQUssQ0FBQyxvQ0FBb0MsQ0FBQyxDQUFDO1FBQ3hELENBQUM7SUFDSCxDQUFDO0NBQ0Y7QUE1Q0Qsd0NBNENDIn0=

lib/types.d.ts

@@ -9,2 +9,3 @@ import { AsyncLocalStorage } from 'node:async_hooks';
     getConnectionConfig?: GetConnectionConfig;
+    poolWaitTimeout?: number;
 }
@@ -11,0 +12,0 @@ export interface PoolConnectionPromisify extends Omit<PoolConnection, 'query'> {

package.json

 {
   "name": "ali-rds",
-  "version": "6.4.0",
+  "version": "6.5.0",
   "description": "Aliyun RDS client",
@@ -5,0 +5,0 @@ "main": "lib/client.js",

README.md

@@ -51,2 +51,9 @@ # ali-rds
   // connectionStorageKey: 'datasource',
+  
+  // The timeout for connecting to the MySQL server. (Default: 500 milliseconds)
+  // connectTimeout: 500,
+
+  // The timeout for waiting for a connection from the connection pool. (Default: 500 milliseconds)
+  // So max timeout for get a connection is (connectTimeout + poolWaitTimeout)
+  // poolWaitTimeout: 500,
 });
@@ -53,0 +60,0 @@ ```

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

95231

increased by5.89%

Number of package files

23

increased by9.52%

Lines of code

1321

increased by6.28%

Number of lines in readme file

451

increased by1.58%

No dependency changes