cleanup

Author: skadefro

OpenFlow/src/Config.ts

@@ -96,9 +96,9 @@ export class Config {
         Config.downloadtoken_expires_in = Config.getEnv("downloadtoken_expires_in", "15m");
         Config.personalnoderedtoken_expires_in = Config.getEnv("personalnoderedtoken_expires_in", "365d");
 
-        Config.nodered_image = Config.getEnv("nodered_image", "openiap/nodered:edge");
+        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", "ws://localhost:3000");
+        // Config.api_ws_url = Config.getEnv("api_ws_url", "ws://localhost:3000");
         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"));
@@ -185,9 +185,9 @@ export class Config {
     public static downloadtoken_expires_in: string = Config.getEnv("downloadtoken_expires_in", "15m");
     public static personalnoderedtoken_expires_in: string = Config.getEnv("personalnoderedtoken_expires_in", "365d");
 
-    public static nodered_image: string = Config.getEnv("nodered_image", "openiap/nodered:edge");
+    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", "ws://localhost:3000");
+    // public static api_ws_url: string = Config.getEnv("api_ws_url", "ws://localhost:3000");
     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"));

OpenFlow/src/Messages/Message.ts

@@ -1067,6 +1067,11 @@ export class Message {
             if (skipcreate) return;
             cli._logger.debug("[" + cli.user.username + "] Deployment " + name + " not found in " + namespace + " so creating it");
 
+            // const api_ws_url = Config.api_ws_url;
+            const api_ws_url = Config.baseurl();
+            // const api_ws_url = "ws://api/";
+            // const api_ws_url = "https://demo.openiap.io/"
+            // const api_ws_url = "https://demo.openiap.io/"
             const _deployment = {
                 metadata: { name: name, namespace: namespace, labels: { billed: hasbilling.toString(), userid: _id, app: name } },
                 spec: {
@@ -1090,7 +1095,7 @@ export class Message {
                                         { name: "nodered_sa", value: nodereduser.username },
                                         { name: "jwt", value: nodered_jwt },
                                         { name: "queue_prefix", value: user.nodered.queue_prefix },
-                                        { name: "api_ws_url", value: Config.api_ws_url },
+                                        { name: "api_ws_url", value: api_ws_url },
                                         { name: "amqp_url", value: Config.amqp_url },
                                         { name: "nodered_domain_schema", value: hostname },
                                         { name: "domain", value: hostname },
@@ -1380,19 +1385,23 @@ export class Message {
         try {
             cli._logger.debug("[" + cli.user.username + "] GetKubeNodeLabels");
             msg = GetKubeNodeLabels.assign(this.data);
-            const list = await KubeUtil.instance().CoreV1Api.listNode();
-            const result: any = {};
-            if (list != null) {
-                list.body.items.forEach(node => {
-                    if (node.metadata && node.metadata.labels) {
-                        const keys = Object.keys(node.metadata.labels);
-                        keys.forEach(key => {
-                            result[key] = node.metadata.labels[key];
-                        });
-                    }
-                });
+            if (Config.nodered_allow_nodeselector) {
+                const list = await KubeUtil.instance().CoreV1Api.listNode();
+                const result: any = {};
+                if (list != null) {
+                    list.body.items.forEach(node => {
+                        if (node.metadata && node.metadata.labels) {
+                            const keys = Object.keys(node.metadata.labels);
+                            keys.forEach(key => {
+                                result[key] = node.metadata.labels[key];
+                            });
+                        }
+                    });
+                }
+                msg.result = result;
+            } else {
+                msg.result = null;
             }
-            msg.result = result;
         } catch (error) {
             this.data = "";
             cli._logger.error(error);

OpenFlow/src/cli.ts

@@ -41,8 +41,10 @@ try {
 }
 function getToken(): Promise<string> {
     return new Promise<string>(async (resolve, reject) => {
-        logger.info("wsurl " + Config.api_ws_url);
-        let socket: WebSocketClient = new WebSocketClient(logger, Config.api_ws_url);
+        // logger.info("wsurl " + Config.api_ws_url);
+        // let socket: WebSocketClient = new WebSocketClient(logger, Config.api_ws_url);
+        logger.info("wsurl " + Config.baseurl());
+        let socket: WebSocketClient = new WebSocketClient(logger, Config.baseurl());
         socket.agent = "openflow-cli";
         socket.version = Config.version;
         socket.events.on("onopen", async () => {

OpenFlow/src/public/Nodered.html

@@ -106,7 +106,7 @@ <h1 translate lib="web">nodered</h1>
   </div>
 </section>
 <section>
-  <div class="form-group" ng-show="menuctrl.hasrole('admins') && ctrl.labels">
+  <div class="form-group" ng-show="menuctrl.hasrole('admins') && ctrl.labels && ctrl.labels.length > 0">
     <label class="col-sm-3 control-label"><span translate lib="web">label</span>: </label>
     <div class="col-sm-9">
       <select class="form-control" ng-model="ctrl.label">

OpenFlowNodeRED/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openiap/nodered",
-  "version": "1.1.111",
+  "version": "1.1.114",
   "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": {

OpenFlowNodeRED/src/WebServer.ts

@@ -62,13 +62,16 @@ export class WebServer {
                 const name = Config.getEnv("nodered_id", null);
                 if (!NoderedUtil.IsNullEmpty(name)) defaultLabels["name"] = name;
                 if (NoderedUtil.IsNullEmpty(name)) defaultLabels["name"] = hostname;
+                this._logger.debug("WebServer.configure::configure register");
                 register.setDefaultLabels(defaultLabels);
                 client.collectDefaultMetrics({ register })
 
+                this._logger.debug("WebServer.configure::registerMetrics");
                 if (!NoderedUtil.IsNullUndefinded(register)) register.registerMetric(WebServer.openflow_nodered_node_count);
                 if (!NoderedUtil.IsNullUndefinded(register)) register.registerMetric(WebServer.openflow_nodered_node_duration);
 
 
+                this._logger.debug("WebServer.configure::promBundle");
                 const metricsMiddleware = promBundle({ includeMethod: true, includePath: true, promRegistry: register, autoregister: true });
                 this.app.use(metricsMiddleware);
                 // this.app.use(morgan('combined', { stream: (winston.stream as any).write }));
@@ -77,6 +80,7 @@ export class WebServer {
                         logger.silly(message);
                     }
                 };
+                this._logger.debug("WebServer.configure::setup express middleware");
                 this.app.use(morgan('combined', { stream: loggerstream }));
                 this.app.use(compression());
                 this.app.use(bodyParser.urlencoded({ limit: '10mb', extended: true }))
@@ -93,6 +97,7 @@ export class WebServer {
                     done(null, user);
                 });
                 if (Config.tls_crt != '' && Config.tls_key != '') {
+                    this._logger.debug("WebServer.configure::configure ssl");
                     let options: any = {
                         cert: Config.tls_crt,
                         key: Config.tls_key
@@ -116,6 +121,7 @@ export class WebServer {
                     if (Config.tls_passphrase !== "") {
                         options.passphrase = Config.tls_passphrase;
                     }
+                    this._logger.debug("WebServer.configure::create https server");
                     server = https.createServer(options, this.app);
 
                     const redirapp = express();
@@ -126,13 +132,15 @@ export class WebServer {
                     })
                     // _http.listen(80);
                 } else {
+                    this._logger.debug("WebServer.configure::create http server");
                     server = http.createServer(this.app);
                 }
                 server.on("error", (error) => {
                     this._logger.error(error);
                     process.exit(404);
                 });
 
+                this._logger.debug("WebServer.configure::configure nodered settings");
                 this.settings = new nodered_settings();
                 const c = Config;
                 if (Config.nodered_port > 0) {
@@ -220,6 +228,7 @@ export class WebServer {
                     noderedcontribmiddlewareauth.process(socket, req, res, next);
                 };
 
+                this._logger.debug("WebServer.configure::configure nodered storageModule");
                 this.settings.storageModule = new noderedcontribopenflowstorage(logger, socket);
                 const n: noderednpmrc = await this.settings.storageModule._getnpmrc();
                 if (!NoderedUtil.IsNullUndefinded(n) && !NoderedUtil.IsNullUndefinded(n.catalogues)) {
@@ -248,6 +257,7 @@ export class WebServer {
                     name: 'session', secret: Config.cookie_secret
                 }))
 
+                this._logger.debug("WebServer.configure::init nodered");
                 // initialise the runtime with a server and settings
                 await (RED as any).init(server, this.settings);
 
@@ -263,9 +273,11 @@ export class WebServer {
                 });
 
                 if (Config.nodered_port > 0) {
+                    this._logger.debug("WebServer.configure::server.listen on port " + Config.nodered_port);
                     server.listen(Config.nodered_port);
                 }
                 else {
+                    this._logger.debug("WebServer.configure::server.listen on port " + Config.port);
                     server.listen(Config.port);
                 }
 
@@ -284,6 +296,7 @@ export class WebServer {
             let hasErrors: boolean = true, errorCounter: number = 0, err: any;
             while (hasErrors) {
                 try {
+                    this._logger.debug("WebServer.configure::restarting nodered ...");
                     RED.start();
                     hasErrors = false;
                 } catch (error) {

VERSION

@@ -1 +1 @@
-1.1.111
+1.1.114

docker-compose-toolbox.yml

@@ -45,7 +45,7 @@ services:
       - "traefik.http.routers.web.rule=Host(`toolbox.openrpa.dk`)"
       - "traefik.http.routers.web.entrypoints=web"
       - "traefik.frontend.passHostHeader=true"
-    image: "openiap/openflow:1.1.111"
+    image: "openiap/openflow"
     container_name: "web"
     environment:
       - update_acl_based_on_groups=true
@@ -82,7 +82,7 @@ services:
       - "traefik.http.routers.nodered.rule=Host(`nodered1.toolbox.openrpa.dk`)"
       - "traefik.http.routers.nodered.entrypoints=web"
       - "traefik.http.services.nodered.loadbalancer.server.port=1880"
-    image: "openiap/nodered:1.1.111"
+    image: "openiap/nodered"
     container_name: "nodered"
     environment:
       #      - nodered_id=1

docker-compose-traefik-letsencrypt.yml

@@ -69,7 +69,7 @@ services:
       - "traefik.http.routers.web.entrypoints=web,websecure"
       - "traefik.frontend.passHostHeader=true"
       - "traefik.http.routers.web.tls.certresolver=myresolver"
-    image: "openiap/openflow:1.1.111"
+    image: "openiap/openflow"
     container_name: "web"
     environment:
       - update_acl_based_on_groups=true
@@ -107,7 +107,7 @@ services:
       - "traefik.http.routers.nodered.entrypoints=web,websecure"
       - "traefik.http.services.nodered.loadbalancer.server.port=1880"
       - "traefik.http.routers.nodered.tls.certresolver=myresolver"
-    image: "openiap/nodered:1.1.111"
+    image: "openiap/nodered"
     container_name: "nodered"
     environment:
       #      - nodered_id=1

docker-compose-traefik.yml

@@ -45,7 +45,7 @@ services:
       - "traefik.http.routers.web.rule=Host(`localhost.openrpa.dk`)"
       - "traefik.http.routers.web.entrypoints=web"
       - "traefik.frontend.passHostHeader=true"
-    image: "openiap/openflow:1.1.111"
+    image: "openiap/openflow"
     container_name: "web"
     environment:
       - update_acl_based_on_groups=true
@@ -82,7 +82,7 @@ services:
       - "traefik.http.routers.nodered.rule=Host(`nodered1.localhost.openrpa.dk`)"
       - "traefik.http.routers.nodered.entrypoints=web"
       - "traefik.http.services.nodered.loadbalancer.server.port=1880"
-    image: "openiap/nodered:1.1.111"
+    image: "openiap/nodered"
     container_name: "nodered"
     environment:
       #      - nodered_id=1