@tdengine/websocket 3.1.0 → 3.1.2

package/lib/example/test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=test.d.ts.map

package/lib/example/test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"test.d.ts","sourceRoot":"","sources":["../../example/test.ts"],"names":[],"mappings":""}

package/lib/example/test.js

@@ -0,0 +1,88 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const config_1 = require("../src/common/config");
+const wsSql_1 = require("../src/sql/wsSql");
+const utils_1 = require("../test/utils");
+// const DSN = 'ws://root:taosdata@127.0.0.1:6041'
+let dsn = 'ws://root:taosdata@192.168.1.98:6041';
+let conf = new config_1.WSConfig(dsn);
+const resultMap = new Map();
+resultMap.set("POINT (4.0 8.0)", (0, utils_1.hexToBytes)("010100000000000000000010400000000000002040"));
+resultMap.set("POINT (3.0 5.0)", (0, utils_1.hexToBytes)("010100000000000000000008400000000000001440"));
+resultMap.set("LINESTRING (1.000000 1.000000, 2.000000 2.000000, 5.000000 5.000000)", (0, utils_1.hexToBytes)("010200000003000000000000000000f03f000000000000f03f0000000000000040000000000000004000000000000014400000000000001440"));
+resultMap.set("POLYGON ((3.000000 6.000000, 5.000000 6.000000, 5.000000 8.000000, 3.000000 8.000000, 3.000000 6.000000))", (0, utils_1.hexToBytes)("010300000001000000050000000000000000000840000000000000184000000000000014400000000000001840000000000000144000000000000020400000000000000840000000000000204000000000000008400000000000001840"));
+resultMap.set("POINT (7.0 9.0)", (0, utils_1.hexToBytes)("01010000000000000000001c400000000000002240"));
+resultMap.set("0x7661726332", (0, utils_1.hexToBytes)("307837363631373236333332"));
+resultMap.set("0x7661726333", (0, utils_1.hexToBytes)("307837363631373236333333"));
+resultMap.set("0x7661726334", (0, utils_1.hexToBytes)("307837363631373236333334"));
+resultMap.set("0x7661726335", (0, utils_1.hexToBytes)("307837363631373236333335"));
+const table = 'ws_q_n';
+const stable = 'ws_q_s';
+const tableCN = 'ws_q_n_cn';
+const stableCN = 'ws_q_s_cn';
+const db = 'ws_q_db';
+const jsonTable = 'ws_q_j';
+const jsonTableCN = 'ws_q_j_cn';
+const createDB = `create database if not exists ${db} keep 3650`;
+const dropDB = `drop database if exists ${db}`;
+const useDB = `use ${db}`;
+const stableTags = [true, -1, -2, -3, BigInt(-4), 1, 2, 3, BigInt(4), parseFloat(3.1415.toFixed(5)), parseFloat(3.14159265.toFixed(15)), 'varchar_tag_1', 'nchar_tag_1'];
+const stableCNTags = [false, -1 * 2, -2 * 2, -3 * 2, BigInt(-4 * 2), 1 * 2, 2 * 2, 3 * 2, BigInt(4 * 2), parseFloat((3.1415 * 2).toFixed(5)), parseFloat((3.14159265 * 2).toFixed(15)), 'varchar_标签_壹', 'nchar_标签_贰'];
+const tableValues = [
+    [BigInt(1656677710000), 0, -1, -2, BigInt(-3), 0, 1, 2, BigInt(3), parseFloat(3.1415.toFixed(5)), parseFloat(3.14159265.toFixed(15)), 'varchar_col_1', 'nchar_col_1', true, 'NULL', 'POINT (4.0 8.0)', '0x7661726332'],
+    [BigInt(1656677720000), -1, -2, -3, BigInt(-4), 1, 2, 3, BigInt(4), parseFloat((3.1415 * 2).toFixed(5)), parseFloat((3.14159265 * 2).toFixed(15)), 'varchar_col_2', 'nchar_col_2', false, 'NULL', 'POINT (3.0 5.0)', '0x7661726333'],
+    [BigInt(1656677730000), -2, -3, -4, BigInt(-5), 2, 3, 4, BigInt(5), parseFloat((3.1415 * 3).toFixed(5)), parseFloat((3.14159265 * 3).toFixed(15)), 'varchar_col_3', 'nchar_col_3', true, 'NULL', 'LINESTRING (1.000000 1.000000, 2.000000 2.000000, 5.000000 5.000000)', '0x7661726334'],
+    [BigInt(1656677740000), -3, -4, -5, BigInt(-6), 3, 4, 5, BigInt(6), parseFloat((3.1415 * 4).toFixed(5)), parseFloat((3.14159265 * 4).toFixed(15)), 'varchar_col_4', 'nchar_col_4', false, 'NULL', 'POLYGON ((3.000000 6.000000, 5.000000 6.000000, 5.000000 8.000000, 3.000000 8.000000, 3.000000 6.000000))', '0x7661726335'],
+    [BigInt(1656677750000), -4, -5, -6, BigInt(-7), 4, 5, 6, BigInt(7), parseFloat((3.1415 * 5).toFixed(5)), parseFloat((3.14159265 * 5).toFixed(15)), 'varchar_col_5', 'nchar_col_5', true, 'NULL', 'POINT (7.0 9.0)', '0x7661726335'],
+];
+const tableCNValues = [
+    [BigInt(1656677760000), 0, -1, -2, BigInt(-3), 0, 1, 2, BigInt(3), parseFloat(3.1415.toFixed(5)), parseFloat(3.14159265.toFixed(15)), 'varchar_列_壹', 'nchar_列_甲', true, 'NULL', 'POINT (4.0 8.0)', '0x7661726332'],
+    [BigInt(1656677770000), -1, -2, -3, BigInt(-4), 1, 2, 3, BigInt(4), parseFloat((3.1415 * 2).toFixed(5)), parseFloat((3.14159265 * 2).toFixed(15)), 'varchar_列_贰', 'nchar_列_乙', false, 'NULL', 'POINT (3.0 5.0)', '0x7661726333'],
+    [BigInt(1656677780000), -2, -3, -4, BigInt(-5), 2, 3, 4, BigInt(5), parseFloat((3.1415 * 3).toFixed(5)), parseFloat((3.14159265 * 3).toFixed(15)), 'varchar_列_叁', 'nchar_列_丙', true, 'NULL', 'LINESTRING (1.000000 1.000000, 2.000000 2.000000, 5.000000 5.000000)', '0x7661726334'],
+    [BigInt(1656677790000), -3, -4, -5, BigInt(-6), 3, 4, 5, BigInt(6), parseFloat((3.1415 * 4).toFixed(5)), parseFloat((3.14159265 * 4).toFixed(15)), 'varchar_列_肆', 'nchar_列_丁', false, 'NULL', 'POLYGON ((3.000000 6.000000, 5.000000 6.000000, 5.000000 8.000000, 3.000000 8.000000, 3.000000 6.000000))', '0x7661726335'],
+    [BigInt(1656677800000), -4, -5, -6, BigInt(-7), 4, 5, 6, BigInt(7), parseFloat((3.1415 * 5).toFixed(5)), parseFloat((3.14159265 * 5).toFixed(15)), 'varchar_列_伍', 'nchar_列_戊', true, 'NULL', 'POINT (7.0 9.0)', '0x7661726335'],
+];
+const jsonTags = ["{\"key1\":\"taos\",\"key2\":null,\"key3\":\"TDengine\",\"key4\":0,\"key5\":false}"];
+const jsonTagsCN = ["{\"key1\":\"taosdata\",\"key2\":null,\"key3\":\"TDengine涛思数据\",\"key4\":1,\"key5\":true}"];
+// const selectStable = `select * from ${stable}`
+const selectStableCN = `select * from ${stableCN}`;
+// const selectTable = `select * from ${table}`
+// const selectTableCN = `select * from ${tableCN}`
+// const selectJsonTable = `select * from ${jsonTable}`
+// const selectJsonTableCN = `select * from ${jsonTableCN}`
+(async () => {
+    let ws = await wsSql_1.WsSql.open(conf);
+    await ws.exec(useDB);
+    let insertCN = (0, utils_1.insertStable)(tableCNValues, stableCNTags, stableCN);
+    let insertRes = await ws.exec(insertCN);
+    console.log("insertRes------", insertRes);
+    // let queryRes = await ws.exec(selectStableCN)
+    // let expectMeta = tableMeta.concat(tagMeta)
+    // let expectData = expectStableData(tableCNValues, stableCNTags)
+    // let actualMeta = queryRes.getMeta()
+    // let actualData = queryRes.getData()
+    await ws.close();
+    // if (actualData && actualMeta) {
+    //     actualMeta.forEach((meta, index) => {
+    //         expect(meta.name).toBe(expectMeta[index].name)
+    //         expect(meta.type).toBe(expectMeta[index].type)
+    //         expect(meta.length).toBe(expectMeta[index].length)
+    //     })
+    //     for (let i = 0; i < actualData.length; i++) {
+    //         actualData[i].forEach((d, index) => {
+    //             if (expectMeta[index].name == 'geo' || expectMeta[index].name == 'vbinary') {
+    //                 let buffer:ArrayBuffer = resultMap.get(expectData[i][index])
+    //                 if (buffer) {
+    //                     let dbData :ArrayBuffer  = d
+    //                     console.log(i, index, dbData, expectData[i][index], buffer, compareUint8Arrays(new Uint8Array(dbData), new Uint8Array(buffer)))
+    //                     expect(compareUint8Arrays(new Uint8Array(dbData), new Uint8Array(buffer))).toBe(true)
+    //                 }
+    //             } else {
+    //                 expect(d).toBe(expectData[i][index])
+    //             }
+    //         })
+    //     }
+    // } else {
+    //     throw new Error("retrieve empty result")
+    // }
+})();

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

@@ -1,5 +1,4 @@
-import { TaosResult } from '../common/taosResult';
-import { WSQueryResponse, WSFetchResponse } from './wsResponse';
+import { WSQueryResponse } from './wsResponse';
 export declare class WsClient {
     private _wsConnector?;
     private _timeout?;
@@ -8,11 +7,9 @@ export declare class WsClient {
     connect(database?: string | undefined | null): Promise<void>;
     execNoResp(queryMsg: string): Promise<void>;
     exec(queryMsg: string, bSqlQuery?: boolean): Promise<any>;
-    sendBinaryMsg(reqId: bigint, action: string, message: ArrayBuffer, bSqlQuery?: boolean): Promise<any>;
+    sendBinaryMsg(reqId: bigint, action: string, message: ArrayBuffer, bSqlQuery?: boolean, bResultBinary?: boolean): Promise<any>;
     getState(): number;
     ready(): Promise<void>;
-    fetch(res: WSQueryResponse): Promise<WSFetchResponse>;
-    fetchBlock(fetchResponse: WSFetchResponse, taosResult: TaosResult): Promise<TaosResult>;
     sendMsg(msg: string): Promise<any>;
     freeResult(res: WSQueryResponse): Promise<unknown>;
     version(): Promise<string>;

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

@@ -1 +1 @@
-{"version":3,"file":"wsClient.d.ts","sourceRoot":"","sources":["../../../src/client/wsClient.ts"],"names":[],"mappings":"AAGA,OAAO,EAA2B,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAE3E,OAAO,EAGH,eAAe,EACf,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;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,GAAG,OAAO,CAAC,GAAG,CAAC;IAsB/G,QAAQ;IAQF,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAetB,KAAK,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;IA0BrD,UAAU,CAAC,aAAa,EAAE,eAAe,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IA2BvF,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;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"}

package/lib/src/client/wsClient.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WsClient = void 0;
 const json_bigint_1 = __importDefault(require("json-bigint"));
 const wsConnectorPool_1 = require("./wsConnectorPool");
-const taosResult_1 = require("../common/taosResult");
 const wsError_1 = require("../common/wsError");
 const wsResponse_1 = require("./wsResponse");
 const reqid_1 = require("../common/reqid");
@@ -81,10 +80,13 @@ class WsClient {
         });
     }
     // need to construct Response.
-    async sendBinaryMsg(reqId, action, message, bSqlQuery = true) {
+    async sendBinaryMsg(reqId, action, message, bSqlQuery = true, bResultBinary = false) {
         return new Promise((resolve, reject) => {
             if (this._wsConnector && this._wsConnector.readyState() > 0) {
                 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));
@@ -123,58 +125,6 @@ class WsClient {
             throw (new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_WEBSOCKET_CONNECTION_FAIL, `connection creation failed, url: ${this._url}`));
         }
     }
-    async fetch(res) {
-        let fetchMsg = {
-            action: 'fetch',
-            args: {
-                req_id: reqid_1.ReqId.getReqID(),
-                id: res.id,
-            },
-        };
-        return new Promise((resolve, reject) => {
-            let jsonStr = json_bigint_1.default.stringify(fetchMsg);
-            log_1.default.debug('[wsQueryInterface.fetch.fetchMsg]===>' + jsonStr);
-            if (this._wsConnector && this._wsConnector.readyState() > 0) {
-                this._wsConnector.sendMsg(jsonStr).then((e) => {
-                    if (e.msg.code == 0) {
-                        resolve(new wsResponse_1.WSFetchResponse(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"));
-            }
-        });
-    }
-    async fetchBlock(fetchResponse, taosResult) {
-        let fetchBlockMsg = {
-            action: 'fetch_block',
-            args: {
-                req_id: reqid_1.ReqId.getReqID(),
-                id: fetchResponse.id,
-            },
-        };
-        return new Promise((resolve, reject) => {
-            let jsonStr = json_bigint_1.default.stringify(fetchBlockMsg);
-            log_1.default.debug("[wsQueryInterface.fetchBlock.fetchBlockMsg]===>" + jsonStr);
-            if (this._wsConnector && this._wsConnector.readyState() > 0) {
-                this._wsConnector.sendMsg(jsonStr).then((e) => {
-                    let resp = e;
-                    taosResult.addTotalTime(resp.totalTime);
-                    // if retrieve JSON then reject with message
-                    // else is binary , so parse raw block to TaosResult
-                    (0, taosResult_1.parseBlock)(fetchResponse.rows, new wsResponse_1.WSFetchBlockResponse(resp.msg), taosResult);
-                    resolve(taosResult);
-                }).catch((e) => reject(e));
-            }
-            else {
-                reject(new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_CONNECTION_CLOSED, "invalid websocket connect"));
-            }
-        });
-    }
     async sendMsg(msg) {
         return new Promise((resolve, reject) => {
             log_1.default.debug("[wsQueryInterface.sendMsg]===>" + msg);

package/lib/src/client/wsConnector.js

@@ -22,7 +22,7 @@ class WebSocketConnector {
             if (timeout) {
                 this._timeout = timeout;
             }
-            this._wsConn = new websocket_1.w3cwebsocket(origin.concat(pathname).concat(search));
+            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.onclose = this._onclose;
             this._wsConn.onmessage = this._onmessage;
@@ -50,7 +50,7 @@ class WebSocketConnector {
         let data = event.data;
         log_1.default.debug("wsClient._onMessage()====" + (Object.prototype.toString.call(data)));
         if (Object.prototype.toString.call(data) === '[object ArrayBuffer]') {
-            let id = new DataView(data, 8, 8).getBigUint64(0, true);
+            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]') {
@@ -122,7 +122,7 @@ class WebSocketConnector {
                     wsEventCallback_1.WsEventCallback.instance().registerCallback({ action: action, req_id: reqId,
                         timeout: this._timeout, id: reqId }, resolve, reject);
                 }
-                log_1.default.debug("[wsClient.sendBinaryMsg()]===>" + reqId, action, message.byteLength);
+                log_1.default.debug("[wsClient.sendBinaryMsg()]===>" + reqId + action + message.byteLength);
                 this._wsConn.send(message);
             }
             else {

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

@@ -28,23 +28,18 @@ export declare class WSQueryResponse {
     constructor(resp: MessageResp);
     private initMsg;
 }
-export declare class WSFetchResponse {
-    code: number;
-    message: string;
-    action: string;
-    req_id: number;
-    timing: bigint;
-    id: bigint;
-    completed: boolean;
-    length: Array<number>;
-    rows: number;
-    totalTime: number;
-    constructor(resp: MessageResp);
-}
 export declare class WSFetchBlockResponse {
-    id: bigint;
-    data: ArrayBuffer;
+    data: DataView | undefined;
+    action: bigint;
     timing: bigint;
+    reqId: bigint;
+    code: number;
+    blockLen: number;
+    message: string | undefined;
+    resultId: bigint | undefined;
+    finished: number | undefined;
+    metaType: number | undefined;
+    textDecoder: TextDecoder;
     constructor(msg: ArrayBuffer);
 }
 interface IWSConnResponse {

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;AAEnD,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,eAAe;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;gBACN,IAAI,EAAC,WAAW;CAY/B;AAED,qBAAa,oBAAoB;IAE7B,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,WAAW,CAAA;IACjB,MAAM,EAAE,MAAM,CAAA;gBACF,GAAG,EAAE,WAAW;CAK/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,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"}

package/lib/src/client/wsResponse.js

@@ -3,7 +3,8 @@
  * define ws Response type|class, for query?
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WSConnResponse = exports.WSFetchBlockResponse = exports.WSFetchResponse = exports.WSQueryResponse = exports.WSVersionResponse = void 0;
+exports.WSConnResponse = exports.WSFetchBlockResponse = exports.WSQueryResponse = exports.WSVersionResponse = void 0;
+const taosResult_1 = require("../common/taosResult");
 class WSVersionResponse {
     constructor(resp) {
         this.version = resp.msg.version;
@@ -41,26 +42,37 @@ class WSQueryResponse {
     }
 }
 exports.WSQueryResponse = WSQueryResponse;
-class WSFetchResponse {
-    constructor(resp) {
-        this.totalTime = resp.totalTime;
-        this.code = resp.msg.code;
-        this.message = resp.msg.message;
-        this.action = resp.msg.action;
-        this.req_id = resp.msg.req_id;
-        this.timing = BigInt(resp.msg.timing);
-        this.id = BigInt(resp.msg.id);
-        this.completed = resp.msg.completed;
-        this.length = resp.msg.length;
-        this.rows = resp.msg.rows;
-    }
-}
-exports.WSFetchResponse = WSFetchResponse;
 class WSFetchBlockResponse {
     constructor(msg) {
-        this.timing = new DataView(msg, 0, 8).getBigUint64(0, true);
-        this.id = new DataView(msg, 8, 8).getBigUint64(0, true);
-        this.data = msg.slice(16);
+        let dataView = new DataView(msg);
+        this.action = dataView.getBigUint64(8, true);
+        this.timing = dataView.getBigUint64(18, true);
+        this.reqId = dataView.getBigUint64(26, true);
+        this.code = dataView.getUint32(34, true);
+        this.textDecoder = new TextDecoder();
+        this.blockLen = 0;
+        if (this.code != 0) {
+            let len = dataView.getUint32(38, true);
+            this.message = (0, taosResult_1.readVarchar)(msg, 42, len, this.textDecoder);
+            return;
+        }
+        this.resultId = dataView.getBigUint64(42, true);
+        let offset = 50;
+        if (this.action == BigInt(8)) {
+            this.metaType = dataView.getUint16(50, true);
+            offset += 2;
+        }
+        else {
+            this.finished = dataView.getUint8(50);
+            if (this.finished == 1) {
+                return;
+            }
+            offset += 1;
+        }
+        this.blockLen = dataView.getUint32(offset, true);
+        if (this.blockLen > 0) {
+            this.data = new DataView(msg, offset + 4);
+        }
     }
 }
 exports.WSFetchBlockResponse = WSFetchBlockResponse;

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

@@ -4,9 +4,31 @@ export interface IndexableString {
 export interface StringIndexable {
     [index: string]: number;
 }
+export declare const BinaryQueryMessage: bigint;
+export declare const FetchRawBlockMessage: bigint;
 export declare const TDengineTypeName: IndexableString;
 export declare const ColumnsBlockType: StringIndexable;
-export declare const TDengineTypeCode: StringIndexable;
+export declare enum TDengineTypeCode {
+    NULL = 0,
+    BOOL = 1,
+    TINYINT = 2,
+    SMALLINT = 3,
+    INT = 4,
+    BIGINT = 5,
+    FLOAT = 6,
+    DOUBLE = 7,
+    BINARY = 8,
+    VARCHAR = 8,
+    TIMESTAMP = 9,
+    NCHAR = 10,
+    TINYINT_UNSIGNED = 11,
+    SMALLINT_UNSIGNED = 12,
+    INT_UNSIGNED = 13,
+    BIGINT_UNSIGNED = 14,
+    JSON = 15,
+    VARBINARY = 16,
+    GEOMETRY = 20
+}
 export declare const TDenginePrecision: IndexableString;
 export declare const TDengineTypeLength: StringIndexable;
 export declare const PrecisionLength: 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,gBAAgB,EAAE,eAmB9B,CAAA;AAED,eAAO,MAAM,gBAAgB,EAAE,eAM9B,CAAA;AAGD,eAAO,MAAM,gBAAgB,EAAE,eAoB9B,CAAA;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,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"}

package/lib/src/common/constant.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PrecisionLength = exports.TDengineTypeLength = exports.TDenginePrecision = exports.TDengineTypeCode = exports.ColumnsBlockType = exports.TDengineTypeName = void 0;
+exports.PrecisionLength = exports.TDengineTypeLength = exports.TDenginePrecision = exports.TDengineTypeCode = exports.ColumnsBlockType = exports.TDengineTypeName = exports.FetchRawBlockMessage = exports.BinaryQueryMessage = void 0;
+exports.BinaryQueryMessage = BigInt(6);
+exports.FetchRawBlockMessage = BigInt(7);
 exports.TDengineTypeName = {
     0: 'NULL',
     1: 'BOOL',
@@ -28,27 +30,28 @@ exports.ColumnsBlockType = {
     'GEOMETRY': 3,
     'VARBINARY': 4,
 };
-exports.TDengineTypeCode = {
-    'NULL': 0,
-    'BOOL': 1,
-    'TINYINT': 2,
-    'SMALLINT': 3,
-    'INT': 4,
-    'BIGINT': 5,
-    'FLOAT': 6,
-    'DOUBLE': 7,
-    'BINARY': 8,
-    'VARCHAR': 8,
-    'TIMESTAMP': 9,
-    'NCHAR': 10,
-    'TINYINT UNSIGNED': 11,
-    'SMALLINT UNSIGNED': 12,
-    'INT UNSIGNED': 13,
-    'BIGINT UNSIGNED': 14,
-    'JSON': 15,
-    'VARBINARY': 16,
-    'GEOMETRY': 20,
-};
+var TDengineTypeCode;
+(function (TDengineTypeCode) {
+    TDengineTypeCode[TDengineTypeCode["NULL"] = 0] = "NULL";
+    TDengineTypeCode[TDengineTypeCode["BOOL"] = 1] = "BOOL";
+    TDengineTypeCode[TDengineTypeCode["TINYINT"] = 2] = "TINYINT";
+    TDengineTypeCode[TDengineTypeCode["SMALLINT"] = 3] = "SMALLINT";
+    TDengineTypeCode[TDengineTypeCode["INT"] = 4] = "INT";
+    TDengineTypeCode[TDengineTypeCode["BIGINT"] = 5] = "BIGINT";
+    TDengineTypeCode[TDengineTypeCode["FLOAT"] = 6] = "FLOAT";
+    TDengineTypeCode[TDengineTypeCode["DOUBLE"] = 7] = "DOUBLE";
+    TDengineTypeCode[TDengineTypeCode["BINARY"] = 8] = "BINARY";
+    TDengineTypeCode[TDengineTypeCode["VARCHAR"] = 8] = "VARCHAR";
+    TDengineTypeCode[TDengineTypeCode["TIMESTAMP"] = 9] = "TIMESTAMP";
+    TDengineTypeCode[TDengineTypeCode["NCHAR"] = 10] = "NCHAR";
+    TDengineTypeCode[TDengineTypeCode["TINYINT_UNSIGNED"] = 11] = "TINYINT_UNSIGNED";
+    TDengineTypeCode[TDengineTypeCode["SMALLINT_UNSIGNED"] = 12] = "SMALLINT_UNSIGNED";
+    TDengineTypeCode[TDengineTypeCode["INT_UNSIGNED"] = 13] = "INT_UNSIGNED";
+    TDengineTypeCode[TDengineTypeCode["BIGINT_UNSIGNED"] = 14] = "BIGINT_UNSIGNED";
+    TDengineTypeCode[TDengineTypeCode["JSON"] = 15] = "JSON";
+    TDengineTypeCode[TDengineTypeCode["VARBINARY"] = 16] = "VARBINARY";
+    TDengineTypeCode[TDengineTypeCode["GEOMETRY"] = 20] = "GEOMETRY";
+})(TDengineTypeCode || (exports.TDengineTypeCode = TDengineTypeCode = {}));
 exports.TDenginePrecision = {
     0: 'MILLISECOND',
     1: "MICROSECOND",

package/lib/src/common/log.js

@@ -19,7 +19,7 @@ const transport = new winston_daily_rotate_file_1.default({
     maxFiles: '14d', // Keep log files for 14 days
     handleExceptions: true, // Whether to handle exceptions
     json: false, // Whether to output logs in JSON format
-    format: winston_1.default.format.combine(winston_1.default.format.timestamp(), customFormat),
+    format: winston_1.default.format.combine(winston_1.default.format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }), customFormat),
     level: 'info', // set log level
 });
 const logger = winston_1.default.createLogger({

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

@@ -14,6 +14,7 @@ export interface MessageResp {
     msg: any;
 }
 export declare class TaosResult {
+    private _topic?;
     private _meta;
     private _data;
     private _precision;
@@ -22,8 +23,12 @@ export declare class TaosResult {
     /** unit nano seconds */
     private _timing;
     constructor(queryResponse?: WSQueryResponse);
+    setPrecision(precision: number): void;
     setRowsAndTime(rows: number, timing?: bigint): void;
+    getTopic(): string;
+    setTopic(topic?: string): void;
     getMeta(): Array<TDengineMeta> | null;
+    setMeta(metaData: ResponseMeta): void;
     getData(): Array<Array<any>> | null;
     setData(value: Array<Array<any>> | null): void;
     getAffectRows(): number | null | undefined;
@@ -37,13 +42,14 @@ export declare class TaosResult {
      */
     private getTDengineMeta;
 }
-export declare function parseBlock(rows: number, blocks: WSFetchBlockResponse, taosResult: TaosResult): TaosResult;
-export declare function _isVarType(meta: ResponseMeta): Number;
-export declare function readSolidDataToArray(buffer: ArrayBuffer, colBlockHead: number, rows: number, meta: ResponseMeta, bitMapArr: ArrayBuffer): any[];
-export declare function readSolidData(dataBuffer: ArrayBuffer, colDataHead: number, meta: ResponseMeta): Number | Boolean | BigInt;
+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 readBinary(dataBuffer: ArrayBuffer, colDataHead: number, length: number): ArrayBuffer;
-export declare function readVarchar(dataBuffer: ArrayBuffer, colDataHead: number, length: number): string;
+export declare function readVarchar(dataBuffer: ArrayBuffer, colDataHead: number, length: number, textDecoder: TextDecoder): string;
 export declare function readNchar(dataBuffer: ArrayBuffer, colDataHead: number, length: number): string;
+export declare function getString(dataBuffer: DataView, colDataHead: number, length: number, textDecoder: TextDecoder): string;
 export declare function getCharOffset(n: number): number;
 export declare function setBitmapNull(c: number, n: number): number;
 export declare function bitmapLen(n: number): number;

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

@@ -1 +1 @@
-{"version":3,"file":"taosResult.d.ts","sourceRoot":"","sources":["../../../src/common/taosResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAM7E,MAAM,WAAW,YAAY;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,YAAY;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,WAAW;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAC,GAAG,CAAC;CACX;AAED,qBAAa,UAAU;IACnB,OAAO,CAAC,KAAK,CAA6B;IAC1C,OAAO,CAAC,KAAK,CAA2B;IAExC,OAAO,CAAC,UAAU,CAA4B;IAC9C,SAAS,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACjD,OAAO,CAAC,UAAU,CAAK;IACvB,wBAAwB;IACxB,OAAO,CAAC,OAAO,CAA4B;gBAC/B,aAAa,CAAC,EAAE,eAAe;IAkCpC,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAC,MAAM;IAY3C,OAAO,IAAI,KAAK,CAAC,YAAY,CAAC,GAAG,IAAI;IAIrC,OAAO,IAAI,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI;IAGnC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI;IAGvC,aAAa,IAAI,MAAM,GAAG,IAAI,GAAG,SAAS;IAI1C,WAAW,IAAI,KAAK,CAAC,YAAY,CAAC,GAAG,IAAI;IAIzC,YAAY,IAAG,MAAM,GAAG,IAAI,GAAG,SAAS;IAGxC,YAAY;IAGZ,YAAY,CAAC,SAAS,EAAC,MAAM;IAI7B,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM;IAShC;;OAEG;IACH,OAAO,CAAC,eAAe;CAc1B;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,oBAAoB,EAAE,UAAU,EAAE,UAAU,GAAG,UAAU,CAyEzG;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM,CAwBrD;AACD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,WAAW,EAAE,YAAY,EAAC,MAAM,EACzE,IAAI,EAAC,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,WAAW,GAAG,GAAG,EAAE,CAmHlE;AACD,wBAAgB,aAAa,CAAC,UAAU,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CA4CzH;AAED,wBAAgB,UAAU,CAAC,UAAU,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,CAGpG;AAED,wBAAgB,WAAW,CAAC,UAAU,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAKhG;AAED,wBAAgB,SAAS,CAAC,UAAU,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAQ9F;AAmBD,wBAAgB,aAAa,CAAC,CAAC,EAAC,MAAM,GAAE,MAAM,CAE7C;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAC,MAAM,EAAE,CAAC,EAAC,MAAM,GAAE,MAAM,CAEvD;AAMD,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAE3C"}
+{"version":3,"file":"taosResult.d.ts","sourceRoot":"","sources":["../../../src/common/taosResult.ts"],"names":[],"mappings":"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"}