@tdengine/websocket 3.1.5 → 3.1.7

package/lib/example/basicSchemaless.js

@@ -17,7 +17,7 @@ async function Prepare() {
     await wsSql.exec(dropDB);
     await wsSql.exec('create database if not exists power KEEP 3650 DURATION 10 BUFFER 16 WAL_LEVEL 1;');
     await wsSql.exec('CREATE STABLE if not exists power.meters (ts timestamp, current float, voltage int, phase float) TAGS (location binary(64), groupId int);');
-    wsSql.close();
+    await wsSql.close();
 }
 (async () => {
     let wsSchemaless = null;
@@ -31,7 +31,6 @@ async function Prepare() {
         await wsSchemaless.schemalessInsert([influxdbData], wsProto_1.SchemalessProto.InfluxDBLineProtocol, wsProto_1.Precision.NANO_SECONDS, 0);
         await wsSchemaless.schemalessInsert([telnetData], wsProto_1.SchemalessProto.OpenTSDBTelnetLineProtocol, wsProto_1.Precision.SECONDS, 0);
         await wsSchemaless.schemalessInsert([jsonData], wsProto_1.SchemalessProto.OpenTSDBJsonFormatProtocol, wsProto_1.Precision.SECONDS, 0);
-        wsSchemaless.close();
     }
     catch (e) {
         console.error(e);

package/lib/example/basicSql.js

@@ -35,7 +35,7 @@ let dsn = 'ws://root:taosdata@localhost:6041';
                 let result = wsRows.getData();
                 console.log('queryRes.Scan().then=>', result);
             }
-            wsRows.close();
+            await wsRows.close();
         }
     }
     catch (err) {

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

@@ -3,6 +3,7 @@ export declare class WsClient {
     private _wsConnector?;
     private _timeout?;
     private readonly _url;
+    private static readonly _minVersion;
     constructor(url: URL, timeout?: number | undefined | null);
     connect(database?: string | undefined | null): Promise<void>;
     execNoResp(queryMsg: string): Promise<void>;
@@ -15,5 +16,6 @@ export declare class WsClient {
     version(): Promise<string>;
     close(): Promise<void>;
     checkURL(url: URL): void;
+    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":"AAIA,OAAO,EAEH,eAAe,EAClB,MAAM,cAAc,CAAC;AAMtB,qBAAa,QAAQ;IACjB,OAAO,CAAC,YAAY,CAAC,CAAqB;IAC1C,OAAO,CAAC,QAAQ,CAAC,CAA2B;IAC5C,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAK;gBAEd,GAAG,EAAE,GAAG,EAAE,OAAQ,CAAC,EAAC,MAAM,GAAG,SAAS,GAAG,IAAI;IAOnD,OAAO,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAqC5D,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAU3C,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,GAAC,OAAc,GAAG,OAAO,CAAC,GAAG,CAAC;IAuB9D,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAC,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,GAAC,OAAc,EAAE,aAAa,GAAE,OAAe,GAAG,OAAO,CAAC,GAAG,CAAC;IA0B/I,QAAQ;IAQF,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAetB,OAAO,CAAC,GAAG,EAAC,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAajC,UAAU,CAAC,GAAG,EAAE,eAAe;IAqB/B,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IA4B1B,KAAK,IAAG,OAAO,CAAC,IAAI,CAAC;IAS3B,QAAQ,CAAC,GAAG,EAAE,GAAG;CASpB"}
+{"version":3,"file":"wsClient.d.ts","sourceRoot":"","sources":["../../../src/client/wsClient.ts"],"names":[],"mappings":"AAIA,OAAO,EAEH,eAAe,EAClB,MAAM,cAAc,CAAC;AAKtB,qBAAa,QAAQ;IACjB,OAAO,CAAC,YAAY,CAAC,CAAqB;IAC1C,OAAO,CAAC,QAAQ,CAAC,CAA2B;IAC5C,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAK;IAC1B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAa;gBAEpC,GAAG,EAAE,GAAG,EAAE,OAAQ,CAAC,EAAC,MAAM,GAAG,SAAS,GAAG,IAAI;IAOnD,OAAO,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAsC5D,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAU3C,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,GAAC,OAAc,GAAG,OAAO,CAAC,GAAG,CAAC;IAuB9D,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAC,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,GAAC,OAAc,EAAE,aAAa,GAAE,OAAe,GAAG,OAAO,CAAC,GAAG,CAAC;IA0B/I,QAAQ;IAQF,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAetB,OAAO,CAAC,GAAG,EAAC,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAajC,UAAU,CAAC,GAAG,EAAE,eAAe;IAqB/B,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IA4B1B,KAAK,IAAG,OAAO,CAAC,IAAI,CAAC;IAS3B,QAAQ,CAAC,GAAG,EAAE,GAAG;IASX,YAAY;CAQrB"}

package/lib/src/client/wsClient.js

@@ -41,11 +41,13 @@ class WsClient {
             if (result.msg.code == 0) {
                 return;
             }
+            await this.close();
             throw (new wsError_1.WebSocketQueryError(result.msg.code, result.msg.message));
         }
         catch (e) {
-            log_1.default.error(e.code, e.message);
-            throw (new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_WEBSOCKET_CONNECTION_FAIL, `connection creation failed, url: ${this._url}`));
+            await this.close();
+            log_1.default.error(`connection creation failed, url: ${this._url}, code:${e.code}, msg:${e.message}`);
+            throw (new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_WEBSOCKET_CONNECTION_FAIL, `connection creation failed, url: ${this._url}, code:${e.code}, msg:${e.message}`));
         }
     }
     async execNoResp(queryMsg) {
@@ -122,8 +124,8 @@ class WsClient {
             return;
         }
         catch (e) {
-            log_1.default.error(e.code, e.message);
-            throw (new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_WEBSOCKET_CONNECTION_FAIL, `connection creation failed, url: ${this._url}`));
+            log_1.default.error(`connection creation failed, url: ${this._url}, code: ${e.code}, message: ${e.message}`);
+            throw (new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_WEBSOCKET_CONNECTION_FAIL, `connection creation failed, url: ${this._url}, code: ${e.code}, message: ${e.message}`));
         }
     }
     async sendMsg(msg) {
@@ -179,8 +181,8 @@ class WsClient {
                 throw (new wsError_1.WebSocketInterfaceError(result.msg.code, result.msg.message));
             }
             catch (e) {
-                log_1.default.error(e.code, e.message);
-                throw (new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_WEBSOCKET_CONNECTION_FAIL, `connection creation failed, url: ${this._url}`));
+                log_1.default.error(`connection creation failed, url: ${this._url}, code: ${e.code}, message: ${e.message}`);
+                throw (new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_WEBSOCKET_CONNECTION_FAIL, `connection creation failed, url: ${this._url}, code: ${e.code}, message: ${e.message}`));
             }
         }
         throw (wsError_1.ErrorCode.ERR_CONNECTION_CLOSED, "invalid websocket connect");
@@ -200,5 +202,14 @@ class WsClient {
             }
         }
     }
+    async checkVersion() {
+        let version = await this.version();
+        let result = (0, utils_1.compareVersions)(version, WsClient._minVersion);
+        if (result < 0) {
+            log_1.default.error(`TDengine version is too low, current version: ${version}, minimum required version: ${WsClient._minVersion}`);
+            throw (new wsError_1.WebSocketQueryError(wsError_1.ErrorCode.ERR_TDENIGNE_VERSION_IS_TOO_LOW, `Version mismatch. The minimum required TDengine version is ${WsClient._minVersion}`));
+        }
+    }
 }
 exports.WsClient = WsClient;
+WsClient._minVersion = "3.3.2.0";

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

@@ -11,7 +11,6 @@ export declare class WebSocketConnector {
     sendMsgNoResp(message: string): Promise<void>;
     sendMsg(message: string, register?: Boolean): Promise<unknown>;
     sendBinaryMsg(reqId: bigint, action: string, message: ArrayBuffer, register?: Boolean): Promise<unknown>;
-    configTimeout(ms: number): void;
     getWsURL(): URL;
 }
 //# 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":"AAMA,qBAAa,kBAAkB;IAC3B,OAAO,CAAC,OAAO,CAAe;IAC9B,OAAO,CAAC,MAAM,CAAM;IACpB,QAAQ,SAAQ;gBAGJ,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAsBlD,KAAK;YAeG,QAAQ;IAKtB,OAAO,CAAC,UAAU;IA0BlB,KAAK;IASL,UAAU,IAAI,MAAM;IAId,aAAa,CAAC,OAAO,EAAE,MAAM,GAAE,OAAO,CAAC,IAAI,CAAC;IAmB5C,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,GAAE,OAAc;IAuBjD,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAC,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,GAAE,OAAc;IAgBzF,aAAa,CAAC,EAAE,EAAE,MAAM;IAIxB,QAAQ,IAAI,GAAG;CAGzB"}
+{"version":3,"file":"wsConnector.d.ts","sourceRoot":"","sources":["../../../src/client/wsConnector.ts"],"names":[],"mappings":"AAMA,qBAAa,kBAAkB;IAC3B,OAAO,CAAC,OAAO,CAAe;IAC9B,OAAO,CAAC,MAAM,CAAM;IACpB,QAAQ,SAAQ;gBAGJ,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAsBlD,KAAK;YAcG,QAAQ;IAKtB,OAAO,CAAC,UAAU;IA0BlB,KAAK;IASL,UAAU,IAAI,MAAM;IAId,aAAa,CAAC,OAAO,EAAE,MAAM,GAAE,OAAO,CAAC,IAAI,CAAC;IAmB5C,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,GAAE,OAAc;IAuBjD,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAC,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,GAAE,OAAc;IAgBzF,QAAQ,IAAI,GAAG;CAGzB"}

package/lib/src/client/wsConnector.js

@@ -23,7 +23,7 @@ class WebSocketConnector {
                 this._timeout = timeout;
             }
             this._wsConn = new websocket_1.w3cwebsocket(origin.concat(pathname).concat(search), undefined, undefined, undefined, undefined, { maxReceivedFrameSize: 0x60000000, maxReceivedMessageSize: 0x60000000 });
-            this._wsConn.onerror = function (err) { log_1.default.error(err.message); throw err; };
+            this._wsConn.onerror = function (err) { log_1.default.error(`webSocket connection failed, url: ${this.url}, error: ${err.message}`); };
             this._wsConn.onclose = this._onclose;
             this._wsConn.onmessage = this._onmessage;
             this._wsConn._binaryType = "arraybuffer";
@@ -130,9 +130,6 @@ class WebSocketConnector {
             }
         });
     }
-    configTimeout(ms) {
-        this._timeout = ms;
-    }
     getWsURL() {
         return this._wsURL;
     }

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

@@ -2,8 +2,9 @@ import { WebSocketConnector } from "./wsConnector";
 export declare class WebSocketConnectionPool {
     private static _instance?;
     private pool;
-    private _connectionCount;
     private readonly _maxConnections;
+    private static sharedBuffer;
+    private static sharedArray;
     private constructor();
     static instance(maxConnections?: number): WebSocketConnectionPool;
     getConnection(url: URL, timeout: number | undefined | null): Promise<WebSocketConnector>;

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;AAKnD,qBAAa,uBAAuB;IAChC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAyB;IAClD,OAAO,CAAC,IAAI,CAAgD;IAC5D,OAAO,CAAC,gBAAgB,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;IACzC,OAAO;WAKO,QAAQ,CAAC,cAAc,GAAE,MAAW,GAAE,uBAAuB;IAOrE,aAAa,CAAC,GAAG,EAAC,GAAG,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,OAAO,CAAC,kBAAkB,CAAC;IA8BvF,iBAAiB,CAAC,SAAS,EAAE,kBAAkB,GAAE,OAAO,CAAC,IAAI,CAAC;IA0BpE,SAAS;CAYZ"}
+{"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,CAAyB;IAClD,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,GAAE,uBAAuB;IAOrE,aAAa,CAAC,GAAG,EAAC,GAAG,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,OAAO,CAAC,kBAAkB,CAAC;IA8BvF,iBAAiB,CAAC,SAAS,EAAE,kBAAkB,GAAE,OAAO,CAAC,IAAI,CAAC;IA4BpE,SAAS;CAcZ"}

package/lib/src/client/wsConnectorPool.js

@@ -13,7 +13,9 @@ class WebSocketConnectionPool {
     constructor(maxConnections = -1) {
         this.pool = new Map();
         this._maxConnections = maxConnections;
-        this._connectionCount = 0;
+        WebSocketConnectionPool.sharedBuffer = new SharedArrayBuffer(4);
+        WebSocketConnectionPool.sharedArray = new Int32Array(WebSocketConnectionPool.sharedBuffer);
+        Atomics.store(WebSocketConnectionPool.sharedArray, 0, 0);
     }
     static instance(maxConnections = -1) {
         if (!WebSocketConnectionPool._instance) {
@@ -23,7 +25,6 @@ class WebSocketConnectionPool {
     }
     async getConnection(url, timeout) {
         let connectAddr = url.origin.concat(url.pathname).concat(url.search);
-        log_1.default.info("url:" + url);
         let connector;
         const unlock = await mutex.acquire();
         try {
@@ -36,13 +37,14 @@ class WebSocketConnectionPool {
                 }
             }
             if (connector) {
-                log_1.default.debug("get connection success:" + this._connectionCount);
+                log_1.default.debug("get connection success:" + Atomics.load(WebSocketConnectionPool.sharedArray, 0));
                 return connector;
             }
-            if (this._maxConnections != -1 && this._connectionCount > this._maxConnections) {
-                throw new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_WEBSOCKET_CONNECTION_ARRIVED_LIMIT, "websocket connect arrived limited:" + this._connectionCount);
+            if (this._maxConnections != -1 && 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));
             }
-            this._connectionCount++;
+            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);
         }
         finally {
@@ -65,10 +67,12 @@ class WebSocketConnectionPool {
                     else {
                         connectors.push(connector);
                     }
+                    log_1.default.info("releaseConnection, current connection count:" + connectors.length);
                 }
                 else {
-                    this._connectionCount--;
+                    Atomics.add(WebSocketConnectionPool.sharedArray, 0, -1);
                     connector.close();
+                    log_1.default.info("releaseConnection, current connection status fail:" + Atomics.load(WebSocketConnectionPool.sharedArray, 0));
                 }
             }
             finally {
@@ -77,15 +81,17 @@ class WebSocketConnectionPool {
         }
     }
     destroyed() {
+        let num = 0;
         if (this.pool) {
             for (let values of this.pool.values()) {
                 for (let i in values) {
-                    values.pop()?.close();
+                    num++;
+                    values[i].close();
                 }
             }
         }
-        log_1.default.info("destroyed connect:" + this._connectionCount);
-        this._connectionCount = 0;
+        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.map

@@ -1 +1 @@
-{"version":3,"file":"wsEventCallback.d.ts","sourceRoot":"","sources":["../../../src/client/wsEventCallback.ts"],"names":[],"mappings":"AAKA,UAAU,SAAS;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAC,MAAM,CAAA;CAClB;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,CAAiB;IAC1C,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAA4C;IAC7E,OAAO;WAGO,QAAQ,IAAG,eAAe;IAOlC,gBAAgB,CAAC,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,EAAE,GAAG,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI;IAgBxF,mBAAmB,CAAC,GAAG,EAAE,SAAS,EAAE,WAAW,EAAC,aAAa,EAAE,IAAI,EAAC,GAAG;CAqDhF"}
+{"version":3,"file":"wsEventCallback.d.ts","sourceRoot":"","sources":["../../../src/client/wsEventCallback.ts"],"names":[],"mappings":"AAKA,UAAU,SAAS;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAC,MAAM,CAAA;CAClB;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,CAAiB;IAC1C,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAA4C;IAC7E,OAAO;WAGO,QAAQ,IAAG,eAAe;IAOlC,gBAAgB,CAAC,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,EAAE,GAAG,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI;IAgBxF,mBAAmB,CAAC,GAAG,EAAE,SAAS,EAAE,WAAW,EAAC,aAAa,EAAE,IAAI,EAAC,GAAG;CAmDhF"}

package/lib/src/client/wsEventCallback.js

@@ -40,9 +40,8 @@ class WsEventCallback {
     }
     async handleEventCallback(msg, messageType, data) {
         let action = undefined;
-        log_1.default.debug("HandleEventCallback msg=", msg, messageType);
         let release = await eventMutex.acquire();
-        log_1.default.debug("HandleEventCallback get lock msg=", msg, messageType);
+        log_1.default.debug(`HandleEventCallback get lock msg=${msg}, ${messageType}`);
         log_1.default.debug(WsEventCallback._msgActionRegister);
         try {
             for (let [k, v] of WsEventCallback._msgActionRegister) {

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

@@ -4,4 +4,14 @@ export declare function isEmpty(value: any): boolean;
 export declare function getBinarySql(action: bigint, reqId: bigint, resultId: bigint, sql?: string): ArrayBuffer;
 export declare function zigzagDecode(n: number): number;
 export declare function safeDecodeURIComponent(str: string): string;
+/**
+ * compare two semantic version numbers
+ * @param v1 (e.g., "3.3.6.3-alpha")
+ * @param v2 (e.g., "3.3.6.2")
+ * @returns
+ *   1 -> v1 > v2
+ *   -1 -> v1 < v2
+ *   0 -> v1 === v2
+ */
+export declare function compareVersions(v1: string, v2: string): number;
 //# sourceMappingURL=utils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/common/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAGpC,wBAAgB,MAAM,CAAC,QAAQ,EAAC,QAAQ,GAAE,GAAG,CAe5C;AAGD,wBAAgB,OAAO,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAM3C;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAC,MAAM,EAAE,KAAK,EAAC,MAAM,EAAE,QAAQ,EAAC,MAAM,EAAE,GAAG,CAAC,EAAC,MAAM,GAAG,WAAW,CA6BnG;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAE9C;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,UAQjD"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/common/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAGpC,wBAAgB,MAAM,CAAC,QAAQ,EAAC,QAAQ,GAAE,GAAG,CAe5C;AAGD,wBAAgB,OAAO,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAM3C;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAC,MAAM,EAAE,KAAK,EAAC,MAAM,EAAE,QAAQ,EAAC,MAAM,EAAE,GAAG,CAAC,EAAC,MAAM,GAAG,WAAW,CA6BnG;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAE9C;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,UAQjD;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAW9D"}

package/lib/src/common/utils.js

@@ -5,6 +5,7 @@ exports.isEmpty = isEmpty;
 exports.getBinarySql = getBinarySql;
 exports.zigzagDecode = zigzagDecode;
 exports.safeDecodeURIComponent = safeDecodeURIComponent;
+exports.compareVersions = compareVersions;
 const wsError_1 = require("./wsError");
 function getUrl(wsConfig) {
     let url = new URL(wsConfig.getUrl());
@@ -71,3 +72,66 @@ function safeDecodeURIComponent(str) {
         throw (new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_INVALID_URL, `Decoding ${str} error: ${e}`));
     }
 }
+/**
+ * compare two semantic version numbers
+ * @param v1 (e.g., "3.3.6.3-alpha")
+ * @param v2 (e.g., "3.3.6.2")
+ * @returns
+ *   1 -> v1 > v2
+ *   -1 -> v1 < v2
+ *   0 -> v1 === v2
+ */
+function compareVersions(v1, v2) {
+    // analyze the core part of the version number and pre release tags
+    const [main1, pre1] = splitVersion(v1);
+    const [main2, pre2] = splitVersion(v2);
+    // compare the main version number section
+    const mainComparison = compareMainVersions(main1, main2);
+    if (mainComparison !== 0)
+        return mainComparison;
+    // comparing pre release tags with the same main version
+    return comparePreReleases(pre1, pre2);
+}
+/**
+ * Split version number into main version and pre release tags
+ */
+function splitVersion(version) {
+    // split main version and pre release tags
+    const parts = version.split('-');
+    const main = parts[0];
+    const prerelease = parts.length > 1 ? parts[1] : null;
+    // split the main version into a numerical array
+    const mainParts = main.split('.').map(Number);
+    return [mainParts, prerelease];
+}
+/**
+ * compare the main version number section
+ */
+function compareMainVersions(v1, v2) {
+    const maxLength = Math.max(v1.length, v2.length);
+    for (let i = 0; i < maxLength; i++) {
+        // if partially missing, it is considered as 0
+        const part1 = v1[i] || 0;
+        const part2 = v2[i] || 0;
+        if (part1 > part2)
+            return 1;
+        if (part1 < part2)
+            return -1;
+    }
+    return 0;
+}
+/**
+ * compare pre release tags
+ */
+function comparePreReleases(pre1, pre2) {
+    // both have no pre release tags → equal
+    if (pre1 === null && pre2 === null)
+        return 0;
+    // versions with pre release tags have lower priority
+    if (pre1 === null)
+        return 1; // v1 is stable > v2
+    if (pre2 === null)
+        return -1; // v2 is stable > v1
+    // compare pre release tag strings
+    return pre1.localeCompare(pre2);
+}

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

@@ -24,6 +24,7 @@ export declare enum ErrorCode {
     ERR_CONNECTION_CLOSED = 108,
     ERR_INVALID_FETCH_MESSAGE_DATA = 109,
     ERR_WEBSOCKET_CONNECTION_ARRIVED_LIMIT = 110,
-    ERR_PARTITIONS_TOPIC_VGROUP_LENGTH_NOT_EQUAL = 111
+    ERR_PARTITIONS_TOPIC_VGROUP_LENGTH_NOT_EQUAL = 111,
+    ERR_TDENIGNE_VERSION_IS_TOO_LOW = 112
 }
 //# sourceMappingURL=wsError.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"wsError.d.ts","sourceRoot":"","sources":["../../../src/common/wsError.ts"],"names":[],"mappings":"AAAA,qBAAa,sBAAuB,SAAQ,KAAK;IAC7C,IAAI,EAAC,MAAM,CAAK;gBACJ,IAAI,EAAC,MAAM,EAAE,OAAO,GAAE,MAAW;CAahD;AACD,qBAAa,mBAAoB,SAAQ,sBAAsB;CAAI;AACnE,qBAAa,uBAAwB,SAAQ,sBAAsB;CAAG;AACtE,qBAAa,4BAA6B,SAAQ,uBAAuB;CAAE;AAC3E,qBAAa,eAAgB,SAAQ,sBAAsB;CAAE;AAC7D,qBAAa,SAAU,SAAQ,sBAAsB;CAAE;AAEvD,oBAAY,SAAS;IACjB,kBAAkB,MAAM;IACxB,eAAe,MAAM;IACrB,kBAAkB,MAAM;IACxB,wBAAwB,MAAM;IAC9B,6BAA6B,MAAM;IACnC,2BAA2B,MAAM;IACjC,0BAA0B,MAAM;IAChC,6BAA6B,MAAM;IACnC,qBAAqB,MAAM;IAC3B,8BAA8B,MAAM;IACpC,sCAAsC,MAAM;IAC5C,4CAA4C,MAAM;CAErD"}
+{"version":3,"file":"wsError.d.ts","sourceRoot":"","sources":["../../../src/common/wsError.ts"],"names":[],"mappings":"AAAA,qBAAa,sBAAuB,SAAQ,KAAK;IAC7C,IAAI,EAAC,MAAM,CAAK;gBACJ,IAAI,EAAC,MAAM,EAAE,OAAO,GAAE,MAAW;CAahD;AACD,qBAAa,mBAAoB,SAAQ,sBAAsB;CAAI;AACnE,qBAAa,uBAAwB,SAAQ,sBAAsB;CAAG;AACtE,qBAAa,4BAA6B,SAAQ,uBAAuB;CAAE;AAC3E,qBAAa,eAAgB,SAAQ,sBAAsB;CAAE;AAC7D,qBAAa,SAAU,SAAQ,sBAAsB;CAAE;AAEvD,oBAAY,SAAS;IACjB,kBAAkB,MAAM;IACxB,eAAe,MAAM;IACrB,kBAAkB,MAAM;IACxB,wBAAwB,MAAM;IAC9B,6BAA6B,MAAM;IACnC,2BAA2B,MAAM;IACjC,0BAA0B,MAAM;IAChC,6BAA6B,MAAM;IACnC,qBAAqB,MAAM;IAC3B,8BAA8B,MAAM;IACpC,sCAAsC,MAAM;IAC5C,4CAA4C,MAAM;IAClD,+BAA+B,MAAM;CACxC"}

package/lib/src/common/wsError.js

@@ -48,4 +48,5 @@ var ErrorCode;
     ErrorCode[ErrorCode["ERR_INVALID_FETCH_MESSAGE_DATA"] = 109] = "ERR_INVALID_FETCH_MESSAGE_DATA";
     ErrorCode[ErrorCode["ERR_WEBSOCKET_CONNECTION_ARRIVED_LIMIT"] = 110] = "ERR_WEBSOCKET_CONNECTION_ARRIVED_LIMIT";
     ErrorCode[ErrorCode["ERR_PARTITIONS_TOPIC_VGROUP_LENGTH_NOT_EQUAL"] = 111] = "ERR_PARTITIONS_TOPIC_VGROUP_LENGTH_NOT_EQUAL";
+    ErrorCode[ErrorCode["ERR_TDENIGNE_VERSION_IS_TOO_LOW"] = 112] = "ERR_TDENIGNE_VERSION_IS_TOO_LOW";
 })(ErrorCode || (exports.ErrorCode = ErrorCode = {}));

package/lib/src/sql/wsRows.js

@@ -47,7 +47,7 @@ class WSRows {
                     throw new wsError_1.TaosResultError(wsResponse.code, wsResponse.message);
                 }
                 if (wsResponse.finished == 1) {
-                    this.close();
+                    await this.close();
                     this._taosResult.setData(null);
                 }
                 else {
@@ -57,7 +57,7 @@ class WSRows {
             return this._taosResult;
         }
         catch (err) {
-            this.close();
+            await this.close();
             throw new wsError_1.TaosResultError(err.code, err.message);
         }
     }

package/lib/src/sql/wsSql.d.ts

@@ -19,6 +19,5 @@ export declare class WsSql {
     exec(sql: string, reqId?: number, action?: string): Promise<TaosResult>;
     private executeSchemalessInsert;
     query(sql: string, reqId?: number): Promise<WSRows>;
-    private getSql;
 }
 //# sourceMappingURL=wsSql.d.ts.map

package/lib/src/sql/wsSql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wsSql.d.ts","sourceRoot":"","sources":["../../../src/sql/wsSql.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAc,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAG7D,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAG3C,OAAO,EAAE,SAAS,EAAyB,eAAe,EAAE,MAAM,WAAW,CAAA;AAC7E,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAKvC,qBAAa,KAAK;IACd,OAAO,CAAC,QAAQ,CAAU;IAC1B,OAAO,CAAC,SAAS,CAAW;gBAChB,QAAQ,EAAC,QAAQ;WAMhB,IAAI,CAAC,QAAQ,EAAC,QAAQ,GAAE,OAAO,CAAC,KAAK,CAAC;IAmBnD,KAAK;IAIL;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IAI1B,KAAK,IAAG,OAAO,CAAC,IAAI,CAAC;IAIrB,gBAAgB,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BnI,QAAQ,CAAC,KAAK,CAAC,EAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAuBxC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,MAAM,GAAC,MAAuB,GAAG,OAAO,CAAC,UAAU,CAAC;YA4C9E,uBAAuB;IAa/B,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAWxD,OAAO,CAAC,MAAM;CAajB"}
+{"version":3,"file":"wsSql.d.ts","sourceRoot":"","sources":["../../../src/sql/wsSql.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAc,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAG7D,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAG3C,OAAO,EAAE,SAAS,EAAyB,eAAe,EAAE,MAAM,WAAW,CAAA;AAC7E,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAKvC,qBAAa,KAAK;IACd,OAAO,CAAC,QAAQ,CAAU;IAC1B,OAAO,CAAC,SAAS,CAAW;gBAChB,QAAQ,EAAC,QAAQ;WAMhB,IAAI,CAAC,QAAQ,EAAC,QAAQ,GAAE,OAAO,CAAC,KAAK,CAAC;IAuBnD,KAAK;IAIL;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IAI1B,KAAK,IAAG,OAAO,CAAC,IAAI,CAAC;IAIrB,gBAAgB,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BnI,QAAQ,CAAC,KAAK,CAAC,EAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAuBxC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,MAAM,GAAC,MAAuB,GAAG,OAAO,CAAC,UAAU,CAAC;YA4C9E,uBAAuB;IAa/B,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAW3D"}

package/lib/src/sql/wsSql.js

@@ -28,13 +28,17 @@ class WsSql {
         let database = wsConfig.getDb();
         try {
             await wsSql._wsClient.connect(database);
+            await wsSql._wsClient.checkVersion();
             if (database && database.length > 0) {
                 await wsSql.exec(`use ${database}`);
             }
             return wsSql;
         }
         catch (e) {
-            log_1.default.error(e.code, e.message);
+            log_1.default.error(`WsSql open is failed, ${e.code}, ${e.message}`);
+            if (wsSql) {
+                await wsSql.close();
+            }
             throw (e);
         }
     }
@@ -88,7 +92,7 @@ class WsSql {
                 return await wsStmt_1.WsStmt.newStmt(this._wsClient, precision, reqId);
             }
             catch (e) {
-                log_1.default.error(e.code, e.message);
+                log_1.default.error(`stmtInit failed, code: ${e.code}, message: ${e.message}`);
                 throw (e);
             }
         }
@@ -158,17 +162,5 @@ class WsSql {
             throw new wsError_1.TaosResultError(err.code, err.message);
         }
     }
-    getSql(sql, reqId, action = 'query') {
-        // construct msg
-        let queryMsg = {
-            action: action,
-            args: {
-                req_id: reqid_1.ReqId.getReqID(reqId),
-                sql: sql,
-                id: 0
-            },
-        };
-        return JSON.stringify(queryMsg);
-    }
 }
 exports.WsSql = WsSql;

package/lib/src/stmt/wsStmt.d.ts

@@ -15,10 +15,6 @@ export declare class WsStmt {
     bind(paramsArray: StmtBindParams): Promise<void>;
     jsonBind(paramArray: Array<Array<any>>): Promise<void>;
     batch(): Promise<void>;
-    /**
-     * return client version.
-     */
-    version(): Promise<string>;
     exec(): Promise<void>;
     getLastAffected(): number | null | undefined;
     close(): Promise<void>;

package/lib/src/stmt/wsStmt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wsStmt.d.ts","sourceRoot":"","sources":["../../../src/stmt/wsStmt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAK9C,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAG5C,qBAAa,MAAM;IACf,OAAO,CAAC,SAAS,CAAW;IAC5B,OAAO,CAAC,QAAQ,CAA4B;IAC5C,OAAO,CAAC,UAAU,CAAgC;IAElD,OAAO,CAAC,YAAY,CAA4B;IAChD,OAAO;WAOM,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,CAAC,EAAC,MAAM,EAAE,KAAK,CAAC,EAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAWrF,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYnC,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAY9C,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAYlD,YAAY,IAAG,cAAc;IAIvB,OAAO,CAAC,WAAW,EAAC,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAclD,IAAI,CAAC,WAAW,EAAC,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAc/C,QAAQ,CAAC,UAAU,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAYtD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAW5B;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IAI1B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAW3B,eAAe;IAIT,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAWrB,SAAS,IAAI,MAAM,GAAG,SAAS,GAAG,IAAI;YAI/B,OAAO;YA2BP,aAAa;YAeb,IAAI;CAuBrB"}
+{"version":3,"file":"wsStmt.d.ts","sourceRoot":"","sources":["../../../src/stmt/wsStmt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAK9C,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAG5C,qBAAa,MAAM;IACf,OAAO,CAAC,SAAS,CAAW;IAC5B,OAAO,CAAC,QAAQ,CAA4B;IAC5C,OAAO,CAAC,UAAU,CAAgC;IAElD,OAAO,CAAC,YAAY,CAA4B;IAChD,OAAO;WAOM,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,CAAC,EAAC,MAAM,EAAE,KAAK,CAAC,EAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAWrF,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYnC,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAY9C,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAYlD,YAAY,IAAG,cAAc;IAIvB,OAAO,CAAC,WAAW,EAAC,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAclD,IAAI,CAAC,WAAW,EAAC,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAc/C,QAAQ,CAAC,UAAU,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAYtD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAWtB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAW3B,eAAe;IAIT,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAWrB,SAAS,IAAI,MAAM,GAAG,SAAS,GAAG,IAAI;YAI/B,OAAO;YA2BP,aAAa;YAeb,IAAI;CAwBrB"}

package/lib/src/stmt/wsStmt.js

@@ -24,7 +24,7 @@ class WsStmt {
             return await wsStmt.init(reqId);
         }
         catch (e) {
-            log_1.default.error(e.code, e.message);
+            log_1.default.error(`WsStmt init is failed, ${e.code}, ${e.message}`);
             throw (e);
         }
     }
@@ -109,12 +109,6 @@ class WsStmt {
         };
         return await this.execute(queryMsg);
     }
-    /**
-     * return client version.
-     */
-    async version() {
-        return await this._wsClient.version();
-    }
     async exec() {
         let queryMsg = {
             action: 'exec',
@@ -186,6 +180,7 @@ class WsStmt {
             try {
                 if (this._wsClient.getState() <= 0) {
                     await this._wsClient.connect();
+                    await this._wsClient.checkVersion();
                 }
                 let queryMsg = {
                     action: 'init',
@@ -197,7 +192,7 @@ class WsStmt {
                 return this;
             }
             catch (e) {
-                log_1.default.error(e.code, e.message);
+                log_1.default.error(`stmt init filed, ${e.code}, ${e.message}`);
                 throw (e);
             }
         }

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

@@ -1,14 +1,16 @@
 export declare class TmqConfig {
-    url: URL;
-    user: string;
-    password: string;
-    group_id: string;
-    client_id: string;
-    offset_rest: string;
+    url: URL | null;
+    sql_url: URL | null;
+    user: string | null;
+    password: string | null;
+    group_id: string | null;
+    client_id: string | null;
+    offset_rest: string | null;
     topics?: Array<string>;
     auto_commit: boolean;
     auto_commit_interval_ms: number;
     timeout: number;
+    otherConfigs: Map<string, any>;
     constructor(wsConfig: Map<string, any>);
 }
 //# sourceMappingURL=config.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/tmq/config.ts"],"names":[],"mappings":"AAEA,qBAAa,SAAS;IAElB,GAAG,EAAE,GAAG,CAAC;IACT,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACvB,WAAW,EAAE,OAAO,CAAC;IACrB,uBAAuB,EAAE,MAAM,CAAC;IAChC,OAAO,EAAC,MAAM,CAAC;gBAGH,QAAQ,EAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC;CAwCxC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/tmq/config.ts"],"names":[],"mappings":"AAEA,qBAAa,SAAS;IAElB,GAAG,EAAE,GAAG,GAAG,IAAI,CAAQ;IACvB,OAAO,EAAE,GAAG,GAAG,IAAI,CAAQ;IAC3B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC3B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC/B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC/B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAQ;IAChC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAQ;IAClC,MAAM,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACvB,WAAW,EAAE,OAAO,CAAS;IAC7B,uBAAuB,EAAE,MAAM,CAAY;IAC3C,OAAO,EAAE,MAAM,CAAQ;IACvB,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;gBAGnB,QAAQ,EAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC;CAyDxC"}

package/lib/src/tmq/config.js

@@ -4,23 +4,50 @@ exports.TmqConfig = void 0;
 const constant_1 = require("./constant");
 class TmqConfig {
     constructor(wsConfig) {
-        this.url = new URL(wsConfig.get(constant_1.TMQConstants.WS_URL));
-        this.user = wsConfig.get(constant_1.TMQConstants.CONNECT_USER);
-        this.password = wsConfig.get(constant_1.TMQConstants.CONNECT_PASS);
-        this.group_id = wsConfig.get(constant_1.TMQConstants.GROUP_ID);
-        this.client_id = wsConfig.get(constant_1.TMQConstants.CLIENT_ID);
-        this.offset_rest = wsConfig.get(constant_1.TMQConstants.AUTO_OFFSET_RESET);
-        this.auto_commit = wsConfig.get(constant_1.TMQConstants.ENABLE_AUTO_COMMIT);
-        if (!this.auto_commit) {
-            this.auto_commit = false;
-        }
-        this.auto_commit_interval_ms = wsConfig.get(constant_1.TMQConstants.AUTO_COMMIT_INTERVAL_MS);
-        if (!this.auto_commit_interval_ms) {
-            this.auto_commit_interval_ms = 5 * 1000;
-        }
-        this.timeout = wsConfig.get(constant_1.TMQConstants.CONNECT_MESSAGE_TIMEOUT);
-        if (!this.timeout) {
-            this.timeout = 5000;
+        // req_id: number;
+        this.url = null;
+        this.sql_url = null;
+        this.user = null;
+        this.password = null;
+        this.group_id = null;
+        this.client_id = null;
+        this.offset_rest = null;
+        this.auto_commit = false;
+        this.auto_commit_interval_ms = 5 * 1000;
+        this.timeout = 5000;
+        this.otherConfigs = new Map();
+        for (const [key, value] of wsConfig) {
+            switch (key) {
+                case constant_1.TMQConstants.WS_URL:
+                    this.url = new URL(value);
+                    break;
+                case constant_1.TMQConstants.CONNECT_USER:
+                    this.user = value;
+                    break;
+                case constant_1.TMQConstants.CONNECT_PASS:
+                    this.password = value;
+                    break;
+                case constant_1.TMQConstants.GROUP_ID:
+                    this.group_id = value;
+                    break;
+                case constant_1.TMQConstants.CLIENT_ID:
+                    this.client_id = value;
+                    break;
+                case constant_1.TMQConstants.AUTO_OFFSET_RESET:
+                    this.offset_rest = value;
+                    break;
+                case constant_1.TMQConstants.ENABLE_AUTO_COMMIT:
+                    this.auto_commit = value;
+                    break;
+                case constant_1.TMQConstants.AUTO_COMMIT_INTERVAL_MS:
+                    this.auto_commit_interval_ms = value;
+                    break;
+                case constant_1.TMQConstants.CONNECT_MESSAGE_TIMEOUT:
+                    this.timeout = value;
+                    break;
+                default:
+                    this.otherConfigs.set(key, value);
+            }
         }
         if (this.url) {
             if (this.user) {
@@ -35,6 +62,8 @@ class TmqConfig {
             else {
                 this.password = this.url.password;
             }
+            this.sql_url = new URL(this.url);
+            this.sql_url.pathname = '/ws';
             this.url.pathname = '/rest/tmq';
         }
     }

package/lib/src/tmq/wsTmq.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wsTmq.d.ts","sourceRoot":"","sources":["../../../src/tmq/wsTmq.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAkF,cAAc,EAA0D,MAAM,eAAe,CAAC;AAKvL,qBAAa,UAAU;IACnB,OAAO,CAAC,SAAS,CAAW;IAC5B,OAAO,CAAC,SAAS,CAAW;IAC5B,OAAO,CAAC,OAAO,CAAC,CAAU;IAC1B,OAAO,CAAC,WAAW,CAAC,CAAQ;IAC5B,OAAO;YAMO,IAAI;WAML,WAAW,CAAC,QAAQ,EAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,GAAE,OAAO,CAAC,UAAU,CAAC;IAUjE,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,EAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB9D,WAAW,CAAC,KAAK,CAAC,EAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUzC,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAgBvE,YAAY,CAAC,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAYlD,MAAM,CAAC,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAK5C,QAAQ;IAYhB,SAAS,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IA0BzF,aAAa,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAc9E,YAAY,CAAC,SAAS,EAAC,cAAc,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,IAAI,CAAC;IAkBnE,SAAS,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IA0BzF,IAAI,CAAC,SAAS,EAAC,cAAc,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,IAAI,CAAC;IAkB3D,eAAe,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,GAAE,OAAO,CAAC,IAAI,CAAC;IAQ/D,SAAS,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,GAAE,OAAO,CAAC,IAAI,CAAC;IASzD,KAAK,IAAG,OAAO,CAAC,IAAI,CAAC;YAIb,cAAc;YAwBd,QAAQ;YA4BR,iBAAiB;IAczB,UAAU,CAAC,MAAM,CAAC,EAAC,MAAM,EAAE,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAoBnD,gBAAgB;CA6BjC"}
+{"version":3,"file":"wsTmq.d.ts","sourceRoot":"","sources":["../../../src/tmq/wsTmq.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAkF,cAAc,EAA0D,MAAM,eAAe,CAAC;AAKvL,qBAAa,UAAU;IACnB,OAAO,CAAC,SAAS,CAAW;IAC5B,OAAO,CAAC,SAAS,CAAW;IAC5B,OAAO,CAAC,OAAO,CAAC,CAAU;IAC1B,OAAO,CAAC,WAAW,CAAC,CAAQ;IAC5B,OAAO;YAWO,IAAI;WAuBL,WAAW,CAAC,QAAQ,EAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,GAAE,OAAO,CAAC,UAAU,CAAC;IAUjE,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,EAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAyB9D,WAAW,CAAC,KAAK,CAAC,EAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUzC,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAgBvE,YAAY,CAAC,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAYlD,MAAM,CAAC,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAK5C,QAAQ;IAYhB,SAAS,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IA0BzF,aAAa,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAc9E,YAAY,CAAC,SAAS,EAAC,cAAc,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,IAAI,CAAC;IAkBnE,SAAS,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IA0BzF,IAAI,CAAC,SAAS,EAAC,cAAc,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,IAAI,CAAC;IAkB3D,eAAe,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,GAAE,OAAO,CAAC,IAAI,CAAC;IAQ/D,SAAS,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,GAAE,OAAO,CAAC,IAAI,CAAC;IASzD,KAAK,IAAG,OAAO,CAAC,IAAI,CAAC;YAIb,cAAc;YAwBd,QAAQ;YA4BR,iBAAiB;IAczB,UAAU,CAAC,MAAM,CAAC,EAAC,MAAM,EAAE,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAoBnD,gBAAgB;CA6BjC"}