#369 Refresh vector layers, also some WEBSOCKET_ROOT_PATH (#370) (#371)

NASA-AMMOS · May 1, 2023 · 9ba5072 · 9ba5072
1 parent 9cbe4ef
commit 9ba5072
Show file tree

Hide file tree

Showing 11 changed files with 599 additions and 433 deletions.
diff --git a/API/Backend/Config/setup.js b/API/Backend/Config/setup.js
@@ -25,6 +25,10 @@ let setup = {
               process.env.NODE_ENV === "development"
                 ? ""
                 : process.env.ROOT_PATH || "",
+            WEBSOCKET_ROOT_PATH:
+              process.env.NODE_ENV === "development"
+                ? ""
+                : process.env.WEBSOCKET_ROOT_PATH || "",
           });
         }
       );

diff --git a/API/websocket.js b/API/websocket.js
@@ -1,66 +1,52 @@
-const WebSocket = require('isomorphic-ws');
+const WebSocket = require("isomorphic-ws");
 const logger = require("./logger");
 
 const websocket = {
-    wss: null,
-    init: function (server) {
-        logger(
-            "info",
-            "Trying to init websocket...",
-            "websocket",
-            null,
-            ""
-        );
-
-        if (!server === null) {
-            logger(
-                "websocket_error",
-                "server parameter not defined.",
-                "error",
-                null,
-                ""
-            );
-            return null
-        }
-
-        logger(
-            "info",
-            "Server is valid so still trying to init websocket...",
-            "websocket",
-            null,
-            ""
-        );
-
-        const wss = new WebSocket.Server({ server });
-        websocket.wss = wss;
-
-        // Broadcast to all clients
-        wss.broadcast = function broadcast(data, isBinary) {
-            wss.clients.forEach(client => {
-                if (client.readyState === WebSocket.OPEN && data !== undefined) {
-                    client.send(data, { binary: isBinary });
-                }
-            });
-        };
-
-        wss.on('connection', (ws) => {
-            ws.on('message', (message) => {
-                wss.broadcast(message);
-            });
-        });
-
-        wss.on('close', () => {
-            logger(
-                "info",
-                "Websocket disconnected...",
-                "websocket",
-                null,
-                ""
-            );
-            websocket.wss = null
-        });
+  wss: null,
+  init: function (server) {
+    logger("info", "Trying to init websocket...", "websocket", null, "");
+
+    if (!server === null) {
+      logger(
+        "websocket_error",
+        "server parameter not defined.",
+        "error",
+        null,
+        ""
+      );
+      return null;
     }
-}
 
+    logger(
+      "info",
+      "Server is valid so still trying to init websocket...",
+      "websocket",
+      null,
+      ""
+    );
+    const wss = new WebSocket.Server({ server });
+    websocket.wss = wss;
+
+    // Broadcast to all clients
+    wss.broadcast = function broadcast(data, isBinary) {
+      wss.clients.forEach((client) => {
+        if (client.readyState === WebSocket.OPEN && data !== undefined) {
+          client.send(data, { binary: isBinary });
+        }
+      });
+    };
+
+    wss.on("connection", (ws) => {
+      ws.on("message", (message) => {
+        wss.broadcast(message);
+      });
+    });
+
+    wss.on("close", () => {
+      logger("info", "Websocket disconnected...", "websocket", null, "");
+      websocket.wss = null;
+    });
+  },
+};
 
 module.exports = { websocket };
diff --git a/configuration/env.js b/configuration/env.js
@@ -82,6 +82,10 @@ function getClientEnvironment(publicUrl) {
           (process.env.NODE_ENV || "development") === "development"
             ? ""
             : process.env.ROOT_PATH || "",
+        WEBSOCKET_ROOT_PATH:
+          (process.env.NODE_ENV || "development") === "development"
+            ? ""
+            : process.env.WEBSOCKET_ROOT_PATH || "",
         // We support configuring the sockjs pathname during development.
         // These settings let a developer run multiple simultaneous projects.
         // They are used as the connection `hostname`, `pathname` and `port`

diff --git a/docs/pages/Setup/ENVs/ENVs.md b/docs/pages/Setup/ENVs/ENVs.md
@@ -88,6 +88,10 @@ Sets "SameSite=None; Secure" on the login cookie. Useful when using AUTH=local a
 
 Set MMGIS to be deployed under a subpath. For example if serving at the subpath 'https://{domain}/path/where/I/serve/mmgis' is desired, set `ROOT_PATH=/path/where/I/serve/mmgis`. If no subpath, leave blank. | string | default `""`
 
+#### `WEBSOCKET_ROOT_PATH=`
+
+Overrides ROOT_PATH's use when the client connects via websocket. Websocket url: `${ws_protocol}://${window.location.host}${WEBSOCKET_ROOT_PATH || ROOT_PATH || ''}/` | string | default `""`
+
 #### `CLEARANCE_NUMBER=`
 
 Sets a clearance for the website | string | default `CL##-####`