geonix 1.21.2 → 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.21.2",
+    "version": "1.22.2",
     "type": "module",
     "description": "",
     "bin": {

package/src/Request.js

@@ -143,7 +143,7 @@ export async function directRequest(identifier, method, args, context, options,
  * @param {string|number} payload 
  */
 export async function Publish(subject, payload) {
-    connection.publishRaw(`gx.sub.${subject}`, Buffer.from(payload));
+    connection.publishRaw(subject, Buffer.from(payload));
 }
 
 /**
@@ -158,7 +158,7 @@ export async function Subscribe(subject, callback) {
         return;
     }
 
-    const subscription = await connection.subscribe(`gx.sub.${subject}`);
+    const subscription = await connection.subscribe(subject);
     for await (const event of subscription) {
         callback(event.data);
     }

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();
@@ -227,7 +227,7 @@ export class Service {
     }
 
     async #sub(subject, handler) {
-        const subscription = await connection.subscribe(`gx.sub.${subject}`);
+        const subscription = await connection.subscribe(subject);
         const processor = async () => {
             for await (const event of subscription) {
                 handler(event.data);

package/src/Util.js

@@ -287,9 +287,7 @@ export async function parseMultipart(req, _options) {
 
         let combined = Buffer.concat([lastChunk, chunk]);
 
-        let $dbg = 3;
-
-        while (combined.length >= boundary.length + 2 && $dbg-- > 0) {
+        while (combined.length >= boundary.length + 2) {
             const boundaryIndex = combined.indexOf(boundary);
             const isLastBoundary = combined[boundaryIndex + boundary.length] === 45 && combined[boundaryIndex + boundary.length + 1] === 45;
 
@@ -385,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();

package/versions

@@ -1,89 +0,0 @@
-npm unpublish geonix@1.1.0
-npm unpublish geonix@1.1.1
-npm unpublish geonix@1.1.2
-npm unpublish geonix@1.1.5
-npm unpublish geonix@1.1.6
-npm unpublish geonix@1.1.7
-npm unpublish geonix@1.1.8
-npm unpublish geonix@1.1.9
-npm unpublish geonix@1.1.10
-npm unpublish geonix@1.1.11
-npm unpublish geonix@1.1.12
-npm unpublish geonix@1.1.13
-npm unpublish geonix@1.1.14
-npm unpublish geonix@1.1.15
-npm unpublish geonix@1.1.16
-npm unpublish geonix@1.1.17
-npm unpublish geonix@1.1.18
-npm unpublish geonix@1.1.19
-npm unpublish geonix@1.1.20
-npm unpublish geonix@1.1.21
-npm unpublish geonix@1.1.22
-npm unpublish geonix@1.1.23
-npm unpublish geonix@1.1.24
-npm unpublish geonix@1.1.25
-npm unpublish geonix@1.1.26
-npm unpublish geonix@1.1.27
-npm unpublish geonix@1.1.28
-npm unpublish geonix@1.1.29
-npm unpublish geonix@1.1.30
-npm unpublish geonix@1.1.31
-npm unpublish geonix@1.1.32
-npm unpublish geonix@1.1.33
-npm unpublish geonix@1.1.34
-npm unpublish geonix@1.1.35
-npm unpublish geonix@1.1.36
-npm unpublish geonix@1.1.37
-npm unpublish geonix@1.1.38
-npm unpublish geonix@1.1.39
-npm unpublish geonix@1.1.40
-npm unpublish geonix@1.1.41
-npm unpublish geonix@1.1.42
-npm unpublish geonix@1.1.43
-npm unpublish geonix@1.1.44
-npm unpublish geonix@1.1.45
-npm unpublish geonix@1.1.46
-npm unpublish geonix@1.1.47
-npm unpublish geonix@1.1.48
-npm unpublish geonix@1.1.50
-npm unpublish geonix@1.1.51
-npm unpublish geonix@1.1.52
-npm unpublish geonix@1.2.0
-npm unpublish geonix@1.2.1
-npm unpublish geonix@1.2.2
-npm unpublish geonix@1.2.3
-npm unpublish geonix@1.2.4
-npm unpublish geonix@1.2.5
-npm unpublish geonix@1.2.6
-npm unpublish geonix@1.2.7
-npm unpublish geonix@1.2.8
-npm unpublish geonix@1.2.9
-npm unpublish geonix@1.2.10
-npm unpublish geonix@1.2.11
-npm unpublish geonix@1.2.12
-npm unpublish geonix@1.2.14
-npm unpublish geonix@1.3.0
-npm unpublish geonix@1.3.1
-npm unpublish geonix@1.3.2
-npm unpublish geonix@1.3.3
-npm unpublish geonix@1.4.0
-npm unpublish geonix@1.4.1
-npm unpublish geonix@1.4.2
-npm unpublish geonix@1.4.3
-npm unpublish geonix@1.4.4
-npm unpublish geonix@1.4.5
-npm unpublish geonix@1.4.6
-npm unpublish geonix@1.4.7
-npm unpublish geonix@1.4.8
-npm unpublish geonix@1.5.0
-npm unpublish geonix@1.5.1
-npm unpublish geonix@1.5.2
-npm unpublish geonix@1.5.3
-npm unpublish geonix@1.5.5
-npm unpublish geonix@1.6.0
-npm unpublish geonix@1.7.0
-npm unpublish geonix@1.7.1
-npm unpublish geonix@1.7.2
-npm unpublish geonix@1.7.3
-npm unpublish geonix@1.7.4
-npm unpublish geonix@1.7.5