@tdengine/websocket 3.2.2 → 3.3.0

package/lib/src/common/dsn.js

@@ -0,0 +1,221 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CLOUD_DEFAULT_PORT = exports.DEFAULT_PORT = exports.Dsn = exports.Address = exports.WS_TMQ_ENDPOINT = exports.WS_SQL_ENDPOINT = void 0;
+exports.parse = parse;
+exports.isCloudServiceHost = isCloudServiceHost;
+exports.getDefaultPortForHost = getDefaultPortForHost;
+const wsError_1 = require("./wsError");
+exports.WS_SQL_ENDPOINT = "sql";
+exports.WS_TMQ_ENDPOINT = "tmq";
+const WS_SQL_PATH = "ws";
+const WS_TMQ_PATH = "rest/tmq";
+class Address {
+    constructor(host, port) {
+        this.host = host;
+        this.port = port;
+    }
+}
+exports.Address = Address;
+const REDACTED = "[REDACTED]";
+const SENSITIVE_PARAM_KEYS = new Set([
+    "token",
+    "bearer_token",
+    "td.connect.token",
+]);
+function shouldMaskParam(key) {
+    return SENSITIVE_PARAM_KEYS.has(key.toLowerCase());
+}
+class Dsn {
+    constructor(scheme, username, password, addresses, database, params, endpoint = exports.WS_SQL_ENDPOINT) {
+        this.scheme = scheme;
+        this.username = username;
+        this.password = password;
+        this.addresses = addresses.map((address) => new Address(address.host, address.port));
+        this.database = database;
+        this.params = new Map(params);
+        this.endpoint = endpoint;
+    }
+    toString() {
+        const params = {};
+        for (const [key, value] of this.params.entries()) {
+            params[key] = shouldMaskParam(key) ? REDACTED : value;
+        }
+        return JSON.stringify({
+            scheme: this.scheme,
+            username: this.username,
+            password: this.password.length > 0 ? REDACTED : this.password,
+            addresses: this.addresses,
+            database: this.database,
+            params,
+            endpoint: this.endpoint,
+        });
+    }
+    path() {
+        return this.endpoint === exports.WS_TMQ_ENDPOINT ? WS_TMQ_PATH : WS_SQL_PATH;
+    }
+}
+exports.Dsn = Dsn;
+/**
+ * Parse a multi-host TDengine WebSocket URL.
+ * Format: ws://username:password@host1:port1,host2:port2,[::1]:port3/db?key=value
+ */
+function parse(url) {
+    if (!url || url.trim().length === 0) {
+        throw new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_INVALID_URL, "URL must not be empty");
+    }
+    // Extract scheme
+    const schemeMatch = url.match(/^(wss?):\/\//i);
+    if (!schemeMatch) {
+        throw new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_INVALID_URL, "Invalid URL scheme, expected ws:// or wss://");
+    }
+    const scheme = schemeMatch[1].toLowerCase();
+    let remainder = url.slice(schemeMatch[0].length);
+    // Isolate authority from path/query before parsing userinfo.
+    const slashIndex = remainder.indexOf("/");
+    const queryMarkIndex = remainder.indexOf("?");
+    let authorityEndIndex = remainder.length;
+    if (slashIndex !== -1) {
+        authorityEndIndex = Math.min(authorityEndIndex, slashIndex);
+    }
+    if (queryMarkIndex !== -1) {
+        authorityEndIndex = Math.min(authorityEndIndex, queryMarkIndex);
+    }
+    const authority = remainder.slice(0, authorityEndIndex);
+    const suffix = remainder.slice(authorityEndIndex);
+    // Extract username:password@ from authority only.
+    let username = "";
+    let password = "";
+    const atIndex = authority.lastIndexOf("@");
+    let hostPort = authority;
+    if (atIndex !== -1) {
+        const userInfo = authority.slice(0, atIndex);
+        hostPort = authority.slice(atIndex + 1);
+        const colonIndex = userInfo.indexOf(":");
+        if (colonIndex !== -1) {
+            username = userInfo.slice(0, colonIndex);
+            password = userInfo.slice(colonIndex + 1);
+        }
+        else {
+            username = userInfo;
+        }
+    }
+    remainder = `${hostPort}${suffix}`;
+    // Extract query params (after ?)
+    let params = new Map();
+    const queryIndex = remainder.indexOf("?");
+    let queryString = "";
+    if (queryIndex !== -1) {
+        queryString = remainder.slice(queryIndex + 1);
+        remainder = remainder.slice(0, queryIndex);
+        const searchParams = new URLSearchParams(queryString);
+        searchParams.forEach((value, key) => {
+            params.set(key, value);
+        });
+    }
+    // Extract database (after /)
+    let database = "";
+    const pathIndex = remainder.indexOf("/");
+    if (pathIndex !== -1) {
+        database = remainder.slice(pathIndex + 1);
+        remainder = remainder.slice(0, pathIndex);
+    }
+    // remainder is now the host list: host1:port1,host2:port2,[::1]:port3
+    const hosts = parseHostList(remainder);
+    if (hosts.length === 0) {
+        throw new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_INVALID_URL, "No hosts found in URL");
+    }
+    // Deduplicate hosts (preserve order, keep first occurrence)
+    const seen = new Set();
+    const dedupedHosts = [];
+    for (const h of hosts) {
+        const key = `${h.host}:${h.port}`;
+        if (!seen.has(key)) {
+            seen.add(key);
+            dedupedHosts.push(h);
+        }
+    }
+    return new Dsn(scheme, username, password, dedupedHosts, database, params);
+}
+exports.DEFAULT_PORT = 6041;
+exports.CLOUD_DEFAULT_PORT = 443;
+function isCloudServiceHost(host) {
+    const normalizedHost = host.toLowerCase();
+    return (normalizedHost.includes("cloud.tdengine.com") ||
+        normalizedHost.includes("cloud.taosdata.com"));
+}
+function getDefaultPortForHost(host) {
+    return isCloudServiceHost(host) ? exports.CLOUD_DEFAULT_PORT : exports.DEFAULT_PORT;
+}
+/**
+ * Parse comma-separated host list. Supports IPv6 in brackets.
+ * Examples: "host1:6041,host2:6042", "[::1]:6041,host2:6042"
+ */
+function parseHostList(hostStr) {
+    if (!hostStr || hostStr.trim().length === 0) {
+        return [];
+    }
+    const hosts = [];
+    let i = 0;
+    while (i < hostStr.length) {
+        // Skip comma separator
+        if (hostStr[i] === ",") {
+            i++;
+            continue;
+        }
+        if (hostStr[i] === "[") {
+            // IPv6 address in brackets
+            const closeBracket = hostStr.indexOf("]", i);
+            if (closeBracket === -1) {
+                throw new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_INVALID_URL, `Unclosed bracket in IPv6 address: ${hostStr.slice(i)}`);
+            }
+            const ipv6Host = hostStr.slice(i + 1, closeBracket);
+            let port = getDefaultPortForHost(ipv6Host);
+            let next = closeBracket + 1;
+            if (next < hostStr.length && hostStr[next] === ":") {
+                const portEnd = hostStr.indexOf(",", next);
+                const portStr = portEnd === -1
+                    ? hostStr.slice(next + 1)
+                    : hostStr.slice(next + 1, portEnd);
+                port = parsePort(portStr, hostStr, ipv6Host);
+                i = portEnd === -1 ? hostStr.length : portEnd;
+            }
+            else {
+                i = next;
+            }
+            hosts.push(new Address(`[${ipv6Host}]`, port));
+        }
+        else {
+            // Regular host or IPv4
+            const commaIndex = hostStr.indexOf(",", i);
+            const segment = commaIndex === -1
+                ? hostStr.slice(i)
+                : hostStr.slice(i, commaIndex);
+            const lastColon = segment.lastIndexOf(":");
+            if (lastColon !== -1) {
+                const host = segment.slice(0, lastColon);
+                const port = parsePort(segment.slice(lastColon + 1), hostStr, host);
+                hosts.push(new Address(host, port));
+            }
+            else {
+                hosts.push(new Address(segment, getDefaultPortForHost(segment)));
+            }
+            i = commaIndex === -1 ? hostStr.length : commaIndex;
+        }
+    }
+    return hosts;
+}
+function parsePort(portStr, context, host) {
+    // If port string is empty, use default port
+    if (portStr.length === 0) {
+        return getDefaultPortForHost(host);
+    }
+    // Validate that port string contains only digits
+    if (!/^\d+$/.test(portStr)) {
+        throw new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_INVALID_URL, `Invalid port "${portStr}" in host string: ${context}`);
+    }
+    const port = parseInt(portStr, 10);
+    if (isNaN(port) || port < 1 || port > 65535) {
+        throw new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_INVALID_URL, `Invalid port "${portStr}" in host string: ${context}`);
+    }
+    return port;
+}

package/lib/src/common/taosResult.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"taosResult.d.ts","sourceRoot":"","sources":["../../../src/common/taosResult.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"taosResult.d.ts","sourceRoot":"","sources":["../../../src/common/taosResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAe7E,MAAM,WAAW,YAAY;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,YAAY;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,WAAW;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,GAAG,CAAC;CACZ;AAED,qBAAa,UAAU;IACnB,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,KAAK,CAA6B;IAC1C,OAAO,CAAC,KAAK,CAA2B;IAExC,OAAO,CAAC,UAAU,CAA4B;IAC9C,SAAS,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACjD,OAAO,CAAC,UAAU,CAAK;IACvB,OAAO,CAAC,iBAAiB,CAAC,CAAuB;IACjD,OAAO,CAAC,aAAa,CAAC,CAAuB;IAE7C,wBAAwB;IACxB,OAAO,CAAC,OAAO,CAA4B;gBAC/B,aAAa,CAAC,EAAE,eAAe;IA2CpC,YAAY,CAAC,SAAS,EAAE,MAAM;IAI9B,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM;IAU5C,QAAQ,IAAI,MAAM;IAMlB,QAAQ,CAAC,KAAK,GAAE,MAAW;IAG3B,OAAO,IAAI,KAAK,CAAC,YAAY,CAAC,GAAG,IAAI;IAIrC,OAAO,CAAC,QAAQ,EAAE,YAAY;IAM9B,OAAO,IAAI,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI;IAInC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI;IAIvC,aAAa,IAAI,MAAM,GAAG,IAAI,GAAG,SAAS;IAI1C,WAAW,IAAI,KAAK,CAAC,YAAY,CAAC,GAAG,IAAI;IAIzC,YAAY,IAAI,MAAM,GAAG,IAAI,GAAG,SAAS;IAIzC,YAAY;IAIZ,YAAY,CAAC,SAAS,EAAE,MAAM;IAI9B,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM;IAUzB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAOpD;;OAEG;IACH,OAAO,CAAC,eAAe;CAc1B;AAED,wBAAgB,UAAU,CACtB,MAAM,EAAE,oBAAoB,EAC5B,UAAU,EAAE,UAAU,GACvB,UAAU,CAiIZ;AAED,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAwBnD;AAED,wBAAgB,oBAAoB,CAChC,UAAU,EAAE,QAAQ,EACpB,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,UAAU,EACrB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,GACjB,GAAG,EAAE,CAmKP;AAED,wBAAgB,aAAa,CACzB,UAAU,EAAE,QAAQ,EACpB,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,YAAY,EAClB,YAAY,EAAE,MAAM,GAAG,IAAI,GAC5B,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,CA2DpC;AAED,wBAAgB,UAAU,CACtB,UAAU,EAAE,WAAW,EACvB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,GACf,WAAW,CAGb;AAED,wBAAgB,WAAW,CACvB,UAAU,EAAE,WAAW,EACvB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,WAAW,GACzB,MAAM,CAGR;AAED,wBAAgB,SAAS,CACrB,UAAU,EAAE,WAAW,EACvB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,GACf,MAAM,CAOR;AAED,wBAAgB,SAAS,CACrB,UAAU,EAAE,QAAQ,EACpB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,WAAW,GACzB,MAAM,CAOR;AAgBD,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAE1D;AAMD,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAE3C"}

package/lib/src/common/taosResult.js

@@ -449,7 +449,6 @@ function readSolidData(dataBuffer, colDataHead, meta, fields_scale) {
         }
         case constant_1.TDengineTypeCode.TIMESTAMP: {
             return dataBuffer.getBigInt64(colDataHead, true);
-            // could change
         }
         case constant_1.TDengineTypeCode.DECIMAL: {
             let decimalHighPart = dataBuffer.getBigInt64(colDataHead + 8, true);
@@ -471,13 +470,11 @@ function readBinary(dataBuffer, colDataHead, length) {
     return buff;
 }
 function readVarchar(dataBuffer, colDataHead, length, textDecoder) {
-    // let buff = dataBuffer.slice(colDataHead, colDataHead + length)
     let dataView = new DataView(dataBuffer, colDataHead, length);
     return textDecoder.decode(dataView);
 }
 function readNchar(dataBuffer, colDataHead, length) {
     let data = [];
-    // let buff: ArrayBuffer = dataBuffer.slice(colDataHead, colDataHead + length);
     let dataView = new DataView(dataBuffer, colDataHead, length);
     for (let i = 0; i < length / 4; i++) {
         data.push((0, ut8Helper_1.appendRune)(dataView.getUint32(i * 4, true)));
@@ -485,7 +482,6 @@ function readNchar(dataBuffer, colDataHead, length) {
     return data.join("");
 }
 function getString(dataBuffer, colDataHead, length, textDecoder) {
-    // let buff = dataBuffer.slice(colDataHead, colDataHead + length - 1)
     let dataView = new Uint8Array(dataBuffer.buffer, dataBuffer.byteOffset + colDataHead, length - 1);
     return textDecoder.decode(dataView);
 }
@@ -514,7 +510,6 @@ function bitmapLen(n) {
     return (n + ((1 << 3) - 1)) >> 3;
 }
 function getScaleFromRowBlock(buffer, colIndex, startOffset) {
-    // for decimal: |___bytes___|__empty__|___prec___|__scale___|
     let backupPos = buffer.byteOffset + startOffset + 28 + colIndex * 5 + 1;
     let scaleBuffer = new DataView(buffer.buffer, backupPos);
     let scale = scaleBuffer.getInt32(0, true);

package/lib/src/common/urlParser.d.ts

@@ -0,0 +1,32 @@
+export interface HostInfo {
+    host: string;
+    port: number;
+}
+export interface ParsedUrl {
+    hosts: HostInfo[];
+    scheme: string;
+    username: string;
+    password: string;
+    database: string;
+    params: Map<string, string>;
+}
+/**
+ * Parse a multi-host TDengine WebSocket URL.
+ * Format: ws://username:password@host1:port1,host2:port2,[::1]:port3/db?key=value
+ */
+export declare function parseMultiHostUrl(url: string): ParsedUrl;
+/**
+ * Build a single-host URL from parsed components + a specific host.
+ * Used by ConnectionManager to create WebSocketConnector URLs.
+ */
+export declare function buildHostUrl(parsed: ParsedUrl, host: HostInfo, extraParams?: Map<string, string>): URL;
+/**
+ * Extract retry options from parsed URL params.
+ */
+export declare function extractRetryOptions(params: Map<string, string>): {
+    retries?: number;
+    retryBackoffMs?: number;
+    retryBackoffMaxMs?: number;
+    resendWrite?: boolean;
+};
+//# sourceMappingURL=urlParser.d.ts.map

package/lib/src/common/urlParser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"urlParser.d.ts","sourceRoot":"","sources":["../../../src/common/urlParser.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,QAAQ;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,SAAS;IACtB,KAAK,EAAE,QAAQ,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC/B;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAqFxD;AA0FD;;;GAGG;AACH,wBAAgB,YAAY,CACxB,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,QAAQ,EACd,WAAW,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAClC,GAAG,CA0BL;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG;IAC9D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,WAAW,CAAC,EAAE,OAAO,CAAC;CACzB,CAgBA"}

package/lib/src/common/urlParser.js

@@ -0,0 +1,201 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseMultiHostUrl = parseMultiHostUrl;
+exports.buildHostUrl = buildHostUrl;
+exports.extractRetryOptions = extractRetryOptions;
+const wsError_1 = require("./wsError");
+/**
+ * Parse a multi-host TDengine WebSocket URL.
+ * Format: ws://username:password@host1:port1,host2:port2,[::1]:port3/db?key=value
+ */
+function parseMultiHostUrl(url) {
+    if (!url || url.trim().length === 0) {
+        throw new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_INVALID_URL, "URL must not be empty");
+    }
+    // Extract scheme
+    const schemeMatch = url.match(/^(wss?):\/\//i);
+    if (!schemeMatch) {
+        throw new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_INVALID_URL, `Invalid URL scheme, expected ws:// or wss://, got: ${url}`);
+    }
+    const scheme = schemeMatch[1].toLowerCase();
+    let remainder = url.slice(schemeMatch[0].length);
+    // Extract username:password@ if present
+    let username = "";
+    let password = "";
+    const atIndex = remainder.indexOf("@");
+    if (atIndex !== -1) {
+        const userInfo = remainder.slice(0, atIndex);
+        remainder = remainder.slice(atIndex + 1);
+        const colonIndex = userInfo.indexOf(":");
+        if (colonIndex !== -1) {
+            username = userInfo.slice(0, colonIndex);
+            password = userInfo.slice(colonIndex + 1);
+        }
+        else {
+            username = userInfo;
+        }
+    }
+    // Extract query params (after ?)
+    let params = new Map();
+    const queryIndex = remainder.indexOf("?");
+    let queryString = "";
+    if (queryIndex !== -1) {
+        queryString = remainder.slice(queryIndex + 1);
+        remainder = remainder.slice(0, queryIndex);
+        const searchParams = new URLSearchParams(queryString);
+        searchParams.forEach((value, key) => {
+            params.set(key, value);
+        });
+    }
+    // Extract database (after /)
+    let database = "";
+    const pathIndex = remainder.indexOf("/");
+    if (pathIndex !== -1) {
+        database = remainder.slice(pathIndex + 1);
+        remainder = remainder.slice(0, pathIndex);
+    }
+    // remainder is now the host list: host1:port1,host2:port2,[::1]:port3
+    const hosts = parseHostList(remainder);
+    if (hosts.length === 0) {
+        throw new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_INVALID_URL, "No hosts found in URL");
+    }
+    // Deduplicate hosts (preserve order, keep first occurrence)
+    const seen = new Set();
+    const dedupedHosts = [];
+    for (const h of hosts) {
+        const key = `${h.host}:${h.port}`;
+        if (!seen.has(key)) {
+            seen.add(key);
+            dedupedHosts.push(h);
+        }
+    }
+    return {
+        hosts: dedupedHosts,
+        scheme,
+        username,
+        password,
+        database,
+        params,
+    };
+}
+const DEFAULT_PORT = 6041;
+/**
+ * Parse comma-separated host list. Supports IPv6 in brackets.
+ * Examples: "host1:6041,host2:6042", "[::1]:6041,host2:6042"
+ */
+function parseHostList(hostStr) {
+    if (!hostStr || hostStr.trim().length === 0) {
+        return [];
+    }
+    const hosts = [];
+    let i = 0;
+    while (i < hostStr.length) {
+        // Skip comma separator
+        if (hostStr[i] === ",") {
+            i++;
+            continue;
+        }
+        if (hostStr[i] === "[") {
+            // IPv6 address in brackets
+            const closeBracket = hostStr.indexOf("]", i);
+            if (closeBracket === -1) {
+                throw new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_INVALID_URL, `Unclosed bracket in IPv6 address: ${hostStr.slice(i)}`);
+            }
+            const ipv6Host = hostStr.slice(i + 1, closeBracket);
+            let port = DEFAULT_PORT;
+            let next = closeBracket + 1;
+            if (next < hostStr.length && hostStr[next] === ":") {
+                const portEnd = hostStr.indexOf(",", next);
+                const portStr = portEnd === -1
+                    ? hostStr.slice(next + 1)
+                    : hostStr.slice(next + 1, portEnd);
+                port = parsePort(portStr, hostStr);
+                i = portEnd === -1 ? hostStr.length : portEnd;
+            }
+            else {
+                i = next;
+            }
+            hosts.push({ host: `[${ipv6Host}]`, port });
+        }
+        else {
+            // Regular host or IPv4
+            const commaIndex = hostStr.indexOf(",", i);
+            const segment = commaIndex === -1
+                ? hostStr.slice(i)
+                : hostStr.slice(i, commaIndex);
+            const lastColon = segment.lastIndexOf(":");
+            if (lastColon !== -1) {
+                const host = segment.slice(0, lastColon);
+                const port = parsePort(segment.slice(lastColon + 1), hostStr);
+                hosts.push({ host, port });
+            }
+            else {
+                hosts.push({ host: segment, port: DEFAULT_PORT });
+            }
+            i = commaIndex === -1 ? hostStr.length : commaIndex;
+        }
+    }
+    return hosts;
+}
+function parsePort(portStr, context) {
+    // If port string is empty, use default port
+    if (portStr.length === 0) {
+        return DEFAULT_PORT;
+    }
+    // Validate that port string contains only digits
+    if (!/^\d+$/.test(portStr)) {
+        throw new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_INVALID_URL, `Invalid port "${portStr}" in host string: ${context}`);
+    }
+    const port = parseInt(portStr, 10);
+    if (isNaN(port) || port < 1 || port > 65535) {
+        throw new wsError_1.TDWebSocketClientError(wsError_1.ErrorCode.ERR_INVALID_URL, `Invalid port "${portStr}" in host string: ${context}`);
+    }
+    return port;
+}
+/**
+ * Build a single-host URL from parsed components + a specific host.
+ * Used by ConnectionManager to create WebSocketConnector URLs.
+ */
+function buildHostUrl(parsed, host, extraParams) {
+    const origin = `${parsed.scheme}://${host.host}:${host.port}`;
+    const url = new URL(origin + "/ws");
+    if (parsed.username) {
+        url.username = parsed.username;
+    }
+    if (parsed.password) {
+        url.password = parsed.password;
+    }
+    // Copy non-retry params
+    const retryParams = new Set(["retries", "retry_backoff_ms", "retry_backoff_max_ms", "resend_write"]);
+    parsed.params.forEach((value, key) => {
+        if (!retryParams.has(key)) {
+            url.searchParams.set(key, value);
+        }
+    });
+    if (extraParams) {
+        extraParams.forEach((value, key) => {
+            url.searchParams.set(key, value);
+        });
+    }
+    return url;
+}
+/**
+ * Extract retry options from parsed URL params.
+ */
+function extractRetryOptions(params) {
+    const result = {};
+    if (params.has("retries")) {
+        result.retries = parseInt(params.get("retries"), 10);
+    }
+    if (params.has("retry_backoff_ms")) {
+        result.retryBackoffMs = parseInt(params.get("retry_backoff_ms"), 10);
+    }
+    if (params.has("retry_backoff_max_ms")) {
+        result.retryBackoffMaxMs = parseInt(params.get("retry_backoff_max_ms"), 10);
+    }
+    if (params.has("resend_write")) {
+        const val = params.get("resend_write").toLowerCase();
+        result.resendWrite = val === "true" || val === "1";
+    }
+    return result;
+}

package/lib/src/common/utils.d.ts

@@ -1,5 +1,7 @@
+import { TmqConfig } from "../tmq/config";
 import { WSConfig } from "./config";
-export declare function getUrl(wsConfig: WSConfig): URL;
+import { Dsn } from "./dsn";
+export declare function getDsn(wsConfig: WSConfig): Dsn;
 export declare function isEmpty(value: any): boolean;
 export declare function getBinarySql(action: bigint, reqId: bigint, resultId: bigint, sql?: string): ArrayBuffer;
 export declare function zigzagDecode(n: number): number;
@@ -15,4 +17,7 @@ export declare function safeDecodeURIComponent(str: string): string;
  */
 export declare function compareVersions(v1: string, v2: string): number;
 export declare function decimalToString(valueStr: string, fields_scale: bigint | null): string;
+export declare function maskSensitiveForLog(message: string): string;
+export declare function maskUrlForLog(url: URL | null): string;
+export declare function maskTmqConfigForLog(config: TmqConfig): string;
 //# sourceMappingURL=utils.d.ts.map

package/lib/src/common/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/common/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAGpC,wBAAgB,MAAM,CAAC,QAAQ,EAAE,QAAQ,GAAG,GAAG,CA6B9C;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAM3C;AAED,wBAAgB,YAAY,CACxB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,GAAG,CAAC,EAAE,MAAM,GACb,WAAW,CA6Bb;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAE9C;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,UAWjD;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAW9D;AAkDD,wBAAgB,eAAe,CAC3B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,GAAG,IAAI,GAC5B,MAAM,CAoBR"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/common/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACpC,OAAO,EAAE,GAAG,EAAS,MAAM,OAAO,CAAC;AAGnC,wBAAgB,MAAM,CAAC,QAAQ,EAAE,QAAQ,GAAG,GAAG,CA0C9C;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAI3C;AAED,wBAAgB,YAAY,CACxB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,GAAG,CAAC,EAAE,MAAM,GACb,WAAW,CA2Bb;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAE9C;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,UAWjD;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAW9D;AAkDD,wBAAgB,eAAe,CAC3B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,GAAG,IAAI,GAC5B,MAAM,CAkBR;AAKD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE3D;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,GAAG,MAAM,CAcrD;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAmB7D"}

package/lib/src/common/utils.js

@@ -1,49 +1,65 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUrl = getUrl;
+exports.getDsn = getDsn;
 exports.isEmpty = isEmpty;
 exports.getBinarySql = getBinarySql;
 exports.zigzagDecode = zigzagDecode;
 exports.safeDecodeURIComponent = safeDecodeURIComponent;
 exports.compareVersions = compareVersions;
 exports.decimalToString = decimalToString;
+exports.maskSensitiveForLog = maskSensitiveForLog;
+exports.maskUrlForLog = maskUrlForLog;
+exports.maskTmqConfigForLog = maskTmqConfigForLog;
+const dsn_1 = require("./dsn");
 const wsError_1 = require("./wsError");
-function getUrl(wsConfig) {
-    let url = new URL(wsConfig.getUrl());
-    if (wsConfig.getUser()) {
-        url.username = wsConfig.getUser() || "";
+function getDsn(wsConfig) {
+    const dsn = (0, dsn_1.parse)(wsConfig.getUrl());
+    const user = wsConfig.getUser();
+    if (user) {
+        dsn.username = user;
     }
-    if (wsConfig.getPwd()) {
-        url.password = wsConfig.getPwd() || "";
+    const password = wsConfig.getPwd();
+    if (password) {
+        dsn.password = password;
     }
-    let token = wsConfig.getToken();
+    const token = wsConfig.getToken();
     if (token) {
-        url.searchParams.set("token", token);
+        dsn.params.set("token", token);
     }
-    let timezone = wsConfig.getTimezone();
+    else if (dsn.params.has("token")) {
+        wsConfig.setToken(dsn.params.get("token") || "");
+    }
+    const bearerToken = wsConfig.getBearerToken();
+    if (bearerToken) {
+        dsn.params.set("bearer_token", bearerToken);
+    }
+    else if (dsn.params.has("bearer_token")) {
+        wsConfig.setBearerToken(dsn.params.get("bearer_token") || "");
+    }
+    const timezone = wsConfig.getTimezone();
     if (timezone) {
-        url.searchParams.set("timezone", timezone);
+        dsn.params.set("timezone", timezone);
     }
-    if (url.pathname && url.pathname !== "/") {
-        wsConfig.setDb(url.pathname.slice(1));
+    else if (dsn.params.has("timezone")) {
+        wsConfig.setTimezone(dsn.params.get("timezone") || "");
     }
-    if (url.searchParams.has("timezone")) {
-        wsConfig.setTimezone(url.searchParams.get("timezone") || "");
+    const db = wsConfig.getDb();
+    if (db && db.length > 0) {
+        dsn.database = db;
     }
-    url.pathname = "/ws";
-    return url;
+    else if (dsn.database.length > 0) {
+        wsConfig.setDb(dsn.database);
+    }
+    return dsn;
 }
 function isEmpty(value) {
     if (value === null || value === undefined)
         return true;
-    // if (typeof value === 'string' && value.trim() === '') return true;
     if (Array.isArray(value) && value.length === 0)
         return true;
-    // if (typeof value === 'object' && Object.keys(value).length === 0) return true;
     return false;
 }
 function getBinarySql(action, reqId, resultId, sql) {
-    // construct msg
     if (sql) {
         const encoder = new TextEncoder();
         const buffer = encoder.encode(sql);
@@ -153,12 +169,10 @@ function decimalToString(valueStr, fields_scale) {
         const isNegative = decimalStr.startsWith("-");
         const absStr = isNegative ? decimalStr.slice(1) : decimalStr;
         if (absStr.length <= scale) {
-            // If the length of the number is less than or equal to the precision, add 0 before it.
             const paddedStr = absStr.padStart(scale + 1, "0");
             decimalStr = (isNegative ? "-" : "") + "0." + paddedStr.slice(1);
         }
         else {
-            // 在指定位置插入小数点
             const integerPart = absStr.slice(0, absStr.length - scale);
             const decimalPart = absStr.slice(absStr.length - scale);
             decimalStr =
@@ -167,3 +181,41 @@ function decimalToString(valueStr, fields_scale) {
     }
     return decimalStr;
 }
+const SENSITIVE_FIELD_REGEX = /("(?:password|token|bearer_token|td\.connect\.token)"\s*:\s*)"([^"\\]*(?:\\.[^"\\]*)*)"/g;
+function maskSensitiveForLog(message) {
+    return message.replace(SENSITIVE_FIELD_REGEX, '$1"[REDACTED]"');
+}
+function maskUrlForLog(url) {
+    if (!url) {
+        return "";
+    }
+    const masked = new URL(url.toString());
+    masked.password = "[REDACTED]";
+    if (masked.searchParams.has("token")) {
+        masked.searchParams.set("token", "[REDACTED]");
+    }
+    if (masked.searchParams.has("bearer_token")) {
+        masked.searchParams.set("bearer_token", "[REDACTED]");
+    }
+    return masked.toString().replace(/%5BREDACTED%5D/g, "[REDACTED]");
+}
+function maskTmqConfigForLog(config) {
+    const masked = {
+        ...config,
+        otherConfigs: Object.fromEntries(config.otherConfigs)
+    };
+    return JSON.stringify(masked, (key, value) => {
+        switch (key) {
+            case 'dsn':
+            case 'sqlDsn':
+                return value ? value.toString() : value;
+            case 'token':
+            case 'password':
+            case 'bearer_token':
+            case 'td.connect.token':
+                return value ? '[REDACTED]' : value;
+            default:
+                return value;
+        }
+    });
+}