@tdengine/websocket 3.1.0 → 3.1.1

package/lib/test/bulkPulling/stmt.func.test.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const wsConnectorPool_1 = require("../../src/client/wsConnectorPool");
 const config_1 = require("../../src/common/config");
 const wsSql_1 = require("../../src/sql/wsSql");
+let dns = 'ws://localhost:6041';
 beforeAll(async () => {
-    let dns = 'ws://localhost:6041';
     let conf = new config_1.WSConfig(dns);
     conf.setUser('root');
     conf.setPwd('taosdata');
@@ -27,10 +27,11 @@ describe('TDWebSocket.Stmt()', () => {
         [0.32, 0.33, 0.34],
     ];
     test('normal connect', async () => {
-        let dsn = 'ws://root:taosdata@localhost:6041';
-        let wsConf = new config_1.WSConfig(dsn);
-        wsConf.setDb('power');
-        let connector = await wsSql_1.WsSql.open(wsConf);
+        let conf = new config_1.WSConfig(dns);
+        conf.setUser('root');
+        conf.setPwd('taosdata');
+        conf.setDb('power');
+        let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
         expect(stmt).toBeTruthy();
         expect(connector.state()).toBeGreaterThan(0);
@@ -41,10 +42,11 @@ describe('TDWebSocket.Stmt()', () => {
         expect.assertions(1);
         let connector = null;
         try {
-            let dsn = 'ws://root:taosdata@localhost:6041';
-            let wsConf = new config_1.WSConfig(dsn);
-            wsConf.setDb('jest');
-            connector = await wsSql_1.WsSql.open(wsConf);
+            let conf = new config_1.WSConfig(dns);
+            conf.setUser('root');
+            conf.setPwd('taosdata');
+            conf.setDb('jest');
+            connector = await wsSql_1.WsSql.open(conf);
             let stmt = await connector.stmtInit();
             await stmt.close();
         }
@@ -59,10 +61,11 @@ describe('TDWebSocket.Stmt()', () => {
         }
     });
     test('normal Prepare', async () => {
-        let dsn = 'ws://root:taosdata@localhost:6041';
-        let wsConf = new config_1.WSConfig(dsn);
-        wsConf.setDb('power');
-        let connector = await wsSql_1.WsSql.open(wsConf);
+        let conf = new config_1.WSConfig(dns);
+        conf.setUser('root');
+        conf.setPwd('taosdata');
+        conf.setDb('power');
+        let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
         expect(stmt).toBeTruthy();
         expect(connector.state()).toBeGreaterThan(0);
@@ -76,10 +79,11 @@ describe('TDWebSocket.Stmt()', () => {
         await connector.close();
     });
     test('set tag error', async () => {
-        let dsn = 'ws://root:taosdata@localhost:6041';
-        let wsConf = new config_1.WSConfig(dsn);
-        wsConf.setDb('power');
-        let connector = await wsSql_1.WsSql.open(wsConf);
+        let conf = new config_1.WSConfig(dns);
+        conf.setUser('root');
+        conf.setPwd('taosdata');
+        conf.setDb('power');
+        let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
         expect(stmt).toBeTruthy();
         expect(connector.state()).toBeGreaterThan(0);
@@ -97,10 +101,11 @@ describe('TDWebSocket.Stmt()', () => {
         await connector.close();
     });
     test('error Prepare table', async () => {
-        let dsn = 'ws://root:taosdata@localhost:6041';
-        let wsConf = new config_1.WSConfig(dsn);
-        wsConf.setDb('power');
-        let connector = await wsSql_1.WsSql.open(wsConf);
+        let conf = new config_1.WSConfig(dns);
+        conf.setUser('root');
+        conf.setPwd('taosdata');
+        conf.setDb('power');
+        let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
         expect(stmt).toBeTruthy();
         expect(connector.state()).toBeGreaterThan(0);
@@ -116,10 +121,11 @@ describe('TDWebSocket.Stmt()', () => {
         await connector.close();
     });
     test('error Prepare tag', async () => {
-        let dsn = 'ws://root:taosdata@localhost:6041';
-        let wsConf = new config_1.WSConfig(dsn);
-        wsConf.setDb('power');
-        let connector = await wsSql_1.WsSql.open(wsConf);
+        let conf = new config_1.WSConfig(dns);
+        conf.setUser('root');
+        conf.setPwd('taosdata');
+        conf.setDb('power');
+        let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
         expect(stmt).toBeTruthy();
         expect(connector.state()).toBeGreaterThan(0);
@@ -135,12 +141,11 @@ describe('TDWebSocket.Stmt()', () => {
         await connector.close();
     });
     test('normal BindParam', async () => {
-        let dsn = 'ws://root:taosdata@localhost:6041';
-        let wsConf = new config_1.WSConfig(dsn);
-        wsConf.setDb('power');
-        // let connector = WsStmtConnect.NewConnector(wsConf) 
-        // let stmt = await connector.Init()
-        let connector = await wsSql_1.WsSql.open(wsConf);
+        let conf = new config_1.WSConfig(dns);
+        conf.setUser('root');
+        conf.setPwd('taosdata');
+        conf.setDb('power');
+        let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
         expect(stmt).toBeTruthy();
         await stmt.prepare('INSERT INTO ? USING power.meters (location, groupId) TAGS (?, ?) VALUES (?, ?, ?, ?)');
@@ -172,10 +177,11 @@ describe('TDWebSocket.Stmt()', () => {
         await connector.close();
     });
     test('error BindParam', async () => {
-        let dsn = 'ws://root:taosdata@localhost:6041';
-        let wsConf = new config_1.WSConfig(dsn);
-        wsConf.setDb('power');
-        let connector = await wsSql_1.WsSql.open(wsConf);
+        let conf = new config_1.WSConfig(dns);
+        conf.setUser('root');
+        conf.setPwd('taosdata');
+        conf.setDb('power');
+        let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
         expect(stmt).toBeTruthy();
         expect(connector.state()).toBeGreaterThan(0);
@@ -209,10 +215,11 @@ describe('TDWebSocket.Stmt()', () => {
         await connector.close();
     });
     test('no Batch', async () => {
-        let dsn = 'ws://root:taosdata@localhost:6041';
-        let wsConf = new config_1.WSConfig(dsn);
-        wsConf.setDb('power');
-        let connector = await wsSql_1.WsSql.open(wsConf);
+        let conf = new config_1.WSConfig(dns);
+        conf.setUser('root');
+        conf.setPwd('taosdata');
+        conf.setDb('power');
+        let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
         expect(stmt).toBeTruthy();
         expect(connector.state()).toBeGreaterThan(0);
@@ -245,10 +252,11 @@ describe('TDWebSocket.Stmt()', () => {
         await connector.close();
     });
     test('Batch after BindParam', async () => {
-        let dsn = 'ws://root:taosdata@localhost:6041';
-        let wsConf = new config_1.WSConfig(dsn);
-        wsConf.setDb('power');
-        let connector = await wsSql_1.WsSql.open(wsConf);
+        let conf = new config_1.WSConfig(dns);
+        conf.setUser('root');
+        conf.setPwd('taosdata');
+        conf.setDb('power');
+        let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
         expect(stmt).toBeTruthy();
         expect(connector.state()).toBeGreaterThan(0);
@@ -277,6 +285,11 @@ describe('TDWebSocket.Stmt()', () => {
         dataParams.setFloat(multi1[3]);
         await stmt.bind(dataParams);
         await stmt.batch();
+        await stmt.setTableName('d1002');
+        params = stmt.newStmtParam();
+        params.setVarchar(['SanFrancisco']);
+        params.setInt([5]);
+        await stmt.setTags(params);
         dataParams = stmt.newStmtParam();
         dataParams.setTimestamp(multi2[0]);
         dataParams.setFloat(multi2[1]);
@@ -290,10 +303,11 @@ describe('TDWebSocket.Stmt()', () => {
         await connector.close();
     });
     test('no set tag', async () => {
-        let dsn = 'ws://root:taosdata@localhost:6041';
-        let wsConf = new config_1.WSConfig(dsn);
-        wsConf.setDb('power');
-        let connector = await wsSql_1.WsSql.open(wsConf);
+        let conf = new config_1.WSConfig(dns);
+        conf.setUser('root');
+        conf.setPwd('taosdata');
+        conf.setDb('power');
+        let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
         expect(stmt).toBeTruthy();
         expect(connector.state()).toBeGreaterThan(0);
@@ -318,10 +332,11 @@ describe('TDWebSocket.Stmt()', () => {
         await connector.close();
     });
     test('normal binary BindParam', async () => {
-        let dsn = 'ws://root:taosdata@localhost:6041';
-        let wsConf = new config_1.WSConfig(dsn);
-        wsConf.setDb('power');
-        let connector = await wsSql_1.WsSql.open(wsConf);
+        let conf = new config_1.WSConfig(dns);
+        conf.setUser('root');
+        conf.setPwd('taosdata');
+        conf.setDb('power');
+        let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
         expect(stmt).toBeTruthy();
         expect(connector.state()).toBeGreaterThan(0);
@@ -345,10 +360,11 @@ describe('TDWebSocket.Stmt()', () => {
         await connector.close();
     });
     test('normal json BindParam', async () => {
-        let dsn = 'ws://root:taosdata@localhost:6041';
-        let wsConf = new config_1.WSConfig(dsn);
-        wsConf.setDb('power');
-        let connector = await wsSql_1.WsSql.open(wsConf);
+        let conf = new config_1.WSConfig(dns);
+        conf.setUser('root');
+        conf.setPwd('taosdata');
+        conf.setDb('power');
+        let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
         expect(stmt).toBeTruthy();
         expect(connector.state()).toBeGreaterThan(0);

package/lib/test/bulkPulling/stmt.type.test.js

@@ -70,8 +70,8 @@ const selectTable = `select * from ${table}`;
 const selectTableCN = `select * from ${tableCN}`;
 const selectJsonTable = `select * from ${jsonTable}`;
 const selectJsonTableCN = `select * from ${jsonTableCN}`;
+let dsn = 'ws://root:taosdata@localhost:6041';
 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(dropDB);
@@ -84,7 +84,6 @@ beforeAll(async () => {
 describe('TDWebSocket.Stmt()', () => {
     jest.setTimeout(20 * 1000);
     test('normal BindParam', async () => {
-        let dsn = 'ws://root:taosdata@localhost:6041';
         let wsConf = new config_1.WSConfig(dsn);
         wsConf.setDb(db);
         let connector = await wsSql_1.WsSql.open(wsConf);
@@ -136,7 +135,6 @@ describe('TDWebSocket.Stmt()', () => {
         await connector.close();
     });
     test('normal CN BindParam', async () => {
-        let dsn = 'ws://root:taosdata@localhost:6041';
         let wsConf = new config_1.WSConfig(dsn);
         wsConf.setDb(db);
         let connector = await wsSql_1.WsSql.open(wsConf);
@@ -188,7 +186,6 @@ describe('TDWebSocket.Stmt()', () => {
         await connector.close();
     });
     test('normal json tag BindParam', async () => {
-        let dsn = 'ws://root:taosdata@localhost:6041';
         let wsConf = new config_1.WSConfig(dsn);
         wsConf.setDb(db);
         let connector = await wsSql_1.WsSql.open(wsConf);
@@ -228,7 +225,6 @@ describe('TDWebSocket.Stmt()', () => {
         await connector.close();
     });
     test('normal json cn tag BindParam', async () => {
-        let dsn = 'ws://root:taosdata@localhost:6041';
         let wsConf = new config_1.WSConfig(dsn);
         wsConf.setDb(db);
         let connector = await wsSql_1.WsSql.open(wsConf);

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,13 +127,12 @@ 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)
         }
@@ -143,7 +144,7 @@ describe('TDWebSocket.Tmq()', () => {
         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/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@tdengine/websocket",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "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",