@tdengine/websocket 3.1.4 → 3.1.6

package/lib/src/tmq/wsTmq.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wsTmq.d.ts","sourceRoot":"","sources":["../../../src/tmq/wsTmq.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAkF,cAAc,EAA0D,MAAM,eAAe,CAAC;AAKvL,qBAAa,UAAU;IACnB,OAAO,CAAC,SAAS,CAAW;IAC5B,OAAO,CAAC,SAAS,CAAW;IAC5B,OAAO,CAAC,OAAO,CAAC,CAAU;IAC1B,OAAO,CAAC,WAAW,CAAC,CAAQ;IAC5B,OAAO;YAMO,IAAI;WAML,WAAW,CAAC,QAAQ,EAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,GAAE,OAAO,CAAC,UAAU,CAAC;IAUjE,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,EAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB9D,WAAW,CAAC,KAAK,CAAC,EAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUzC,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAgBvE,YAAY,CAAC,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAYlD,MAAM,CAAC,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAK5C,QAAQ;IAYhB,SAAS,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IA0BzF,aAAa,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAc9E,YAAY,CAAC,SAAS,EAAC,cAAc,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,IAAI,CAAC;IAkBnE,SAAS,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IA0BzF,IAAI,CAAC,SAAS,EAAC,cAAc,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,IAAI,CAAC;IAkB3D,eAAe,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,GAAE,OAAO,CAAC,IAAI,CAAC;IAQ/D,SAAS,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,GAAE,OAAO,CAAC,IAAI,CAAC;IASzD,KAAK,IAAG,OAAO,CAAC,IAAI,CAAC;YAIb,cAAc;YAwBd,QAAQ;YA4BR,iBAAiB;IAczB,UAAU,CAAC,MAAM,CAAC,EAAC,MAAM,EAAE,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAoBnD,gBAAgB;CA6BjC"}
+{"version":3,"file":"wsTmq.d.ts","sourceRoot":"","sources":["../../../src/tmq/wsTmq.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAkF,cAAc,EAA0D,MAAM,eAAe,CAAC;AAKvL,qBAAa,UAAU;IACnB,OAAO,CAAC,SAAS,CAAW;IAC5B,OAAO,CAAC,SAAS,CAAW;IAC5B,OAAO,CAAC,OAAO,CAAC,CAAU;IAC1B,OAAO,CAAC,WAAW,CAAC,CAAQ;IAC5B,OAAO;YAWO,IAAI;WAuBL,WAAW,CAAC,QAAQ,EAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,GAAE,OAAO,CAAC,UAAU,CAAC;IAUjE,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,EAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAyB9D,WAAW,CAAC,KAAK,CAAC,EAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUzC,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAgBvE,YAAY,CAAC,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAYlD,MAAM,CAAC,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAK5C,QAAQ;IAYhB,SAAS,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IA0BzF,aAAa,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAc9E,YAAY,CAAC,SAAS,EAAC,cAAc,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,IAAI,CAAC;IAkBnE,SAAS,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IA0BzF,IAAI,CAAC,SAAS,EAAC,cAAc,EAAE,KAAK,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,IAAI,CAAC;IAkB3D,eAAe,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,GAAE,OAAO,CAAC,IAAI,CAAC;IAQ/D,SAAS,CAAC,UAAU,EAAC,KAAK,CAAC,cAAc,CAAC,GAAE,OAAO,CAAC,IAAI,CAAC;IASzD,KAAK,IAAG,OAAO,CAAC,IAAI,CAAC;YAIb,cAAc;YAwBd,QAAQ;YA4BR,iBAAiB;IAczB,UAAU,CAAC,MAAM,CAAC,EAAC,MAAM,EAAE,GAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAoBnD,gBAAgB;CA6BjC"}

package/lib/src/tmq/wsTmq.js

@@ -16,10 +16,33 @@ class WsConsumer {
     constructor(wsConfig) {
         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.');
+        }
         this._wsClient = new wsClient_1.WsClient(this._wsConfig.url, this._wsConfig.timeout);
     }
     async init() {
-        await this._wsClient.ready();
+        let wsSql = null;
+        try {
+            if (this._wsConfig.sql_url) {
+                wsSql = new wsClient_1.WsClient(this._wsConfig.sql_url, this._wsConfig.timeout);
+                await wsSql.connect();
+                await wsSql.checkVersion();
+                await this._wsClient.ready();
+            }
+            else {
+                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);
+        }
+        finally {
+            if (wsSql) {
+                await wsSql.close();
+            }
+        }
         return this;
     }
     static async newConsumer(wsConfig) {
@@ -44,7 +67,8 @@ class WsConsumer {
                 topics: topics,
                 offset_rest: this._wsConfig.offset_rest,
                 auto_commit: this._wsConfig.auto_commit,
-                auto_commit_interval_ms: this._wsConfig.auto_commit_interval_ms
+                auto_commit_interval_ms: this._wsConfig.auto_commit_interval_ms,
+                config: this._wsConfig.otherConfigs
             },
         };
         this._topics = topics;

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

@@ -4,12 +4,18 @@ 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");
 let dns = 'ws://localhost:6041';
+let password1 = 'Ab1!@#$%,.:?<>;~';
+let password2 = 'Bc%^&*()-_+=[]{}';
+(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(`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 (0, utils_1.Sleep)(100);
     await wsSql.exec('use power');
@@ -28,6 +34,30 @@ describe('TDWebSocket.WsSql()', () => {
         expect(wsSql.state()).toBeGreaterThan(0);
         await wsSql.close();
     });
+    test('special characters connect1', async () => {
+        let wsSql = null;
+        let conf = new config_1.WSConfig(dns);
+        conf.setUser('user1');
+        conf.setPwd(password1);
+        wsSql = await wsSql_1.WsSql.open(conf);
+        expect(wsSql.state()).toBeGreaterThan(0);
+        let version = await wsSql.version();
+        expect(version).not.toBeNull();
+        expect(version).not.toBeUndefined();
+        await wsSql.close();
+    });
+    test('special characters connect2', async () => {
+        let wsSql = null;
+        let conf = new config_1.WSConfig(dns);
+        conf.setUser('user2');
+        conf.setPwd(password2);
+        wsSql = await wsSql_1.WsSql.open(conf);
+        expect(wsSql.state()).toBeGreaterThan(0);
+        let version = await wsSql.version();
+        expect(version).not.toBeNull();
+        expect(version).not.toBeUndefined();
+        await wsSql.close();
+    });
     test('connect db with error', async () => {
         expect.assertions(1);
         let wsSql = null;
@@ -147,6 +177,8 @@ afterAll(async () => {
     conf.setPwd('taosdata');
     let wsSql = await wsSql_1.WsSql.open(conf);
     await wsSql.exec('drop database power');
+    await wsSql.exec('DROP USER user1;');
+    await wsSql.exec('DROP USER user2;');
     await wsSql.close();
     wsConnectorPool_1.WebSocketConnectionPool.instance().destroyed();
 });

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

@@ -228,7 +228,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, jsonTags.length, db, jsonTable));

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

@@ -62,12 +62,15 @@ describe('TDWebSocket.Tmq()', () => {
         [constant_1.TMQConstants.CLIENT_ID, 'test_tmq_client'],
         [constant_1.TMQConstants.WS_URL, tmqDsn],
         [constant_1.TMQConstants.ENABLE_AUTO_COMMIT, 'true'],
-        [constant_1.TMQConstants.AUTO_COMMIT_INTERVAL_MS, '1000']
+        [constant_1.TMQConstants.AUTO_COMMIT_INTERVAL_MS, '1000'],
+        ["session.timeout.ms", "10000"],
+        ["max.poll.interval.ms", "30000"],
+        ["msg.with.table.name", "true"]
     ]);
     console.log(configMap);
     test('normal connect', async () => {
         let consumer = await wsTmq_1.WsConsumer.newConsumer(configMap);
-        consumer.close();
+        await consumer.close();
     });
     test('connect error', async () => {
         expect.assertions(1);
@@ -80,7 +83,10 @@ describe('TDWebSocket.Tmq()', () => {
             [constant_1.TMQConstants.CLIENT_ID, 'test_tmq_client'],
             [constant_1.TMQConstants.WS_URL, tmqDsn],
             [constant_1.TMQConstants.ENABLE_AUTO_COMMIT, 'true'],
-            [constant_1.TMQConstants.AUTO_COMMIT_INTERVAL_MS, '1000']
+            [constant_1.TMQConstants.AUTO_COMMIT_INTERVAL_MS, '1000'],
+            ["session.timeout.ms", "10000"],
+            ["max.poll.interval.ms", "30000"],
+            ["msg.with.table.name", "true"]
         ]);
         try {
             consumer = await wsTmq_1.WsConsumer.newConsumer(errConfigMap);

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

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

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

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

package/lib/test/bulkPulling/utils.test.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("../../src/common/utils");
+describe('utils test', () => {
+    test('compare versions test', async () => {
+        expect((0, utils_1.compareVersions)("3.3.6.3-alpha", "3.3.6.2")).toBe(1);
+        expect((0, utils_1.compareVersions)("3.3.6.2", "3.3.6.3")).toBe(-1);
+        expect((0, utils_1.compareVersions)("3.3.6.3", "3.3.6.3")).toBe(0);
+        expect((0, utils_1.compareVersions)("3.3.6.3", "3.3.6.3-alpha")).toBe(1);
+        expect((0, utils_1.compareVersions)("3.3.6.3-beta", "3.3.6.3-alpha")).toBe(1);
+        expect((0, utils_1.compareVersions)("3.3", "3.3.0.0")).toBe(0);
+    });
+});

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

@@ -7,6 +7,7 @@ const wsSql_1 = require("../../src/sql/wsSql");
 const constant_1 = require("../../src/tmq/constant");
 const wsTmq_1 = require("../../src/tmq/wsTmq");
 const utils_1 = require("../utils");
+const log_1 = require("../../src/common/log");
 let dsn = 'ws://root:taosdata@localhost:6041';
 let tags = ['California.SanFrancisco', 3];
 let multi = [
@@ -30,6 +31,7 @@ const db = 'power_connect';
 const topics = ['pwer_meters_topic'];
 let createTopic = `create topic if not exists ${topics[0]} as select * from ${db}.${stable}`;
 let stmtIds = [];
+(0, log_1.setLevel)("debug");
 async function connect() {
     let dsn = 'ws://root:taosdata@localhost:6041';
     let wsSql = null;
@@ -38,7 +40,7 @@ async function connect() {
     wsSql = await wsSql_1.WsSql.open(conf);
     expect(wsSql.state()).toBeGreaterThan(0);
     console.log(await wsSql.version());
-    wsSql.close();
+    await wsSql.close();
 }
 async function stmtConnect() {
     let dsn = 'ws://root:taosdata@localhost:6041';
@@ -70,8 +72,8 @@ async function stmtConnect() {
     await stmt.batch();
     await stmt.exec();
     expect(stmt.getLastAffected()).toEqual(30);
-    stmt.close();
-    connector.close();
+    await stmt.close();
+    await connector.close();
 }
 async function tmqConnect() {
     let consumer = null;
@@ -101,7 +103,7 @@ async function tmqConnect() {
     }
     finally {
         if (consumer) {
-            consumer.close();
+            await consumer.close();
         }
     }
 }
@@ -132,7 +134,6 @@ describe('TDWebSocket.WsSql()', () => {
             allp.push(tmqConnect());
         }
         await Promise.all(allp);
-        wsConnectorPool_1.WebSocketConnectionPool.instance().destroyed();
         console.log(stmtIds);
     });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tdengine/websocket",
-  "version": "3.1.4",
+  "version": "3.1.6",
   "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",
@@ -16,7 +16,6 @@
     "build": "tsc",
     "prepublish": "node ./prepare.js"
   },
-
   "repository": {
     "type": "git",
     "url": "git+https://github.com/taosdata/taos-connector-node.git"
@@ -39,10 +38,6 @@
   ],
   "homepage": "https://github.com/taosdata/taos-connector-node#readme",
   "dependencies": {
-    "@types/json-bigint": "^1.0.1",
-    "@types/node": "^18.0.0",
-    "@types/uuid": "^9.0.8",
-    "@types/websocket": "^1.0",
     "async-mutex": "^0.5.0",
     "json-bigint": "^1.0.0",
     "moment-timezone": "^0.5.45",
@@ -52,18 +47,19 @@
     "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",
     "@types/jest": "^29.2.1",
     "@types/json-bigint": "^1.0.1",
     "@types/node": "^18.0.0",
-    "@types/websocket": "^1.0",
     "@types/uuid": "^9.0.8",
+    "@types/websocket": "^1.0",
     "jest": "^29.2.2",
     "parcel": "^2.7.0",
+    "qingwa": "^1.0.7",
     "ts-jest": "^29.0.3",
-    "typescript": "^5.3.3",
-    "qingwa": "^1.0.7"
+    "typescript": "^5.3.3"
   }
 }

package/lib/example/logs/.007e668bb78549e9a304b8466671945ab2a1553e-audit.json

@@ -1,15 +0,0 @@
-{
-    "keep": {
-        "days": true,
-        "amount": 14
-    },
-    "auditLog": "logs/.007e668bb78549e9a304b8466671945ab2a1553e-audit.json",
-    "files": [
-        {
-            "date": 1737686882977,
-            "name": "logs/app-2025-01-24.log",
-            "hash": "8a2d013d385f90aa98e2df24afbdef62cb7a94443f79bd047d7b104714f9f37b"
-        }
-    ],
-    "hashType": "sha256"
-}