@tdengine/websocket 3.1.7 → 3.1.9

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

@@ -1,11 +1,14 @@
 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 static readonly _minVersion;
     constructor(url: URL, timeout?: number | undefined | null);
     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>;
     sendBinaryMsg(reqId: bigint, action: string, message: ArrayBuffer, bSqlQuery?: boolean, bResultBinary?: boolean): Promise<any>;

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;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"}
+{"version":3,"file":"wsClient.d.ts","sourceRoot":"","sources":["../../../src/client/wsClient.ts"],"names":[],"mappings":"AAIA,OAAO,EAEH,eAAe,EAClB,MAAM,cAAc,CAAC;AAKtB,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAE5D,qBAAa,QAAQ;IACjB,OAAO,CAAC,YAAY,CAAC,CAAqB;IAC1C,OAAO,CAAC,QAAQ,CAAC,CAA2B;IAC5C,OAAO,CAAC,SAAS,CAAC,CAA2B;IAC7C,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;IAWnD,OAAO,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAiC5D,mBAAmB,CAAC,MAAM,EAAE,sBAAsB,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBxF,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;IA0B1B,KAAK,IAAG,OAAO,CAAC,IAAI,CAAC;IAQ3B,QAAQ,CAAC,GAAG,EAAE,GAAG;IASX,YAAY;CAQrB"}

package/lib/src/client/wsClient.js

@@ -11,28 +11,31 @@ const wsResponse_1 = require("./wsResponse");
 const reqid_1 = require("../common/reqid");
 const log_1 = __importDefault(require("../common/log"));
 const utils_1 = require("../common/utils");
+const websocket_1 = require("websocket");
 class WsClient {
     constructor(url, timeout) {
         this.checkURL(url);
         this._url = url;
         this._timeout = timeout;
+        if (this._url.searchParams.has("timezone")) {
+            this._timezone = this._url.searchParams.get("timezone") || undefined;
+            this._url.searchParams.delete("timezone");
+        }
     }
     async connect(database) {
-        let _db = this._url.pathname.split('/')[3];
-        if (database) {
-            _db = database;
-        }
         let connMsg = {
             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),
-                db: _db,
+                db: database,
+                ...(this._timezone && { tz: this._timezone }),
             },
         };
+        log_1.default.debug("[wsClient.connect.connMsg]===>" + json_bigint_1.default.stringify(connMsg));
         this._wsConnector = await wsConnectorPool_1.WebSocketConnectionPool.instance().getConnection(this._url, this._timeout);
-        if (this._wsConnector.readyState() > 0) {
+        if (this._wsConnector.readyState() === websocket_1.w3cwebsocket.OPEN) {
             return;
         }
         try {
@@ -50,9 +53,31 @@ class WsClient {
             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 setOptionConnection(option, value) {
+        log_1.default.debug("[wsClient.setOptionConnection]===>" + option + ", " + value);
+        let connMsg = {
+            action: 'options_connection',
+            args: {
+                req_id: reqid_1.ReqId.getReqID(),
+                options: [
+                    {
+                        option: option,
+                        value: value
+                    }
+                ]
+            }
+        };
+        try {
+            await this.exec(json_bigint_1.default.stringify(connMsg), false);
+        }
+        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() > 0) {
+        if (this._wsConnector && this._wsConnector.readyState() === websocket_1.w3cwebsocket.OPEN) {
             await this._wsConnector.sendMsgNoResp(queryMsg);
             return;
         }
@@ -62,7 +87,7 @@ class WsClient {
     async exec(queryMsg, bSqlQuery = true) {
         return new Promise((resolve, reject) => {
             log_1.default.debug('[wsQueryInterface.query.queryMsg]===>' + queryMsg);
-            if (this._wsConnector && this._wsConnector.readyState() > 0) {
+            if (this._wsConnector && this._wsConnector.readyState() === websocket_1.w3cwebsocket.OPEN) {
                 this._wsConnector.sendMsg(queryMsg).then((e) => {
                     if (e.msg.code == 0) {
                         if (bSqlQuery) {
@@ -85,7 +110,7 @@ class WsClient {
     // need to construct Response.
     async sendBinaryMsg(reqId, action, message, bSqlQuery = true, bResultBinary = false) {
         return new Promise((resolve, reject) => {
-            if (this._wsConnector && this._wsConnector.readyState() > 0) {
+            if (this._wsConnector && this._wsConnector.readyState() === websocket_1.w3cwebsocket.OPEN) {
                 this._wsConnector.sendBinaryMsg(reqId, action, message).then((e) => {
                     if (bResultBinary) {
                         resolve(e);
@@ -117,7 +142,7 @@ class WsClient {
     async ready() {
         try {
             this._wsConnector = await wsConnectorPool_1.WebSocketConnectionPool.instance().getConnection(this._url, this._timeout);
-            if (this._wsConnector.readyState() <= 0) {
+            if (this._wsConnector.readyState() !== websocket_1.w3cwebsocket.OPEN) {
                 await this._wsConnector.ready();
             }
             log_1.default.debug("ready status ", this._url, this._wsConnector.readyState());
@@ -131,7 +156,7 @@ class WsClient {
     async sendMsg(msg) {
         return new Promise((resolve, reject) => {
             log_1.default.debug("[wsQueryInterface.sendMsg]===>" + msg);
-            if (this._wsConnector && this._wsConnector.readyState() > 0) {
+            if (this._wsConnector && this._wsConnector.readyState() === websocket_1.w3cwebsocket.OPEN) {
                 this._wsConnector.sendMsg(msg).then((e) => {
                     resolve(e);
                 }).catch((e) => reject(e));
@@ -152,8 +177,8 @@ class WsClient {
         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() > 0) {
-                this._wsConnector.sendMsg(jsonStr, false)
+            if (this._wsConnector && this._wsConnector.readyState() === websocket_1.w3cwebsocket.OPEN) {
+                this._wsConnector.sendMsgNoResp(jsonStr)
                     .then((e) => { resolve(e); })
                     .catch((e) => reject(e));
             }
@@ -171,7 +196,7 @@ class WsClient {
         };
         if (this._wsConnector) {
             try {
-                if (this._wsConnector.readyState() <= 0) {
+                if (this._wsConnector.readyState() !== websocket_1.w3cwebsocket.OPEN) {
                     await this._wsConnector.ready();
                 }
                 let result = await this._wsConnector.sendMsg(json_bigint_1.default.stringify(versionMsg));

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;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"}
+{"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;IAkBlB,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

@@ -53,12 +53,6 @@ class WebSocketConnector {
             let id = new DataView(data, 26, 8).getBigUint64(0, true);
             wsEventCallback_1.WsEventCallback.instance().handleEventCallback({ id: id, action: '', req_id: BigInt(0) }, wsEventCallback_1.OnMessageType.MESSAGE_TYPE_ARRAYBUFFER, data);
         }
-        else if (Object.prototype.toString.call(data) === '[object Blob]') {
-            data.arrayBuffer().then((d) => {
-                let id = new DataView(d, 8, 8).getBigUint64(0, true);
-                wsEventCallback_1.WsEventCallback.instance().handleEventCallback({ id: id, action: '', req_id: BigInt(0) }, wsEventCallback_1.OnMessageType.MESSAGE_TYPE_BLOB, d);
-            });
-        }
         else if (Object.prototype.toString.call(data) === '[object String]') {
             let msg = JSON.parse(data);
             log_1.default.debug("[_onmessage.stringType]==>:" + data);
@@ -86,7 +80,7 @@ class WebSocketConnector {
             msg.args.id = BigInt(msg.args.id);
         }
         return new Promise((resolve, reject) => {
-            if (this._wsConn && this._wsConn.readyState > 0) {
+            if (this._wsConn && this._wsConn.readyState === websocket_1.w3cwebsocket.OPEN) {
                 this._wsConn.send(message);
                 resolve();
             }
@@ -102,12 +96,12 @@ class WebSocketConnector {
             msg.args.id = BigInt(msg.args.id);
         }
         return new Promise((resolve, reject) => {
-            if (this._wsConn && this._wsConn.readyState > 0) {
+            if (this._wsConn && this._wsConn.readyState === websocket_1.w3cwebsocket.OPEN) {
                 if (register) {
                     wsEventCallback_1.WsEventCallback.instance().registerCallback({ action: msg.action, req_id: msg.args.req_id,
                         timeout: this._timeout, id: msg.args.id === undefined ? msg.args.id : BigInt(msg.args.id) }, resolve, reject);
                 }
-                log_1.default.debug("[wsClient.sendMessage.msg]===>\n", message);
+                log_1.default.debug(`[wsClient.sendMessage.msg]===> ${message}`);
                 this._wsConn.send(message);
             }
             else {
@@ -117,7 +111,7 @@ class WebSocketConnector {
     }
     async sendBinaryMsg(reqId, action, message, register = true) {
         return new Promise((resolve, reject) => {
-            if (this._wsConn && this._wsConn.readyState > 0) {
+            if (this._wsConn && this._wsConn.readyState === websocket_1.w3cwebsocket.OPEN) {
                 if (register) {
                     wsEventCallback_1.WsEventCallback.instance().registerCallback({ action: action, req_id: reqId,
                         timeout: this._timeout, id: reqId }, resolve, reject);

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,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"}
+{"version":3,"file":"wsConnectorPool.d.ts","sourceRoot":"","sources":["../../../src/client/wsConnectorPool.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AASnD,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;IAuCvF,iBAAiB,CAAC,SAAS,EAAE,kBAAkB,GAAE,OAAO,CAAC,IAAI,CAAC;IA4BpE,SAAS;CAcZ"}

package/lib/src/client/wsConnectorPool.js

@@ -8,6 +8,7 @@ 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 mutex = new async_mutex_1.Mutex();
 class WebSocketConnectionPool {
     constructor(maxConnections = -1) {
@@ -29,10 +30,20 @@ class WebSocketConnectionPool {
         const unlock = await mutex.acquire();
         try {
             if (this.pool.has(connectAddr)) {
-                let connectors = this.pool.get(connectAddr);
-                if (connectors) {
-                    if (connectors.length > 0) {
-                        connector = connectors.pop();
+                const connectors = this.pool.get(connectAddr);
+                while (connectors && connectors.length > 0) {
+                    const candidate = connectors.pop();
+                    if (!candidate) {
+                        continue;
+                    }
+                    if (candidate && candidate.readyState() === websocket_1.w3cwebsocket.OPEN) {
+                        connector = candidate;
+                        break;
+                    }
+                    else if (candidate) {
+                        Atomics.add(WebSocketConnectionPool.sharedArray, 0, -1);
+                        candidate.close();
+                        log_1.default.error(`getConnection, current connection status fail, url: ${connectAddr}`);
                     }
                 }
             }
@@ -55,7 +66,7 @@ class WebSocketConnectionPool {
         if (connector) {
             const unlock = await mutex.acquire();
             try {
-                if (connector.readyState() > 0) {
+                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);

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

@@ -24,6 +24,8 @@ export declare class WSQueryResponse {
     fields_names?: Array<string> | null;
     fields_types?: Array<number> | null;
     fields_lengths?: Array<number> | null;
+    fields_precisions?: Array<bigint> | null;
+    fields_scales?: Array<bigint> | null;
     precision?: number;
     constructor(resp: MessageResp);
     private initMsg;
@@ -42,20 +44,4 @@ export declare class WSFetchBlockResponse {
     textDecoder: TextDecoder;
     constructor(msg: ArrayBuffer);
 }
-interface IWSConnResponse {
-    code: number;
-    message: string;
-    action: string;
-    req_id: number;
-    timing: bigint;
-}
-export declare class WSConnResponse {
-    code: number;
-    message: string;
-    action: string;
-    req_id: number;
-    timing: bigint;
-    constructor(msg: IWSConnResponse);
-}
-export {};
 //# sourceMappingURL=wsResponse.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"wsResponse.d.ts","sourceRoot":"","sources":["../../../src/client/wsResponse.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAe,MAAM,sBAAsB,CAAC;AAEhE,qBAAa,iBAAiB;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;gBACN,IAAI,EAAC,WAAW;CAO/B;AAED,qBAAa,eAAe;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,YAAY,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IACpC,YAAY,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IACpC,cAAc,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IACtC,SAAS,CAAC,EAAE,MAAM,CAAC;gBAEP,IAAI,EAAC,WAAW;IAI5B,OAAO,CAAC,OAAO;CAoBlB;AAED,qBAAa,oBAAoB;IAC7B,IAAI,EAAE,QAAQ,GAAG,SAAS,CAAA;IAC1B,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAA;IAC3B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,WAAW,EAAE,WAAW,CAAA;gBACZ,GAAG,EAAE,WAAW;CAgC/B;AAED,UAAU,eAAe;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,cAAc;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;gBAEH,GAAG,EAAE,eAAe;CAOnC"}
+{"version":3,"file":"wsResponse.d.ts","sourceRoot":"","sources":["../../../src/client/wsResponse.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAe,MAAM,sBAAsB,CAAC;AAEhE,qBAAa,iBAAiB;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;gBACN,IAAI,EAAC,WAAW;CAO/B;AAED,qBAAa,eAAe;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,YAAY,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IACpC,YAAY,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IACpC,cAAc,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IACtC,iBAAiB,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IACzC,aAAa,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IACrC,SAAS,CAAC,EAAE,MAAM,CAAC;gBAEP,IAAI,EAAC,WAAW;IAI5B,OAAO,CAAC,OAAO;CAsBlB;AAED,qBAAa,oBAAoB;IAC7B,IAAI,EAAE,QAAQ,GAAG,SAAS,CAAA;IAC1B,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAA;IAC3B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,WAAW,EAAE,WAAW,CAAA;gBACZ,GAAG,EAAE,WAAW;CAgC/B"}

package/lib/src/client/wsResponse.js

@@ -3,7 +3,7 @@
  * define ws Response type|class, for query?
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WSConnResponse = exports.WSFetchBlockResponse = exports.WSQueryResponse = exports.WSVersionResponse = void 0;
+exports.WSFetchBlockResponse = exports.WSQueryResponse = exports.WSVersionResponse = void 0;
 const taosResult_1 = require("../common/taosResult");
 class WSVersionResponse {
     constructor(resp) {
@@ -39,6 +39,8 @@ class WSQueryResponse {
         this.fields_types = msg.fields_types;
         this.fields_lengths = msg.fields_lengths;
         this.precision = msg.precision;
+        this.fields_precisions = msg.fields_precisions ? msg.fields_precisions.map((p) => BigInt(p)) : [];
+        this.fields_scales = msg.fields_scales ? msg.fields_scales.map((s) => BigInt(s)) : [];
     }
 }
 exports.WSQueryResponse = WSQueryResponse;
@@ -76,13 +78,3 @@ class WSFetchBlockResponse {
     }
 }
 exports.WSFetchBlockResponse = WSFetchBlockResponse;
-class WSConnResponse {
-    constructor(msg) {
-        this.code = msg.code;
-        this.message = msg.message;
-        this.action = msg.action;
-        this.req_id = msg.req_id;
-        this.timing = BigInt(msg.timing);
-    }
-}
-exports.WSConnResponse = WSConnResponse;

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

@@ -5,6 +5,7 @@ export declare class WSConfig {
     private _url;
     private _timeout;
     private _token;
+    private _timezone;
     constructor(url: string);
     getToken(): string | undefined | null;
     setToken(token: string): void;
@@ -18,5 +19,7 @@ export declare class WSConfig {
     setUrl(url: string): void;
     setTimeOut(ms: number): void;
     getTimeOut(): number | undefined | null;
+    setTimezone(timezone: string): void;
+    getTimezone(): string | undefined | null;
 }
 //# sourceMappingURL=config.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/common/config.ts"],"names":[],"mappings":"AAAA,qBAAa,QAAQ;IACjB,OAAO,CAAC,KAAK,CAA4B;IACzC,OAAO,CAAC,SAAS,CAA4B;IAC7C,OAAO,CAAC,GAAG,CAA4B;IACvC,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,QAAQ,CAA0B;IAC1C,OAAO,CAAC,MAAM,CAA2B;gBAE7B,GAAG,EAAC,MAAM;IAIf,QAAQ,IAAI,MAAM,GAAG,SAAS,GAAG,IAAI;IAGrC,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,OAAO,IAAI,MAAM,GAAG,SAAS,GAAG,IAAI;IAGpC,OAAO,CAAC,IAAI,EAAE,MAAM;IAIpB,MAAM,IAAI,MAAM,GAAG,SAAS,GAAG,IAAI;IAGnC,MAAM,CAAC,GAAG,EAAC,MAAM;IAIjB,KAAK,IAAI,MAAM,GAAG,SAAS,GAAG,IAAI;IAGlC,KAAK,CAAC,EAAE,EAAE,MAAM;IAIhB,MAAM,IAAI,MAAM;IAIhB,MAAM,CAAC,GAAG,EAAE,MAAM;IAIlB,UAAU,CAAC,EAAE,EAAG,MAAM;IAGtB,UAAU,IAAI,MAAM,GAAG,SAAS,GAAG,IAAI;CAKjD"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/common/config.ts"],"names":[],"mappings":"AAAA,qBAAa,QAAQ;IACjB,OAAO,CAAC,KAAK,CAA4B;IACzC,OAAO,CAAC,SAAS,CAA4B;IAC7C,OAAO,CAAC,GAAG,CAA4B;IACvC,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,QAAQ,CAA0B;IAC1C,OAAO,CAAC,MAAM,CAA2B;IACzC,OAAO,CAAC,SAAS,CAA2B;gBAEhC,GAAG,EAAC,MAAM;IAIf,QAAQ,IAAI,MAAM,GAAG,SAAS,GAAG,IAAI;IAGrC,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,OAAO,IAAI,MAAM,GAAG,SAAS,GAAG,IAAI;IAGpC,OAAO,CAAC,IAAI,EAAE,MAAM;IAIpB,MAAM,IAAI,MAAM,GAAG,SAAS,GAAG,IAAI;IAGnC,MAAM,CAAC,GAAG,EAAC,MAAM;IAIjB,KAAK,IAAI,MAAM,GAAG,SAAS,GAAG,IAAI;IAGlC,KAAK,CAAC,EAAE,EAAE,MAAM;IAIhB,MAAM,IAAI,MAAM;IAIhB,MAAM,CAAC,GAAG,EAAE,MAAM;IAIlB,UAAU,CAAC,EAAE,EAAG,MAAM;IAGtB,UAAU,IAAI,MAAM,GAAG,SAAS,GAAG,IAAI;IAGvC,WAAW,CAAC,QAAQ,EAAE,MAAM;IAG5B,WAAW,IAAI,MAAM,GAAG,SAAS,GAAG,IAAI;CAGlD"}

package/lib/src/common/config.js

@@ -41,5 +41,11 @@ class WSConfig {
     getTimeOut() {
         return this._timeout;
     }
+    setTimezone(timezone) {
+        this._timezone = timezone;
+    }
+    getTimezone() {
+        return this._timezone;
+    }
 }
 exports.WSConfig = WSConfig;

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

@@ -27,7 +27,15 @@ export declare enum TDengineTypeCode {
     BIGINT_UNSIGNED = 14,
     JSON = 15,
     VARBINARY = 16,
-    GEOMETRY = 20
+    DECIMAL = 17,
+    GEOMETRY = 20,
+    DECIMAL64 = 21
+}
+export declare enum TSDB_OPTION_CONNECTION {
+    TSDB_OPTION_CONNECTION_CHARSET = 0,// charset, Same as the scope supported by the system
+    TSDB_OPTION_CONNECTION_TIMEZONE = 1,// timezone, Same as the scope supported by the system
+    TSDB_OPTION_CONNECTION_USER_IP = 2,// user ip
+    TSDB_OPTION_CONNECTION_USER_APP = 3
 }
 export declare const TDenginePrecision: IndexableString;
 export declare const TDengineTypeLength: StringIndexable;

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

@@ -1 +1 @@
-{"version":3,"file":"constant.d.ts","sourceRoot":"","sources":["../../../src/common/constant.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,eAAe;IAC5B,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAC1B;AAED,MAAM,WAAW,eAAe;IAC5B,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAC1B;AAED,eAAO,MAAM,kBAAkB,EAAE,MAAkB,CAAC;AACpD,eAAO,MAAM,oBAAoB,EAAE,MAAkB,CAAC;AAEtD,eAAO,MAAM,gBAAgB,EAAE,eAmB9B,CAAA;AAED,eAAO,MAAM,gBAAgB,EAAE,eAM9B,CAAA;AAGD,oBAAY,gBAAgB;IACxB,IAAI,IAAI;IACR,IAAI,IAAI;IACR,OAAO,IAAI;IACX,QAAQ,IAAI;IACZ,GAAG,IAAI;IACP,MAAM,IAAI;IACV,KAAK,IAAI;IACT,MAAM,IAAI;IACV,MAAM,IAAI;IACV,OAAO,IAAI;IACX,SAAS,IAAI;IACb,KAAK,KAAK;IACV,gBAAgB,KAAK;IACrB,iBAAiB,KAAK;IACtB,YAAY,KAAK;IACjB,eAAe,KAAK;IACpB,IAAI,KAAK;IACT,SAAS,KAAK;IACd,QAAQ,KAAK;CAChB;AAED,eAAO,MAAM,iBAAiB,EAAE,eAI/B,CAAA;AAED,eAAO,MAAM,kBAAkB,EAAE,eAahC,CAAA;AAED,eAAO,MAAM,eAAe,EAAE,eAI7B,CAAA"}
+{"version":3,"file":"constant.d.ts","sourceRoot":"","sources":["../../../src/common/constant.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,eAAe;IAC5B,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAC1B;AAED,MAAM,WAAW,eAAe;IAC5B,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAC1B;AAED,eAAO,MAAM,kBAAkB,EAAE,MAAkB,CAAC;AACpD,eAAO,MAAM,oBAAoB,EAAE,MAAkB,CAAC;AAEtD,eAAO,MAAM,gBAAgB,EAAE,eAmB9B,CAAA;AAED,eAAO,MAAM,gBAAgB,EAAE,eAM9B,CAAA;AAGD,oBAAY,gBAAgB;IACxB,IAAI,IAAI;IACR,IAAI,IAAI;IACR,OAAO,IAAI;IACX,QAAQ,IAAI;IACZ,GAAG,IAAI;IACP,MAAM,IAAI;IACV,KAAK,IAAI;IACT,MAAM,IAAI;IACV,MAAM,IAAI;IACV,OAAO,IAAI;IACX,SAAS,IAAI;IACb,KAAK,KAAK;IACV,gBAAgB,KAAK;IACrB,iBAAiB,KAAK;IACtB,YAAY,KAAK;IACjB,eAAe,KAAK;IACpB,IAAI,KAAK;IACT,SAAS,KAAK;IACd,OAAO,KAAK;IACZ,QAAQ,KAAK;IACb,SAAS,KAAK;CACjB;AAED,oBAAY,sBAAsB;IAChC,8BAA8B,IAAA,CAAS,qDAAqD;IAC5F,+BAA+B,IAAA,CAAQ,sDAAsD;IAC7F,8BAA8B,IAAA,CAAS,UAAU;IACjD,+BAA+B,IAAA;CAChC;AAED,eAAO,MAAM,iBAAiB,EAAE,eAI/B,CAAA;AAED,eAAO,MAAM,kBAAkB,EAAE,eAahC,CAAA;AAED,eAAO,MAAM,eAAe,EAAE,eAI7B,CAAA"}

package/lib/src/common/constant.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PrecisionLength = exports.TDengineTypeLength = exports.TDenginePrecision = exports.TDengineTypeCode = exports.ColumnsBlockType = exports.TDengineTypeName = exports.FetchRawBlockMessage = exports.BinaryQueryMessage = void 0;
+exports.PrecisionLength = exports.TDengineTypeLength = exports.TDenginePrecision = exports.TSDB_OPTION_CONNECTION = exports.TDengineTypeCode = exports.ColumnsBlockType = exports.TDengineTypeName = exports.FetchRawBlockMessage = exports.BinaryQueryMessage = void 0;
 exports.BinaryQueryMessage = BigInt(6);
 exports.FetchRawBlockMessage = BigInt(7);
 exports.TDengineTypeName = {
@@ -50,8 +50,17 @@ var TDengineTypeCode;
     TDengineTypeCode[TDengineTypeCode["BIGINT_UNSIGNED"] = 14] = "BIGINT_UNSIGNED";
     TDengineTypeCode[TDengineTypeCode["JSON"] = 15] = "JSON";
     TDengineTypeCode[TDengineTypeCode["VARBINARY"] = 16] = "VARBINARY";
+    TDengineTypeCode[TDengineTypeCode["DECIMAL"] = 17] = "DECIMAL";
     TDengineTypeCode[TDengineTypeCode["GEOMETRY"] = 20] = "GEOMETRY";
+    TDengineTypeCode[TDengineTypeCode["DECIMAL64"] = 21] = "DECIMAL64";
 })(TDengineTypeCode || (exports.TDengineTypeCode = TDengineTypeCode = {}));
+var TSDB_OPTION_CONNECTION;
+(function (TSDB_OPTION_CONNECTION) {
+    TSDB_OPTION_CONNECTION[TSDB_OPTION_CONNECTION["TSDB_OPTION_CONNECTION_CHARSET"] = 0] = "TSDB_OPTION_CONNECTION_CHARSET";
+    TSDB_OPTION_CONNECTION[TSDB_OPTION_CONNECTION["TSDB_OPTION_CONNECTION_TIMEZONE"] = 1] = "TSDB_OPTION_CONNECTION_TIMEZONE";
+    TSDB_OPTION_CONNECTION[TSDB_OPTION_CONNECTION["TSDB_OPTION_CONNECTION_USER_IP"] = 2] = "TSDB_OPTION_CONNECTION_USER_IP";
+    TSDB_OPTION_CONNECTION[TSDB_OPTION_CONNECTION["TSDB_OPTION_CONNECTION_USER_APP"] = 3] = "TSDB_OPTION_CONNECTION_USER_APP";
+})(TSDB_OPTION_CONNECTION || (exports.TSDB_OPTION_CONNECTION = TSDB_OPTION_CONNECTION = {}));
 exports.TDenginePrecision = {
     0: 'MILLISECOND',
     1: "MICROSECOND",

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

@@ -20,6 +20,8 @@ export declare class TaosResult {
     private _precision;
     protected _affectRows: number | null | undefined;
     private _totalTime;
+    private fields_precisions?;
+    private fields_scales?;
     /** unit nano seconds */
     private _timing;
     constructor(queryResponse?: WSQueryResponse);
@@ -37,6 +39,7 @@ export declare class TaosResult {
     getTotalTime(): number;
     addTotalTime(totalTime: number): void;
     setTiming(timing?: bigint): void;
+    getFieldsScales(index: number): bigint | null;
     /**
      * Mapping the WebSocket response type code to TDengine's type name.
      */
@@ -44,8 +47,8 @@ export declare class TaosResult {
 }
 export declare function parseBlock(blocks: WSFetchBlockResponse, taosResult: TaosResult): TaosResult;
 export declare function _isVarType(metaType: number): Number;
-export declare function readSolidDataToArray(dataBuffer: DataView, colBlockHead: number, rows: number, metaType: number, bitMapArr: Uint8Array): any[];
-export declare function readSolidData(dataBuffer: DataView, colDataHead: number, meta: ResponseMeta): Number | Boolean | BigInt;
+export declare function readSolidDataToArray(dataBuffer: DataView, colBlockHead: number, rows: number, metaType: number, bitMapArr: Uint8Array, startOffset: number, colIndex: number): any[];
+export declare function readSolidData(dataBuffer: DataView, colDataHead: number, meta: ResponseMeta, fields_scale: bigint | null): Number | Boolean | BigInt | string;
 export declare function readBinary(dataBuffer: ArrayBuffer, colDataHead: number, length: number): ArrayBuffer;
 export declare function readVarchar(dataBuffer: ArrayBuffer, colDataHead: number, length: number, textDecoder: TextDecoder): string;
 export declare function readNchar(dataBuffer: ArrayBuffer, colDataHead: number, length: number): string;

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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"}

package/lib/src/common/taosResult.js

@@ -19,6 +19,7 @@ const constant_1 = require("./constant");
 const wsError_1 = require("./wsError");
 const ut8Helper_1 = require("./ut8Helper");
 const log_1 = __importDefault(require("./log"));
+const utils_1 = require("./utils");
 class TaosResult {
     constructor(queryResponse) {
         this._totalTime = 0;
@@ -53,6 +54,8 @@ class TaosResult {
         this._timing = queryResponse.timing;
         this._precision = queryResponse.precision;
         this._totalTime = queryResponse.totalTime;
+        this.fields_precisions = queryResponse.fields_precisions;
+        this.fields_scales = queryResponse.fields_scales;
     }
     setPrecision(precision) {
         this._precision = precision;
@@ -114,6 +117,12 @@ class TaosResult {
             this._timing = this._timing + timing;
         }
     }
+    getFieldsScales(index) {
+        if (this.fields_scales) {
+            return this.fields_scales[index];
+        }
+        return null;
+    }
     /**
      * Mapping the WebSocket response type code to TDengine's type name.
      */
@@ -175,7 +184,7 @@ function parseBlock(blocks, taosResult) {
                         row.push("NULL");
                     }
                     else {
-                        row.push(readSolidData(dataView, colDataHead, metaList[j]));
+                        row.push(readSolidData(dataView, colDataHead, metaList[j], taosResult.getFieldsScales(j)));
                     }
                     colBlockHead = colBlockHead + bitMapSize + dataView.getInt32(INT_32_SIZE * j, true);
                 }
@@ -235,7 +244,7 @@ function _isVarType(metaType) {
         }
     }
 }
-function readSolidDataToArray(dataBuffer, colBlockHead, rows, metaType, bitMapArr) {
+function readSolidDataToArray(dataBuffer, colBlockHead, rows, metaType, bitMapArr, startOffset, colIndex) {
     let result = [];
     switch (metaType) {
         case constant_1.TDengineTypeCode.BOOL:
@@ -350,13 +359,41 @@ function readSolidDataToArray(dataBuffer, colBlockHead, rows, metaType, bitMapAr
             }
             break;
         }
+        case constant_1.TDengineTypeCode.DECIMAL64: {
+            let scale = getScaleFromRowBlock(dataBuffer, colIndex, startOffset);
+            for (let i = 0; i < rows; i++, colBlockHead += 8) {
+                if (isNull(bitMapArr, i)) {
+                    result.push(null);
+                }
+                else {
+                    let decimalVal = dataBuffer.getBigInt64(colBlockHead, true);
+                    result.push((0, utils_1.decimalToString)(decimalVal.toString(), BigInt(scale)));
+                }
+            }
+            break;
+        }
+        case constant_1.TDengineTypeCode.DECIMAL: {
+            let scale = getScaleFromRowBlock(dataBuffer, colIndex, startOffset);
+            for (let i = 0; i < rows; i++, colBlockHead += 16) {
+                if (isNull(bitMapArr, i)) {
+                    result.push(null);
+                }
+                else {
+                    let decimalHighPart = dataBuffer.getBigInt64(colBlockHead + 8, true);
+                    const decimalLowPart = dataBuffer.getBigUint64(colBlockHead, true);
+                    const decimalCombined = (decimalHighPart << 64n) | decimalLowPart;
+                    result.push((0, utils_1.decimalToString)(decimalCombined.toString(), BigInt(scale)));
+                }
+            }
+            break;
+        }
         default: {
-            throw new wsError_1.WebSocketQueryInterFaceError(wsError_1.ErrorCode.ERR_UNSUPPORTED_TDENGINE_TYPE, `unspported type ${metaType}`);
+            throw new wsError_1.WebSocketQueryInterFaceError(wsError_1.ErrorCode.ERR_UNSUPPORTED_TDENGINE_TYPE, `unsupported type ${metaType}`);
         }
     }
     return result;
 }
-function readSolidData(dataBuffer, colDataHead, meta) {
+function readSolidData(dataBuffer, colDataHead, meta, fields_scale) {
     switch (meta.type) {
         case constant_1.TDengineTypeCode.BOOL: {
             return (Boolean)(dataBuffer.getInt8(colDataHead));
@@ -395,8 +432,18 @@ function readSolidData(dataBuffer, colDataHead, meta) {
             return dataBuffer.getBigInt64(colDataHead, true);
             // could change 
         }
+        case constant_1.TDengineTypeCode.DECIMAL: {
+            let decimalHighPart = dataBuffer.getBigInt64(colDataHead + 8, true);
+            const decimalLowPart = dataBuffer.getBigUint64(colDataHead, true);
+            const decimalCombined = (decimalHighPart << 64n) | decimalLowPart;
+            return (0, utils_1.decimalToString)(decimalCombined.toString(), fields_scale);
+        }
+        case constant_1.TDengineTypeCode.DECIMAL64: {
+            let decimalVal = dataBuffer.getBigInt64(colDataHead, true);
+            return (0, utils_1.decimalToString)(decimalVal.toString(), fields_scale);
+        }
         default: {
-            throw new wsError_1.WebSocketQueryInterFaceError(wsError_1.ErrorCode.ERR_UNSUPPORTED_TDENGINE_TYPE, `unspported type ${meta.type} for column ${meta.name}`);
+            throw new wsError_1.WebSocketQueryInterFaceError(wsError_1.ErrorCode.ERR_UNSUPPORTED_TDENGINE_TYPE, `unsupported type ${meta.type} for column ${meta.name}`);
         }
     }
 }
@@ -447,3 +494,10 @@ function bitPos(n) {
 function bitmapLen(n) {
     return ((n) + ((1 << 3) - 1)) >> 3;
 }
+function getScaleFromRowBlock(buffer, colIndex, startOffset) {
+    // for decimal: |___bytes___|__empty__|___prec___|__scale___|
+    let backupPos = buffer.byteOffset + startOffset + 28 + colIndex * 5 + 1;
+    let scaleBuffer = new DataView(buffer.buffer, backupPos);
+    let scale = scaleBuffer.getInt32(0, true);
+    return scale & 0xFF;
+}

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

@@ -14,4 +14,5 @@ export declare function safeDecodeURIComponent(str: string): string;
  *   0 -> v1 === v2
  */
 export declare function compareVersions(v1: string, v2: string): number;
+export declare function decimalToString(valueStr: string, fields_scale: bigint | null): string;
 //# 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;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAW9D"}
+{"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,CA6B5C;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;AAkDD,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAmBrF"}

package/lib/src/common/utils.js

@@ -6,6 +6,7 @@ exports.getBinarySql = getBinarySql;
 exports.zigzagDecode = zigzagDecode;
 exports.safeDecodeURIComponent = safeDecodeURIComponent;
 exports.compareVersions = compareVersions;
+exports.decimalToString = decimalToString;
 const wsError_1 = require("./wsError");
 function getUrl(wsConfig) {
     let url = new URL(wsConfig.getUrl());
@@ -19,6 +20,16 @@ function getUrl(wsConfig) {
     if (token) {
         url.searchParams.set("token", token);
     }
+    let timezone = wsConfig.getTimezone();
+    if (timezone) {
+        url.searchParams.set("timezone", timezone);
+    }
+    if (url.pathname && url.pathname !== '/') {
+        wsConfig.setDb(url.pathname.slice(1));
+    }
+    if (url.searchParams.has("timezone")) {
+        wsConfig.setTimezone(url.searchParams.get("timezone") || '');
+    }
     url.pathname = '/ws';
     return url;
 }
@@ -135,3 +146,23 @@ function comparePreReleases(pre1, pre2) {
     // compare pre release tag strings
     return pre1.localeCompare(pre2);
 }
+function decimalToString(valueStr, fields_scale) {
+    let decimalStr = valueStr;
+    if (fields_scale && fields_scale > 0) {
+        const scale = Number(fields_scale);
+        const isNegative = decimalStr.startsWith('-');
+        const absStr = isNegative ? decimalStr.slice(1) : decimalStr;
+        if (absStr.length <= scale) {
+            // If the length of the number is less than or equal to the precision, add 0 before it.
+            const paddedStr = absStr.padStart(scale + 1, '0');
+            decimalStr = (isNegative ? '-' : '') + '0.' + paddedStr.slice(1);
+        }
+        else {
+            // 在指定位置插入小数点
+            const integerPart = absStr.slice(0, absStr.length - scale);
+            const decimalPart = absStr.slice(absStr.length - scale);
+            decimalStr = (isNegative ? '-' : '') + integerPart + '.' + decimalPart;
+        }
+    }
+    return decimalStr;
+}