@tdengine/websocket 3.2.3 → 3.3.0

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;AAQnD,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;IAOtE,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAwDxF,iBAAiB,CAAC,SAAS,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IA8BrE,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,12 +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 utils_1 = require("../common/utils");
+const wsConnector_1 = require("./wsConnector");
 const mutex = new async_mutex_1.Mutex();
 class WebSocketConnectionPool {
     constructor(maxConnections = -1) {
@@ -25,27 +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: ${(0, utils_1.maskUrlForLog)(new URL(connectAddr))}`);
-                    }
+                    Atomics.add(WebSocketConnectionPool.sharedArray, 0, -1);
+                    candidate.close();
+                    log_1.default.error("getConnection, current connection status fail, poolKey: " + poolKeyForLog);
                 }
             }
             if (connector) {
@@ -62,44 +85,41 @@ class WebSocketConnectionPool {
             if (log_1.default.isInfoEnabled()) {
                 log_1.default.info("getConnection, new connection count:" +
                     Atomics.load(WebSocketConnectionPool.sharedArray, 0) +
-                    ", connectAddr:" +
-                    connectAddr.replace(/(token=)[^&]*/i, "$1[REDACTED]"));
+                    ", poolKey:" +
+                    poolKeyForLog);
             }
-            return new wsConnector_1.WebSocketConnector(url, timeout);
+            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;
@@ -111,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();
     }

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;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;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/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/dsn.d.ts

@@ -1,18 +1,30 @@
-export interface Address {
+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 interface Dsn {
+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

@@ -1 +1 @@
-{"version":3,"file":"dsn.d.ts","sourceRoot":"","sources":["../../../src/common/dsn.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,OAAO;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,GAAG;IAChB,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;CAC/B;AAED;;;GAGG;AACH,wBAAgB,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAqFtC"}
+{"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"}

package/lib/src/common/dsn.js

@@ -1,7 +1,60 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.CLOUD_DEFAULT_PORT = exports.DEFAULT_PORT = exports.Dsn = exports.Address = exports.WS_TMQ_ENDPOINT = exports.WS_SQL_ENDPOINT = void 0;
 exports.parse = parse;
+exports.isCloudServiceHost = isCloudServiceHost;
+exports.getDefaultPortForHost = getDefaultPortForHost;
 const wsError_1 = require("./wsError");
+exports.WS_SQL_ENDPOINT = "sql";
+exports.WS_TMQ_ENDPOINT = "tmq";
+const WS_SQL_PATH = "ws";
+const WS_TMQ_PATH = "rest/tmq";
+class Address {
+    constructor(host, port) {
+        this.host = host;
+        this.port = port;
+    }
+}
+exports.Address = Address;
+const REDACTED = "[REDACTED]";
+const SENSITIVE_PARAM_KEYS = new Set([
+    "token",
+    "bearer_token",
+    "td.connect.token",
+]);
+function shouldMaskParam(key) {
+    return SENSITIVE_PARAM_KEYS.has(key.toLowerCase());
+}
+class Dsn {
+    constructor(scheme, username, password, addresses, database, params, endpoint = exports.WS_SQL_ENDPOINT) {
+        this.scheme = scheme;
+        this.username = username;
+        this.password = password;
+        this.addresses = addresses.map((address) => new Address(address.host, address.port));
+        this.database = database;
+        this.params = new Map(params);
+        this.endpoint = endpoint;
+    }
+    toString() {
+        const params = {};
+        for (const [key, value] of this.params.entries()) {
+            params[key] = shouldMaskParam(key) ? REDACTED : value;
+        }
+        return JSON.stringify({
+            scheme: this.scheme,
+            username: this.username,
+            password: this.password.length > 0 ? REDACTED : this.password,
+            addresses: this.addresses,
+            database: this.database,
+            params,
+            endpoint: this.endpoint,
+        });
+    }
+    path() {
+        return this.endpoint === exports.WS_TMQ_ENDPOINT ? WS_TMQ_PATH : WS_SQL_PATH;
+    }
+}
+exports.Dsn = Dsn;
 /**
  * Parse a multi-host TDengine WebSocket URL.
  * Format: ws://username:password@host1:port1,host2:port2,[::1]:port3/db?key=value
@@ -13,17 +66,30 @@ function parse(url) {
     // Extract scheme
     const schemeMatch = url.match(/^(wss?):\/\//i);
     if (!schemeMatch) {
-        throw new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_INVALID_URL, `Invalid URL scheme, expected ws:// or wss://, got: ${url}`);
+        throw new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_INVALID_URL, "Invalid URL scheme, expected ws:// or wss://");
     }
     const scheme = schemeMatch[1].toLowerCase();
     let remainder = url.slice(schemeMatch[0].length);
-    // Extract username:password@ if present
+    // Isolate authority from path/query before parsing userinfo.
+    const slashIndex = remainder.indexOf("/");
+    const queryMarkIndex = remainder.indexOf("?");
+    let authorityEndIndex = remainder.length;
+    if (slashIndex !== -1) {
+        authorityEndIndex = Math.min(authorityEndIndex, slashIndex);
+    }
+    if (queryMarkIndex !== -1) {
+        authorityEndIndex = Math.min(authorityEndIndex, queryMarkIndex);
+    }
+    const authority = remainder.slice(0, authorityEndIndex);
+    const suffix = remainder.slice(authorityEndIndex);
+    // Extract username:password@ from authority only.
     let username = "";
     let password = "";
-    const atIndex = remainder.indexOf("@");
+    const atIndex = authority.lastIndexOf("@");
+    let hostPort = authority;
     if (atIndex !== -1) {
-        const userInfo = remainder.slice(0, atIndex);
-        remainder = remainder.slice(atIndex + 1);
+        const userInfo = authority.slice(0, atIndex);
+        hostPort = authority.slice(atIndex + 1);
         const colonIndex = userInfo.indexOf(":");
         if (colonIndex !== -1) {
             username = userInfo.slice(0, colonIndex);
@@ -33,6 +99,7 @@ function parse(url) {
             username = userInfo;
         }
     }
+    remainder = `${hostPort}${suffix}`;
     // Extract query params (after ?)
     let params = new Map();
     const queryIndex = remainder.indexOf("?");
@@ -67,16 +134,18 @@ function parse(url) {
             dedupedHosts.push(h);
         }
     }
-    return {
-        addresses: dedupedHosts,
-        scheme,
-        username,
-        password,
-        database,
-        params,
-    };
+    return new Dsn(scheme, username, password, dedupedHosts, database, params);
+}
+exports.DEFAULT_PORT = 6041;
+exports.CLOUD_DEFAULT_PORT = 443;
+function isCloudServiceHost(host) {
+    const normalizedHost = host.toLowerCase();
+    return (normalizedHost.includes("cloud.tdengine.com") ||
+        normalizedHost.includes("cloud.taosdata.com"));
+}
+function getDefaultPortForHost(host) {
+    return isCloudServiceHost(host) ? exports.CLOUD_DEFAULT_PORT : exports.DEFAULT_PORT;
 }
-const DEFAULT_PORT = 6041;
 /**
  * Parse comma-separated host list. Supports IPv6 in brackets.
  * Examples: "host1:6041,host2:6042", "[::1]:6041,host2:6042"
@@ -100,20 +169,20 @@ function parseHostList(hostStr) {
                 throw new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_INVALID_URL, `Unclosed bracket in IPv6 address: ${hostStr.slice(i)}`);
             }
             const ipv6Host = hostStr.slice(i + 1, closeBracket);
-            let port = DEFAULT_PORT;
+            let port = getDefaultPortForHost(ipv6Host);
             let next = closeBracket + 1;
             if (next < hostStr.length && hostStr[next] === ":") {
                 const portEnd = hostStr.indexOf(",", next);
                 const portStr = portEnd === -1
                     ? hostStr.slice(next + 1)
                     : hostStr.slice(next + 1, portEnd);
-                port = parsePort(portStr, hostStr);
+                port = parsePort(portStr, hostStr, ipv6Host);
                 i = portEnd === -1 ? hostStr.length : portEnd;
             }
             else {
                 i = next;
             }
-            hosts.push({ host: `[${ipv6Host}]`, port });
+            hosts.push(new Address(`[${ipv6Host}]`, port));
         }
         else {
             // Regular host or IPv4
@@ -124,21 +193,21 @@ function parseHostList(hostStr) {
             const lastColon = segment.lastIndexOf(":");
             if (lastColon !== -1) {
                 const host = segment.slice(0, lastColon);
-                const port = parsePort(segment.slice(lastColon + 1), hostStr);
-                hosts.push({ host, port });
+                const port = parsePort(segment.slice(lastColon + 1), hostStr, host);
+                hosts.push(new Address(host, port));
             }
             else {
-                hosts.push({ host: segment, port: DEFAULT_PORT });
+                hosts.push(new Address(segment, getDefaultPortForHost(segment)));
             }
             i = commaIndex === -1 ? hostStr.length : commaIndex;
         }
     }
     return hosts;
 }
-function parsePort(portStr, context) {
+function parsePort(portStr, context, host) {
     // If port string is empty, use default port
     if (portStr.length === 0) {
-        return DEFAULT_PORT;
+        return getDefaultPortForHost(host);
     }
     // Validate that port string contains only digits
     if (!/^\d+$/.test(portStr)) {

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

@@ -1 +1 @@
-{"version":3,"file":"taosResult.d.ts","sourceRoot":"","sources":["../../../src/common/taosResult.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"taosResult.d.ts","sourceRoot":"","sources":["../../../src/common/taosResult.ts"],"names":[],"mappings":"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"}