@tdengine/websocket 3.1.7 → 3.1.9

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

@@ -16,9 +16,9 @@ beforeAll(async () => {
     let wsSql = await wsSql_1.WsSql.open(conf);
     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();
 });
@@ -26,12 +26,22 @@ describe('TDWebSocket.WsSql()', () => {
     jest.setTimeout(20 * 1000);
     test('normal connect', async () => {
         let wsSql = null;
-        let conf = new config_1.WSConfig(dns);
+        let conf = new config_1.WSConfig('');
+        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 () => {
@@ -78,6 +88,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');
@@ -103,7 +129,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();
@@ -113,7 +139,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);');
@@ -126,7 +152,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');
@@ -141,7 +167,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++) {
@@ -163,7 +189,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');
@@ -176,7 +202,7 @@ 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 USER user1;');
     await wsSql.exec('DROP USER user2;');
     await wsSql.close();

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

@@ -2,8 +2,10 @@
 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");
 let dns = 'ws://localhost:6041';
+(0, log_1.setLevel)("debug");
 beforeAll(async () => {
     let conf = new config_1.WSConfig(dns);
     conf.setUser('root');

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

@@ -264,6 +264,47 @@ 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);

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

@@ -6,6 +6,8 @@ const config_1 = require("../../src/common/config");
 const wsSql_1 = require("../../src/sql/wsSql");
 const utils_1 = require("../utils");
 const wsConnectorPool_1 = require("../../src/client/wsConnectorPool");
+const log_1 = require("../../src/common/log");
+(0, log_1.setLevel)("debug");
 const stable = 'st';
 const db = 'ws_tmq_test';
 const topics = ['topic_ws_bean'];

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

@@ -80,7 +80,7 @@ async function tmqConnect() {
     try {
         consumer = await wsTmq_1.WsConsumer.newConsumer(configMap);
         await consumer.subscribe(topics);
-        let res = await consumer.poll(500);
+        let res = await consumer.poll(100);
         for (let [key, value] of res) {
             console.log(key, value.getMeta());
             let data = value.getData();
@@ -118,7 +118,7 @@ beforeAll(async () => {
     await ws.close();
 });
 describe('TDWebSocket.WsSql()', () => {
-    jest.setTimeout(20 * 1000);
+    jest.setTimeout(60 * 1000);
     test('ReqId', async () => {
         const allp = [];
         for (let i = 0; i < 10; i++) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tdengine/websocket",
-  "version": "3.1.7",
+  "version": "3.1.9",
   "description": "The websocket Node.js connector for TDengine. TDengine versions 3.3.2.0 and above are recommended to use this connector.",
   "source": "index.ts",
   "main": "lib/index.js",
@@ -47,7 +47,6 @@
     "winston": "^3.17.0",
     "winston-daily-rotate-file": "^5.0.0"
   },
-
   "devDependencies": {
     "@parcel/packager-ts": "^2.7.0",
     "@parcel/transformer-typescript-types": "^2.7.0",
@@ -56,7 +55,7 @@
     "@types/node": "^18.0.0",
     "@types/uuid": "^9.0.8",
     "@types/websocket": "^1.0",
-    "jest": "^29.2.2",
+    "jest": "^29.7.0",
     "parcel": "^2.7.0",
     "qingwa": "^1.0.7",
     "ts-jest": "^29.0.3",