geonix 1.20.0 → 1.20.1

package/index.d.ts

@@ -77,21 +77,27 @@ declare class Registry {
 export {};
 export function Remote(service: string, ...context: (string | Stream | Object)[]): string | Stream | Object;
 /**
+ * Send a request to a service
  *
- * @param {*} service
- * @param {*} method
- * @param {*} args
+ * @param {string} service
+ * @param {string} method
+ * @param {any[]} args
+ * @param {any[]} context
+ * @param {object} options
  * @returns
  */
-export function Request(service: any, method: any, args: any, context: any[] | undefined, options: any): Promise<any>;
+export function Request(service: string, method: string, args: any[], context: any[], options: object): Promise<any>;
 /**
+ * Send a request to a service
  *
- * @param {*} service
- * @param {*} method
- * @param {*} args
+ * @param {string} identifier
+ * @param {string} method
+ * @param {any[]} args
+ * @param {any[]} context
+ * @param {object} options
  * @returns
  */
-export function directRequest(identifier: any, method: any, args: any, context: any[] | undefined, options: any, service: any): Promise<any>;
+export function directRequest(identifier: string, method: string, args: any[], context: any[], options: object, service: any): Promise<any>;
 /**
  * Publish payload to a subject
  *
@@ -115,7 +121,6 @@ export function RequestOptions(options: any): RequestOptionsClass;
 export class Service {
     static serviceClasses: any[];
     static start(options?: {}): void;
-    static static(): void;
     connections: Map<any, any>;
     $createConnection(streamId: any): Promise<boolean>;
     $getEnv(): {
@@ -152,6 +157,7 @@ export const stats: {};
  * @returns
  */
 export function parseURL(url: string): any;
+export function getFirstItemFromAsyncIterable(asyncIterable: any): Promise<any>;
 export function sleep(delay: number): Promise<any>;
 export function picoid(size?: number): any;
 export function hash(data: string | Buffer): any;

package/package.json

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

package/src/Connection.js

@@ -72,7 +72,9 @@ class Connection {
      * Wait for the connection to be safely closed
      */
     async waitUntilClosed() {
-        await this.#getConnection().closed();
+        // wait for all connections to be closed
+        await Promise.all(this.#connections.map(connection => connection.closed()));
+
         this.#closed = true;
         console.log("gx.connection.closed");
 
@@ -181,9 +183,7 @@ class Connection {
     async drain() {
         this.#draining = true;
 
-        for (let connection of this.#connections) {
-            await connection.drain();
-        }
+        await Promise.all(this.#connections.map(connection => connection.drain()));
     }
 
 }

package/src/Gateway.js

@@ -163,20 +163,22 @@ export class Gateway {
 
             // figure out if endpoints is reachable via direct http call
             let backend;
-            for (let address of entry.a)
-                try {
-                    const ac = new AbortController();
-                    const timeout = setTimeout(() => ac.abort(), 500);
-                    const result = await (await fetch(`http://${address}${HEALTH_CHECK_ENDPOINT}`, { signal: ac.signal })).json();
-                    clearTimeout(timeout);
-                    if (result.status === "healthy" && result.services?.includes(entry.n)) {
-                        backend = address;
-                        console.log(`${entry.n}@${entry.v} (#${entry.i}) directly reachable @ ${address}`);
-                        break;
+            if (entry.a) {
+                for (let address of entry.a)
+                    try {
+                        const ac = new AbortController();
+                        const timeout = setTimeout(() => ac.abort(), 500);
+                        const result = await (await fetch(`http://${address}${HEALTH_CHECK_ENDPOINT}`, { signal: ac.signal })).json();
+                        clearTimeout(timeout);
+                        if (result.status === "healthy" && result.services?.includes(entry.n)) {
+                            backend = address;
+                            console.log(`${entry.n}@${entry.v} (#${entry.i}) directly reachable @ ${address}`);
+                            break;
+                        }
+                    } catch {
+                        // silently ignore errors
                     }
-                } catch {
-                    // silently ignore errors
-                }
+            }
 
             let proxy;
             if (!backend) {