geonix 1.32.1 → 1.32.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "geonix",
-    "version": "1.32.1",
+    "version": "1.32.2",
     "type": "module",
     "description": "",
     "bin": {

package/src/Request.js

@@ -73,11 +73,16 @@ export async function Request(service, method, args, context, options) {
     return directRequest(identifier, method, args, context, options, service);
 }
 
+let _httpInstanceRoundRobin = 0;
 let _httpRpcRoundRobin = 0;
 
+const DEFAULT_HTTP_TIMEOUT = 300_000;
+
 /**
  * Sends a request directly to a resolved registry identifier without performing a registry
- * lookup. Prefers HTTP RPC for single-instance services; falls back to NATS otherwise.
+ * lookup. Prefers HTTP RPC; for multi-instance services round-robins across instances that
+ * have advertised addresses. Falls back to NATS when no instance has addresses or the HTTP
+ * attempt fails.
  *
  * @param {string} identifier - Registry identifier in the form `"Name@version"` or an instance ID.
  * @param {string} method - Method name to invoke on the service.
@@ -92,53 +97,53 @@ export async function directRequest(identifier, method, args, context, options,
     const originator = rpcContext.getStore()?.originator;
     const requestBegin = Date.now();
 
-    // try HTTP RPC first if the service has a single known instance with addresses
-    // (multiple instances use NATS so queue-group distribution is preserved)
+    // HTTP path: round-robin across instances that have advertised addresses; within the
+    // chosen instance, round-robin across addresses (loopback-prefer kept by isLoopbackAddress).
+    // NATS handles the fallback when no usable instance exists or the HTTP attempt fails.
     const entries = registry.getEntriesForIdentifier(identifier);
-    if (entries.length === 1) {
-        const addresses = entries[0].a || [];
-        if (addresses.length > 0) {
-            const loopback = addresses.filter(isLoopbackAddress);
-            const remote = addresses.filter((a) => !isLoopbackAddress(a));
-            const pool = loopback.length > 0 ? loopback : remote;
-            const address = pool[_httpRpcRoundRobin++ % pool.length];
-
-            const url = `http://${address}/!!_gx/rpc/${hash(entries[0].i)}`;
-            const rpcPayload = { m: method, a: args, c: context, o: originator };
-            const fetchBody = _payloadKey
-                ? encryptPayload(Buffer.from(JSON.stringify(rpcPayload)))
-                : JSON.stringify(rpcPayload);
-            const contentType = _payloadKey ? "application/octet-stream" : "application/json";
-
-            let httpResponse;
-            try {
-                const res = await fetchWithTimeout(
-                    url,
-                    {
-                        method: "POST",
-                        headers: { "content-type": contentType },
-                        body: fetchBody,
-                    },
-                    options?.httpTimeout ?? 5000,
-                );
-                if (res.ok) {
-                    httpResponse = _payloadKey
-                        ? JSON.parse(decryptPayload(Buffer.from(await res.arrayBuffer())))
-                        : await res.json();
-                }
-            } catch (e) {
-                logger.debug("directRequest: HTTP RPC failed, falling back to NATS", address, e.message);
+    const usable = entries.filter((e) => e.a?.length > 0);
+    if (usable.length > 0) {
+        const instance = usable[_httpInstanceRoundRobin++ % usable.length];
+        const loopback = instance.a.filter(isLoopbackAddress);
+        const remote = instance.a.filter((a) => !isLoopbackAddress(a));
+        const pool = loopback.length > 0 ? loopback : remote;
+        const address = pool[_httpRpcRoundRobin++ % pool.length];
+
+        const url = `http://${address}/!!_gx/rpc/${hash(instance.i)}`;
+        const rpcPayload = { m: method, a: args, c: context, o: originator };
+        const fetchBody = _payloadKey
+            ? encryptPayload(Buffer.from(JSON.stringify(rpcPayload)))
+            : JSON.stringify(rpcPayload);
+        const contentType = _payloadKey ? "application/octet-stream" : "application/json";
+
+        let httpResponse;
+        try {
+            const res = await fetchWithTimeout(
+                url,
+                {
+                    method: "POST",
+                    headers: { "content-type": contentType },
+                    body: fetchBody,
+                },
+                options?.httpTimeout ?? DEFAULT_HTTP_TIMEOUT,
+            );
+            if (res.ok) {
+                httpResponse = _payloadKey
+                    ? JSON.parse(decryptPayload(Buffer.from(await res.arrayBuffer())))
+                    : await res.json();
             }
+        } catch (e) {
+            logger.debug("directRequest: HTTP RPC failed, falling back to NATS", address, e.message);
+        }
 
-            if (httpResponse) {
-                if (httpResponse.e) {
-                    throw Error(`Request: remote error: ${httpResponse.e}`);
-                }
-                if (isStream(httpResponse.r)) {
-                    return JSON.parse(await streamToString(httpResponse.r));
-                }
-                return httpResponse.r;
+        if (httpResponse) {
+            if (httpResponse.e) {
+                throw Error(`Request: remote error: ${httpResponse.e}`);
+            }
+            if (isStream(httpResponse.r)) {
+                return JSON.parse(await streamToString(httpResponse.r));
             }
+            return httpResponse.r;
         }
     }