geonix 1.22.1 → 1.22.3

package/index.d.ts

@@ -213,6 +213,7 @@ type ServiceOptions = {
 export function parseURL(url: string): any;
 export function getFirstItemFromAsyncIterable(asyncIterable: any): Promise<any>;
 export function getNetworkAddresses(): any[];
+export function isIterable(obj: any): any;
 /**
  *
  *
@@ -227,6 +228,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.3",
     "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

@@ -241,6 +241,10 @@ export function getNetworkAddresses() {
     return list;
 }
 
+export function isIterable(obj) {
+    return obj && (typeof obj[Symbol.iterator] === "function" || typeof obj[Symbol.asyncIterator] === "function");
+}
+
 /**
  * 
  * 
@@ -263,7 +267,7 @@ export async function parseMultipart(req, _options) {
     let stream = req;
 
     // if body is present, create a stream from it and use memory
-    if (req.body) {
+    if (req.body && isIterable(req.body)) {
         stream = Readable.from(req.body);
         options.useMemory = true;
     }
@@ -383,4 +387,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;
 }