@tdengine/websocket 3.1.0 → 3.1.2

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

@@ -22,7 +22,6 @@ export declare class WsConsumer {
     seekToBeginning(partitions: Array<TopicPartition>): Promise<void>;
     seekToEnd(partitions: Array<TopicPartition>): Promise<void>;
     close(): Promise<void>;
-    private fetch;
     private fetchBlockData;
     private pollData;
     private sendAssignmentReq;

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,EAA6E,MAAM,eAAe,CAAC;AAI1M,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;IAkBvE,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,KAAK;YAcL,cAAc;YAed,QAAQ;YAkCR,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;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"}

package/lib/src/tmq/wsTmq.js

@@ -11,6 +11,7 @@ const wsError_1 = require("../common/wsError");
 const tmqResponse_1 = require("./tmqResponse");
 const reqid_1 = require("../common/reqid");
 const log_1 = __importDefault(require("../common/log"));
+const wsResponse_1 = require("../client/wsResponse");
 class WsConsumer {
     constructor(wsConfig) {
         this._wsConfig = new config_1.TmqConfig(wsConfig);
@@ -198,9 +199,9 @@ class WsConsumer {
     async close() {
         await this._wsClient.close();
     }
-    async fetch(pollResp) {
+    async fetchBlockData(pollResp, taosResult) {
         let fetchMsg = {
-            action: 'fetch',
+            action: 'fetch_raw_data',
             args: {
                 req_id: reqid_1.ReqId.getReqID(),
                 message_id: pollResp.message_id,
@@ -208,22 +209,16 @@ class WsConsumer {
         };
         let jsonStr = JSON.stringify(fetchMsg);
         log_1.default.debug('[wsQueryInterface.fetch.fetchMsg]===>' + jsonStr);
-        let result = await this._wsClient.exec(jsonStr, false);
-        return new tmqResponse_1.WsTmqQueryResponse(result);
-    }
-    async fetchBlockData(fetchResponse, taosResult) {
-        let fetchMsg = {
-            action: 'fetch_block',
-            args: {
-                req_id: fetchResponse.req_id,
-                message_id: fetchResponse.message_id,
-            },
-        };
-        let jsonStr = JSON.stringify(fetchMsg);
-        log_1.default.debug('[wsQueryInterface.fetch.fetchMsg]===>' + jsonStr);
         let result = await this._wsClient.sendMsg(jsonStr);
-        (0, tmqResponse_1.parseTmqBlock)(fetchResponse.rows, new tmqResponse_1.WSTmqFetchBlockResponse(result), taosResult);
-        return taosResult;
+        let wsResponse = new wsResponse_1.WSFetchBlockResponse(result.msg);
+        if (wsResponse && wsResponse.data && wsResponse.blockLen > 0) {
+            let wsTmqResponse = new tmqResponse_1.WSTmqFetchBlockInfo(wsResponse.data, taosResult);
+            log_1.default.debug('[WSTmqFetchBlockInfo.fetchBlockData]===>' + wsTmqResponse.taosResult);
+            if (wsTmqResponse.rows > 0) {
+                return true;
+            }
+        }
+        return false;
     }
     async pollData(timeoutMs, reqId) {
         let queryMsg = {
@@ -233,26 +228,17 @@ class WsConsumer {
                 blocking_time: timeoutMs
             },
         };
-        var taosResults = new Map();
         let resp = await this._wsClient.exec(JSON.stringify(queryMsg), false);
         let pollResp = new tmqResponse_1.WsPollResponse(resp);
+        let taosResult = new tmqResponse_1.TaosTmqResult(pollResp);
+        var taosResults = new Map();
+        taosResults.set(pollResp.topic, taosResult);
         if (!pollResp.have_message || pollResp.message_type != constant_1.TMQMessageType.ResDataType) {
             return taosResults;
         }
-        while (true) {
-            let fetchResp = await this.fetch(pollResp);
-            if (fetchResp.completed || fetchResp.rows == 0) {
-                break;
-            }
-            let taosResult = taosResults.get(pollResp.topic + pollResp.vgroup_id);
-            if (taosResult == null) {
-                taosResult = new tmqResponse_1.TaosTmqResult(fetchResp, pollResp);
-                taosResults.set(pollResp.topic + pollResp.vgroup_id, taosResult);
-            }
-            else {
-                taosResult.setRowsAndTime(fetchResp.rows);
-            }
-            await this.fetchBlockData(fetchResp, taosResult);
+        let finish = false;
+        while (!finish) {
+            finish = await this.fetchBlockData(pollResp, taosResult);
         }
         return taosResults;
     }

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

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

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

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

package/lib/test/bulkPulling/log.test.js

@@ -0,0 +1,44 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const log_1 = __importStar(require("../../src/common/log"));
+describe('log level print', () => {
+    test('normal connect', async () => {
+        log_1.default.info('log level is info');
+        log_1.default.debug('log level is debug');
+        log_1.default.error('log level is error');
+        let isLevel = log_1.default.isLevelEnabled("info");
+        expect(isLevel).toEqual(true);
+        (0, log_1.setLevel)("debug");
+        log_1.default.debug('log level is debug');
+        isLevel = log_1.default.isLevelEnabled("debug");
+        expect(isLevel).toEqual(true);
+        (0, log_1.setLevel)("error");
+        log_1.default.error('log level is error');
+        log_1.default.debug('log level is debug');
+        isLevel = log_1.default.isLevelEnabled("error");
+        expect(isLevel).toEqual(true);
+    });
+});

package/lib/test/bulkPulling/schemaless.test.js

@@ -10,8 +10,9 @@ beforeAll(async () => {
     conf.setUser('root');
     conf.setPwd('taosdata');
     let wsSql = await wsSql_1.WsSql.open(conf);
-    await wsSql.exec('create database if not exists power KEEP 3650 DURATION 10 BUFFER 16 WAL_LEVEL 1;');
-    await wsSql.exec('CREATE STABLE if not exists power.meters (ts timestamp, current float, voltage int, phase float) TAGS (location binary(64), groupId int);');
+    await wsSql.exec('drop database if exists power_schemaless;');
+    await wsSql.exec('create database if not exists power_schemaless KEEP 3650 DURATION 10 BUFFER 16 WAL_LEVEL 1;');
+    await wsSql.exec('CREATE STABLE if not exists power_schemaless.meters (ts timestamp, current float, voltage int, phase float) TAGS (location binary(64), groupId int);');
     await wsSql.close();
 });
 describe('TDWebSocket.WsSchemaless()', () => {
@@ -23,7 +24,7 @@ describe('TDWebSocket.WsSchemaless()', () => {
         let conf = new config_1.WSConfig(dns);
         conf.setUser('root');
         conf.setPwd('taosdata');
-        conf.setDb('power');
+        conf.setDb('power_schemaless');
         let wsSchemaless = await wsSql_1.WsSql.open(conf);
         expect(wsSchemaless.state()).toBeGreaterThan(0);
         await wsSchemaless.close();
@@ -52,7 +53,7 @@ describe('TDWebSocket.WsSchemaless()', () => {
         let conf = new config_1.WSConfig(dns);
         conf.setUser('root');
         conf.setPwd('taosdata');
-        conf.setDb('power');
+        conf.setDb('power_schemaless');
         let wsSchemaless = await wsSql_1.WsSql.open(conf);
         expect(wsSchemaless.state()).toBeGreaterThan(0);
         await wsSchemaless.schemalessInsert([influxdbData], wsProto_1.SchemalessProto.InfluxDBLineProtocol, wsProto_1.Precision.NANO_SECONDS, 0);
@@ -64,7 +65,7 @@ describe('TDWebSocket.WsSchemaless()', () => {
         let conf = new config_1.WSConfig(dns);
         conf.setUser('root');
         conf.setPwd('taosdata');
-        conf.setDb('power');
+        conf.setDb('power_schemaless');
         let wsSchemaless = await wsSql_1.WsSql.open(conf);
         expect(wsSchemaless.state()).toBeGreaterThan(0);
         await wsSchemaless.schemalessInsert([influxdbData], wsProto_1.SchemalessProto.InfluxDBLineProtocol, wsProto_1.Precision.NOT_CONFIGURED, 0);
@@ -77,7 +78,7 @@ describe('TDWebSocket.WsSchemaless()', () => {
         let conf = new config_1.WSConfig(dns);
         conf.setUser('root');
         conf.setPwd('taosdata');
-        conf.setDb('power');
+        conf.setDb('power_schemaless');
         let wsSchemaless = await wsSql_1.WsSql.open(conf);
         expect(wsSchemaless.state()).toBeGreaterThan(0);
         try {

package/lib/test/bulkPulling/sql.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');
@@ -17,9 +17,10 @@ beforeAll(async () => {
 describe('TDWebSocket.WsSql()', () => {
     jest.setTimeout(20 * 1000);
     test('normal connect', async () => {
-        let dsn = 'ws://root:taosdata@localhost:6041';
         let wsSql = null;
-        let conf = new config_1.WSConfig(dsn);
+        let conf = new config_1.WSConfig(dns);
+        conf.setUser('root');
+        conf.setPwd('taosdata');
         conf.setDb('power');
         wsSql = await wsSql_1.WsSql.open(conf);
         expect(wsSql.state()).toBeGreaterThan(0);
@@ -29,8 +30,9 @@ describe('TDWebSocket.WsSql()', () => {
         expect.assertions(1);
         let wsSql = null;
         try {
-            let dsn = 'ws://root:taosdata@localhost:6041';
-            let conf = new config_1.WSConfig(dsn);
+            let conf = new config_1.WSConfig(dns);
+            conf.setUser('root');
+            conf.setPwd('taosdata');
             conf.setDb('jest');
             wsSql = await wsSql_1.WsSql.open(conf);
         }
@@ -45,8 +47,9 @@ describe('TDWebSocket.WsSql()', () => {
         }
     });
     test('get taosc version', async () => {
-        let dsn = 'ws://root:taosdata@localhost:6041';
-        let conf = new config_1.WSConfig(dsn);
+        let conf = new config_1.WSConfig(dns);
+        conf.setUser('root');
+        conf.setPwd('taosdata');
         let wsSql = await wsSql_1.WsSql.open(conf);
         let version = await wsSql.version();
         await wsSql.close();
@@ -54,8 +57,9 @@ describe('TDWebSocket.WsSql()', () => {
         expect(version).toBeTruthy();
     });
     test('show databases', async () => {
-        let dsn = 'ws://root:taosdata@localhost:6041';
-        let conf = new config_1.WSConfig(dsn);
+        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('show databases');
         await wsSql.close();
@@ -63,8 +67,9 @@ describe('TDWebSocket.WsSql()', () => {
         expect(taosResult).toBeTruthy();
     });
     test('create databases', async () => {
-        let dsn = 'ws://root:taosdata@localhost:6041';
-        let conf = new config_1.WSConfig(dsn);
+        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('create database if not exists power KEEP 3650 DURATION 10 BUFFER 16 WAL_LEVEL 1;');
         await wsSql.close();
@@ -72,8 +77,9 @@ describe('TDWebSocket.WsSql()', () => {
         expect(taosResult).toBeTruthy();
     });
     test('create stable', async () => {
-        let dsn = 'ws://root:taosdata@localhost:6041';
-        let conf = new config_1.WSConfig(dsn);
+        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);
@@ -84,22 +90,24 @@ describe('TDWebSocket.WsSql()', () => {
         expect(taosResult).toBeTruthy();
     });
     test('insert recoder', async () => {
-        let dsn = 'ws://root:taosdata@localhost:6041';
-        let conf = new config_1.WSConfig(dsn);
+        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 meters');
         console.log(taosResult);
-        taosResult = await wsSql.exec('INSERT INTO d1001 USING meters (location, groupid) TAGS ("California.SanFrancisco", 3) VALUES (NOW, 10.2, 219, 0.32)');
+        taosResult = await wsSql.exec('INSERT INTO d1001 USING meters (location, groupid) TAGS ("California", 3) VALUES (NOW, 10.2, 219, 0.32)');
         console.log(taosResult);
         expect(taosResult.getAffectRows()).toBeGreaterThanOrEqual(1);
         await wsSql.close();
     });
     test('query sql', async () => {
-        let dsn = 'ws://root:taosdata@localhost:6041';
-        let conf = new config_1.WSConfig(dsn);
+        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);
@@ -118,6 +126,18 @@ describe('TDWebSocket.WsSql()', () => {
         }
         await wsSql.close();
     });
+    test('query sql no getdata', 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();
+        let wsRows = await wsSql.query('select * from meters');
+        await wsRows.close();
+        await wsSql.close();
+    });
 });
 afterAll(async () => {
     wsConnectorPool_1.WebSocketConnectionPool.instance().destroyed();

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');
@@ -15,7 +15,7 @@ beforeAll(async () => {
 });
 describe('TDWebSocket.Stmt()', () => {
     jest.setTimeout(20 * 1000);
-    let tags = ['California.SanFrancisco', 3];
+    let tags = ['California', 3];
     let multi = [
         // [1709183268567],
         // [10.2],
@@ -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);