geonix 1.23.3 → 1.23.5

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "geonix",
-    "version": "1.23.3",
+    "version": "1.23.5",
     "type": "module",
     "description": "",
     "bin": {
@@ -17,7 +17,7 @@
     "license": "MIT",
     "dependencies": {
         "cookie-parser": "1.4.7",
-        "express": "4.21.1",
+        "express": "^4.21.2",
         "express-async-errors": "3.1.1",
         "express-ws": "5.0.2",
         "nats": "2.28.2",
@@ -28,7 +28,7 @@
         "registry": "https://registry.npmjs.org/"
     },
     "devDependencies": {
-        "eslint": "^9.10.0",
+        "eslint": "^9.36.0",
         "typescript": "^5.5.4"
     }
-}
+}

package/src/Gateway.js

@@ -1,6 +1,6 @@
 import { connection } from "./Connection.js";
 import { registry } from "./Registry.js";
-import { createTCPServer, GeonixVersion, picoid, proxyHttp, sleep } from "./Util.js";
+import { cleanupWebsocketUrl, createTCPServer, GeonixVersion, picoid, proxyHttp, sleep } from "./Util.js";
 import express, { Router } from "express";
 import { Request } from "./Request.js";
 import { HEALTH_CHECK_ENDPOINT } from "./WebServer.js";
@@ -401,10 +401,10 @@ export class Gateway {
 
                 if (verb === "ws") {
                     router.ws(uri, (ws, req) => {
-                        const url = req.originalUrl.replace(/\/\.websocket$/, "");
+                        let target = cleanupWebsocketUrl(`ws://${backend}${req.originalUrl}`);
 
-                        logger.debug("proxy.web.ws.to:", backend + req.originalUrl);
-                        this.#proxyWebsocketOverNats(`ws://${backend}${url}`, ws, req);
+                        logger.debug("proxy.web.ws.to:", target);
+                        this.#proxyWebsocketOverNats(target, ws, req);
                     });
                 } else {
                     router[verb](uri, async (req, res, _next) => {

package/src/Util.js

@@ -413,4 +413,14 @@ export function deepMerge(target, ...source) {
     }
 
     return target;
+}
+
+export function cleanupWebsocketUrl(url) {
+    try {
+        const parsed = new URL(url);
+        parsed.pathname = parsed.pathname.replace(/\/\.websocket$/, "");
+        return parsed.toString();
+    } catch {
+        return url;
+    }
 }

package/test/gateway.js

@@ -1,33 +1,34 @@
 import { Gateway, Service, streamToBuffer } from "../exports.js";
 import { parseMultipart } from "../src/Util.js";
 
-class TestService extends Service {
+// class TestService extends Service {
 
-    "GET /"(req, res) {
-        res.send("Hello World");
-    }
+//     "GET /"(req, res) {
+//         res.send("Hello World");
+//     }
 
-    async "POST /upload"(req, res) {
-        const parts = await parseMultipart(req, { useMemory: false });
+//     async "POST /upload"(req, res) {
+//         const parts = await parseMultipart(req, { useMemory: false });
 
-        for (const part of parts) {
-            console.log(part.body);
-        }
+//         for (const part of parts) {
+//             console.log(part.body);
+//         }
 
-        res.send("OK");
-    }
+//         res.send("OK");
+//     }
 
-}
+// }
 
-TestService.start({
-    middleware: {
-        raw: true,
-        json: false,
-        cookies: false,
-    }
-});
-Gateway.start({
-    beforeRequest: (req, res) => {
-        res.set("X-Test", "Test");
-    }
-});
+// TestService.start({
+//     middleware: {
+//         raw: true,
+//         json: false,
+//         cookies: false,
+//     }
+// });
+// Gateway.start({
+//     beforeRequest: (req, res) => {
+//         res.set("X-Test", "Test");
+//     }
+// });
+Gateway.start();

package/test/ws_auth.js

@@ -0,0 +1,21 @@
+import { Gateway, ServeStatic, Service } from "../exports.js";
+
+class ServiceFirst extends Service {
+    "WS /ws/first" = (ws) => {
+        ws.on("message", (message) => {
+            ws.send("first:" + message);
+        });
+    };
+}
+
+class ServiceSecond extends Service {
+    "WS /ws/second" = (ws) => {
+        ws.on("message", (message) => {
+            ws.send("second:" + message);
+        });
+    };
+}
+
+Gateway.start();
+ServiceFirst.start();
+ServiceSecond.start();