@tdengine/websocket 3.2.2 → 3.3.0

package/lib/test/bulkPulling/wsClient.recovery.test.js

@@ -0,0 +1,104 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const websocket_1 = require("websocket");
+const wsClient_1 = require("../../src/client/wsClient");
+const wsConnectorPool_1 = require("../../src/client/wsConnectorPool");
+const dsn_1 = require("../../src/common/dsn");
+const wsError_1 = require("../../src/common/wsError");
+function createMockConnector() {
+    return {
+        readyState: jest.fn(() => websocket_1.w3cwebsocket.OPEN),
+        ready: jest.fn(async () => { }),
+        setSessionRecoveryHook: jest.fn(),
+        sendMsgDirect: jest.fn(async (_message) => ({
+            msg: { code: 0, message: "" }
+        })),
+        sendMsg: jest.fn(async () => ({ msg: { code: 0, message: "" } })),
+        sendMsgNoResp: jest.fn(async () => { }),
+    };
+}
+describe("WsClient recovery hook", () => {
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+    test("uses dsn endpoint when creating connection", async () => {
+        const dsn = (0, dsn_1.parse)("ws://root:taosdata@localhost:6041");
+        dsn.endpoint = dsn_1.WS_TMQ_ENDPOINT;
+        const connector = createMockConnector();
+        const getConnectionSpy = jest
+            .spyOn(wsConnectorPool_1.WebSocketConnectionPool.instance(), "getConnection")
+            .mockResolvedValue(connector);
+        const client = new wsClient_1.WsClient(dsn, 4321);
+        await client.ready();
+        expect(getConnectionSpy).toHaveBeenCalledWith(dsn, 4321);
+    });
+    test("runs custom recovery hook without sql conn recovery on tmq path", async () => {
+        const dsn = (0, dsn_1.parse)("ws://root:taosdata@localhost:6041");
+        dsn.endpoint = dsn_1.WS_TMQ_ENDPOINT;
+        const connector = createMockConnector();
+        jest
+            .spyOn(wsConnectorPool_1.WebSocketConnectionPool.instance(), "getConnection")
+            .mockResolvedValue(connector);
+        const customRecoveryHook = jest.fn(async () => { });
+        const client = new wsClient_1.WsClient(dsn, 5000);
+        client.setSessionRecoveryHook(customRecoveryHook);
+        await client.ready();
+        const hookCalls = connector.setSessionRecoveryHook.mock.calls;
+        const hook = hookCalls[hookCalls.length - 1]?.[0];
+        expect(hook).toBeTruthy();
+        await hook();
+        expect(connector.sendMsgDirect).not.toHaveBeenCalled();
+        expect(customRecoveryHook).toHaveBeenCalledTimes(1);
+    });
+    test("keeps sql conn recovery and then runs custom recovery on sql endpoint", async () => {
+        const dsn = (0, dsn_1.parse)("ws://root:taosdata@localhost:6041");
+        const connector = createMockConnector();
+        const callOrder = [];
+        connector.sendMsgDirect.mockImplementation(async (message) => {
+            const action = JSON.parse(message).action;
+            callOrder.push(action);
+            return { msg: { code: 0, message: "" } };
+        });
+        jest
+            .spyOn(wsConnectorPool_1.WebSocketConnectionPool.instance(), "getConnection")
+            .mockResolvedValue(connector);
+        const client = new wsClient_1.WsClient(dsn, 5000);
+        client._connectedDatabase = "db_recovery";
+        client.setSessionRecoveryHook(async () => {
+            callOrder.push("custom");
+        });
+        await client.ready();
+        const hookCalls = connector.setSessionRecoveryHook.mock.calls;
+        const hook = hookCalls[hookCalls.length - 1]?.[0];
+        expect(hook).toBeTruthy();
+        await hook();
+        expect(connector.sendMsgDirect).toHaveBeenCalledTimes(1);
+        const firstCall = connector.sendMsgDirect.mock.calls[0];
+        const connMsg = JSON.parse(firstCall[0]);
+        expect(connMsg.action).toBe("conn");
+        expect(connMsg.args.db).toBe("db_recovery");
+        expect(callOrder).toEqual(["conn", "custom"]);
+    });
+    test("throws WebSocketQueryError when sql recovery direct call fails", async () => {
+        const dsn = (0, dsn_1.parse)("ws://root:taosdata@localhost:6041");
+        const connector = createMockConnector();
+        connector.sendMsgDirect.mockResolvedValue({
+            msg: {
+                code: 9001,
+                message: "conn failed",
+            },
+        });
+        jest
+            .spyOn(wsConnectorPool_1.WebSocketConnectionPool.instance(), "getConnection")
+            .mockResolvedValue(connector);
+        const customRecoveryHook = jest.fn(async () => { });
+        const client = new wsClient_1.WsClient(dsn, 5000);
+        client.setSessionRecoveryHook(customRecoveryHook);
+        await client.ready();
+        const hookCalls = connector.setSessionRecoveryHook.mock.calls;
+        const hook = hookCalls[hookCalls.length - 1]?.[0];
+        expect(hook).toBeTruthy();
+        await expect(hook()).rejects.toBeInstanceOf(wsError_1.WebSocketQueryError);
+        expect(customRecoveryHook).not.toHaveBeenCalled();
+    });
+});

package/lib/test/bulkPulling/wsConfig.dsn.test.d.ts

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

package/lib/test/bulkPulling/wsConfig.dsn.test.d.ts.map

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

package/lib/test/bulkPulling/wsConfig.dsn.test.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const config_1 = require("../../src/common/config");
+const utils_1 = require("../../src/common/utils");
+const dsn_1 = require("../../src/common/dsn");
+describe("WSConfig to Dsn conversion", () => {
+    test("parses multi-address dsn and keeps connector-level params", () => {
+        const conf = new config_1.WSConfig("ws://root:taosdata@host1:6041,host2:6042/mydb?retries=5&retry_backoff_ms=120&timezone=UTC");
+        const dsn = (0, utils_1.getDsn)(conf);
+        expect(dsn.scheme).toBe("ws");
+        expect(dsn.addresses).toEqual([
+            { host: "host1", port: 6041 },
+            { host: "host2", port: 6042 },
+        ]);
+        expect(dsn.database).toBe("mydb");
+        expect(dsn.endpoint).toBe(dsn_1.WS_SQL_ENDPOINT);
+        expect(dsn.params.get("retries")).toBe("5");
+        expect(dsn.params.get("retry_backoff_ms")).toBe("120");
+        expect(dsn.params.get("timezone")).toBe("UTC");
+        expect(conf.getDb()).toBe("mydb");
+        expect(conf.getTimezone()).toBe("UTC");
+    });
+    test("applies WSConfig overrides on top of dsn", () => {
+        const conf = new config_1.WSConfig("ws://root:taosdata@host1:6041/mydb");
+        conf.setUser("admin");
+        conf.setPwd("secret");
+        conf.setToken("token-1");
+        conf.setBearerToken("bearer-1");
+        conf.setTimezone("Asia/Shanghai");
+        conf.setDb("override_db");
+        const dsn = (0, utils_1.getDsn)(conf);
+        expect(dsn.username).toBe("admin");
+        expect(dsn.password).toBe("secret");
+        expect(dsn.database).toBe("override_db");
+        expect(dsn.params.get("token")).toBe("token-1");
+        expect(dsn.params.get("bearer_token")).toBe("bearer-1");
+        expect(dsn.params.get("timezone")).toBe("Asia/Shanghai");
+    });
+});

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

@@ -8,7 +8,7 @@ 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 dsn = `ws://${(0, utils_1.testUsername)()}:${(0, utils_1.testPassword)()}@localhost:6041`;
 let tags = ["California.SanFrancisco", 3];
 let multi = [
     [1709183268567, 1709183268568, 1709183268569],
@@ -18,8 +18,8 @@ let multi = [
 ];
 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.CONNECT_USER, (0, utils_1.testUsername)()],
+    [constant_1.TMQConstants.CONNECT_PASS, (0, utils_1.testPassword)()],
     [constant_1.TMQConstants.AUTO_OFFSET_RESET, "earliest"],
     [constant_1.TMQConstants.CLIENT_ID, "test_tmq_client"],
     [constant_1.TMQConstants.WS_URL, "ws://localhost:6041"],
@@ -33,7 +33,7 @@ let createTopic = `create topic if not exists ${topics[0]} as select * from ${db
 let stmtIds = [];
 (0, log_1.setLevel)("debug");
 async function connect() {
-    let dsn = "ws://root:taosdata@localhost:6041";
+    let dsn = `ws://${(0, utils_1.testUsername)()}:${(0, utils_1.testPassword)()}@localhost:6041`;
     let wsSql = null;
     let conf = new config_1.WSConfig(dsn);
     conf.setDb(db);
@@ -43,7 +43,7 @@ async function connect() {
     await wsSql.close();
 }
 async function stmtConnect() {
-    let dsn = "ws://root:taosdata@localhost:6041";
+    let dsn = `ws://${(0, utils_1.testUsername)()}:${(0, utils_1.testPassword)()}@localhost:6041`;
     let wsConf = new config_1.WSConfig(dsn, "100.100.100.100");
     wsConf.setDb(db);
     // let connector = WsStmtConnect.NewConnector(wsConf)
@@ -139,8 +139,8 @@ describe("TDWebSocket.WsSql()", () => {
 });
 afterAll(async () => {
     let conf = new config_1.WSConfig(dsn);
-    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 topic if exists ${topics[0]};`);
     await wsSql.exec(`drop database if exists ${db};`);

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

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

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

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