@tdengine/websocket 3.2.3 → 3.3.0

package/lib/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@tdengine/websocket",
-    "version": "3.2.3",
+    "version": "3.3.0",
     "description": "The websocket Node.js connector for TDengine. TDengine versions 3.3.2.0 and above are recommended to use this connector.",
     "source": "index.ts",
     "main": "lib/index.js",

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

@@ -1,26 +1,42 @@
+import type { SessionRecoveryHook } from "./wsConnector";
+import { Dsn } from "../common/dsn";
 import { WSQueryResponse } from "./wsResponse";
 import { TSDB_OPTION_CONNECTION } from "../common/constant";
 export declare class WsClient {
     private _wsConnector?;
     private _timeout?;
     private _timezone?;
-    private readonly _url;
+    private readonly _dsn;
     private static readonly _minVersion;
     private _version?;
     private _bearerToken?;
-    constructor(url: URL, timeout?: number | undefined | null);
+    private _connectedDatabase;
+    private _connectionOptions;
+    private _customRecoveryHook;
+    constructor(dsn: Dsn, timeout?: number | undefined | null);
+    private buildConnMessage;
+    private getWsConnector;
+    private bindReconnectRecoveryHook;
+    private isSqlPath;
+    private normalizeConnectedDatabase;
+    private recoverSqlSessionContext;
+    setSessionRecoveryHook(hook: SessionRecoveryHook | null | undefined): void;
     connect(database?: string | undefined | null): Promise<void>;
     setOptionConnection(option: TSDB_OPTION_CONNECTION, value: string | null): Promise<void>;
-    execNoResp(queryMsg: string): Promise<void>;
-    exec(queryMsg: string, bSqlQuery?: boolean): Promise<any>;
+    execNoResp(message: string): Promise<void>;
+    exec(message: string, bSqlQuery?: boolean): Promise<any>;
+    sendMsgDirect(message: string, bSqlQuery?: boolean): Promise<any>;
     sendBinaryMsg(reqId: bigint, action: string, message: ArrayBuffer, bSqlQuery?: boolean, bResultBinary?: boolean): Promise<any>;
     getState(): number;
     ready(): Promise<void>;
-    sendMsg(msg: string): Promise<any>;
-    freeResult(res: WSQueryResponse): Promise<unknown>;
+    waitForReady(): Promise<void>;
+    isNetworkError(err: unknown): boolean;
+    getReconnectRetries(): number;
+    sendMsg(message: string): Promise<any>;
+    freeResult(res: WSQueryResponse): Promise<void>;
     version(): Promise<string>;
     close(): Promise<void>;
-    checkURL(url: URL): void;
+    private checkAuth;
     checkVersion(): Promise<void>;
 }
 //# sourceMappingURL=wsClient.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"wsClient.d.ts","sourceRoot":"","sources":["../../../src/client/wsClient.ts"],"names":[],"mappings":"AASA,OAAO,EAAqB,eAAe,EAAE,MAAM,cAAc,CAAC;AAKlE,OAAO,EAAiB,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAE3E,qBAAa,QAAQ;IACjB,OAAO,CAAC,YAAY,CAAC,CAAqB;IAC1C,OAAO,CAAC,QAAQ,CAAC,CAA4B;IAC7C,OAAO,CAAC,SAAS,CAAC,CAA4B;IAC9C,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAM;IAC3B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAa;IAChD,OAAO,CAAC,QAAQ,CAAC,CAA4B;IAC7C,OAAO,CAAC,YAAY,CAAC,CAA4B;gBAErC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAanD,OAAO,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IA4C5D,mBAAmB,CAAC,MAAM,EAAE,sBAAsB,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBxF,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB3C,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,GAAE,OAAc,GAAG,OAAO,CAAC,GAAG,CAAC;IA0C/D,aAAa,CACf,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,WAAW,EACpB,SAAS,GAAE,OAAc,EACzB,aAAa,GAAE,OAAe,GAC/B,OAAO,CAAC,GAAG,CAAC;IA0Cf,QAAQ;IAOF,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAyBtB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAwBlC,UAAU,CAAC,GAAG,EAAE,eAAe;IAkC/B,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IAoC1B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAS5B,QAAQ,CAAC,GAAG,EAAE,GAAG;IAYX,YAAY;CAarB"}
+{"version":3,"file":"wsClient.d.ts","sourceRoot":"","sources":["../../../src/client/wsClient.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAEzD,OAAO,EAAE,GAAG,EAAmB,MAAM,eAAe,CAAC;AAOrD,OAAO,EAAqB,eAAe,EAAE,MAAM,cAAc,CAAC;AASlE,OAAO,EAEH,sBAAsB,EACzB,MAAM,oBAAoB,CAAC;AAE5B,qBAAa,QAAQ;IACjB,OAAO,CAAC,YAAY,CAAC,CAAqB;IAC1C,OAAO,CAAC,QAAQ,CAAC,CAA4B;IAC7C,OAAO,CAAC,SAAS,CAAC,CAA4B;IAC9C,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAM;IAC3B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAa;IAChD,OAAO,CAAC,QAAQ,CAAC,CAA4B;IAC7C,OAAO,CAAC,YAAY,CAAC,CAA4B;IACjD,OAAO,CAAC,kBAAkB,CAAuB;IACjD,OAAO,CAAC,kBAAkB,CAAyD;IACnF,OAAO,CAAC,mBAAmB,CAAoC;gBAEnD,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAYzD,OAAO,CAAC,gBAAgB;IAexB,OAAO,CAAC,cAAc;IAUtB,OAAO,CAAC,yBAAyB;IAejC,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,0BAA0B;YAOpB,wBAAwB;IA6B/B,sBAAsB,CACzB,IAAI,EAAE,mBAAmB,GAAG,IAAI,GAAG,SAAS,GAC7C,IAAI;IAKD,OAAO,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAmC5D,mBAAmB,CAAC,MAAM,EAAE,sBAAsB,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBxF,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAK1C,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,GAAE,OAAc,GAAG,OAAO,CAAC,GAAG,CAAC;IAmB9D,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,GAAE,OAAc,GAAG,OAAO,CAAC,GAAG,CAAC;IAmBvE,aAAa,CACf,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,WAAW,EACpB,SAAS,GAAE,OAAc,EACzB,aAAa,GAAE,OAAe,GAC/B,OAAO,CAAC,GAAG,CAAC;IAmBf,QAAQ;IAOF,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA2BtB,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAInC,cAAc,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO;IAIrC,mBAAmB,IAAI,MAAM;IAIvB,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAKtC,UAAU,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAa/C,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IAiC1B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAW5B,OAAO,CAAC,SAAS;IAYX,YAAY;CAarB"}

package/lib/src/client/wsClient.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WsClient = void 0;
 const json_bigint_1 = __importDefault(require("json-bigint"));
 const wsConnectorPool_1 = require("./wsConnectorPool");
+const dsn_1 = require("../common/dsn");
 const wsError_1 = require("../common/wsError");
 const wsResponse_1 = require("./wsResponse");
 const reqid_1 = require("../common/reqid");
@@ -14,42 +15,104 @@ const utils_1 = require("../common/utils");
 const websocket_1 = require("websocket");
 const constant_1 = require("../common/constant");
 class WsClient {
-    constructor(url, timeout) {
-        this.checkURL(url);
-        this._url = url;
+    constructor(dsn, timeout) {
+        this._connectedDatabase = null;
+        this._connectionOptions = new Map();
+        this._customRecoveryHook = null;
+        this.checkAuth(dsn);
+        this._dsn = dsn;
         this._timeout = timeout;
-        if (this._url.searchParams.has("timezone")) {
-            this._timezone = this._url.searchParams.get("timezone") || undefined;
-            this._url.searchParams.delete("timezone");
+        if (this._dsn.params.has("timezone")) {
+            this._timezone = this._dsn.params.get("timezone") || undefined;
         }
-        if (this._url.searchParams.has("bearer_token")) {
-            this._bearerToken = this._url.searchParams.get("bearer_token") || undefined;
+        if (this._dsn.params.has("bearer_token")) {
+            this._bearerToken = this._dsn.params.get("bearer_token") || undefined;
         }
     }
-    async connect(database) {
-        let connMsg = {
+    buildConnMessage(database) {
+        return {
             action: "conn",
             args: {
                 req_id: reqid_1.ReqId.getReqID(),
-                user: (0, utils_1.safeDecodeURIComponent)(this._url.username),
-                password: (0, utils_1.safeDecodeURIComponent)(this._url.password),
+                user: (0, utils_1.safeDecodeURIComponent)(this._dsn.username),
+                password: (0, utils_1.safeDecodeURIComponent)(this._dsn.password),
                 db: database,
                 connector: constant_1.ConnectorInfo,
                 ...(this._timezone && { tz: this._timezone }),
                 ...(this._bearerToken && { bearer_token: this._bearerToken }),
             },
         };
+    }
+    getWsConnector() {
+        if (!this._wsConnector) {
+            throw new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_CONNECTION_CLOSED, "Invalid websocket connection");
+        }
+        return this._wsConnector;
+    }
+    bindReconnectRecoveryHook() {
+        if (!this._wsConnector) {
+            return;
+        }
+        this._wsConnector.setSessionRecoveryHook(async () => {
+            if (this.isSqlPath()) {
+                await this.recoverSqlSessionContext();
+            }
+            if (this._customRecoveryHook) {
+                await this._customRecoveryHook();
+            }
+        });
+    }
+    isSqlPath() {
+        return this._dsn.endpoint === dsn_1.WS_SQL_ENDPOINT;
+    }
+    normalizeConnectedDatabase(database) {
+        if (database && database.length > 0) {
+            return database;
+        }
+        return this.isSqlPath() ? "information_schema" : null;
+    }
+    async recoverSqlSessionContext() {
+        if (!this._wsConnector) {
+            return;
+        }
+        const connMsg = this.buildConnMessage(this.normalizeConnectedDatabase(this._connectedDatabase));
+        await this.sendMsgDirect(JSON.stringify(connMsg), false);
+        if (this._connectionOptions.size <= 0) {
+            return;
+        }
+        const options = Array.from(this._connectionOptions.entries()).map(([option, value]) => ({
+            option,
+            value,
+        }));
+        const optionsMsg = {
+            action: "options_connection",
+            args: {
+                req_id: reqid_1.ReqId.getReqID(),
+                options,
+            },
+        };
+        await this.sendMsgDirect(json_bigint_1.default.stringify(optionsMsg), false);
+    }
+    setSessionRecoveryHook(hook) {
+        this._customRecoveryHook = hook || null;
+        this.bindReconnectRecoveryHook();
+    }
+    async connect(database) {
+        const connMsg = this.buildConnMessage(database);
         if (log_1.default.isDebugEnabled()) {
             log_1.default.debug("[wsClient.connect.connMsg]===>" + json_bigint_1.default.stringify(connMsg, (key, value) => (key === "password" || key === "bearer_token") ? "[REDACTED]" : value));
         }
-        this._wsConnector = await wsConnectorPool_1.WebSocketConnectionPool.instance().getConnection(this._url, this._timeout);
+        this._wsConnector = await wsConnectorPool_1.WebSocketConnectionPool.instance().getConnection(this._dsn, this._timeout);
+        this.bindReconnectRecoveryHook();
         if (this._wsConnector.readyState() === websocket_1.w3cwebsocket.OPEN) {
+            this._connectedDatabase = this.normalizeConnectedDatabase(database ?? null);
             return;
         }
         try {
             await this._wsConnector.ready();
             let result = await this._wsConnector.sendMsg(JSON.stringify(connMsg));
             if (result.msg.code == 0) {
+                this._connectedDatabase = this.normalizeConnectedDatabase(database ?? null);
                 return;
             }
             await this.close();
@@ -57,9 +120,8 @@ class WsClient {
         }
         catch (e) {
             await this.close();
-            const maskedUrl = (0, utils_1.maskUrlForLog)(this._url);
-            log_1.default.error(`connection creation failed, url: ${maskedUrl}, code:${e.code}, msg:${e.message}`);
-            throw new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_WEBSOCKET_CONNECTION_FAIL, `connection creation failed, url: ${maskedUrl}, code:${e.code}, msg:${e.message}`);
+            log_1.default.error(`connection creation failed, dsn:${this._dsn}, code:${e.code}, msg:${e.message}`);
+            throw new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_WEBSOCKET_CONNECTION_FAIL, `connection creation failed, dsn:${this._dsn}, code:${e.code}, msg:${e.message}`);
         }
     }
     async setOptionConnection(option, value) {
@@ -78,84 +140,55 @@ class WsClient {
         };
         try {
             await this.exec(json_bigint_1.default.stringify(connMsg), false);
+            this._connectionOptions.set(option, value);
         }
         catch (e) {
             log_1.default.error("[wsClient.setOptionConnection] failed: " + e.message);
             throw e;
         }
     }
-    async execNoResp(queryMsg) {
-        log_1.default.debug("[wsQueryInterface.query.queryMsg]===>" + queryMsg);
-        if (this._wsConnector &&
-            this._wsConnector.readyState() === websocket_1.w3cwebsocket.OPEN) {
-            await this._wsConnector.sendMsgNoResp(queryMsg);
-            return;
-        }
-        throw new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_CONNECTION_CLOSED, "invalid websocket connect");
+    async execNoResp(message) {
+        log_1.default.debug("[wsClient.execNoResp]===>" + message);
+        await this.getWsConnector().sendMsgNoResp(message);
     }
-    // Need to construct Response
-    async exec(queryMsg, bSqlQuery = true) {
-        return new Promise((resolve, reject) => {
-            if (log_1.default.isDebugEnabled()) {
-                log_1.default.debug("[wsQueryInterface.query.queryMsg]===>" + (0, utils_1.maskSensitiveForLog)(queryMsg));
-            }
-            if (this._wsConnector &&
-                this._wsConnector.readyState() === websocket_1.w3cwebsocket.OPEN) {
-                this._wsConnector
-                    .sendMsg(queryMsg)
-                    .then((e) => {
-                    if (e.msg.code == 0) {
-                        if (bSqlQuery) {
-                            resolve(new wsResponse_1.WSQueryResponse(e));
-                        }
-                        else {
-                            resolve(e);
-                        }
-                    }
-                    else {
-                        reject(new wsError_1.WebSocketInterfaceError(e.msg.code, e.msg.message));
-                    }
-                })
-                    .catch((e) => {
-                    reject(e);
-                });
+    async exec(message, bSqlQuery = true) {
+        if (log_1.default.isDebugEnabled()) {
+            log_1.default.debug("[wsClient.exec]===>" + (0, utils_1.maskSensitiveForLog)(message));
+        }
+        const resp = await this.getWsConnector().sendMsg(message);
+        if (resp.msg.code == 0) {
+            if (bSqlQuery) {
+                return new wsResponse_1.WSQueryResponse(resp);
             }
-            else {
-                reject(new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_CONNECTION_CLOSED, "invalid websocket connect"));
+            return resp;
+        }
+        throw new wsError_1.WebSocketInterfaceError(resp.msg.code, resp.msg.message);
+    }
+    async sendMsgDirect(message, bSqlQuery = true) {
+        if (log_1.default.isDebugEnabled()) {
+            log_1.default.debug("[wsClient.sendMsgDirect]===>" + (0, utils_1.maskSensitiveForLog)(message));
+        }
+        const resp = await this.getWsConnector().sendMsgDirect(message);
+        if (resp.msg.code == 0) {
+            if (bSqlQuery) {
+                return new wsResponse_1.WSQueryResponse(resp);
             }
-        });
+            return resp;
+        }
+        throw new wsError_1.WebSocketQueryError(resp.msg.code, resp.msg.message);
     }
-    // need to construct Response.
     async sendBinaryMsg(reqId, action, message, bSqlQuery = true, bResultBinary = false) {
-        return new Promise((resolve, reject) => {
-            if (this._wsConnector &&
-                this._wsConnector.readyState() === websocket_1.w3cwebsocket.OPEN) {
-                this._wsConnector
-                    .sendBinaryMsg(reqId, action, message)
-                    .then((e) => {
-                    if (bResultBinary) {
-                        resolve(e);
-                    }
-                    if (e.msg.code == 0) {
-                        if (bSqlQuery) {
-                            resolve(new wsResponse_1.WSQueryResponse(e));
-                        }
-                        else {
-                            resolve(e);
-                        }
-                    }
-                    else {
-                        reject(new wsError_1.WebSocketInterfaceError(e.msg.code, e.msg.message));
-                    }
-                })
-                    .catch((e) => {
-                    reject(e);
-                });
-            }
-            else {
-                reject(new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_CONNECTION_CLOSED, "invalid websocket connect"));
+        const resp = await this.getWsConnector().sendBinaryMsg(reqId, action, message);
+        if (bResultBinary) {
+            return resp;
+        }
+        if (resp.msg.code == 0) {
+            if (bSqlQuery) {
+                return new wsResponse_1.WSQueryResponse(resp);
             }
-        });
+            return resp;
+        }
+        throw new wsError_1.WebSocketInterfaceError(resp.msg.code, resp.msg.message);
     }
     getState() {
         if (this._wsConnector) {
@@ -165,62 +198,45 @@ class WsClient {
     }
     async ready() {
         try {
-            this._wsConnector = await wsConnectorPool_1.WebSocketConnectionPool.instance().getConnection(this._url, this._timeout);
+            this._wsConnector = await wsConnectorPool_1.WebSocketConnectionPool.instance().getConnection(this._dsn, this._timeout);
+            this.bindReconnectRecoveryHook();
             if (this._wsConnector.readyState() !== websocket_1.w3cwebsocket.OPEN) {
                 await this._wsConnector.ready();
             }
             if (log_1.default.isDebugEnabled()) {
-                log_1.default.debug("ready status ", (0, utils_1.maskUrlForLog)(this._url), this._wsConnector.readyState());
+                log_1.default.debug(`ready status, dsn: ${this._dsn}, state: ${this._wsConnector.readyState()}`);
             }
             return;
         }
         catch (e) {
-            const maskedUrl = (0, utils_1.maskUrlForLog)(this._url);
-            log_1.default.error(`connection creation failed, url: ${maskedUrl}, code: ${e.code}, message: ${e.message}`);
-            throw new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_WEBSOCKET_CONNECTION_FAIL, `connection creation failed, url: ${maskedUrl}, code: ${e.code}, message: ${e.message}`);
+            log_1.default.error(`connection creation failed, dsn: ${this._dsn}, code: ${e.code}, message: ${e.message}`);
+            throw new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_WEBSOCKET_CONNECTION_FAIL, `connection creation failed, dsn: ${this._dsn}, code: ${e.code}, message: ${e.message}`);
         }
     }
-    async sendMsg(msg) {
-        return new Promise((resolve, reject) => {
-            log_1.default.debug("[wsQueryInterface.sendMsg]===>" + msg);
-            if (this._wsConnector &&
-                this._wsConnector.readyState() === websocket_1.w3cwebsocket.OPEN) {
-                this._wsConnector
-                    .sendMsg(msg)
-                    .then((e) => {
-                    resolve(e);
-                })
-                    .catch((e) => reject(e));
-            }
-            else {
-                reject(new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_CONNECTION_CLOSED, "invalid websocket connect"));
-            }
-        });
+    async waitForReady() {
+        await this.getWsConnector().ready();
+    }
+    isNetworkError(err) {
+        return this.getWsConnector().isNetworkError(err);
+    }
+    getReconnectRetries() {
+        return this.getWsConnector().getReconnectRetries();
+    }
+    async sendMsg(message) {
+        log_1.default.debug("[wsClient.sendMsg]===>" + message);
+        return this.getWsConnector().sendMsg(message);
     }
     async freeResult(res) {
-        let freeResultMsg = {
+        const freeResultMsg = {
             action: "free_result",
             args: {
                 req_id: reqid_1.ReqId.getReqID(),
                 id: res.id,
             },
         };
-        return new Promise((resolve, reject) => {
-            let jsonStr = json_bigint_1.default.stringify(freeResultMsg);
-            log_1.default.debug("[wsQueryInterface.freeResult.freeResultMsg]===>" + jsonStr);
-            if (this._wsConnector &&
-                this._wsConnector.readyState() === websocket_1.w3cwebsocket.OPEN) {
-                this._wsConnector
-                    .sendMsgNoResp(jsonStr)
-                    .then((e) => {
-                    resolve(e);
-                })
-                    .catch((e) => reject(e));
-            }
-            else {
-                reject(new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_CONNECTION_CLOSED, "invalid websocket connect"));
-            }
-        });
+        const jsonStr = json_bigint_1.default.stringify(freeResultMsg);
+        log_1.default.debug("[wsClient.freeResult]===>" + jsonStr);
+        await this.getWsConnector().sendMsgNoResp(jsonStr);
     }
     async version() {
         if (this._version) {
@@ -232,35 +248,34 @@ class WsClient {
                 req_id: reqid_1.ReqId.getReqID(),
             },
         };
-        if (this._wsConnector) {
-            try {
-                if (this._wsConnector.readyState() !== websocket_1.w3cwebsocket.OPEN) {
-                    await this._wsConnector.ready();
-                }
-                let result = await this._wsConnector.sendMsg(json_bigint_1.default.stringify(versionMsg));
-                if (result.msg.code == 0) {
-                    return new wsResponse_1.WSVersionResponse(result).version;
-                }
-                throw new wsError_1.WebSocketInterfaceError(result.msg.code, result.msg.message);
+        try {
+            const connector = this.getWsConnector();
+            if (connector.readyState() !== websocket_1.w3cwebsocket.OPEN) {
+                await connector.ready();
             }
-            catch (e) {
-                const maskedUrl = (0, utils_1.maskUrlForLog)(this._url);
-                log_1.default.error(`connection creation failed, url: ${maskedUrl}, code: ${e.code}, message: ${e.message}`);
-                throw new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_WEBSOCKET_CONNECTION_FAIL, `connection creation failed, url: ${maskedUrl}, code: ${e.code}, message: ${e.message}`);
+            let result = await connector.sendMsg(json_bigint_1.default.stringify(versionMsg));
+            if (result.msg.code == 0) {
+                return new wsResponse_1.WSVersionResponse(result).version;
             }
+            throw new wsError_1.WebSocketInterfaceError(result.msg.code, result.msg.message);
+        }
+        catch (e) {
+            log_1.default.error(`connection creation failed, dsn: ${this._dsn}, code: ${e.code}, message: ${e.message}`);
+            throw new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_WEBSOCKET_CONNECTION_FAIL, `connection creation failed, dsn: ${this._dsn}, code: ${e.code}, message: ${e.message}`);
         }
-        throw (wsError_1.ErrorCode.ERR_CONNECTION_CLOSED, "invalid websocket connect");
     }
     async close() {
         if (this._wsConnector) {
+            this._wsConnector.setSessionRecoveryHook(null);
             await wsConnectorPool_1.WebSocketConnectionPool.instance().releaseConnection(this._wsConnector);
             this._wsConnector = undefined;
         }
+        this._customRecoveryHook = null;
     }
-    checkURL(url) {
-        // Assert token or bearer_token exists, otherwise username and password must exist.
-        if (!url.searchParams.get("token") && !url.searchParams.get("bearer_token")) {
-            if (!(url.username || url.password)) {
+    checkAuth(dsn) {
+        const hasToken = dsn.params.get("token") || dsn.params.get("bearer_token");
+        if (!hasToken) {
+            if (!(dsn.username || dsn.password)) {
                 throw new wsError_1.WebSocketInterfaceError(wsError_1.ErrorCode.ERR_INVALID_AUTHENTICATION, `invalid url, provide non-empty "token" or "bearer_token", or provide username/password`);
             }
         }

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

@@ -1,16 +1,62 @@
+import { Dsn } from "../common/dsn";
+export type SessionRecoveryHook = () => Promise<void>;
+export declare class RetryConfig {
+    readonly retries: number;
+    readonly retryBackoffMs: number;
+    readonly retryBackoffMaxMs: number;
+    constructor(retries: number, retryBackoffMs: number, retryBackoffMaxMs: number);
+    getBackoffDelay(attempt: number): number;
+    static fromDsn(dsn: Dsn): RetryConfig;
+}
 export declare class WebSocketConnector {
-    private _wsConn;
-    private _wsURL;
-    _timeout: number;
-    constructor(url: URL, timeout: number | undefined | null);
-    ready(): Promise<unknown>;
-    private _onclose;
+    private _conn;
+    private readonly _poolKey;
+    private readonly _dsn;
+    private _currentAddress;
+    private _retryConfig;
+    private _inflightStore;
+    private readonly _suppressedSockets;
+    private _reconnectLock;
+    private _isReconnecting;
+    private _allowReconnect;
+    private _connectionReady;
+    private _sessionRecoveryHook;
+    private _timeout;
+    constructor(dsn: Dsn, poolKey: string, timeout: number | undefined | null);
+    refreshRetryConfig(dsn: Dsn): void;
+    private buildUrl;
+    private createConnection;
     private _onmessage;
+    private shouldSkipReconnect;
+    private failNonRetriableCallbacksOnDisconnect;
+    private handleDisconnect;
+    private extractReqId;
+    private isRetriableAction;
+    private extractBinaryAction;
+    private isRetriableBinaryAction;
+    isNetworkError(err: unknown): boolean;
+    private send;
+    ready(): Promise<void>;
+    private getCurrentAddress;
+    private selectLeastConnectedAddress;
+    private sleep;
+    private isReconnectAllowed;
+    private triggerReconnect;
+    private _doReconnect;
+    private reconnect;
+    private attemptReconnect;
+    private replayRequests;
+    private failAllInflightRequests;
     close(): void;
     readyState(): number;
+    setSessionRecoveryHook(hook: SessionRecoveryHook | undefined | null): void;
+    private recoverSessionContext;
+    sendMsgDirect(message: string): Promise<any>;
     sendMsgNoResp(message: string): Promise<void>;
-    sendMsg(message: string, register?: Boolean): Promise<unknown>;
-    sendBinaryMsg(reqId: bigint, action: string, message: ArrayBuffer, register?: Boolean): Promise<unknown>;
-    getWsURL(): URL;
+    sendMsg(message: string): Promise<unknown>;
+    sendBinaryMsg(reqId: bigint, action: string, message: ArrayBuffer): Promise<unknown>;
+    private sendAndTrackResponse;
+    getPoolKey(): string;
+    getReconnectRetries(): number;
 }
 //# sourceMappingURL=wsConnector.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"wsConnector.d.ts","sourceRoot":"","sources":["../../../src/client/wsConnector.ts"],"names":[],"mappings":"AAWA,qBAAa,kBAAkB;IAC3B,OAAO,CAAC,OAAO,CAAe;IAC9B,OAAO,CAAC,MAAM,CAAM;IACpB,QAAQ,SAAQ;gBAEJ,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAkClD,KAAK;YA6BG,QAAQ;IAItB,OAAO,CAAC,UAAU;IA0BlB,KAAK;IAWL,UAAU,IAAI,MAAM;IAId,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAsB7C,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,GAAE,OAAc;IAsCjD,aAAa,CACf,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,WAAW,EACpB,QAAQ,GAAE,OAAc;IAkCrB,QAAQ,IAAI,GAAG;CAGzB"}
+{"version":3,"file":"wsConnector.d.ts","sourceRoot":"","sources":["../../../src/client/wsConnector.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,GAAG,EAAE,MAAM,eAAe,CAAC;AA0D7C,MAAM,MAAM,mBAAmB,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;AA0DtD,qBAAa,WAAW;IACpB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;gBAEvB,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM;IAM9E,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAOxC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,WAAW;CAexC;AAED,qBAAa,kBAAkB;IAC3B,OAAO,CAAC,KAAK,CAAgB;IAC7B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAM;IAC3B,OAAO,CAAC,eAAe,CAAU;IACjC,OAAO,CAAC,YAAY,CAAc;IAClC,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAwC;IAC3E,OAAO,CAAC,cAAc,CAA8B;IACpD,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,eAAe,CAAQ;IAC/B,OAAO,CAAC,gBAAgB,CAAoC;IAC5D,OAAO,CAAC,oBAAoB,CAAoC;IAChE,OAAO,CAAC,QAAQ,CAAS;gBAGrB,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAoB/B,kBAAkB,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI;IAIzC,OAAO,CAAC,QAAQ;IAahB,OAAO,CAAC,gBAAgB;IAmExB,OAAO,CAAC,UAAU;IA0BlB,OAAO,CAAC,mBAAmB;YAOb,qCAAqC;YAcrC,gBAAgB;IAkB9B,OAAO,CAAC,YAAY;IAWpB,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,mBAAmB;IAO3B,OAAO,CAAC,uBAAuB;IAIxB,cAAc,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO;IA4B5C,OAAO,CAAC,IAAI;IAcN,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAmB5B,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,2BAA2B;YAWrB,KAAK;IAInB,OAAO,CAAC,kBAAkB;YAIZ,gBAAgB;YAkBhB,YAAY;YAkBZ,SAAS;YAUT,gBAAgB;YAsChB,cAAc;IAiB5B,OAAO,CAAC,uBAAuB;IAO/B,KAAK;IAiBL,UAAU,IAAI,MAAM;IAIb,sBAAsB,CACzB,IAAI,EAAE,mBAAmB,GAAG,SAAS,GAAG,IAAI,GAC7C,IAAI;YAIO,qBAAqB;IAOtB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAmCnD,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ7C,OAAO,CAAC,OAAO,EAAE,MAAM;IAgBvB,aAAa,CACf,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,WAAW;YAWV,oBAAoB;IAgF3B,UAAU,IAAI,MAAM;IAIpB,mBAAmB,IAAI,MAAM;CAGvC"}