geonix 1.22.3 → 1.22.5

package/index.d.ts

@@ -1,4 +1,4 @@
-export function encode(data: any): Uint8Array;
+export function encode(data: any): Uint8Array<ArrayBuffer>;
 export function decode(data: any): unknown;
 export const codec: import("nats").Codec<unknown>;
 export const connection: Connection;
@@ -195,15 +195,24 @@ type ParsedMultiPart = {
     body: Readable;
 };
 type ServiceOptions = {
-    middleware: {
-        json: boolean;
-        raw: boolean;
-        cookies: boolean;
-    };
+    middleware?: {
+        /**
+         * Enable JSON middleware
+         */
+        json?: boolean | undefined;
+        /**
+         * Enable RAW middleware
+         */
+        raw?: boolean | undefined;
+        /**
+         * Enable cookies middleware
+         */
+        cookies?: boolean | undefined;
+    } | undefined;
     /**
      * Enable full beacon
      */
-    fullBeacon: boolean;
+    fullBeacon?: boolean | undefined;
 };
 /**
  * Parse nats:// URL

package/package.json

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

package/src/Types.js

@@ -16,9 +16,9 @@
 
 /**
  * @typedef {Object} ServiceOptions
- * @property {Object} middleware
- * @property {boolean} middleware.json Enable JSON middleware
- * @property {boolean} middleware.raw Enable RAW middleware
- * @property {boolean} middleware.cookies Enable cookies middleware
- * @property {boolean} fullBeacon Enable full beacon
+ * @property {Object} [middleware]
+ * @property {boolean} [middleware.json] Enable JSON middleware
+ * @property {boolean} [middleware.raw] Enable RAW middleware
+ * @property {boolean} [middleware.cookies] Enable cookies middleware
+ * @property {boolean} [fullBeacon] Enable full beacon
  */

package/src/WebServer.js

@@ -50,6 +50,8 @@ class WebServer {
     #ready = false;
     #started = false;
 
+    #routers = [];
+
     async start() {
         if (this.#started) { return; }
 
@@ -88,17 +90,41 @@ class WebServer {
             res.send({ status: "healthy", services: Service.serviceClasses });
         });
 
-        // wait for 2 seconds and then set fall-through handler
-        // this should provide more than enough time to start all the services
-        setTimeout(() => {
-            // default answer
-            this.#app.all("*", (req, res) => {
-                res.status(404).send({
-                    error: 404,
-                    source: "ws"
+        // middleware to handle dynamic routers
+        this.#app.use(async (req, res, next) => {
+            const routers = [...this.#routers];
+            let currentResolve;
+            let handled = false;
+
+            res.on("finish", () => {
+                handled = true;
+                currentResolve();
+            });
+
+            let router = routers.shift();
+            while (router) {
+                router = await new Promise((resolve) => {
+                    currentResolve = resolve;
+                    router(req, res, () => {
+                        // go to next router
+                        resolve(routers.shift());
+                    });
                 });
+            }
+
+            if (!handled) {
+                // go to next router
+                next();
+            }
+        });
+
+        // fallthrough handler
+        this.#app.all("*", (req, res) => {
+            res.status(404).send({
+                error: 404,
+                source: "ws"
             });
-        }, 2000);
+        });
 
         // config
         this.#app.disable("x-powered-by");
@@ -115,7 +141,7 @@ class WebServer {
 
     router() {
         const router = Router();
-        this.#app.use(router);
+        this.#routers.push(router);
         return router;
     }
 

package/test/delayedStart.js

@@ -0,0 +1,24 @@
+import { Gateway, Service, streamToBuffer } from "../exports.js";
+import { parseMultipart, sleep } from "../src/Util.js";
+
+class TestService extends Service {
+
+    "GET /test/"(req, res) {
+        res.send("Hello World");
+    }
+
+}
+
+class Application extends Service {
+
+    "GET /"(req, res) {
+        res.send("app");
+    }
+
+}
+
+Application.start();
+
+await sleep(3000);
+
+TestService.start();