@tdengine/websocket 3.2.2 → 3.3.0

package/lib/src/client/wsConnectorPool.d.ts

@@ -1,3 +1,4 @@
+import { Dsn } from "../common/dsn";
 import { WebSocketConnector } from "./wsConnector";
 export declare class WebSocketConnectionPool {
     private static _instance?;
@@ -7,7 +8,10 @@ export declare class WebSocketConnectionPool {
     private static sharedArray;
     private constructor();
     static instance(maxConnections?: number): WebSocketConnectionPool;
-    getConnection(url: URL, timeout: number | undefined | null): Promise<WebSocketConnector>;
+    private maskPoolKeyForLog;
+    private buildAuthScope;
+    private getPoolKey;
+    getConnection(dsn: Dsn, timeout: number | undefined | null): Promise<WebSocketConnector>;
     releaseConnection(connector: WebSocketConnector): Promise<void>;
     destroyed(): void;
 }

package/lib/src/client/wsConnectorPool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wsConnectorPool.d.ts","sourceRoot":"","sources":["../../../src/client/wsConnectorPool.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAOnD,qBAAa,uBAAuB;IAChC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAA0B;IACnD,OAAO,CAAC,IAAI,CAAgD;IAC5D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;IACzC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAoB;IAC/C,OAAO,CAAC,MAAM,CAAC,WAAW,CAAa;IAEvC,OAAO;WASO,QAAQ,CAClB,cAAc,GAAE,MAAW,GAC5B,uBAAuB;IASpB,aAAa,CACf,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GACnC,OAAO,CAAC,kBAAkB,CAAC;IA4DxB,iBAAiB,CAAC,SAAS,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAmCrE,SAAS;CAmBZ"}
+{"version":3,"file":"wsConnectorPool.d.ts","sourceRoot":"","sources":["../../../src/client/wsConnectorPool.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAIpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAInD,qBAAa,uBAAuB;IAChC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAA0B;IACnD,OAAO,CAAC,IAAI,CAAgD;IAC5D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;IACzC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAoB;IAC/C,OAAO,CAAC,MAAM,CAAC,WAAW,CAAa;IAEvC,OAAO;WAOO,QAAQ,CAAC,cAAc,GAAE,MAAW,GAAG,uBAAuB;IAO5E,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,UAAU;IAUZ,aAAa,CACf,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GACnC,OAAO,CAAC,kBAAkB,CAAC;IA0DxB,iBAAiB,CAAC,SAAS,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IA4BrE,SAAS;CAiBZ"}

package/lib/src/client/wsConnectorPool.js

@@ -4,11 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSocketConnectionPool = void 0;
+const crypto_1 = require("crypto");
 const async_mutex_1 = require("async-mutex");
-const wsConnector_1 = require("./wsConnector");
 const wsError_1 = require("../common/wsError");
 const log_1 = __importDefault(require("../common/log"));
 const websocket_1 = require("websocket");
+const wsConnector_1 = require("./wsConnector");
 const mutex = new async_mutex_1.Mutex();
 class WebSocketConnectionPool {
     constructor(maxConnections = -1) {
@@ -24,28 +25,50 @@ class WebSocketConnectionPool {
         }
         return WebSocketConnectionPool._instance;
     }
-    async getConnection(url, timeout) {
-        let connectAddr = url.origin.concat(url.pathname).concat(url.search);
+    maskPoolKeyForLog(poolKey) {
+        return poolKey.replace(/#auth=[^#]*/, "#auth=[REDACTED]");
+    }
+    buildAuthScope(dsn) {
+        const token = dsn.params.get("token") || "";
+        const bearerToken = dsn.params.get("bearer_token") || "";
+        const raw = JSON.stringify({
+            username: dsn.username,
+            password: dsn.password,
+            token,
+            bearerToken,
+        });
+        return (0, crypto_1.createHash)("sha256").update(raw).digest("hex");
+    }
+    getPoolKey(dsn) {
+        const addrs = [...dsn.addresses]
+            .sort((a, b) => `${a.host}:${a.port}`.localeCompare(`${b.host}:${b.port}`))
+            .map((addr) => `${addr.host}:${addr.port}`)
+            .join(",");
+        const auth = this.buildAuthScope(dsn);
+        const path = dsn.path();
+        return `${dsn.scheme}://${addrs}/${path}#auth=${auth}`;
+    }
+    async getConnection(dsn, timeout) {
+        const poolKey = this.getPoolKey(dsn);
+        const poolKeyForLog = this.maskPoolKeyForLog(poolKey);
         let connector;
         const unlock = await mutex.acquire();
         try {
-            if (this.pool.has(connectAddr)) {
-                const connectors = this.pool.get(connectAddr);
+            if (this.pool.has(poolKey)) {
+                const connectors = this.pool.get(poolKey);
                 while (connectors && connectors.length > 0) {
                     const candidate = connectors.pop();
                     if (!candidate) {
                         continue;
                     }
-                    if (candidate &&
-                        candidate.readyState() === websocket_1.w3cwebsocket.OPEN) {
+                    if (candidate.readyState() === websocket_1.w3cwebsocket.OPEN) {
+                        candidate.refreshRetryConfig(dsn);
                         connector = candidate;
                         break;
                     }
-                    else if (candidate) {
-                        Atomics.add(WebSocketConnectionPool.sharedArray, 0, -1);
-                        candidate.close();
-                        log_1.default.error(`getConnection, current connection status fail, url: ${connectAddr}`);
-                    }
+                    Atomics.add(WebSocketConnectionPool.sharedArray, 0, -1);
+                    candidate.close();
+                    log_1.default.error("getConnection, current connection status fail, poolKey: " + poolKeyForLog);
                 }
             }
             if (connector) {
@@ -54,54 +77,49 @@ class WebSocketConnectionPool {
                 return connector;
             }
             if (this._maxConnections != -1 &&
-                Atomics.load(WebSocketConnectionPool.sharedArray, 0) >
-                    this._maxConnections) {
+                Atomics.load(WebSocketConnectionPool.sharedArray, 0) > this._maxConnections) {
                 throw new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_WEBSOCKET_CONNECTION_ARRIVED_LIMIT, "websocket connect arrived limited:" +
                     Atomics.load(WebSocketConnectionPool.sharedArray, 0));
             }
             Atomics.add(WebSocketConnectionPool.sharedArray, 0, 1);
-            log_1.default.info("getConnection, new connection count:" +
-                Atomics.load(WebSocketConnectionPool.sharedArray, 0) +
-                ", connectAddr:" +
-                connectAddr);
-            return new wsConnector_1.WebSocketConnector(url, timeout);
+            if (log_1.default.isInfoEnabled()) {
+                log_1.default.info("getConnection, new connection count:" +
+                    Atomics.load(WebSocketConnectionPool.sharedArray, 0) +
+                    ", poolKey:" +
+                    poolKeyForLog);
+            }
+            return new wsConnector_1.WebSocketConnector(dsn, poolKey, timeout);
         }
         finally {
             unlock();
         }
     }
     async releaseConnection(connector) {
-        if (connector) {
-            const unlock = await mutex.acquire();
-            try {
-                if (connector.readyState() === websocket_1.w3cwebsocket.OPEN) {
-                    let url = connector.getWsURL();
-                    let connectAddr = url.origin
-                        .concat(url.pathname)
-                        .concat(url.search);
-                    let connectors = this.pool.get(connectAddr);
-                    if (!connectors) {
-                        connectors = new Array();
-                        connectors.push(connector);
-                        this.pool.set(connectAddr, connectors);
-                    }
-                    else {
-                        connectors.push(connector);
-                    }
-                    log_1.default.info("releaseConnection, current connection count:" +
-                        connectors.length);
-                }
-                else {
-                    Atomics.add(WebSocketConnectionPool.sharedArray, 0, -1);
-                    connector.close();
-                    log_1.default.info("releaseConnection, current connection status fail:" +
-                        Atomics.load(WebSocketConnectionPool.sharedArray, 0));
+        if (!connector) {
+            return;
+        }
+        const unlock = await mutex.acquire();
+        try {
+            if (connector.readyState() === websocket_1.w3cwebsocket.OPEN) {
+                const poolKey = connector.getPoolKey();
+                let connectors = this.pool.get(poolKey);
+                if (!connectors) {
+                    connectors = [];
+                    this.pool.set(poolKey, connectors);
                 }
+                connectors.push(connector);
+                log_1.default.info("releaseConnection, current connection count:" + connectors.length);
             }
-            finally {
-                unlock();
+            else {
+                Atomics.add(WebSocketConnectionPool.sharedArray, 0, -1);
+                connector.close();
+                log_1.default.info("releaseConnection, current connection status fail:" +
+                    Atomics.load(WebSocketConnectionPool.sharedArray, 0));
             }
         }
+        finally {
+            unlock();
+        }
     }
     destroyed() {
         let num = 0;
@@ -113,10 +131,8 @@ class WebSocketConnectionPool {
                 }
             }
         }
-        log_1.default.info("destroyed connect:" +
-            Atomics.load(WebSocketConnectionPool.sharedArray, 0) +
-            " current count:" +
-            num);
+        log_1.default.info("destroyed connect: " + Atomics.load(WebSocketConnectionPool.sharedArray, 0) +
+            ", current count:" + num);
         Atomics.store(WebSocketConnectionPool.sharedArray, 0, 0);
         this.pool = new Map();
     }
@@ -133,8 +149,7 @@ process.on("SIGINT", () => {
     process.exit();
 });
 process.on("SIGTERM", () => {
-    log_1.default.info("Received SIGINT. Press Control-D to exit, begin destroy connect");
+    log_1.default.info("Received SIGTERM. Press Control-D to exit, begin destroy connect...");
     WebSocketConnectionPool.instance().destroyed();
     process.exit();
 });
-// process.kill(process.pid, 'SIGINT');

package/lib/src/client/wsEventCallback.d.ts

@@ -3,6 +3,7 @@ interface MessageId {
     req_id: bigint;
     id?: bigint;
     timeout?: number;
+    poolKey?: string;
 }
 export declare enum OnMessageType {
     MESSAGE_TYPE_ARRAYBUFFER = 1,
@@ -17,6 +18,8 @@ export declare class WsEventCallback {
     static instance(): WsEventCallback;
     registerCallback(id: MessageId, res: (args: unknown) => void, rej: (reason: any) => void): Promise<void>;
     handleEventCallback(msg: MessageId, messageType: OnMessageType, data: any): Promise<void>;
+    unregisterCallback(reqId: bigint): Promise<void>;
+    rejectCallbacksExceptReqIds(keepReqIds: Set<bigint>, error: Error, poolKey?: string): Promise<void>;
 }
 export {};
 //# sourceMappingURL=wsEventCallback.d.ts.map

package/lib/src/client/wsEventCallback.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wsEventCallback.d.ts","sourceRoot":"","sources":["../../../src/client/wsEventCallback.ts"],"names":[],"mappings":"AASA,UAAU,SAAS;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;AASD,oBAAY,aAAa;IACrB,wBAAwB,IAAI;IAC5B,iBAAiB,IAAI;IACrB,mBAAmB,IAAI;IACvB,uBAAuB,IAAI;CAC9B;AAGD,qBAAa,eAAe;IACxB,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAkB;IAC3C,OAAO,CAAC,MAAM,CAAC,kBAAkB,CACnB;IACd,OAAO;WAEO,QAAQ,IAAI,eAAe;IAOnC,gBAAgB,CAClB,EAAE,EAAE,SAAS,EACb,GAAG,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,EAC5B,GAAG,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI;IAwBxB,mBAAmB,CACrB,GAAG,EAAE,SAAS,EACd,WAAW,EAAE,aAAa,EAC1B,IAAI,EAAE,GAAG;CA0DhB"}
+{"version":3,"file":"wsEventCallback.d.ts","sourceRoot":"","sources":["../../../src/client/wsEventCallback.ts"],"names":[],"mappings":"AASA,UAAU,SAAS;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;AASD,oBAAY,aAAa;IACrB,wBAAwB,IAAI;IAC5B,iBAAiB,IAAI;IACrB,mBAAmB,IAAI;IACvB,uBAAuB,IAAI;CAC9B;AAID,qBAAa,eAAe;IACxB,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAkB;IAC3C,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAA4C;IAE7E,OAAO;WAEO,QAAQ,IAAI,eAAe;IAOnC,gBAAgB,CAClB,EAAE,EAAE,SAAS,EACb,GAAG,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,EAC5B,GAAG,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI;IAkCxB,mBAAmB,CACrB,GAAG,EAAE,SAAS,EACd,WAAW,EAAE,aAAa,EAC1B,IAAI,EAAE,GAAG;IA+DP,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAehD,2BAA2B,CAC7B,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,EACvB,KAAK,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC;CAyBnB"}

package/lib/src/client/wsEventCallback.js

@@ -26,11 +26,25 @@ class WsEventCallback {
     async registerCallback(id, res, rej) {
         let release = await eventMutex.acquire();
         try {
+            const timer = setTimeout(async () => {
+                let removed = false;
+                const timeoutRelease = await eventMutex.acquire();
+                try {
+                    removed = WsEventCallback._msgActionRegister.delete(id);
+                }
+                finally {
+                    timeoutRelease();
+                }
+                if (!removed) {
+                    return;
+                }
+                rej(new wsError_1.WebSocketQueryError(wsError_1.ErrorCode.ERR_WEBSOCKET_QUERY_TIMEOUT, `action:${id.action},req_id:${id.req_id} timeout with ${id.timeout} milliseconds`));
+            }, id.timeout);
             WsEventCallback._msgActionRegister.set(id, {
                 sendTime: new Date().getTime(),
                 reject: rej,
                 resolve: res,
-                timer: setTimeout(() => rej(new wsError_1.WebSocketQueryError(wsError_1.ErrorCode.ERR_WEBSOCKET_QUERY_TIMEOUT, `action:${id.action},req_id:${id.req_id} timeout with ${id.timeout} milliseconds`)), id.timeout),
+                timer,
             });
         }
         finally {
@@ -39,6 +53,7 @@ class WsEventCallback {
     }
     async handleEventCallback(msg, messageType, data) {
         let action = undefined;
+        let keyToDelete = undefined;
         let release = await eventMutex.acquire();
         log_1.default.debug(`HandleEventCallback get lock msg=${msg}, ${messageType}`);
         log_1.default.debug(WsEventCallback._msgActionRegister);
@@ -47,32 +62,36 @@ class WsEventCallback {
                 if (messageType == OnMessageType.MESSAGE_TYPE_ARRAYBUFFER) {
                     if (k.id == msg.id || k.req_id == msg.id) {
                         action = v;
-                        WsEventCallback._msgActionRegister.delete(k);
+                        keyToDelete = k;
                         break;
                     }
                 }
                 else if (messageType == OnMessageType.MESSAGE_TYPE_BLOB) {
                     if (k.id == msg.id || k.req_id == msg.id) {
                         action = v;
-                        WsEventCallback._msgActionRegister.delete(k);
+                        keyToDelete = k;
                         break;
                     }
                 }
                 else if (messageType == OnMessageType.MESSAGE_TYPE_STRING) {
                     if (k.req_id == msg.req_id && k.action == msg.action) {
                         action = v;
-                        WsEventCallback._msgActionRegister.delete(k);
+                        keyToDelete = k;
                         break;
                     }
                 }
                 else if (messageType == OnMessageType.MESSAGE_TYPE_CONNECTION) {
                     if (k.req_id == msg.req_id && k.action == msg.action) {
                         action = v;
-                        WsEventCallback._msgActionRegister.delete(k);
+                        keyToDelete = k;
                         break;
                     }
                 }
             }
+            if (action && keyToDelete) {
+                clearTimeout(action.timer);
+                WsEventCallback._msgActionRegister.delete(keyToDelete);
+            }
         }
         finally {
             release();
@@ -86,13 +105,53 @@ class WsEventCallback {
             action.resolve(resp);
         }
         else {
-            log_1.default.error("no find callback msg:=", msg);
-            throw new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_WS_NO_CALLBACK, "no callback registered for fetch_block with req_id=" +
+            log_1.default.error("no find callback msg: ", msg);
+            throw new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_WS_NO_CALLBACK, "no callback registered with req_id: " +
                 msg.req_id +
-                " action" +
+                ", action: " +
                 msg.action);
         }
     }
+    async unregisterCallback(reqId) {
+        const release = await eventMutex.acquire();
+        try {
+            for (let [k, v] of WsEventCallback._msgActionRegister) {
+                if (k.req_id === reqId || k.id === reqId) {
+                    clearTimeout(v.timer);
+                    WsEventCallback._msgActionRegister.delete(k);
+                    break;
+                }
+            }
+        }
+        finally {
+            release();
+        }
+    }
+    async rejectCallbacksExceptReqIds(keepReqIds, error, poolKey) {
+        const toReject = [];
+        const release = await eventMutex.acquire();
+        try {
+            for (const [k, v] of WsEventCallback._msgActionRegister) {
+                if (poolKey !== undefined && k.poolKey !== poolKey) {
+                    continue;
+                }
+                const keepByReqId = keepReqIds.has(k.req_id);
+                const keepByCallbackId = k.id !== undefined && keepReqIds.has(k.id);
+                if (keepByReqId || keepByCallbackId) {
+                    continue;
+                }
+                clearTimeout(v.timer);
+                WsEventCallback._msgActionRegister.delete(k);
+                toReject.push(v.reject);
+            }
+        }
+        finally {
+            release();
+        }
+        for (const reject of toReject) {
+            reject(error);
+        }
+    }
 }
 exports.WsEventCallback = WsEventCallback;
 WsEventCallback._msgActionRegister = new Map();

package/lib/src/client/wsResponse.d.ts

@@ -1,6 +1,3 @@
-/**
- * define ws Response type|class, for query?
- */
 import { MessageResp } from "../common/taosResult";
 export declare class WSVersionResponse {
     version: string;

package/lib/src/client/wsResponse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wsResponse.d.ts","sourceRoot":"","sources":["../../../src/client/wsResponse.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAe,MAAM,sBAAsB,CAAC;AAEhE,qBAAa,iBAAiB;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;gBACN,IAAI,EAAE,WAAW;CAOhC;AAED,qBAAa,eAAe;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,YAAY,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IACpC,YAAY,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IACpC,cAAc,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IACtC,iBAAiB,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IACzC,aAAa,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IACrC,SAAS,CAAC,EAAE,MAAM,CAAC;gBAEP,IAAI,EAAE,WAAW;IAI7B,OAAO,CAAC,OAAO;CA0BlB;AAED,qBAAa,oBAAoB;IAC7B,IAAI,EAAE,QAAQ,GAAG,SAAS,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,WAAW,EAAE,WAAW,CAAC;gBACb,GAAG,EAAE,WAAW;CA+B/B"}
+{"version":3,"file":"wsResponse.d.ts","sourceRoot":"","sources":["../../../src/client/wsResponse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAe,MAAM,sBAAsB,CAAC;AAEhE,qBAAa,iBAAiB;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;gBAEN,IAAI,EAAE,WAAW;CAOhC;AAED,qBAAa,eAAe;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,YAAY,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IACpC,YAAY,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IACpC,cAAc,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IACtC,iBAAiB,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IACzC,aAAa,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IACrC,SAAS,CAAC,EAAE,MAAM,CAAC;gBAEP,IAAI,EAAE,WAAW;IAK7B,OAAO,CAAC,OAAO;CA0BlB;AAED,qBAAa,oBAAoB;IAC7B,IAAI,EAAE,QAAQ,GAAG,SAAS,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,WAAW,EAAE,WAAW,CAAC;gBAEb,GAAG,EAAE,WAAW;CA+B/B"}

package/lib/src/client/wsResponse.js

@@ -1,7 +1,4 @@
 "use strict";
-/**
- * define ws Response type|class, for query?
- */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WSFetchBlockResponse = exports.WSQueryResponse = exports.WSVersionResponse = void 0;
 const taosResult_1 = require("../common/taosResult");

package/lib/src/common/addressConnectionTracker.d.ts

@@ -0,0 +1,11 @@
+import { Address } from "./dsn";
+export declare class AddressConnectionTracker {
+    private static _instance;
+    private _counts;
+    static instance(): AddressConnectionTracker;
+    increment(address: string): void;
+    decrement(address: string): void;
+    selectLeastConnected(addresses: Address[]): number;
+    getCount(address: string): number;
+}
+//# sourceMappingURL=addressConnectionTracker.d.ts.map

package/lib/src/common/addressConnectionTracker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"addressConnectionTracker.d.ts","sourceRoot":"","sources":["../../../src/common/addressConnectionTracker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAEhC,qBAAa,wBAAwB;IACjC,OAAO,CAAC,MAAM,CAAC,SAAS,CAA2B;IACnD,OAAO,CAAC,OAAO,CAAkC;IAEjD,MAAM,CAAC,QAAQ,IAAI,wBAAwB;IAO3C,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAKhC,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAShC,oBAAoB,CAAC,SAAS,EAAE,OAAO,EAAE,GAAG,MAAM;IA6BlD,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;CAGpC"}

package/lib/src/common/addressConnectionTracker.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AddressConnectionTracker = void 0;
+class AddressConnectionTracker {
+    constructor() {
+        this._counts = new Map();
+    }
+    static instance() {
+        if (!AddressConnectionTracker._instance) {
+            AddressConnectionTracker._instance = new AddressConnectionTracker();
+        }
+        return AddressConnectionTracker._instance;
+    }
+    increment(address) {
+        const current = this.getCount(address);
+        this._counts.set(address, current + 1);
+    }
+    decrement(address) {
+        const current = this.getCount(address);
+        if (current <= 1) {
+            this._counts.delete(address);
+            return;
+        }
+        this._counts.set(address, current - 1);
+    }
+    selectLeastConnected(addresses) {
+        if (addresses.length === 0) {
+            return 0;
+        }
+        let minCount = Number.MAX_SAFE_INTEGER;
+        const candidateIndexes = [];
+        for (let i = 0; i < addresses.length; i++) {
+            const addr = addresses[i];
+            const key = `${addr.host}:${addr.port}`;
+            const count = this.getCount(key);
+            if (count < minCount) {
+                minCount = count;
+                candidateIndexes.length = 0;
+                candidateIndexes.push(i);
+                continue;
+            }
+            if (count === minCount) {
+                candidateIndexes.push(i);
+            }
+        }
+        const selected = Math.floor(Math.random() * candidateIndexes.length);
+        return candidateIndexes[selected];
+    }
+    getCount(address) {
+        return this._counts.get(address) ?? 0;
+    }
+}
+exports.AddressConnectionTracker = AddressConnectionTracker;

package/lib/src/common/config.d.ts

@@ -7,6 +7,7 @@ export declare class WSConfig {
     private _token;
     private _timezone;
     private _minStmt2Version;
+    private _bearerToken;
     constructor(url: string, minStmt2Version?: string);
     getToken(): string | undefined | null;
     setToken(token: string): void;
@@ -22,6 +23,8 @@ export declare class WSConfig {
     setTimeOut(ms: number): void;
     getTimezone(): string | undefined | null;
     setTimezone(timezone: string): void;
+    getBearerToken(): string | undefined | null;
+    setBearerToken(token: string): void;
     getMinStmt2Version(): string;
 }
 //# sourceMappingURL=config.d.ts.map

package/lib/src/common/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/common/config.ts"],"names":[],"mappings":"AAEA,qBAAa,QAAQ;IACjB,OAAO,CAAC,KAAK,CAA4B;IACzC,OAAO,CAAC,SAAS,CAA4B;IAC7C,OAAO,CAAC,GAAG,CAA4B;IACvC,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,QAAQ,CAA4B;IAC5C,OAAO,CAAC,MAAM,CAA4B;IAC1C,OAAO,CAAC,SAAS,CAA4B;IAC7C,OAAO,CAAC,gBAAgB,CAAS;gBAErB,GAAG,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,MAAM;IAS1C,QAAQ,IAAI,MAAM,GAAG,SAAS,GAAG,IAAI;IAIrC,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,OAAO,IAAI,MAAM,GAAG,SAAS,GAAG,IAAI;IAIpC,OAAO,CAAC,IAAI,EAAE,MAAM;IAIpB,MAAM,IAAI,MAAM,GAAG,SAAS,GAAG,IAAI;IAInC,MAAM,CAAC,GAAG,EAAE,MAAM;IAIlB,KAAK,IAAI,MAAM,GAAG,SAAS,GAAG,IAAI;IAIlC,KAAK,CAAC,EAAE,EAAE,MAAM;IAIhB,MAAM,IAAI,MAAM;IAIhB,MAAM,CAAC,GAAG,EAAE,MAAM;IAIlB,UAAU,IAAI,MAAM,GAAG,SAAS,GAAG,IAAI;IAIvC,UAAU,CAAC,EAAE,EAAE,MAAM;IAIrB,WAAW,IAAI,MAAM,GAAG,SAAS,GAAG,IAAI;IAIxC,WAAW,CAAC,QAAQ,EAAE,MAAM;IAI5B,kBAAkB;CAG5B"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/common/config.ts"],"names":[],"mappings":"AAEA,qBAAa,QAAQ;IACjB,OAAO,CAAC,KAAK,CAA4B;IACzC,OAAO,CAAC,SAAS,CAA4B;IAC7C,OAAO,CAAC,GAAG,CAA4B;IACvC,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,QAAQ,CAA4B;IAC5C,OAAO,CAAC,MAAM,CAA4B;IAC1C,OAAO,CAAC,SAAS,CAA4B;IAC7C,OAAO,CAAC,gBAAgB,CAAS;IACjC,OAAO,CAAC,YAAY,CAA4B;gBAEpC,GAAG,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,MAAM;IAS1C,QAAQ,IAAI,MAAM,GAAG,SAAS,GAAG,IAAI;IAIrC,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,OAAO,IAAI,MAAM,GAAG,SAAS,GAAG,IAAI;IAIpC,OAAO,CAAC,IAAI,EAAE,MAAM;IAIpB,MAAM,IAAI,MAAM,GAAG,SAAS,GAAG,IAAI;IAInC,MAAM,CAAC,GAAG,EAAE,MAAM;IAIlB,KAAK,IAAI,MAAM,GAAG,SAAS,GAAG,IAAI;IAIlC,KAAK,CAAC,EAAE,EAAE,MAAM;IAIhB,MAAM,IAAI,MAAM;IAIhB,MAAM,CAAC,GAAG,EAAE,MAAM;IAIlB,UAAU,IAAI,MAAM,GAAG,SAAS,GAAG,IAAI;IAIvC,UAAU,CAAC,EAAE,EAAE,MAAM;IAIrB,WAAW,IAAI,MAAM,GAAG,SAAS,GAAG,IAAI;IAIxC,WAAW,CAAC,QAAQ,EAAE,MAAM;IAI5B,cAAc,IAAI,MAAM,GAAG,SAAS,GAAG,IAAI;IAI3C,cAAc,CAAC,KAAK,EAAE,MAAM;IAI5B,kBAAkB;CAG5B"}

package/lib/src/common/config.js

@@ -54,6 +54,12 @@ class WSConfig {
     setTimezone(timezone) {
         this._timezone = timezone;
     }
+    getBearerToken() {
+        return this._bearerToken;
+    }
+    setBearerToken(token) {
+        this._bearerToken = token;
+    }
     getMinStmt2Version() {
         return this._minStmt2Version;
     }

package/lib/src/common/constant.d.ts

@@ -7,6 +7,7 @@ export interface StringIndexable {
 export interface NumberIndexable {
     [index: number]: number;
 }
+export declare const ConnectorInfo: string;
 export declare const BinaryQueryMessage: bigint;
 export declare const FetchRawBlockMessage: bigint;
 export declare const MinStmt2Version: string;

package/lib/src/common/constant.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constant.d.ts","sourceRoot":"","sources":["../../../src/common/constant.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,eAAe;IAC5B,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,eAAe;IAC5B,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,eAAe;IAC5B,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;CAC3B;AAED,eAAO,MAAM,kBAAkB,EAAE,MAAkB,CAAC;AACpD,eAAO,MAAM,oBAAoB,EAAE,MAAkB,CAAC;AACtD,eAAO,MAAM,eAAe,EAAE,MAAkB,CAAC;AACjD,eAAO,MAAM,gBAAgB,EAAE,eAmB9B,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,eAM9B,CAAC;AAEF,oBAAY,gBAAgB;IACxB,IAAI,IAAI;IACR,IAAI,IAAI;IACR,OAAO,IAAI;IACX,QAAQ,IAAI;IACZ,GAAG,IAAI;IACP,MAAM,IAAI;IACV,KAAK,IAAI;IACT,MAAM,IAAI;IACV,MAAM,IAAI;IACV,OAAO,IAAI;IACX,SAAS,IAAI;IACb,KAAK,KAAK;IACV,gBAAgB,KAAK;IACrB,iBAAiB,KAAK;IACtB,YAAY,KAAK;IACjB,eAAe,KAAK;IACpB,IAAI,KAAK;IACT,SAAS,KAAK;IACd,OAAO,KAAK;IACZ,QAAQ,KAAK;IACb,SAAS,KAAK;CACjB;AAED,oBAAY,sBAAsB;IAC9B,8BAA8B,IAAA,CAAG,qDAAqD;IACtF,+BAA+B,IAAA,CAAE,sDAAsD;IACvF,8BAA8B,IAAA,CAAG,UAAU;IAC3C,+BAA+B,IAAA;CAClC;AAED,oBAAY,aAAa;IACrB,cAAc,IAAI;IAClB,cAAc,IAAI;IAClB,gBAAgB,IAAI;IACpB,iBAAiB,IAAI;CACxB;AAED,eAAO,MAAM,iBAAiB,EAAE,eAI/B,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,eAahC,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,eAI7B,CAAC"}
+{"version":3,"file":"constant.d.ts","sourceRoot":"","sources":["../../../src/common/constant.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,eAAe;IAC5B,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,eAAe;IAC5B,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,eAAe;IAC5B,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;CAC3B;AAED,eAAO,MAAM,aAAa,QAAsC,CAAC;AACjE,eAAO,MAAM,kBAAkB,EAAE,MAAkB,CAAC;AACpD,eAAO,MAAM,oBAAoB,EAAE,MAAkB,CAAC;AACtD,eAAO,MAAM,eAAe,EAAE,MAAkB,CAAC;AACjD,eAAO,MAAM,gBAAgB,EAAE,eAmB9B,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,eAM9B,CAAC;AAEF,oBAAY,gBAAgB;IACxB,IAAI,IAAI;IACR,IAAI,IAAI;IACR,OAAO,IAAI;IACX,QAAQ,IAAI;IACZ,GAAG,IAAI;IACP,MAAM,IAAI;IACV,KAAK,IAAI;IACT,MAAM,IAAI;IACV,MAAM,IAAI;IACV,OAAO,IAAI;IACX,SAAS,IAAI;IACb,KAAK,KAAK;IACV,gBAAgB,KAAK;IACrB,iBAAiB,KAAK;IACtB,YAAY,KAAK;IACjB,eAAe,KAAK;IACpB,IAAI,KAAK;IACT,SAAS,KAAK;IACd,OAAO,KAAK;IACZ,QAAQ,KAAK;IACb,SAAS,KAAK;CACjB;AAED,oBAAY,sBAAsB;IAC9B,8BAA8B,IAAA,CAAG,qDAAqD;IACtF,+BAA+B,IAAA,CAAE,sDAAsD;IACvF,8BAA8B,IAAA,CAAG,UAAU;IAC3C,+BAA+B,IAAA;CAClC;AAED,oBAAY,aAAa;IACrB,cAAc,IAAI;IAClB,cAAc,IAAI;IAClB,gBAAgB,IAAI;IACpB,iBAAiB,IAAI;CACxB;AAED,eAAO,MAAM,iBAAiB,EAAE,eAI/B,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,eAahC,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,eAI7B,CAAC"}

package/lib/src/common/constant.js

@@ -1,6 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PrecisionLength = exports.TDengineTypeLength = exports.TDenginePrecision = exports.FieldBindType = exports.TSDB_OPTION_CONNECTION = exports.TDengineTypeCode = exports.ColumnsBlockType = exports.TDengineTypeName = exports.MinStmt2Version = exports.FetchRawBlockMessage = exports.BinaryQueryMessage = void 0;
+exports.PrecisionLength = exports.TDengineTypeLength = exports.TDenginePrecision = exports.FieldBindType = exports.TSDB_OPTION_CONNECTION = exports.TDengineTypeCode = exports.ColumnsBlockType = exports.TDengineTypeName = exports.MinStmt2Version = exports.FetchRawBlockMessage = exports.BinaryQueryMessage = exports.ConnectorInfo = void 0;
+const package_json_1 = __importDefault(require("../../package.json"));
+exports.ConnectorInfo = `nodejs-ws-v${package_json_1.default.version}-ncid000`;
 exports.BinaryQueryMessage = BigInt(6);
 exports.FetchRawBlockMessage = BigInt(7);
 exports.MinStmt2Version = "3.3.6.0";

package/lib/src/common/dsn.d.ts

@@ -0,0 +1,30 @@
+export type WebSocketEndpoint = "sql" | "tmq";
+export declare const WS_SQL_ENDPOINT: WebSocketEndpoint;
+export declare const WS_TMQ_ENDPOINT: WebSocketEndpoint;
+export declare class Address {
+    host: string;
+    port: number;
+    constructor(host: string, port: number);
+}
+export declare class Dsn {
+    scheme: string;
+    username: string;
+    password: string;
+    addresses: Address[];
+    database: string;
+    params: Map<string, string>;
+    endpoint: WebSocketEndpoint;
+    constructor(scheme: string, username: string, password: string, addresses: Address[], database: string, params: Map<string, string>, endpoint?: WebSocketEndpoint);
+    toString(): string;
+    path(): string;
+}
+/**
+ * Parse a multi-host TDengine WebSocket URL.
+ * Format: ws://username:password@host1:port1,host2:port2,[::1]:port3/db?key=value
+ */
+export declare function parse(url: string): Dsn;
+export declare const DEFAULT_PORT = 6041;
+export declare const CLOUD_DEFAULT_PORT = 443;
+export declare function isCloudServiceHost(host: string): boolean;
+export declare function getDefaultPortForHost(host: string): number;
+//# sourceMappingURL=dsn.d.ts.map

package/lib/src/common/dsn.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dsn.d.ts","sourceRoot":"","sources":["../../../src/common/dsn.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,iBAAiB,GAAG,KAAK,GAAG,KAAK,CAAC;AAC9C,eAAO,MAAM,eAAe,EAAE,iBAAyB,CAAC;AACxD,eAAO,MAAM,eAAe,EAAE,iBAAyB,CAAC;AAKxD,qBAAa,OAAO;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;gBAED,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;CAIzC;AAaD,qBAAa,GAAG;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,OAAO,EAAE,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5B,QAAQ,EAAE,iBAAiB,CAAC;gBAGxB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,OAAO,EAAE,EACpB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAC3B,QAAQ,GAAE,iBAAmC;IAajD,QAAQ,IAAI,MAAM;IAiBlB,IAAI,IAAI,MAAM;CAGjB;AAED;;;GAGG;AACH,wBAAgB,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAoGtC;AAED,eAAO,MAAM,YAAY,OAAO,CAAC;AACjC,eAAO,MAAM,kBAAkB,MAAM,CAAC;AAEtC,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAMxD;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE1D"}