@tdengine/websocket 3.2.1 → 3.2.3

package/lib/test/bulkPulling/wsConnector.failover.test.js

@@ -0,0 +1,128 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const retryConfig_1 = require("../../src/client/retryConfig");
+const wsConnector_1 = require("../../src/client/wsConnector");
+function createBareConnector() {
+    const connector = Object.create(wsConnector_1.WebSocketConnector.prototype);
+    connector._timeout = 5000;
+    connector._addresses = [
+        { host: "host1", port: 6041 },
+        { host: "host2", port: 6042 },
+    ];
+    connector._currentAddressIndex = 0;
+    connector._retryConfig = new retryConfig_1.RetryConfig(1, 1, 8);
+    connector._reconnectLock = null;
+    connector._isReconnecting = false;
+    connector._inflightRequests = new Map();
+    connector._wsConn = {
+        readyState: 1,
+        send: jest.fn(),
+        close: jest.fn(),
+    };
+    return connector;
+}
+function buildBinaryMessage(action) {
+    const buffer = new ArrayBuffer(26);
+    const view = new DataView(buffer);
+    view.setBigInt64(16, action, true);
+    return buffer;
+}
+function delay(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+describe("WebSocketConnector failover and retry", () => {
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+    test("deduplicates concurrent reconnect triggers with reconnect lock", async () => {
+        const connector = createBareConnector();
+        const reconnectImpl = jest.fn(async () => {
+            await delay(20);
+        });
+        connector._doReconnect = reconnectImpl;
+        await Promise.all([
+            connector.triggerReconnect(),
+            connector.triggerReconnect(),
+            connector.triggerReconnect(),
+        ]);
+        expect(reconnectImpl).toHaveBeenCalledTimes(1);
+    });
+    test("switches to next address after retries are exhausted", async () => {
+        const connector = createBareConnector();
+        const attempts = [];
+        connector.sleep = jest.fn(async () => { });
+        connector.reconnectToCurrentAddress = jest.fn(async () => {
+            const current = connector._addresses[connector._currentAddressIndex];
+            const addr = `${current.host}:${current.port}`;
+            attempts.push(addr);
+            if (addr === "host1:6041") {
+                throw new Error("host1 down");
+            }
+        });
+        await connector.attemptReconnect();
+        expect(attempts).toEqual([
+            "host1:6041",
+            "host1:6041",
+            "host2:6042",
+        ]);
+        expect(connector._currentAddressIndex).toBe(1);
+    });
+    test("keeps retriable string request inflight when send throws", async () => {
+        const connector = createBareConnector();
+        connector._wsConn.send = jest.fn(() => {
+            throw new Error("send failed");
+        });
+        const pending = connector.sendMsg(JSON.stringify({
+            action: "insert",
+            args: {
+                req_id: 101,
+            },
+        }), false);
+        void pending.catch(() => { });
+        const state = await Promise.race([
+            pending.then(() => "resolved").catch(() => "rejected"),
+            delay(20).then(() => "pending"),
+        ]);
+        expect(state).toBe("pending");
+        expect(connector._inflightRequests.has(101n)).toBe(true);
+        connector.failAllInflightRequests(new Error("cleanup"));
+    });
+    test("rejects non-retriable string request immediately when send throws", async () => {
+        const connector = createBareConnector();
+        connector._wsConn.send = jest.fn(() => {
+            throw new Error("send failed");
+        });
+        await expect(connector.sendMsg(JSON.stringify({
+            action: "query",
+            args: {
+                req_id: 102,
+            },
+        }), false)).rejects.toThrow("send failed");
+        expect(connector._inflightRequests.has(102n)).toBe(false);
+    });
+    test("keeps retriable binary request inflight when send throws", async () => {
+        const connector = createBareConnector();
+        connector._wsConn.send = jest.fn(() => {
+            throw new Error("send failed");
+        });
+        const message = buildBinaryMessage(6n);
+        const pending = connector.sendBinaryMsg(201n, "binary_query", message, false);
+        void pending.catch(() => { });
+        const state = await Promise.race([
+            pending.then(() => "resolved").catch(() => "rejected"),
+            delay(20).then(() => "pending"),
+        ]);
+        expect(state).toBe("pending");
+        expect(connector._inflightRequests.has(201n)).toBe(true);
+        connector.failAllInflightRequests(new Error("cleanup"));
+    });
+    test("rejects non-retriable binary request immediately when send throws", async () => {
+        const connector = createBareConnector();
+        connector._wsConn.send = jest.fn(() => {
+            throw new Error("send failed");
+        });
+        const message = buildBinaryMessage(7n);
+        await expect(connector.sendBinaryMsg(202n, "fetch", message, false)).rejects.toThrow("send failed");
+        expect(connector._inflightRequests.has(202n)).toBe(false);
+    });
+});

package/lib/test/bulkPulling/wsConnectorPool.key.test.d.ts

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

package/lib/test/bulkPulling/wsConnectorPool.key.test.d.ts.map

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

package/lib/test/bulkPulling/wsConnectorPool.key.test.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const wsConnectorPool_1 = require("../../src/client/wsConnectorPool");
+const dsn_1 = require("../../src/common/dsn");
+function resetPoolSingleton() {
+    const PoolClass = wsConnectorPool_1.WebSocketConnectionPool;
+    if (PoolClass._instance) {
+        PoolClass._instance.destroyed();
+        PoolClass._instance = undefined;
+    }
+}
+describe("WebSocketConnectionPool key generation", () => {
+    beforeEach(() => {
+        resetPoolSingleton();
+    });
+    afterEach(() => {
+        resetPoolSingleton();
+    });
+    test("normalizes address order when generating pool key", () => {
+        const pool = wsConnectorPool_1.WebSocketConnectionPool.instance();
+        const dsnA = (0, dsn_1.parse)("ws://root:taosdata@host2:6042,host1:6041/mydb?timezone=UTC&token=abc");
+        const dsnB = (0, dsn_1.parse)("ws://root:taosdata@host1:6041,host2:6042/mydb?token=abc&timezone=UTC");
+        const keyA = pool.getPoolKey(dsnA, "ws");
+        const keyB = pool.getPoolKey(dsnB, "ws");
+        expect(keyA).toBe(keyB);
+    });
+    test("isolates connections for different auth identities", () => {
+        const pool = wsConnectorPool_1.WebSocketConnectionPool.instance();
+        const dsnUserA = (0, dsn_1.parse)("ws://root:taosdata@host1:6041/mydb");
+        const dsnUserB = (0, dsn_1.parse)("ws://admin:taosdata@host1:6041/mydb");
+        const keyA = pool.getPoolKey(dsnUserA, "ws");
+        const keyB = pool.getPoolKey(dsnUserB, "ws");
+        expect(keyA).not.toBe(keyB);
+    });
+    test("isolates connections for different token values", () => {
+        const pool = wsConnectorPool_1.WebSocketConnectionPool.instance();
+        const dsnA = (0, dsn_1.parse)("ws://host1:6041/mydb?token=token-a");
+        const dsnB = (0, dsn_1.parse)("ws://host1:6041/mydb?token=token-b");
+        const keyA = pool.getPoolKey(dsnA, "ws");
+        const keyB = pool.getPoolKey(dsnB, "ws");
+        expect(keyA).not.toBe(keyB);
+    });
+    test("includes websocket path in the pool key scope", () => {
+        const pool = wsConnectorPool_1.WebSocketConnectionPool.instance();
+        const dsn = (0, dsn_1.parse)("ws://root:taosdata@host1:6041/mydb");
+        const sqlKey = pool.getPoolKey(dsn, "ws");
+        const tmqKey = pool.getPoolKey(dsn, "rest/tmq");
+        expect(sqlKey).not.toBe(tmqKey);
+    });
+});

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

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

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

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

package/lib/test/bulkPulling/wsEventCallback.test.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const wsEventCallback_1 = require("../../src/client/wsEventCallback");
+function resetCallbackRegistry() {
+    const CallbackClass = wsEventCallback_1.WsEventCallback;
+    CallbackClass._msgActionRegister = new Map();
+}
+describe("WsEventCallback lifecycle", () => {
+    beforeEach(() => {
+        resetCallbackRegistry();
+    });
+    afterEach(() => {
+        resetCallbackRegistry();
+        jest.restoreAllMocks();
+    });
+    test("clears timeout when callback is matched", async () => {
+        const callback = wsEventCallback_1.WsEventCallback.instance();
+        const resolve = jest.fn();
+        const reject = jest.fn();
+        const clearSpy = jest.spyOn(global, "clearTimeout");
+        await callback.registerCallback({
+            action: "insert",
+            req_id: 11n,
+            timeout: 2000,
+        }, resolve, reject);
+        await callback.handleEventCallback({
+            action: "insert",
+            req_id: 11n,
+        }, wsEventCallback_1.OnMessageType.MESSAGE_TYPE_STRING, {
+            action: "insert",
+            req_id: 11n,
+            code: 0,
+        });
+        expect(resolve).toHaveBeenCalledTimes(1);
+        expect(reject).not.toHaveBeenCalled();
+        expect(clearSpy).toHaveBeenCalled();
+        expect(wsEventCallback_1.WsEventCallback._msgActionRegister.size).toBe(0);
+    });
+    test("unregisterCallback removes entry and clears its timeout", async () => {
+        const callback = wsEventCallback_1.WsEventCallback.instance();
+        const resolve = jest.fn();
+        const reject = jest.fn();
+        const clearSpy = jest.spyOn(global, "clearTimeout");
+        await callback.registerCallback({
+            action: "options_connection",
+            req_id: 22n,
+            timeout: 2000,
+            id: 22n,
+        }, resolve, reject);
+        await callback.unregisterCallback(22n);
+        expect(clearSpy).toHaveBeenCalled();
+        expect(wsEventCallback_1.WsEventCallback._msgActionRegister.size).toBe(0);
+    });
+});

package/lib/test/utils.d.ts

@@ -15,4 +15,8 @@ export declare function expectStableData(rows: Array<Array<any>>, tags: Array<an
 export declare function hexToBytes(hex: string): ArrayBuffer;
 export declare function compareUint8Arrays(arr1: Uint8Array, arr2: Uint8Array): boolean;
 export declare function Sleep(ms: number): Promise<void>;
+export declare function testUsername(): string;
+export declare function testPassword(): string;
+export declare const testEnterprise: jest.It;
+export declare const testNon3360: jest.It;
 //# sourceMappingURL=utils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../test/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,wBAAgB,aAAa,CACzB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,MAAM,GACf,MAAM,CAcR;AAED,wBAAgB,YAAY,CACxB,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EACzB,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,EAChB,MAAM,EAAE,MAAM,EACd,KAAK,GAAE,MAAgB,GACxB,MAAM,CAkCR;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAqB7E;AAED,eAAO,MAAM,SAAS,EAAE,KAAK,CAAC,YAAY,CAsFzC,CAAC;AAEF,eAAO,MAAM,QAAQ,EAAE,KAAK,CAAC,YAAY,CAMxC,CAAC;AACF,eAAO,MAAM,OAAO,EAAE,KAAK,CAAC,YAAY,CAkEvC,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAKvD;AACD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAK3D;AACD,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAErD;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAKnD;AACD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAKvD;AACD,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEjD;AAED,wBAAgB,gBAAgB,CAC5B,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EACvB,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,GACjB,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAMnB;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAQnD;AAoBD,wBAAgB,kBAAkB,CAC9B,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,UAAU,GACjB,OAAO,CAYT;AAED,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/C"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../test/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,wBAAgB,aAAa,CACzB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,MAAM,GACf,MAAM,CAcR;AAED,wBAAgB,YAAY,CACxB,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EACzB,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,EAChB,MAAM,EAAE,MAAM,EACd,KAAK,GAAE,MAAgB,GACxB,MAAM,CAkCR;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAqB7E;AAED,eAAO,MAAM,SAAS,EAAE,KAAK,CAAC,YAAY,CAsFzC,CAAC;AAEF,eAAO,MAAM,QAAQ,EAAE,KAAK,CAAC,YAAY,CAMxC,CAAC;AAEF,eAAO,MAAM,OAAO,EAAE,KAAK,CAAC,YAAY,CAkEvC,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAKvD;AACD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAK3D;AACD,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAErD;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAKnD;AACD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAKvD;AACD,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEjD;AAED,wBAAgB,gBAAgB,CAC5B,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EACvB,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,GACjB,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAMnB;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAQnD;AAED,wBAAgB,kBAAkB,CAC9B,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,UAAU,GACjB,OAAO,CAYT;AAED,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/C;AAED,wBAAgB,YAAY,IAAI,MAAM,CAErC;AAED,wBAAgB,YAAY,IAAI,MAAM,CAErC;AAED,eAAO,MAAM,cAAc,SAA2E,CAAC;AACvG,eAAO,MAAM,WAAW,SAAqE,CAAC"}

package/lib/test/utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tagMeta = exports.jsonMeta = exports.tableMeta = void 0;
+exports.testNon3360 = exports.testEnterprise = exports.tagMeta = exports.jsonMeta = exports.tableMeta = void 0;
 exports.getInsertBind = getInsertBind;
 exports.insertStable = insertStable;
 exports.insertNTable = insertNTable;
@@ -17,6 +17,8 @@ exports.expectStableData = expectStableData;
 exports.hexToBytes = hexToBytes;
 exports.compareUint8Arrays = compareUint8Arrays;
 exports.Sleep = Sleep;
+exports.testUsername = testUsername;
+exports.testPassword = testPassword;
 const log_1 = __importDefault(require("../src/common/log"));
 function getInsertBind(valuesLen, tagsLen, db, stable) {
     let sql = `insert into ? using ${db}.${stable} tags ( ?`;
@@ -289,22 +291,6 @@ function hexToBytes(hex) {
     }
     return a.buffer;
 }
-// export function createStmtData(varbinary:string = "ab",
-//     geoHex:string = "0101000020E6100000000000000000F03F0000000000000040"):Array<Array<any>> {
-//     let multi:any[][] = [
-//         [1709183268567, 1709183268568, 1709183268569],
-//         [10.2, 10.3, 10.4],
-//         [292, 293, 294],
-//         [0.32, 0.33, 0.34],
-//         ];
-//     let res = hexToBytes(geoHex)
-//     let geom = Array.from(new Uint8Array(res))
-//     multi.push([geom, geom, geom])
-//     res = new TextEncoder().encode(varbinary)
-//     let binary = Array.from(new Uint8Array(res))
-//     multi.push([binary, binary, binary])
-//     return multi
-// }
 function compareUint8Arrays(arr1, arr2) {
     if (arr1.length !== arr2.length) {
         log_1.default.debug(`${arr1.length} !== ${arr2.length}`);
@@ -321,3 +307,11 @@ function compareUint8Arrays(arr1, arr2) {
 function Sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
+function testUsername() {
+    return process.env.TDENGINE_TEST_USERNAME || "root";
+}
+function testPassword() {
+    return process.env.TDENGINE_TEST_PASSWORD || "taosdata";
+}
+exports.testEnterprise = process.env.TEST_ENTERPRISE?.toLowerCase() === "true" ? test : test.skip;
+exports.testNon3360 = process.env.TEST_3360?.toLowerCase() === "true" ? test.skip : test;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tdengine/websocket",
-  "version": "3.2.1",
+  "version": "3.2.3",
   "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",