@tdengine/websocket 3.2.0 → 3.2.2

package/lib/src/tmq/wsTmq.js

@@ -18,7 +18,7 @@ class WsConsumer {
         this._wsConfig = new config_1.TmqConfig(wsConfig);
         log_1.default.debug(this._wsConfig);
         if (wsConfig.size == 0 || !this._wsConfig.url) {
-            throw new wsError_1.WebSocketInterfaceError(wsError_1.ErrorCode.ERR_INVALID_URL, 'invalid url, password or username needed.');
+            throw new wsError_1.WebSocketInterfaceError(wsError_1.ErrorCode.ERR_INVALID_URL, "invalid url, password or username needed.");
         }
         this._wsClient = new wsClient_1.WsClient(this._wsConfig.url, this._wsConfig.timeout);
         this._lastMessageID = BigInt(0);
@@ -33,12 +33,12 @@ class WsConsumer {
                 await this._wsClient.ready();
             }
             else {
-                throw (new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_WEBSOCKET_CONNECTION_FAIL, `connection creation failed, url: ${this._wsConfig.url}`));
+                throw new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_WEBSOCKET_CONNECTION_FAIL, `connection creation failed, url: ${this._wsConfig.url}`);
             }
         }
         catch (e) {
             await this._wsClient.close();
-            throw (e);
+            throw e;
         }
         finally {
             if (wsSql) {
@@ -49,14 +49,14 @@ class WsConsumer {
     }
     static async newConsumer(wsConfig) {
         if (wsConfig.size == 0 || !wsConfig.get(constant_1.TMQConstants.WS_URL)) {
-            throw new wsError_1.WebSocketInterfaceError(wsError_1.ErrorCode.ERR_INVALID_URL, 'invalid url, password or username needed.');
+            throw new wsError_1.WebSocketInterfaceError(wsError_1.ErrorCode.ERR_INVALID_URL, "invalid url, password or username needed.");
         }
         let wsConsumer = new WsConsumer(wsConfig);
         return await wsConsumer.init();
     }
     async subscribe(topics, reqId) {
         if (!topics || topics.length == 0) {
-            throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_INVALID_PARAMS, 'WsTmq Subscribe params is error!');
+            throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_INVALID_PARAMS, "WsTmq Subscribe params is error!");
         }
         let queryMsg = {
             action: constant_1.TMQMessageType.Subscribe,
@@ -70,7 +70,7 @@ class WsConsumer {
                 offset_rest: this._wsConfig.offset_rest,
                 auto_commit: this._wsConfig.auto_commit,
                 auto_commit_interval_ms: this._wsConfig.auto_commit_interval_ms,
-                config: this._wsConfig.otherConfigs
+                config: this._wsConfig.otherConfigs,
             },
         };
         this._topics = topics;
@@ -120,20 +120,20 @@ class WsConsumer {
             action: constant_1.TMQMessageType.Commit,
             args: {
                 req_id: reqid_1.ReqId.getReqID(reqId),
-                message_id: 0
+                message_id: 0,
             },
         };
         await this._wsClient.exec(JSON.stringify(queryMsg));
     }
     async committed(partitions, reqId) {
         if (!partitions || partitions.length == 0) {
-            throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_INVALID_PARAMS, 'WsTmq Positions params is error!');
+            throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_INVALID_PARAMS, "WsTmq Positions params is error!");
         }
         let offsets = new Array(partitions.length);
         for (let i = 0; i < partitions.length; i++) {
             offsets[i] = {
                 topic: partitions[i].topic,
-                vgroup_id: partitions[i].vgroup_id
+                vgroup_id: partitions[i].vgroup_id,
             };
             offsets[i].vgroup_id = partitions[i].vgroup_id;
         }
@@ -141,7 +141,7 @@ class WsConsumer {
             action: constant_1.TMQMessageType.Committed,
             args: {
                 req_id: reqid_1.ReqId.getReqID(reqId),
-                topic_vgroup_ids: offsets
+                topic_vgroup_ids: offsets,
             },
         };
         let resp = await this._wsClient.exec(json_bigint_1.default.stringify(queryMsg), false);
@@ -149,10 +149,10 @@ class WsConsumer {
     }
     async commitOffsets(partitions) {
         if (!partitions || partitions.length == 0) {
-            throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_INVALID_PARAMS, 'WsTmq CommitOffsets params is error!');
+            throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_INVALID_PARAMS, "WsTmq CommitOffsets params is error!");
         }
         const allp = [];
-        partitions.forEach(e => {
+        partitions.forEach((e) => {
             allp.push(this.commitOffset(e));
         });
         await Promise.all(allp);
@@ -160,7 +160,7 @@ class WsConsumer {
     }
     async commitOffset(partition, reqId) {
         if (!partition) {
-            throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_INVALID_PARAMS, 'WsTmq CommitOffsets params is error!');
+            throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_INVALID_PARAMS, "WsTmq CommitOffsets params is error!");
         }
         let queryMsg = {
             action: constant_1.TMQMessageType.CommitOffset,
@@ -175,13 +175,13 @@ class WsConsumer {
     }
     async positions(partitions, reqId) {
         if (!partitions || partitions.length == 0) {
-            throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_INVALID_PARAMS, 'WsTmq Positions params is error!');
+            throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_INVALID_PARAMS, "WsTmq Positions params is error!");
         }
         let offsets = new Array(partitions.length);
         for (let i = 0; i < partitions.length; i++) {
             offsets[i] = {
                 topic: partitions[i].topic,
-                vgroup_id: partitions[i].vgroup_id
+                vgroup_id: partitions[i].vgroup_id,
             };
             offsets[i].vgroup_id = partitions[i].vgroup_id;
         }
@@ -189,7 +189,7 @@ class WsConsumer {
             action: constant_1.TMQMessageType.Position,
             args: {
                 req_id: reqid_1.ReqId.getReqID(reqId),
-                topic_vgroup_ids: offsets
+                topic_vgroup_ids: offsets,
             },
         };
         let resp = await this._wsClient.exec(JSON.stringify(queryMsg), false);
@@ -197,7 +197,7 @@ class WsConsumer {
     }
     async seek(partition, reqId) {
         if (!partition) {
-            throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_INVALID_PARAMS, 'WsTmq Seek params is error!');
+            throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_INVALID_PARAMS, "WsTmq Seek params is error!");
         }
         let queryMsg = {
             action: constant_1.TMQMessageType.Seek,
@@ -212,13 +212,13 @@ class WsConsumer {
     }
     async seekToBeginning(partitions) {
         if (!partitions || partitions.length == 0) {
-            throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_INVALID_PARAMS, 'WsTmq SeekToBeginning params is error!');
+            throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_INVALID_PARAMS, "WsTmq SeekToBeginning params is error!");
         }
         return await this.seekToBeginOrEnd(partitions);
     }
     async seekToEnd(partitions) {
         if (!partitions || partitions.length == 0) {
-            throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_INVALID_PARAMS, 'WsTmq SeekToEnd params is error!');
+            throw new wsError_1.TaosResultError(wsError_1.ErrorCode.ERR_INVALID_PARAMS, "WsTmq SeekToEnd params is error!");
         }
         return await this.seekToBeginOrEnd(partitions, false);
     }
@@ -227,19 +227,20 @@ class WsConsumer {
     }
     async fetchBlockData(pollResp, taosResult) {
         let fetchMsg = {
-            action: 'fetch_raw_data',
+            action: "fetch_raw_data",
             args: {
                 req_id: reqid_1.ReqId.getReqID(),
                 message_id: pollResp.message_id,
             },
         };
         let jsonStr = json_bigint_1.default.stringify(fetchMsg);
-        log_1.default.debug('[wsQueryInterface.fetch.fetchMsg]===>' + jsonStr);
+        log_1.default.debug("[wsQueryInterface.fetch.fetchMsg]===>" + jsonStr);
         let result = await this._wsClient.sendMsg(jsonStr);
         let wsResponse = new wsResponse_1.WSFetchBlockResponse(result.msg);
         if (wsResponse && wsResponse.data && wsResponse.blockLen > 0) {
             let wsTmqResponse = new tmqResponse_1.WSTmqFetchBlockInfo(wsResponse.data, taosResult);
-            log_1.default.debug('[WSTmqFetchBlockInfo.fetchBlockData]===>' + wsTmqResponse.taosResult);
+            log_1.default.debug("[WSTmqFetchBlockInfo.fetchBlockData]===>" +
+                wsTmqResponse.taosResult);
             if (wsTmqResponse.rows > 0) {
                 return true;
             }
@@ -260,7 +261,8 @@ class WsConsumer {
         let taosResult = new tmqResponse_1.TaosTmqResult(pollResp);
         var taosResults = new Map();
         taosResults.set(pollResp.topic, taosResult);
-        if (!pollResp.have_message || pollResp.message_type != constant_1.TMQMessageType.ResDataType) {
+        if (!pollResp.have_message ||
+            pollResp.message_type != constant_1.TMQMessageType.ResDataType) {
             return taosResults;
         }
         this._lastMessageID = pollResp.message_id;
@@ -275,8 +277,8 @@ class WsConsumer {
             action: constant_1.TMQMessageType.GetTopicAssignment,
             args: {
                 req_id: reqid_1.ReqId.getReqID(),
-                topic: topic
-            }
+                topic: topic,
+            },
         };
         let resp = await this._wsClient.exec(JSON.stringify(queryMsg), false);
         let assignmentInfo = new tmqResponse_1.AssignmentResp(resp, queryMsg.args.topic);
@@ -293,7 +295,7 @@ class WsConsumer {
                 allp.push(this.sendAssignmentReq(topics[i]));
             }
             let result = await Promise.all(allp);
-            result.forEach(e => {
+            result.forEach((e) => {
                 topicPartitions.push(...e);
             });
         }
@@ -301,18 +303,18 @@ class WsConsumer {
     }
     async seekToBeginOrEnd(partitions, bBegin = true) {
         let topics = [];
-        partitions.forEach(e => {
+        partitions.forEach((e) => {
             topics.push(e.topic);
         });
         let topicPartitions = await this.assignment(topics);
         let itemMap = topicPartitions.reduce((map, obj) => {
-            map.set(obj.topic + '_' + obj.vgroup_id, obj);
+            map.set(obj.topic + "_" + obj.vgroup_id, obj);
             return map;
         }, new Map());
         const allp = [];
         for (let i in partitions) {
-            if (itemMap.has(partitions[i].topic + '_' + partitions[i].vgroup_id)) {
-                let topicPartition = itemMap.get(partitions[i].topic + '_' + partitions[i].vgroup_id);
+            if (itemMap.has(partitions[i].topic + "_" + partitions[i].vgroup_id)) {
+                let topicPartition = itemMap.get(partitions[i].topic + "_" + partitions[i].vgroup_id);
                 if (topicPartition) {
                     if (bBegin) {
                         topicPartition.offset = topicPartition.begin;

package/lib/test/bulkPulling/cloud.tmq.test.js

@@ -11,8 +11,8 @@ beforeAll(async () => {
     let wsSql = null;
     try {
         const conf = new config_1.WSConfig(url);
-        conf.setUser('root');
-        conf.setPwd('taosdata');
+        conf.setUser("root");
+        conf.setPwd("taosdata");
         wsSql = await wsSql_1.WsSql.open(conf);
         let sql = `INSERT INTO dmeters.d1001 USING dmeters.meters (groupid, location) TAGS(2, 'SanFrancisco')
             VALUES (NOW + 1a, 10.30000, 219, 0.31000) (NOW + 2a, 12.60000, 218, 0.33000) (NOW + 3a, 12.30000, 221, 0.31000)
@@ -31,21 +31,21 @@ beforeAll(async () => {
         }
     }
 });
-describe('TDWebSocket.Tmq()', () => {
+describe("TDWebSocket.Tmq()", () => {
     jest.setTimeout(20 * 1000);
-    test('normal connect', async () => {
+    test("normal connect", async () => {
         const url = `wss://${process.env.TDENGINE_CLOUD_URL}?token=${process.env.TDENGINE_CLOUD_TOKEN}`;
-        const topic = 'topic_meters';
+        const topic = "topic_meters";
         const topics = [topic];
-        const groupId = 'group1';
-        const clientId = 'client1';
+        const groupId = "group1";
+        const clientId = "client1";
         let configMap = new Map([
             [constant_1.TMQConstants.GROUP_ID, groupId],
             [constant_1.TMQConstants.CLIENT_ID, clientId],
-            [constant_1.TMQConstants.AUTO_OFFSET_RESET, 'earliest'],
+            [constant_1.TMQConstants.AUTO_OFFSET_RESET, "earliest"],
             [constant_1.TMQConstants.WS_URL, url],
-            [constant_1.TMQConstants.ENABLE_AUTO_COMMIT, 'true'],
-            [constant_1.TMQConstants.AUTO_COMMIT_INTERVAL_MS, '1000'],
+            [constant_1.TMQConstants.ENABLE_AUTO_COMMIT, "true"],
+            [constant_1.TMQConstants.AUTO_COMMIT_INTERVAL_MS, "1000"],
         ]);
         (0, log_1.setLevel)("debug");
         // create consumer
@@ -68,7 +68,7 @@ describe('TDWebSocket.Tmq()', () => {
         // seek
         let assignment = await consumer.assignment();
         await consumer.seekToBeginning(assignment);
-        console.log('Assignment seek to beginning successfully');
+        console.log("Assignment seek to beginning successfully");
         // clean
         await consumer.unsubscribe();
         await consumer.close();

package/lib/test/bulkPulling/decimal.test.js

@@ -7,45 +7,69 @@ const utils_1 = require("../utils");
 const log_1 = require("../../src/common/log");
 const constant_1 = require("../../src/tmq/constant");
 const wsTmq_1 = require("../../src/tmq/wsTmq");
-let dns = 'ws://localhost:6041';
+let dns = "ws://localhost:6041";
 let createTopic = `create topic if not exists topic_decimal_test as select * from power.decimal_test`;
 let dropTopic = `DROP TOPIC IF EXISTS topic_decimal_test;`;
 (0, log_1.setLevel)("debug");
 beforeAll(async () => {
     let conf = new config_1.WSConfig(dns);
-    conf.setUser('root');
-    conf.setPwd('taosdata');
+    conf.setUser("root");
+    conf.setPwd("taosdata");
     let wsSql = await wsSql_1.WsSql.open(conf);
     await wsSql.exec(dropTopic);
-    await wsSql.exec('drop database if exists power');
-    await wsSql.exec('create database if not exists power KEEP 3650 DURATION 10 BUFFER 16 WAL_LEVEL 1;');
+    await wsSql.exec("drop database if exists power");
+    await wsSql.exec("create database if not exists power KEEP 3650 DURATION 10 BUFFER 16 WAL_LEVEL 1;");
     await (0, utils_1.Sleep)(100);
-    await wsSql.exec('use power');
-    await wsSql.exec('CREATE STABLE if not exists decimal_test (ts timestamp, dec64 decimal(10,6), dec128 decimal(24,10), int1 int) TAGS (location binary(64), groupId int);');
+    await wsSql.exec("use power");
+    await wsSql.exec("CREATE STABLE if not exists decimal_test (ts timestamp, dec64 decimal(10,6), dec128 decimal(24,10), int1 int) TAGS (location binary(64), groupId int);");
     await wsSql.exec(createTopic);
     await wsSql.close();
 });
 const expectedResultsMap = new Map([
-    ['-1234.654321', { dec128: '-123456789012.0987654321', int1: 3, location: 'California', groupId: 3 }],
-    ['-0.000654', { dec128: '-0.0009876543', int1: 2, location: 'California', groupId: 3 }],
-    ['9876.123456', { dec128: '1234567890.0987654321', int1: 1, location: 'California', groupId: 3 }]
+    [
+        "-1234.654321",
+        {
+            dec128: "-123456789012.0987654321",
+            int1: 3,
+            location: "California",
+            groupId: 3,
+        },
+    ],
+    [
+        "-0.000654",
+        {
+            dec128: "-0.0009876543",
+            int1: 2,
+            location: "California",
+            groupId: 3,
+        },
+    ],
+    [
+        "9876.123456",
+        {
+            dec128: "1234567890.0987654321",
+            int1: 1,
+            location: "California",
+            groupId: 3,
+        },
+    ],
 ]);
-describe('TDWebSocket.WsSql()', () => {
+describe("TDWebSocket.WsSql()", () => {
     jest.setTimeout(20 * 1000);
-    test('insert recoder', async () => {
+    test("insert recoder", async () => {
         let conf = new config_1.WSConfig(dns);
-        conf.setUser('root');
-        conf.setPwd('taosdata');
+        conf.setUser("root");
+        conf.setPwd("taosdata");
         let wsSql = await wsSql_1.WsSql.open(conf);
-        let taosResult = await wsSql.exec('use power');
+        let taosResult = await wsSql.exec("use power");
         console.log(taosResult);
         expect(taosResult).toBeTruthy();
-        taosResult = await wsSql.exec('describe decimal_test');
+        taosResult = await wsSql.exec("describe decimal_test");
         console.log(taosResult);
         taosResult = await wsSql.exec('INSERT INTO d1001 USING decimal_test (location, groupid) TAGS ("California", 3) VALUES (NOW, "9876.123456", "1234567890.0987654321", 1) (NOW + 1a, "-0.000654", "-0.0009876543", 2) (NOW + 2a, "-1234.654321", "-123456789012.0987654321", 3)');
         console.log(taosResult);
         expect(taosResult.getAffectRows()).toBeGreaterThanOrEqual(3);
-        let wsRows = await wsSql.query('select * from decimal_test');
+        let wsRows = await wsSql.query("select * from decimal_test");
         expect(wsRows).toBeTruthy();
         let meta = wsRows.getMeta();
         expect(meta).toBeTruthy();
@@ -69,22 +93,22 @@ describe('TDWebSocket.WsSql()', () => {
         expect(count).toBe(3);
     });
 });
-test('normal Subscribe', async () => {
+test("normal Subscribe", async () => {
     let configMap = new Map([
         [constant_1.TMQConstants.GROUP_ID, "gId"],
         [constant_1.TMQConstants.CONNECT_USER, "root"],
         [constant_1.TMQConstants.CONNECT_PASS, "taosdata"],
         [constant_1.TMQConstants.AUTO_OFFSET_RESET, "earliest"],
-        [constant_1.TMQConstants.CLIENT_ID, 'test_tmq_client'],
+        [constant_1.TMQConstants.CLIENT_ID, "test_tmq_client"],
         [constant_1.TMQConstants.WS_URL, dns],
-        [constant_1.TMQConstants.ENABLE_AUTO_COMMIT, 'true'],
-        [constant_1.TMQConstants.AUTO_COMMIT_INTERVAL_MS, '1000'],
+        [constant_1.TMQConstants.ENABLE_AUTO_COMMIT, "true"],
+        [constant_1.TMQConstants.AUTO_COMMIT_INTERVAL_MS, "1000"],
         ["session.timeout.ms", "10000"],
         ["max.poll.interval.ms", "30000"],
-        ["msg.with.table.name", "true"]
+        ["msg.with.table.name", "true"],
     ]);
     let consumer = await wsTmq_1.WsConsumer.newConsumer(configMap);
-    await consumer.subscribe(['topic_decimal_test']);
+    await consumer.subscribe(["topic_decimal_test"]);
     let assignment = await consumer.assignment();
     console.log(assignment);
     let useTime = [];
@@ -119,11 +143,11 @@ test('normal Subscribe', async () => {
 });
 afterAll(async () => {
     let conf = new config_1.WSConfig(dns);
-    conf.setUser('root');
-    conf.setPwd('taosdata');
+    conf.setUser("root");
+    conf.setPwd("taosdata");
     let wsSql = await wsSql_1.WsSql.open(conf);
     await wsSql.exec(dropTopic);
-    await wsSql.exec('drop database power');
+    await wsSql.exec("drop database power");
     await wsSql.close();
     wsConnectorPool_1.WebSocketConnectionPool.instance().destroyed();
 });

package/lib/test/bulkPulling/log.test.js

@@ -34,20 +34,20 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 const log_1 = __importStar(require("../../src/common/log"));
-describe('log level print', () => {
-    test('normal connect', async () => {
-        log_1.default.info('log level is info');
-        log_1.default.debug('log level is debug');
-        log_1.default.error('log level is error');
+describe("log level print", () => {
+    test("normal connect", async () => {
+        log_1.default.info("log level is info");
+        log_1.default.debug("log level is debug");
+        log_1.default.error("log level is error");
         let isLevel = log_1.default.isLevelEnabled("info");
         expect(isLevel).toEqual(true);
         (0, log_1.setLevel)("debug");
-        log_1.default.debug('log level is debug');
+        log_1.default.debug("log level is debug");
         isLevel = log_1.default.isLevelEnabled("debug");
         expect(isLevel).toEqual(true);
         (0, log_1.setLevel)("error");
-        log_1.default.error('log level is error');
-        log_1.default.debug('log level is debug');
+        log_1.default.error("log level is error");
+        log_1.default.debug("log level is debug");
         isLevel = log_1.default.isLevelEnabled("error");
         expect(isLevel).toEqual(true);
     });