@tdengine/websocket 3.1.0 → 3.1.2

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

@@ -15,8 +15,9 @@ const topics = ['topic_ws_bean'];
 let createTopic = `create topic if not exists ${topics[0]} as select * from ${db}.${stable}`;
 let dropTopic = `DROP TOPIC IF EXISTS ${topics[0]};`;
 // let dropTopic2 = `DROP TOPIC IF EXISTS ${topic2};`
+let dsn = 'ws://root:taosdata@localhost:6041';
+let tmqDsn = 'ws://localhost:6041';
 beforeAll(async () => {
-    let dsn = 'ws://root:taosdata@localhost:6041';
     let conf = new config_1.WSConfig(dsn);
     const createDB = `create database if not exists ${db} keep 3650`;
     const dropDB = `drop database if exists ${db}`;
@@ -59,7 +60,7 @@ describe('TDWebSocket.Tmq()', () => {
         [constant_1.TMQConstants.CONNECT_PASS, "taosdata"],
         [constant_1.TMQConstants.AUTO_OFFSET_RESET, "earliest"],
         [constant_1.TMQConstants.CLIENT_ID, 'test_tmq_client'],
-        [constant_1.TMQConstants.WS_URL, 'ws://localhost:6041'],
+        [constant_1.TMQConstants.WS_URL, tmqDsn],
         [constant_1.TMQConstants.ENABLE_AUTO_COMMIT, 'true'],
         [constant_1.TMQConstants.AUTO_COMMIT_INTERVAL_MS, '1000']
     ]);
@@ -77,7 +78,7 @@ describe('TDWebSocket.Tmq()', () => {
             [constant_1.TMQConstants.CONNECT_PASS, "test"],
             [constant_1.TMQConstants.AUTO_OFFSET_RESET, "earliest1"],
             [constant_1.TMQConstants.CLIENT_ID, 'test_tmq_client'],
-            [constant_1.TMQConstants.WS_URL, 'ws://localhost:6041'],
+            [constant_1.TMQConstants.WS_URL, tmqDsn],
             [constant_1.TMQConstants.ENABLE_AUTO_COMMIT, 'true'],
             [constant_1.TMQConstants.AUTO_COMMIT_INTERVAL_MS, '1000']
         ]);
@@ -100,7 +101,7 @@ describe('TDWebSocket.Tmq()', () => {
         await consumer.subscribe(topics);
         let assignment = await consumer.assignment();
         console.log(assignment);
-        let counts = [0, 0];
+        let counts = 0;
         let useTime = [];
         for (let i = 0; i < 5; i++) {
             let startTime = new Date().getTime();
@@ -108,13 +109,14 @@ describe('TDWebSocket.Tmq()', () => {
             let currTime = new Date().getTime();
             useTime.push(Math.abs(currTime - startTime));
             for (let [key, value] of res) {
+                console.log(key, value.getMeta());
                 let data = value.getData();
-                if (data) {
-                    counts[0] += data.length;
+                if (data == null || data.length == 0) {
+                    break;
+                }
+                for (let record of data) {
+                    console.log("-----===>>", record);
                 }
-            }
-            if (res.size == 0) {
-                break;
             }
             // await Sleep(100)
         }
@@ -125,25 +127,30 @@ describe('TDWebSocket.Tmq()', () => {
             let currTime = new Date().getTime();
             useTime.push(Math.abs(currTime - startTime));
             for (let [key, value] of res) {
+                console.log(key, value.getMeta());
                 let data = value.getData();
-                if (data) {
-                    counts[1] += data.length;
+                if (data == null || data.length == 0) {
+                    break;
                 }
-            }
-            if (res.size == 0) {
-                break;
+                counts += data.length;
             }
             // await Sleep(100)
         }
+        let topicArray = await consumer.subscription();
+        expect(topics.length).toEqual(topicArray.length);
+        for (let index = 0; index < topicArray.length; index++) {
+            expect(topics[index]).toEqual(topicArray[index]);
+        }
         assignment = await consumer.commit();
         console.log(assignment);
         assignment = await consumer.committed(assignment);
+        assignment = await consumer.commitOffsets(assignment);
         console.log(assignment);
         await consumer.unsubscribe();
         await consumer.close();
         console.log("------------->", useTime);
         console.log("------------->", counts);
-        expect(counts).toEqual([10, 10]);
+        expect(counts).toEqual(10);
     });
     test('Topic not exist', async () => {
         let consumer = await wsTmq_1.WsConsumer.newConsumer(configMap);

package/lib/test/bulkPulling/wsConnectPool.test.js

@@ -6,6 +6,7 @@ const reqid_1 = require("../../src/common/reqid");
 const wsSql_1 = require("../../src/sql/wsSql");
 const constant_1 = require("../../src/tmq/constant");
 const wsTmq_1 = require("../../src/tmq/wsTmq");
+let dsn = 'ws://root:taosdata@localhost:6041';
 let tags = ['California.SanFrancisco', 3];
 let multi = [
     [1709183268567, 1709183268568, 1709183268569],
@@ -78,7 +79,14 @@ async function tmqConnect() {
         await consumer.subscribe(topics);
         let res = await consumer.poll(500);
         for (let [key, value] of res) {
-            console.log(key, value);
+            console.log(key, value.getMeta());
+            let data = value.getData();
+            if (data == null || data.length == 0) {
+                break;
+            }
+            for (let record of data) {
+                console.log(record);
+            }
         }
         await consumer.commit();
         let assignment = await consumer.assignment();
@@ -97,7 +105,6 @@ async function tmqConnect() {
     }
 }
 beforeAll(async () => {
-    let dsn = 'ws://root:taosdata@localhost:6041';
     let conf = new config_1.WSConfig(dsn);
     let ws = await wsSql_1.WsSql.open(conf);
     await ws.exec(createTopic, reqid_1.ReqId.getReqID());

package/lib/test/utils.d.ts

@@ -13,6 +13,5 @@ export declare function createSTableJSON(stable: string): string;
 export declare function createTable(table: string): string;
 export declare function expectStableData(rows: Array<Array<any>>, tags: Array<any>): Array<Array<any>>;
 export declare function hexToBytes(hex: string): ArrayBuffer;
-export declare function createStmtData(varbinary?: string, geoHex?: string): Array<Array<any>>;
 export declare function compareUint8Arrays(arr1: Uint8Array, arr2: Uint8Array): boolean;
 //# sourceMappingURL=utils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../test/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAIxD,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAapG;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,GAAE,MAAgB,GAAG,MAAM,CAkCzH;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAqB7E;AAGD,eAAO,MAAM,SAAS,EAAE,KAAK,CAAC,YAAY,CAsFzC,CAAA;AAED,eAAO,MAAM,QAAQ,EAAE,KAAK,CAAC,YAAY,CAMxC,CAAA;AACD,eAAO,MAAM,OAAO,EAAE,KAAK,CAAC,YAAY,CAkEvC,CAAA;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAGvD;AACD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAG3D;AACD,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAErD;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAGnD;AACD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAGvD;AACD,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEjD;AAID,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAM7F;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAQnD;AAED,wBAAgB,cAAc,CAAC,SAAS,GAAC,MAAa,EAClD,MAAM,GAAC,MAA6D,GAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAgB1F;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAY9E"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../test/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAIxD,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAapG;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,GAAE,MAAgB,GAAG,MAAM,CAkCzH;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAqB7E;AAGD,eAAO,MAAM,SAAS,EAAE,KAAK,CAAC,YAAY,CAsFzC,CAAA;AAED,eAAO,MAAM,QAAQ,EAAE,KAAK,CAAC,YAAY,CAMxC,CAAA;AACD,eAAO,MAAM,OAAO,EAAE,KAAK,CAAC,YAAY,CAkEvC,CAAA;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAGvD;AACD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAG3D;AACD,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAErD;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAGnD;AACD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAGvD;AACD,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEjD;AAID,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAM7F;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAQnD;AAqBD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAY9E"}

package/lib/test/utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compareUint8Arrays = exports.createStmtData = exports.hexToBytes = exports.expectStableData = exports.createTable = exports.createSTableJSON = exports.createSTable = exports.createBaseTable = exports.createBaseSTableJSON = exports.createBaseSTable = exports.tagMeta = exports.jsonMeta = exports.tableMeta = exports.insertNTable = exports.insertStable = exports.getInsertBind = void 0;
+exports.compareUint8Arrays = exports.hexToBytes = exports.expectStableData = exports.createTable = exports.createSTableJSON = exports.createSTable = exports.createBaseTable = exports.createBaseSTableJSON = exports.createBaseSTable = exports.tagMeta = exports.jsonMeta = exports.tableMeta = exports.insertNTable = exports.insertStable = exports.getInsertBind = void 0;
 const log_1 = __importDefault(require("../src/common/log"));
 function getInsertBind(valuesLen, tagsLen, db, stable) {
     let sql = `insert into ? using ${db}.${stable} tags ( ?`;
@@ -286,22 +286,22 @@ function hexToBytes(hex) {
     return a.buffer;
 }
 exports.hexToBytes = hexToBytes;
-function createStmtData(varbinary = "ab", geoHex = "0101000020E6100000000000000000F03F0000000000000040") {
-    let multi = [
-        [1709183268567, 1709183268568, 1709183268569],
-        [10.2, 10.3, 10.4],
-        [292, 293, 294],
-        [0.32, 0.33, 0.34],
-    ];
-    let res = hexToBytes(geoHex);
-    let geom = Array.from(new Uint8Array(res));
-    multi.push([geom, geom, geom]);
-    res = new TextEncoder().encode(varbinary);
-    let binary = Array.from(new Uint8Array(res));
-    multi.push([binary, binary, binary]);
-    return multi;
-}
-exports.createStmtData = createStmtData;
+// export function createStmtData(varbinary:string = "ab", 
+//     geoHex:string = "0101000020E6100000000000000000F03F0000000000000040"):Array<Array<any>> {
+//     let multi:any[][] = [
+//         [1709183268567, 1709183268568, 1709183268569],
+//         [10.2, 10.3, 10.4],
+//         [292, 293, 294],
+//         [0.32, 0.33, 0.34],
+//         ];
+//     let res = hexToBytes(geoHex)
+//     let geom = Array.from(new Uint8Array(res))
+//     multi.push([geom, geom, geom])
+//     res = new TextEncoder().encode(varbinary)
+//     let binary = Array.from(new Uint8Array(res))
+//     multi.push([binary, binary, binary])
+//     return multi
+// }
 function compareUint8Arrays(arr1, arr2) {
     if (arr1.length !== arr2.length) {
         log_1.default.debug(`${arr1.length} !== ${arr2.length}`);

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@tdengine/websocket",
-  "version": "3.1.0",
+  "version": "3.1.2",
   "description": "TDengine Connector for nodejs and browser using WebSocket.",
   "source": "index.ts",
   "main": "lib/index.js",
-  "module": "lib/module/index.mjs",
+  "module": "lib/index.js",
   "types": "lib/index.d.ts",
   "directories": {
     "example": "example",