geonix 1.22.1 → 1.22.2

package/index.d.ts

@@ -227,6 +227,7 @@ export function parseMultipart(req: Request, _options: any): Promise<{
 }[]>;
 export function tempFilename(): any;
 export function randomSafeId(size?: number): string;
+export function deepMerge(target: any, ...source: any[]): any;
 export function sleep(delay: number): Promise<any>;
 export function nextTick(): Promise<any>;
 export function picoid(size?: number): any;

package/package.json

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

package/src/Service.js

@@ -1,5 +1,5 @@
 import { connection } from "./Connection.js";
-import { picoid, sleep, hash, getSecondsSinceMidnight, OverlayObject, GeonixVersion, getFirstItemFromAsyncIterable, getNetworkAddresses } from "./Util.js";
+import { picoid, sleep, hash, getSecondsSinceMidnight, OverlayObject, GeonixVersion, getFirstItemFromAsyncIterable, getNetworkAddresses, deepMerge } from "./Util.js";
 import { webserver } from "./WebServer.js";
 import { createConnection } from "net";
 import { EOL } from "os";
@@ -54,7 +54,7 @@ export class Service {
     #options = defaultServiceOptions;
 
     async #start(options = {}) {
-        this.#options = { ...this.#options, ...options };
+        this.#options = deepMerge(this.#options, options); // { ...this.#options, ...options };
 
         await webserver.waitUntilReady();
         await connection.waitUntilReady();

package/src/Util.js

@@ -383,4 +383,22 @@ export function randomSafeId(size = 12) {
     }
 
     return result;
+}
+
+export function deepMerge(target, ...source) {
+    for (const src of source) {
+        for (const key in src) {
+            if (src[key] instanceof Object) {
+                if (!target[key]) {
+                    target[key] = {};
+                }
+
+                deepMerge(target[key], src[key]);
+            } else {
+                target[key] = src[key];
+            }
+        }
+    }
+
+    return target;
 }

package/test/middleware.js

@@ -1,24 +1,26 @@
-import { Router } from "express";
 import { ServeStatic, Service } from "../exports.js";
 
-function special(req, res) {
-    console.log("THIS:", this);
+class First extends Service {
 
-    res.send(`Hello ${this.value}`);
-};
+    "GET /first"(req, res) {
+        res.end(JSON.stringify(req.cookies));
+    }
 
-class ApplicationService extends Service {
+}
 
-    value = "World!";
+class Second extends Service {
 
-    async onStart() {
+    "GET /second"(req, res) {
+        res.end(JSON.stringify(req.cookies));
     }
+}
 
-    "GET *" = [special, ServeStatic("test/static", { indexOn404: true })];
-    // "GET *" = [(req, res) => {
-    //     res.send(`Hello ${this.value}`);
-    // }];
-
+class Third extends Service {
+    "GET /third"(req, res) {
+        res.end(JSON.stringify(req.cookies));
+    }
 }
 
-ApplicationService.start();
+Third.start();
+First.start({ middleware: { raw: true } });
+Second.start();