@tdengine/websocket 3.1.8 → 3.2.0

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

@@ -0,0 +1,129 @@
+"use strict";
+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");
+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 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');
+    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 (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(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 }]
+]);
+describe('TDWebSocket.WsSql()', () => {
+    jest.setTimeout(20 * 1000);
+    test('insert recoder', async () => {
+        let conf = new config_1.WSConfig(dns);
+        conf.setUser('root');
+        conf.setPwd('taosdata');
+        let wsSql = await wsSql_1.WsSql.open(conf);
+        let taosResult = await wsSql.exec('use power');
+        console.log(taosResult);
+        expect(taosResult).toBeTruthy();
+        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');
+        expect(wsRows).toBeTruthy();
+        let meta = wsRows.getMeta();
+        expect(meta).toBeTruthy();
+        console.log("wsRow:meta:=>", meta);
+        let count = 0;
+        while (await wsRows.next()) {
+            let result = wsRows.getData();
+            if (result != null && result.length > 0) {
+                if (expectedResultsMap.has(result[1])) {
+                    console.log("result:=>", result);
+                    const expected = expectedResultsMap.get(result[1]);
+                    expect(result[2]).toBe(expected?.dec128);
+                    expect(result[3]).toBe(expected?.int1);
+                    expect(result[4]).toBe(expected?.location);
+                    expect(result[5]).toBe(expected?.groupId);
+                    count++;
+                }
+            }
+        }
+        await wsSql.close();
+        expect(count).toBe(3);
+    });
+});
+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.WS_URL, dns],
+        [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"]
+    ]);
+    let consumer = await wsTmq_1.WsConsumer.newConsumer(configMap);
+    await consumer.subscribe(['topic_decimal_test']);
+    let assignment = await consumer.assignment();
+    console.log(assignment);
+    let useTime = [];
+    let count = 0;
+    for (let i = 0; i < 5; i++) {
+        let startTime = new Date().getTime();
+        let res = await consumer.poll(500);
+        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 == null || data.length == 0) {
+                break;
+            }
+            for (let record of data) {
+                console.log("record:=----------->", record);
+                if (expectedResultsMap.has(record[1])) {
+                    const expected = expectedResultsMap.get(record[1]);
+                    expect(record[2]).toBe(expected?.dec128);
+                    expect(record[3]).toBe(expected?.int1);
+                    expect(record[4]).toBe(expected?.location);
+                    expect(record[5]).toBe(expected?.groupId);
+                    count++;
+                }
+            }
+        }
+    }
+    await consumer.unsubscribe();
+    await consumer.close();
+    expect(count).toBe(3);
+});
+afterAll(async () => {
+    let conf = new config_1.WSConfig(dns);
+    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.close();
+    wsConnectorPool_1.WebSocketConnectionPool.instance().destroyed();
+});

package/lib/test/bulkPulling/sql.test.js

@@ -14,11 +14,13 @@ beforeAll(async () => {
     conf.setUser('root');
     conf.setPwd('taosdata');
     let wsSql = await wsSql_1.WsSql.open(conf);
+    await wsSql.exec('drop database if exists sql_test');
+    await wsSql.exec('drop database if exists sql_create');
     await wsSql.exec(`CREATE USER user1 PASS '${password1}'`);
     await wsSql.exec(`CREATE USER user2 PASS '${password2}'`);
-    await wsSql.exec('create database if not exists power KEEP 3650 DURATION 10 BUFFER 16 WAL_LEVEL 1;');
+    await wsSql.exec('create database if not exists sql_test KEEP 3650 DURATION 10 BUFFER 16 WAL_LEVEL 1;');
     await (0, utils_1.Sleep)(100);
-    await wsSql.exec('use power');
+    await wsSql.exec('use sql_test');
     await wsSql.exec('CREATE STABLE if not exists meters (ts timestamp, current float, voltage int, phase float) TAGS (location binary(64), groupId int);');
     await wsSql.close();
 });
@@ -30,10 +32,18 @@ describe('TDWebSocket.WsSql()', () => {
         conf.setUrl(dns);
         conf.setUser('root');
         conf.setPwd('taosdata');
-        conf.setDb('power');
+        conf.setDb('sql_test');
+        conf.setTimezone('America/New_York');
         conf.setTimeOut(6000);
         wsSql = await wsSql_1.WsSql.open(conf);
         expect(wsSql.state()).toBeGreaterThan(0);
+        let wsRows = await wsSql.query('select timezone()');
+        while (await wsRows.next()) {
+            let result = wsRows.getData();
+            console.log(result);
+            expect(result).toBeTruthy();
+            expect(JSON.stringify(result)).toContain('America/New_York');
+        }
         await wsSql.close();
     });
     test('special characters connect1', async () => {
@@ -80,6 +90,22 @@ describe('TDWebSocket.WsSql()', () => {
             }
         }
     });
+    test('connect url', async () => {
+        let url = 'ws://root:taosdata@localhost:6041/information_schema?timezone=Asia/Shanghai';
+        let conf = new config_1.WSConfig(url);
+        let wsSql = await wsSql_1.WsSql.open(conf);
+        let version = await wsSql.version();
+        console.log(version);
+        expect(version).toBeTruthy();
+        let wsRows = await wsSql.query('select timezone()');
+        while (await wsRows.next()) {
+            let result = wsRows.getData();
+            console.log(result);
+            expect(result).toBeTruthy();
+            expect(JSON.stringify(result)).toContain('Asia/Shanghai');
+        }
+        await wsSql.close();
+    });
     test('get taosc version', async () => {
         let conf = new config_1.WSConfig(dns);
         conf.setUser('root');
@@ -105,7 +131,7 @@ describe('TDWebSocket.WsSql()', () => {
         conf.setUser('root');
         conf.setPwd('taosdata');
         let wsSql = await wsSql_1.WsSql.open(conf);
-        let taosResult = await wsSql.exec('create database if not exists power KEEP 3650 DURATION 10 BUFFER 16 WAL_LEVEL 1;');
+        let taosResult = await wsSql.exec('create database if not exists sql_create KEEP 3650 DURATION 10 BUFFER 16 WAL_LEVEL 1;');
         await wsSql.close();
         console.log(taosResult);
         expect(taosResult).toBeTruthy();
@@ -115,7 +141,7 @@ describe('TDWebSocket.WsSql()', () => {
         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 sql_test');
         console.log(taosResult);
         expect(taosResult).toBeTruthy();
         taosResult = await wsSql.exec('CREATE STABLE if not exists meters (ts timestamp, current float, voltage int, phase float) TAGS (location binary(64), groupId int);');
@@ -128,7 +154,7 @@ describe('TDWebSocket.WsSql()', () => {
         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 sql_test');
         console.log(taosResult);
         expect(taosResult).toBeTruthy();
         taosResult = await wsSql.exec('describe meters');
@@ -143,7 +169,7 @@ describe('TDWebSocket.WsSql()', () => {
         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 sql_test');
         console.log(taosResult);
         expect(taosResult).toBeTruthy();
         for (let i = 0; i < 10; i++) {
@@ -165,7 +191,7 @@ describe('TDWebSocket.WsSql()', () => {
         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 sql_test');
         console.log(taosResult);
         expect(taosResult).toBeTruthy();
         let wsRows = await wsSql.query('select * from meters');
@@ -178,7 +204,8 @@ afterAll(async () => {
     conf.setUser('root');
     conf.setPwd('taosdata');
     let wsSql = await wsSql_1.WsSql.open(conf);
-    await wsSql.exec('drop database power');
+    await wsSql.exec('drop database sql_test');
+    await wsSql.exec('drop database sql_create');
     await wsSql.exec('DROP USER user1;');
     await wsSql.exec('DROP USER user2;');
     await wsSql.close();

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

@@ -4,7 +4,7 @@ const wsConnectorPool_1 = require("../../src/client/wsConnectorPool");
 const config_1 = require("../../src/common/config");
 const log_1 = require("../../src/common/log");
 const wsSql_1 = require("../../src/sql/wsSql");
-let dns = 'ws://localhost:6041';
+let dns = 'ws://192.168.2.156:6041';
 (0, log_1.setLevel)("debug");
 beforeAll(async () => {
     let conf = new config_1.WSConfig(dns);
@@ -117,7 +117,7 @@ describe('TDWebSocket.Stmt()', () => {
         }
         catch (e) {
             let err = e;
-            expect(err.message).toMatch("syntax error near '? into ? using meters tags (?, ?) values (?, ?, ?, ?)' (keyword INTO is expected)");
+            expect(err.message).toMatch(/keyword INTO is expected|Syntax error in SQL/);
         }
         await stmt.close();
         await connector.close();
@@ -142,7 +142,7 @@ describe('TDWebSocket.Stmt()', () => {
         await stmt.close();
         await connector.close();
     });
-    test('normal BindParam', async () => {
+    test('Bind supper table', async () => {
         let conf = new config_1.WSConfig(dns);
         conf.setUser('root');
         conf.setPwd('taosdata');
@@ -150,14 +150,45 @@ describe('TDWebSocket.Stmt()', () => {
         let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
         expect(stmt).toBeTruthy();
-        await stmt.prepare('INSERT INTO ? USING meters (location, groupId) TAGS (?, ?) VALUES (?, ?, ?, ?)');
-        await stmt.setTableName('d1001');
+        await stmt.prepare('INSERT INTO meters (ts, tbname, current, voltage, phase, location, groupId) VALUES (?, ?, ?, ?, ?, ?, ?)');
+        let lastTs = 0;
+        for (let i = 0; i < 10; i++) {
+            for (let j = 0; j < multi[0].length; j++) {
+                multi[0][j] = multi[0][0] + j;
+                lastTs = multi[0][j];
+            }
+            let dataParams = stmt.newStmtParam();
+            dataParams.setTimestamp(multi[0]);
+            dataParams.setVarchar([`d1001`, `d1002`, `d1003`]);
+            dataParams.setFloat(multi[1]);
+            dataParams.setInt(multi[2]);
+            dataParams.setFloat(multi[3]);
+            dataParams.setVarchar(['SanFrancisco_1', 'SanFrancisco_2', 'SanFrancisco_3']);
+            dataParams.setInt([1, 2, 3]);
+            await stmt.bind(dataParams);
+            multi[0][0] = lastTs + 1;
+        }
+        await stmt.batch();
+        await stmt.exec();
+        expect(stmt.getLastAffected()).toEqual(30);
+        await stmt.close();
+        await connector.close();
+    });
+    test('Bind a single table', async () => {
+        let conf = new config_1.WSConfig(dns);
+        conf.setUser('root');
+        conf.setPwd('taosdata');
+        conf.setDb('power_stmt');
+        let connector = await wsSql_1.WsSql.open(conf);
+        let stmt = await connector.stmtInit();
+        expect(stmt).toBeTruthy();
+        await stmt.prepare('INSERT INTO ? USING meters (location, groupId) TAGS (?, ?) (ts, current, voltage, phase) VALUES (?, ?, ?, ?)');
+        await stmt.setTableName('power_stmt.d1001');
         let params = stmt.newStmtParam();
         params.setVarchar(['SanFrancisco']);
-        params.setInt([7]);
+        params.setInt([1]);
         await stmt.setTags(params);
         let lastTs = 0;
-        const allp = [];
         for (let i = 0; i < 10; i++) {
             for (let j = 0; j < multi[0].length; j++) {
                 multi[0][j] = multi[0][0] + j;
@@ -168,16 +199,73 @@ describe('TDWebSocket.Stmt()', () => {
             dataParams.setFloat(multi[1]);
             dataParams.setInt(multi[2]);
             dataParams.setFloat(multi[3]);
-            allp.push(stmt.bind(dataParams));
+            await stmt.bind(dataParams);
             multi[0][0] = lastTs + 1;
         }
-        await Promise.all(allp);
         await stmt.batch();
         await stmt.exec();
         expect(stmt.getLastAffected()).toEqual(30);
         await stmt.close();
         await connector.close();
     });
+    test('Bind multiple tables', async () => {
+        let conf = new config_1.WSConfig(dns);
+        conf.setUser('root');
+        conf.setPwd('taosdata');
+        conf.setDb('power_stmt');
+        let connector = await wsSql_1.WsSql.open(conf);
+        let stmt = await connector.stmtInit();
+        expect(stmt).toBeTruthy();
+        await stmt.prepare('INSERT INTO ? USING meters (location, groupId) TAGS (?, ?) (ts, current, voltage, phase) VALUES (?, ?, ?, ?)');
+        let lastTs = 0;
+        for (let i = 0; i < 10; i++) {
+            for (let j = 0; j < multi[0].length; j++) {
+                multi[0][j] = multi[0][0] + j;
+                lastTs = multi[0][j];
+            }
+            await stmt.setTableName(`power_stmt.d100${i + 1}`);
+            let params = stmt.newStmtParam();
+            params.setVarchar([`SanFrancisco${i + 1}`]);
+            params.setInt([i + 1]);
+            await stmt.setTags(params);
+            let dataParams = stmt.newStmtParam();
+            dataParams.setTimestamp(multi[0]);
+            dataParams.setFloat(multi[1]);
+            dataParams.setInt(multi[2]);
+            dataParams.setFloat(multi[3]);
+            await stmt.bind(dataParams);
+            multi[0][0] = lastTs + 1;
+        }
+        await stmt.batch();
+        await stmt.exec();
+        expect(stmt.getLastAffected()).toEqual(30);
+        await stmt.close();
+        await connector.close();
+    });
+    test('query bind', async () => {
+        let conf = new config_1.WSConfig(dns);
+        conf.setUser('root');
+        conf.setPwd('taosdata');
+        conf.setDb('power_stmt');
+        let connector = await wsSql_1.WsSql.open(conf);
+        let stmt = await connector.stmtInit();
+        expect(stmt).toBeTruthy();
+        await stmt.prepare('select * from meters where ts > ? and ts < ?');
+        let dataParams = stmt.newStmtParam();
+        dataParams.setTimestamp([1709183268565]);
+        dataParams.setTimestamp([1709183268569]);
+        await stmt.bind(dataParams);
+        await stmt.exec();
+        let wsRows = await stmt.resultSet();
+        while (await wsRows.next()) {
+            let result = await wsRows.getData();
+            console.log(result);
+            expect(result).toBeTruthy();
+        }
+        await wsRows.close();
+        await stmt.close();
+        await connector.close();
+    });
     test('error BindParam', async () => {
         let conf = new config_1.WSConfig(dns);
         conf.setUser('root');
@@ -211,7 +299,7 @@ describe('TDWebSocket.Stmt()', () => {
         }
         catch (e) {
             let err = e;
-            expect(err.message).toMatch("wrong row length");
+            expect(err.message).toMatch(/wrong row length|bind data length error/);
         }
         await stmt.close();
         await connector.close();
@@ -328,7 +416,7 @@ describe('TDWebSocket.Stmt()', () => {
         }
         catch (e) {
             let err = e;
-            expect(err.message).toMatch("Retry needed");
+            expect(err.message).toMatch(/Retry needed|Tags are empty/);
         }
         await stmt.close();
         await connector.close();

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const wsConnectorPool_1 = require("../../src/client/wsConnectorPool");
 const config_1 = require("../../src/common/config");
+const log_1 = require("../../src/common/log");
 const wsSql_1 = require("../../src/sql/wsSql");
 const utils_1 = require("../utils");
 const stable = 'ws_stmt_stb';
@@ -70,7 +71,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';
+let dsn = 'ws://root:taosdata@192.168.2.156:6041';
+(0, log_1.setLevel)("debug");
 beforeAll(async () => {
     let conf = new config_1.WSConfig(dsn);
     let ws = await wsSql_1.WsSql.open(conf);
@@ -87,7 +89,7 @@ describe('TDWebSocket.Stmt()', () => {
         let wsConf = new config_1.WSConfig(dsn);
         wsConf.setDb(db);
         let connector = await wsSql_1.WsSql.open(wsConf);
-        let stmt = await (await connector).stmtInit();
+        let stmt = await connector.stmtInit();
         expect(stmt).toBeTruthy();
         expect(connector.state()).toBeGreaterThan(0);
         await stmt.prepare((0, utils_1.getInsertBind)(tableValues.length + 2, stableTags.length, db, stable));
@@ -264,10 +266,51 @@ describe('TDWebSocket.Stmt()', () => {
         await connector.close();
     });
 });
+test('test bind exception cases', async () => {
+    let wsConf = new config_1.WSConfig(dsn);
+    let connector = await wsSql_1.WsSql.open(wsConf);
+    let stmt = await connector.stmtInit();
+    const params = stmt.newStmtParam();
+    const emptyArrayMethods = [
+        { method: 'setBoolean', name: 'SetBooleanColumn' },
+        { method: 'setTinyInt', name: 'SetTinyIntColumn' },
+        { method: 'setUTinyInt', name: 'SetUTinyIntColumn' },
+        { method: 'setSmallInt', name: 'SetSmallIntColumn' },
+        { method: 'setUSmallInt', name: 'SetSmallIntColumn' },
+        { method: 'setInt', name: 'SetIntColumn' },
+        { method: 'setUInt', name: 'SetUIntColumn' },
+        { method: 'setBigint', name: 'SetBigIntColumn' },
+        { method: 'setUBigint', name: 'SetUBigIntColumn' },
+        { method: 'setFloat', name: 'SetFloatColumn' },
+        { method: 'setDouble', name: 'SetDoubleColumn' },
+        { method: 'setTimestamp', name: 'SeTimestampColumn' }
+    ];
+    emptyArrayMethods.forEach(({ method, name }) => {
+        expect(() => {
+            params[method]([]);
+        }).toThrow(`${name} params is invalid!`);
+        expect(() => {
+            params[method](null);
+        }).toThrow(`${name} params is invalid!`);
+        expect(() => {
+            params[method](undefined);
+        }).toThrow(`${name} params is invalid!`);
+    });
+    expect(() => {
+        params.setBoolean(['not boolean']);
+    }).toThrow('SetTinyIntColumn params is invalid!');
+    expect(() => {
+        params.setTinyInt(['not number']);
+    }).toThrow('SetTinyIntColumn params is invalid!');
+    expect(() => {
+        params.setBigint(['not bigint']);
+    }).toThrow('SetTinyIntColumn params is invalid!');
+    await connector.close();
+});
 afterAll(async () => {
-    let conf = new config_1.WSConfig(dsn);
-    let ws = await wsSql_1.WsSql.open(conf);
-    await ws.exec(dropDB);
-    await ws.close();
+    // let conf :WSConfig = new WSConfig(dsn)
+    // let ws = await WsSql.open(conf);
+    // await ws.exec(dropDB);
+    // await ws.close();
     wsConnectorPool_1.WebSocketConnectionPool.instance().destroyed();
 });

package/lib/test/bulkPulling/stmt1.func.test.d.ts

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

package/lib/test/bulkPulling/stmt1.func.test.d.ts.map

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