@tdengine/websocket 3.2.2 → 3.3.0

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

@@ -5,12 +5,13 @@ const config_1 = require("../../src/common/config");
 const log_1 = require("../../src/common/log");
 const wsSql_1 = require("../../src/sql/wsSql");
 const wsStmt2_1 = require("../../src/stmt/wsStmt2");
+const utils_1 = require("../utils");
 let dns = "ws://localhost:6041";
 (0, log_1.setLevel)("debug");
 beforeAll(async () => {
     let conf = new config_1.WSConfig(dns);
-    conf.setUser("root");
-    conf.setPwd("taosdata");
+    conf.setUser((0, utils_1.testUsername)());
+    conf.setPwd((0, utils_1.testPassword)());
     let wsSql = await wsSql_1.WsSql.open(conf);
     await wsSql.exec("create database if not exists power_func_stmt2 KEEP 3650 DURATION 10 BUFFER 16 WAL_LEVEL 1;");
     await wsSql.exec("CREATE STABLE if not exists power_func_stmt2.meters (ts timestamp, current float, voltage int, phase float) TAGS (location binary(64), groupId int);");
@@ -31,8 +32,8 @@ describe("TDWebSocket.Stmt()", () => {
     ];
     test("normal connect", async () => {
         let conf = new config_1.WSConfig(dns);
-        conf.setUser("root");
-        conf.setPwd("taosdata");
+        conf.setUser((0, utils_1.testUsername)());
+        conf.setPwd((0, utils_1.testPassword)());
         conf.setDb("power_func_stmt2");
         let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
@@ -47,8 +48,8 @@ describe("TDWebSocket.Stmt()", () => {
         let connector = null;
         try {
             let conf = new config_1.WSConfig(dns);
-            conf.setUser("root");
-            conf.setPwd("taosdata");
+            conf.setUser((0, utils_1.testUsername)());
+            conf.setPwd((0, utils_1.testPassword)());
             conf.setDb("jest");
             connector = await wsSql_1.WsSql.open(conf);
             let stmt = await connector.stmtInit();
@@ -66,8 +67,8 @@ describe("TDWebSocket.Stmt()", () => {
     });
     test("normal Prepare", async () => {
         let conf = new config_1.WSConfig(dns);
-        conf.setUser("root");
-        conf.setPwd("taosdata");
+        conf.setUser((0, utils_1.testUsername)());
+        conf.setPwd((0, utils_1.testPassword)());
         conf.setDb("power_func_stmt2");
         let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
@@ -85,8 +86,8 @@ describe("TDWebSocket.Stmt()", () => {
     });
     test("set tag error", async () => {
         let conf = new config_1.WSConfig(dns);
-        conf.setUser("root");
-        conf.setPwd("taosdata");
+        conf.setUser((0, utils_1.testUsername)());
+        conf.setPwd((0, utils_1.testPassword)());
         conf.setDb("power_func_stmt2");
         let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
@@ -108,8 +109,8 @@ describe("TDWebSocket.Stmt()", () => {
     });
     test("error Prepare table", async () => {
         let conf = new config_1.WSConfig(dns);
-        conf.setUser("root");
-        conf.setPwd("taosdata");
+        conf.setUser((0, utils_1.testUsername)());
+        conf.setPwd((0, utils_1.testPassword)());
         conf.setDb("power_func_stmt2");
         let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
@@ -129,8 +130,8 @@ describe("TDWebSocket.Stmt()", () => {
     });
     test("error Prepare tag", async () => {
         let conf = new config_1.WSConfig(dns);
-        conf.setUser("root");
-        conf.setPwd("taosdata");
+        conf.setUser((0, utils_1.testUsername)());
+        conf.setPwd((0, utils_1.testPassword)());
         conf.setDb("power_func_stmt2");
         let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
@@ -150,8 +151,8 @@ describe("TDWebSocket.Stmt()", () => {
     });
     test("Bind supper table", async () => {
         let conf = new config_1.WSConfig(dns);
-        conf.setUser("root");
-        conf.setPwd("taosdata");
+        conf.setUser((0, utils_1.testUsername)());
+        conf.setPwd((0, utils_1.testPassword)());
         conf.setDb("power_func_stmt2");
         let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
@@ -187,8 +188,8 @@ describe("TDWebSocket.Stmt()", () => {
     });
     test("Bind a single table", async () => {
         let conf = new config_1.WSConfig(dns);
-        conf.setUser("root");
-        conf.setPwd("taosdata");
+        conf.setUser((0, utils_1.testUsername)());
+        conf.setPwd((0, utils_1.testPassword)());
         conf.setDb("power_func_stmt2");
         let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
@@ -222,8 +223,8 @@ describe("TDWebSocket.Stmt()", () => {
     });
     test("Bind multiple tables", async () => {
         let conf = new config_1.WSConfig(dns);
-        conf.setUser("root");
-        conf.setPwd("taosdata");
+        conf.setUser((0, utils_1.testUsername)());
+        conf.setPwd((0, utils_1.testPassword)());
         conf.setDb("power_func_stmt2");
         let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
@@ -257,8 +258,8 @@ describe("TDWebSocket.Stmt()", () => {
     });
     test("query bind", async () => {
         let conf = new config_1.WSConfig(dns);
-        conf.setUser("root");
-        conf.setPwd("taosdata");
+        conf.setUser((0, utils_1.testUsername)());
+        conf.setPwd((0, utils_1.testPassword)());
         conf.setDb("power_func_stmt2");
         let wsSql = await wsSql_1.WsSql.open(conf);
         await wsSql.exec("CREATE STABLE if not exists power_func_stmt2.query_meters (ts timestamp, current float, voltage int, phase float) TAGS (location binary(64), groupId int);");
@@ -312,8 +313,8 @@ describe("TDWebSocket.Stmt()", () => {
     });
     test("error BindParam", async () => {
         let conf = new config_1.WSConfig(dns);
-        conf.setUser("root");
-        conf.setPwd("taosdata");
+        conf.setUser((0, utils_1.testUsername)());
+        conf.setPwd((0, utils_1.testPassword)());
         conf.setDb("power_func_stmt2");
         let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
@@ -351,8 +352,8 @@ describe("TDWebSocket.Stmt()", () => {
     });
     test("no Batch", async () => {
         let conf = new config_1.WSConfig(dns);
-        conf.setUser("root");
-        conf.setPwd("taosdata");
+        conf.setUser((0, utils_1.testUsername)());
+        conf.setPwd((0, utils_1.testPassword)());
         conf.setDb("power_func_stmt2");
         let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
@@ -389,8 +390,8 @@ describe("TDWebSocket.Stmt()", () => {
     });
     test("Batch after BindParam", async () => {
         let conf = new config_1.WSConfig(dns);
-        conf.setUser("root");
-        conf.setPwd("taosdata");
+        conf.setUser((0, utils_1.testUsername)());
+        conf.setPwd((0, utils_1.testPassword)());
         conf.setDb("power_func_stmt2");
         let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
@@ -441,8 +442,8 @@ describe("TDWebSocket.Stmt()", () => {
     });
     test("no set tag", async () => {
         let conf = new config_1.WSConfig(dns);
-        conf.setUser("root");
-        conf.setPwd("taosdata");
+        conf.setUser((0, utils_1.testUsername)());
+        conf.setPwd((0, utils_1.testPassword)());
         conf.setDb("power_func_stmt2");
         let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
@@ -471,8 +472,8 @@ describe("TDWebSocket.Stmt()", () => {
     });
     test("normal binary BindParam", async () => {
         let conf = new config_1.WSConfig(dns);
-        conf.setUser("root");
-        conf.setPwd("taosdata");
+        conf.setUser((0, utils_1.testUsername)());
+        conf.setPwd((0, utils_1.testPassword)());
         conf.setDb("power_func_stmt2");
         let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
@@ -500,8 +501,8 @@ describe("TDWebSocket.Stmt()", () => {
     });
     test("normal json BindParam", async () => {
         let conf = new config_1.WSConfig(dns);
-        conf.setUser("root");
-        conf.setPwd("taosdata");
+        conf.setUser((0, utils_1.testUsername)());
+        conf.setPwd((0, utils_1.testPassword)());
         conf.setDb("power_func_stmt2");
         let connector = await wsSql_1.WsSql.open(conf);
         let stmt = await connector.stmtInit();
@@ -534,8 +535,8 @@ describe("TDWebSocket.Stmt()", () => {
 });
 afterAll(async () => {
     let conf = new config_1.WSConfig(dns);
-    conf.setUser("root");
-    conf.setPwd("taosdata");
+    conf.setUser((0, utils_1.testUsername)());
+    conf.setPwd((0, utils_1.testPassword)());
     let wsSql = await wsSql_1.WsSql.open(conf);
     await wsSql.exec("drop database power_func_stmt2");
     await wsSql.close();

package/lib/test/bulkPulling/stmt2.init.failover.test.d.ts

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

package/lib/test/bulkPulling/stmt2.init.failover.test.d.ts.map

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

package/lib/test/bulkPulling/stmt2.init.failover.test.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const wsStmt2_1 = require("../../src/stmt/wsStmt2");
+function createMockWsClient() {
+    return {
+        getState: jest.fn(() => 1),
+        connect: jest.fn(async () => { }),
+        checkVersion: jest.fn(async () => { }),
+        exec: jest.fn(async () => ({
+            totalTime: 0,
+            msg: {
+                code: 0,
+                message: "",
+                timing: 0,
+                stmt_id: 1,
+                is_insert: false,
+                fields_count: 1,
+            },
+        })),
+        execNoResp: jest.fn(async () => { }),
+        sendBinaryMsg: jest.fn(async () => ({
+            totalTime: 0,
+            msg: {
+                code: 0,
+                message: "",
+                timing: 0,
+                stmt_id: 1,
+                affected: 0,
+            },
+        })),
+        waitForReady: jest.fn(async () => { }),
+        isNetworkError: jest.fn((_err) => false),
+    };
+}
+describe("WsStmt2 init failover", () => {
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+    test("init triggers context recovery on network error", async () => {
+        const wsClient = createMockWsClient();
+        const stmt = new wsStmt2_1.WsStmt2(wsClient);
+        const networkError = new Error("socket closed");
+        wsClient.isNetworkError.mockReturnValue(true);
+        jest.spyOn(stmt, "doInit").mockRejectedValueOnce(networkError);
+        const recoverSpy = jest.spyOn(stmt, "recover").mockResolvedValue(undefined);
+        const result = await stmt.init(undefined);
+        expect(result).toBe(stmt);
+        expect(recoverSpy).toHaveBeenCalledWith(0);
+    });
+});

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

@@ -148,7 +148,7 @@ 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://${(0, utils_1.testUsername)()}:${(0, utils_1.testPassword)()}@localhost:6041`;
 (0, log_1.setLevel)("debug");
 beforeAll(async () => {
     let conf = new config_1.WSConfig(dsn);

package/lib/test/bulkPulling/tmq.config.test.d.ts

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

package/lib/test/bulkPulling/tmq.config.test.d.ts.map

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

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

@@ -0,0 +1,77 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const config_1 = require("../../src/tmq/config");
+const constant_1 = require("../../src/tmq/constant");
+const utils_1 = require("../utils");
+describe("TmqConfig - td.connect.token", () => {
+    const baseUrl = "ws://localhost:6041";
+    test("token field is null when CONNECT_TOKEN not provided", () => {
+        const configMap = new Map([
+            [constant_1.TMQConstants.WS_URL, baseUrl],
+            [constant_1.TMQConstants.CONNECT_USER, (0, utils_1.testUsername)()],
+            [constant_1.TMQConstants.CONNECT_PASS, (0, utils_1.testPassword)()],
+            [constant_1.TMQConstants.GROUP_ID, "g1"],
+        ]);
+        const cfg = new config_1.TmqConfig(configMap);
+        expect(cfg.token).toBeNull();
+    });
+    test("token field is set when CONNECT_TOKEN is provided", () => {
+        const configMap = new Map([
+            [constant_1.TMQConstants.WS_URL, baseUrl],
+            [constant_1.TMQConstants.CONNECT_TOKEN, "mytoken123"],
+            [constant_1.TMQConstants.GROUP_ID, "g1"],
+        ]);
+        const cfg = new config_1.TmqConfig(configMap);
+        expect(cfg.token).toBe("mytoken123");
+    });
+    test("bearer_token is appended to url search params when token is provided", () => {
+        const configMap = new Map([
+            [constant_1.TMQConstants.WS_URL, baseUrl],
+            [constant_1.TMQConstants.CONNECT_TOKEN, "mytoken123"],
+            [constant_1.TMQConstants.GROUP_ID, "g1"],
+        ]);
+        const cfg = new config_1.TmqConfig(configMap);
+        expect(cfg.url?.searchParams.get("bearer_token")).toBe("mytoken123");
+    });
+    test("bearer_token is appended to sql_url search params when token is provided", () => {
+        const configMap = new Map([
+            [constant_1.TMQConstants.WS_URL, baseUrl],
+            [constant_1.TMQConstants.CONNECT_TOKEN, "mytoken123"],
+            [constant_1.TMQConstants.GROUP_ID, "g1"],
+        ]);
+        const cfg = new config_1.TmqConfig(configMap);
+        expect(cfg.sql_url?.searchParams.get("bearer_token")).toBe("mytoken123");
+    });
+    test("sql_url pathname is /ws when token is provided", () => {
+        const configMap = new Map([
+            [constant_1.TMQConstants.WS_URL, baseUrl],
+            [constant_1.TMQConstants.CONNECT_TOKEN, "mytoken123"],
+            [constant_1.TMQConstants.GROUP_ID, "g1"],
+        ]);
+        const cfg = new config_1.TmqConfig(configMap);
+        expect(cfg.sql_url?.pathname).toBe("/ws");
+    });
+    test("url pathname is /rest/tmq when token is provided", () => {
+        const configMap = new Map([
+            [constant_1.TMQConstants.WS_URL, baseUrl],
+            [constant_1.TMQConstants.CONNECT_TOKEN, "mytoken123"],
+            [constant_1.TMQConstants.GROUP_ID, "g1"],
+        ]);
+        const cfg = new config_1.TmqConfig(configMap);
+        expect(cfg.url?.pathname).toBe("/rest/tmq");
+    });
+    test("bearer_token not set on urls when token is not provided", () => {
+        const configMap = new Map([
+            [constant_1.TMQConstants.WS_URL, baseUrl],
+            [constant_1.TMQConstants.CONNECT_USER, (0, utils_1.testUsername)()],
+            [constant_1.TMQConstants.CONNECT_PASS, (0, utils_1.testPassword)()],
+            [constant_1.TMQConstants.GROUP_ID, "g1"],
+        ]);
+        const cfg = new config_1.TmqConfig(configMap);
+        expect(cfg.url?.searchParams.has("bearer_token")).toBe(false);
+        expect(cfg.sql_url?.searchParams.has("bearer_token")).toBe(false);
+    });
+    test("CONNECT_TOKEN constant value is td.connect.token", () => {
+        expect(constant_1.TMQConstants.CONNECT_TOKEN).toBe("td.connect.token");
+    });
+});

package/lib/test/bulkPulling/tmq.failover.test.d.ts

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

package/lib/test/bulkPulling/tmq.failover.test.d.ts.map

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