geonix 1.20.2 → 1.20.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "geonix",
-    "version": "1.20.2",
+    "version": "1.20.3",
     "type": "module",
     "description": "",
     "bin": {
@@ -29,7 +29,7 @@
         "registry": "https://registry.npmjs.org/"
     },
     "devDependencies": {
-        "eslint": "^9.9.1",
+        "eslint": "^9.10.0",
         "typescript": "^5.5.4"
     }
-}
+}

package/src/Codec.js

@@ -0,0 +1,16 @@
+import { JSONCodec } from "nats";
+
+export const codec = JSONCodec();
+
+export function encode(data) {
+    return codec.encode(data);
+}
+
+export function decode(data) {
+    // check if data is json
+    if (Buffer.isBuffer(data) && data.readUInt8(0) === "{".charCodeAt(0)) {
+        return codec.decode(data);
+    }
+
+    throw new Error("Codec.decode: unknown data type");
+}

package/src/Connection.js

@@ -1,8 +1,9 @@
-import { connect, JSONCodec } from "nats";
+import { connect } from "nats";
 import { getFirstItemFromAsyncIterable, parseURL, picoid, sleep } from "./Util.js";
 import { Stream } from "./Stream.js";
 import { webserver } from "./WebServer.js";
 import { logger } from "./Logger.js";
+import { decode, encode } from "./Codec.js";
 
 // -------------------------------------------------------------------------------------------------
 const CONNECTION_TIMEOUT = 10000;
@@ -109,11 +110,11 @@ class Connection {
             return;
         }
 
-        let payload = codec.encode(json);
+        let payload = encode(json);
 
         // if payload is too big, convert it to Stream
         if (payload.length > this.getMaxPayloadSize()) {
-            payload = codec.encode(Stream(JSON.stringify(json)));
+            payload = encode(Stream(JSON.stringify(json)));
         }
 
         await this.#getConnection().publish(subject, payload);
@@ -150,11 +151,11 @@ class Connection {
 
         const respondTo = `gx2.r.${picoid(16)}`;
 
-        let payload = codec.encode({ $r: respondTo, p: json });
+        let payload = encode({ $r: respondTo, p: json });
 
         // if payload is too big, convert it to Stream
         if (payload.length > this.getMaxPayloadSize()) {
-            payload = codec.encode(Stream(JSON.stringify({ $r: respondTo, p: json })));
+            payload = encode(Stream(JSON.stringify({ $r: respondTo, p: json })));
         }
 
         const nc = this.#getConnection();
@@ -163,7 +164,7 @@ class Connection {
         await nc.publish(subject, payload);
 
         const event = await getFirstItemFromAsyncIterable(response);
-        return codec.decode(event.data);
+        return decode(event.data);
     }
 
     async subscribe(subject, options) {
@@ -195,8 +196,6 @@ class Connection {
 
 }
 
-export const codec = JSONCodec();
-
 export const connection = new Connection();
 connection.start();
 

package/src/Registry.js

@@ -1,8 +1,9 @@
-import { connection, codec } from "./Connection.js";
+import { connection } from "./Connection.js";
 import { sleep } from "./Util.js";
 import semver from "semver";
 import EventEmitter from "events";
 import { directRequest } from "./Request.js";
+import { decode } from "./Codec.js";
 
 const REGISTRY_ENTRY_TIMEOUT = 5000;
 
@@ -30,7 +31,7 @@ class Registry extends EventEmitter {
         const subscription = await connection.subscribe("gx2.beacon");
 
         for await (const event of subscription) {
-            let data = codec.decode(event.data);
+            let data = decode(event.data);
 
             const exists = this.#registry[data.i] !== undefined;
 

package/src/Service.js

@@ -1,4 +1,4 @@
-import { codec, connection } from "./Connection.js";
+import { connection } from "./Connection.js";
 import { picoid, sleep, hash, getSecondsSinceMidnight, OverlayObject, GeonixVersion, getFirstItemFromAsyncIterable, getNetworkAddresses } from "./Util.js";
 import { webserver } from "./WebServer.js";
 import { createConnection } from "net";
@@ -7,6 +7,7 @@ import cookieParser from "cookie-parser";
 import express from "express";
 import { isStream, streamToString } from "./Stream.js";
 import { logger } from "./Logger.js";
+import { decode } from "./Codec.js";
 
 const protectedMethodNames = ["constructor", "onStart"];
 const endpointMatcher = /^((?<options>.+)\|)?(?<verb>WS|SUB|GET|POST|PATCH|PUT|DELETE|HEAD|OPTIONS|ALL)\s(?<url>.*)/;
@@ -137,7 +138,7 @@ export class Service {
         const subscription = await connection.subscribe(`gx2.service.${hash(identifier)}`, { queue: identifier });
 
         for await (let event of subscription) {
-            let call = codec.decode(event.data);
+            let call = decode(event.data);
 
             if (isStream(call)) { call = JSON.parse(await streamToString(call)); }
 
@@ -153,7 +154,7 @@ export class Service {
         const subscription = await connection.subscribe(`gx2.service.${hash(identifier)}`, { queue: identifier });
 
         for await (let event of subscription) {
-            let call = codec.decode(event.data);
+            let call = decode(event.data);
 
             if (isStream(call)) {
                 call = JSON.parse(await streamToString(call));

package/src/Stream.js

@@ -129,11 +129,10 @@ export async function streamToBuffer(object) {
     return Buffer.concat(await readable.toArray());
 }
 
-export async function streamToString(object) {
-    let readable = object;
-    if (isStream(readable)) {
-        readable = await getReadable(readable);
-    }
+export async function streamToString(object, encoding) {
+    return streamToBuffer(object).toString(encoding);
+}
 
-    return Buffer.concat(await readable.toArray()).toString();
-}
+export async function streamToJSON(object) {
+    return JSON.parse(await streamToBuffer(object));
+}

package/test/context.js

@@ -0,0 +1,35 @@
+import { Remote, Service } from "../exports.js";
+import { sleep } from "../src/Util.js";
+
+class TimeService extends Service {
+
+    #timestamp() {
+        return new Date().toISOString();
+    }
+
+    getCurrentTime() {
+        const [prefix] = this.context;
+
+        return `${prefix} ${this.#timestamp()}`;
+    }
+
+}
+
+class ApplicationService extends Service {
+
+    #timeService = Remote("TimeService", "prefix");
+
+    async onStart() {
+        while (true) {
+            const time = await this.#timeService.getCurrentTime();
+
+            console.log("TIME =", time);
+
+            await sleep(1000);
+        }
+    }
+
+}
+
+TimeService.start();
+ApplicationService.start();

package/test/simple.js

@@ -0,0 +1,29 @@
+import { Remote, Service } from "../exports.js";
+import { sleep } from "../src/Util.js";
+
+class TimeService extends Service {
+
+    getCurrentTime() {
+        return new Date().toISOString();
+    }
+
+}
+
+class ApplicationService extends Service {
+
+    #timeService = Remote("TimeService");
+
+    async onStart() {
+        while (true) {
+            const time = await this.#timeService.getCurrentTime();
+
+            console.log("TIME =", time);
+
+            await sleep(1000);
+        }
+    }
+
+}
+
+TimeService.start();
+ApplicationService.start();