geonix 1.22.2 → 1.22.4

package/dev.js

@@ -0,0 +1,62 @@
+import { BasicAuth, HTTP, Transport, Unit } from "geonix";
+import { Gateway } from "./src/Gateway.js";
+
+const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+
+const middleware = [
+    BasicAuth({ realm: "Test", username: "u", password: "pa" })
+];
+
+class TimeService {
+
+    getTime() {
+        return new Date().toISOString();
+    }
+
+    [HTTP.GET("/time", middleware)] = async (req, res) => {
+        res.setHeader("X-Test", "Test");
+        return {
+            time: this.getTime(),
+            id: this.$meta.id
+        };
+    };
+
+    [HTTP.GET("/time2", middleware)] = async (req, res) => {
+        res.setHeader("X-Test", "Test2");
+        return {
+            time: this.getTime(),
+            id: this.$meta.id
+        };
+    };
+
+    [HTTP.filter] = async () => {
+
+    };
+
+    [HTTP.ERROR()] = async () => {
+        return {
+            error: "Unexpected error"
+        };
+    };
+
+}
+
+const transport = await Transport.start("nats://localhost:4222");
+
+await Unit.start(TimeService, {
+    meta: {
+        id: "first",
+    },
+    transport,
+    port: 30000
+});
+
+await Unit.start(TimeService, {
+    meta: {
+        id: "second",
+    },
+    transport,
+    port: 30001
+});
+
+Gateway.start({ transport, gatewayPort: 8080 });

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
@@ -213,6 +222,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;
 /**
  *
  *

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "geonix",
-    "version": "1.22.2",
+    "version": "1.22.4",
     "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/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;
     }

package/test/middleware.js

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