improve wsurl generation

Author: skadefro

OpenFlow/src/Config.ts

@@ -99,6 +99,7 @@ export class Config {
         Config.nodered_image = Config.getEnv("nodered_image", "openiap/nodered");
         Config.saml_federation_metadata = Config.getEnv("saml_federation_metadata", "");
         Config.api_ws_url = Config.getEnv("api_ws_url", "");
+        Config.nodered_ws_url = Config.getEnv("nodered_ws_url", "");
         Config.namespace = Config.getEnv("namespace", ""); // also sent to website 
         Config.nodered_domain_schema = Config.getEnv("nodered_domain_schema", ""); // also sent to website
         Config.nodered_initial_liveness_delay = parseInt(Config.getEnv("nodered_initial_liveness_delay", "60"));
@@ -188,10 +189,13 @@ export class Config {
     public static nodered_image: string = Config.getEnv("nodered_image", "openiap/nodered");
     public static saml_federation_metadata: string = Config.getEnv("saml_federation_metadata", "");
     public static api_ws_url: string = Config.getEnv("api_ws_url", "");
+    public static nodered_ws_url: string = Config.getEnv("nodered_ws_url", "");
     public static namespace: string = Config.getEnv("namespace", ""); // also sent to website 
     public static nodered_domain_schema: string = Config.getEnv("nodered_domain_schema", ""); // also sent to website
     public static nodered_initial_liveness_delay: number = parseInt(Config.getEnv("nodered_initial_liveness_delay", "60"));
     public static nodered_allow_nodeselector: boolean = Config.parseBoolean(Config.getEnv("nodered_allow_nodeselector", "false"));
+    public static nodered_requests_memory: string = Config.getEnv("nodered_requests_memory", "128Mi");
+    public static nodered_limits_memory: string = Config.getEnv("nodered_limits_memory", "256Mi");
 
     public static baseurl(): string {
         let result: string = "";

OpenFlow/src/LoginProvider.ts

@@ -226,7 +226,7 @@ export class LoginProvider {
                 _url = "wss://" + url.parse(baseurl).host;
             }
             _url += "/";
-            if (NoderedUtil.IsNullEmpty(Config.api_ws_url)) {
+            if (!NoderedUtil.IsNullEmpty(Config.api_ws_url)) {
                 _url = Config.api_ws_url;
                 if (!_url.endsWith("/")) _url += "/";
             }

OpenFlow/src/Messages/Message.ts

@@ -3,6 +3,7 @@ import { lookup } from "mimetype";
 import { SocketMessage } from "../SocketMessage";
 import { Auth } from "../Auth";
 import { Crypt } from "../Crypt";
+import * as url from "url";
 import { Config } from "../Config";
 import { Audit } from "../Audit";
 import { LoginProvider } from "../LoginProvider";
@@ -1003,8 +1004,8 @@ export class Message {
         let hasbilling: boolean = false;
         resources.limits = {};
         resources.requests = {};
-        resources.requests.memory = "70Mi";
-        resources.limits.memory = "256Mi";
+        resources.requests.memory = Config.nodered_requests_memory;
+        resources.limits.memory = Config.nodered_limits_memory;
 
         if (user.nodered) {
             try {
@@ -1072,6 +1073,25 @@ export class Message {
 
             let api_ws_url = Config.baseurl();
             if (!NoderedUtil.IsNullEmpty(Config.api_ws_url)) api_ws_url = Config.api_ws_url;
+            if (!NoderedUtil.IsNullEmpty(Config.nodered_ws_url)) api_ws_url = Config.nodered_ws_url;
+
+            let saml_baseurl = Config.protocol + "://" + hostname + "/";
+
+            let _samlparsed = url.parse(Config.saml_federation_metadata);
+            if (_samlparsed.protocol == "http:" || _samlparsed.protocol == "ws:") {
+                saml_baseurl = "http://" + hostname
+                if (_samlparsed.port && _samlparsed.port != "80") {
+                    saml_baseurl += ":" + _samlparsed.port;
+                }
+            } else {
+                saml_baseurl = "https://" + hostname
+                if (_samlparsed.port && _samlparsed.port != "443") {
+                    saml_baseurl += ":" + _samlparsed.port;
+                }
+            }
+            saml_baseurl += "/";
+
+            // _url = "ws://" + url.parse(baseurl).host;
 
             // const api_ws_url = Config.api_ws_url;
             // const api_ws_url = Config.baseurl();
@@ -1096,7 +1116,7 @@ export class Message {
                                     env: [
                                         { name: "saml_federation_metadata", value: Config.saml_federation_metadata },
                                         { name: "saml_issuer", value: Config.saml_issuer },
-                                        { name: "saml_baseurl", value: Config.protocol + "://" + hostname + "/" },
+                                        { name: "saml_baseurl", value: saml_baseurl },
                                         { name: "nodered_id", value: name },
                                         { name: "nodered_sa", value: nodereduser.username },
                                         { name: "jwt", value: nodered_jwt },

OpenFlowNodeRED/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openiap/nodered",
-  "version": "1.1.119",
+  "version": "1.1.125",
   "description": "Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scaleable NodeRed implementation.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
   "main": "index.js",
   "scripts": {

VERSION

@@ -1 +1 @@
-1.1.119
+1.1.125

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openiap/openflow",
-  "version": "1.1.119",
+  "version": "1.1.125",
   "description": "Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scaleable NodeRed implementation.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
   "main": "index.js",
   "scripts": {