refactor: improve address handling in parseDiscoveredEndpoints and update related tests

Author: qevolg

nodejs/src/client/clusterRegistry.ts

@@ -15,8 +15,8 @@ export class Cluster {
         return this._addresses;
     }
 
-    addAddresses(newAddresses: Address[]): void {
-        const merged = mergeAddresses([...this._addresses], newAddresses);
+    addAddresses(addresses: Address[]): void {
+        const merged = mergeAddresses([...this._addresses], addresses);
         this._addresses = Cluster.freezeAddresses(merged);
     }
 

nodejs/src/common/dsn.ts

@@ -252,35 +252,36 @@ export function parseDiscoveredEndpoints(instances: string[]): Address[] {
 
             const portStr = remainder.startsWith(":") ? remainder.slice(1) : "";
             const parsedPort = parsePortValue(portStr);
-            if (parsedPort === null && portStr.length > 0) {
+            if (parsedPort === null) {
                 warnInvalidEndpoint(raw);
                 continue;
             }
             endpoints.push(
-                new Address(`[${ipv6Host}]`, parsedPort ?? getDefaultPortForHost(ipv6Host))
+                new Address(`[${ipv6Host}]`, parsedPort)
             );
             continue;
         }
 
-        let host = trimmed;
-        let port = getDefaultPortForHost(host);
         const lastColon = trimmed.lastIndexOf(":");
-        if (lastColon !== -1) {
-            host = trimmed.slice(0, lastColon);
-            if (host.length === 0 || host.includes(":")) {
-                warnInvalidEndpoint(raw);
-                continue;
-            }
-            const portStr = trimmed.slice(lastColon + 1);
-            const parsedPort = parsePortValue(portStr);
-            if (parsedPort === null && portStr.length > 0) {
-                warnInvalidEndpoint(raw);
-                continue;
-            }
-            port = parsedPort ?? getDefaultPortForHost(host);
+        if (lastColon === -1) {
+            warnInvalidEndpoint(raw);
+            continue;
+        }
+
+        const host = trimmed.slice(0, lastColon);
+        if (host.length === 0 || host.includes(":")) {
+            warnInvalidEndpoint(raw);
+            continue;
+        }
+
+        const portStr = trimmed.slice(lastColon + 1);
+        const parsedPort = parsePortValue(portStr);
+        if (parsedPort === null) {
+            warnInvalidEndpoint(raw);
+            continue;
         }
 
-        endpoints.push(new Address(host, port));
+        endpoints.push(new Address(host, parsedPort));
     }
     return endpoints;
 }

nodejs/test/common/dsn.test.ts

@@ -509,17 +509,28 @@ describe("dsn", () => {
             ]);
         });
 
-        test("parseDiscoveredEndpoints uses default port for endpoints without explicit port", () => {
+        test("parseDiscoveredEndpoints skips endpoints without explicit port and warns", () => {
+            const warnSpy = jest.spyOn(logger, "warn").mockImplementation(() => logger);
             const result = parseDiscoveredEndpoints([
                 "node3",
                 "tenant.cloud.tdengine.com",
                 "[2001:db8::10]",
             ]);
-            expect(result).toEqual([
-                { host: "node3", port: 6041 },
-                { host: "tenant.cloud.tdengine.com", port: 443 },
-                { host: "[2001:db8::10]", port: 6041 },
-            ]);
+            expect(result).toEqual([]);
+            expect(warnSpy).toHaveBeenCalledTimes(3);
+            expect(warnSpy).toHaveBeenNthCalledWith(
+                1,
+                "Adapter HA: ignoring invalid endpoint: node3"
+            );
+            expect(warnSpy).toHaveBeenNthCalledWith(
+                2,
+                "Adapter HA: ignoring invalid endpoint: tenant.cloud.tdengine.com"
+            );
+            expect(warnSpy).toHaveBeenNthCalledWith(
+                3,
+                "Adapter HA: ignoring invalid endpoint: [2001:db8::10]"
+            );
+            warnSpy.mockRestore();
         });
 
         test("parseDiscoveredEndpoints skips invalid endpoints and warns", () => {