clean up and bump

Author: skadefro

.npmignore

@@ -8,6 +8,11 @@ docs
 node_modules
 logs
 package-lock.json
+tsconfig.json
 OpenFlow
 OpenFlowNodeRED
-temp
+temp
+webpack.config.js
+gulpfile.js
+OpenFlow.code-workspace
+CONTRIBUTING

OpenFlowNodeRED/.npmignore

@@ -1,3 +1,4 @@
 node_modules
 src
 package-lock.json
+tsconfig.json

OpenFlowNodeRED/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openflow-nodered",
-  "version": "1.1.23",
+  "version": "1.1.24",
   "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": {
@@ -38,6 +38,8 @@
     "jsonwebtoken": "^8.5.1",
     "morgan": "^1.10.0",
     "node-red": "^1.2.1",
+    "node-red-contrib-s7": "^2.2.1",
+    "node-red-dashboard": "^2.23.4",
     "node-red-node-email": "^1.7.8",
     "openflow-api": "^1.0.41",
     "os-service": "^2.2.0",

OpenFlowNodeRED/src/node-red-contrib-openflow-storage.ts

@@ -668,7 +668,8 @@ export class noderedcontribopenflowstorage {
                                     await this.RED.runtime.nodes.removeModule({ user: "admin", module: key, version: val.version });
                                 } else if (newsettings.nodes[key].version != oldsettings.nodes[key].version) {
                                     this._logger.info("Install module " + key + "@" + newsettings.nodes[key].version + " up from " + oldsettings.nodes[key].version);
-                                    await this.RED.runtime.nodes.addModule({ user: "admin", module: key, version: newsettings.nodes[key].version });
+                                    let result = await this.RED.runtime.nodes.addModule({ user: "admin", module: key, version: newsettings.nodes[key].version });
+                                    this._logger.debug(result);
                                 }
                             } catch (error) {
                                 this._logger.error((error.message ? error.message : error));
@@ -683,7 +684,8 @@ export class noderedcontribopenflowstorage {
                             try {
                                 if (oldsettings.nodes[key] == null) {
                                     this._logger.info("Install new module " + key + "@" + val.version);
-                                    await this.RED.runtime.nodes.addModule({ user: "admin", module: key, version: val.version });
+                                    let result = await this.RED.runtime.nodes.addModule({ user: "admin", module: key, version: val.version });
+                                    this._logger.debug(result);
                                 } else if (newsettings.nodes[key].version != oldsettings.nodes[key].version) {
                                     this._logger.info("Install module " + key + "@" + newsettings.nodes[key].version + " up from " + oldsettings.nodes[key].version);
                                     await this.RED.runtime.nodes.addModule({ user: "admin", module: key, version: val.version });
@@ -693,7 +695,6 @@ export class noderedcontribopenflowstorage {
                             }
                         }
                     }
-
                     if (this.DiffObjects(newsettings, oldsettings)) {
                         update = true;
                     }

OpenFlowNodeRED/src/nodered/nodes/amqp_nodes.ts

@@ -33,7 +33,7 @@ export class amqp_connection {
             this.webcli = new WebSocketClient(WebSocketClient.instance._logger, this.host);
             this.webcli.agent = "remotenodered";
             this.webcli.version = Config.version;
-            this.webcli._logger.info("amqp_condig: connecting to " + this.host);
+            this.webcli._logger.info("amqp_config: connecting to " + this.host);
             this.webcli.events.on("onopen", async () => {
                 try {
                     var q: SigninMessage = new SigninMessage();
@@ -42,7 +42,7 @@ export class amqp_connection {
                     q.username = this.username;
                     q.password = this.password;
                     var msg: Message = new Message(); msg.command = "signin"; msg.data = JSON.stringify(q);
-                    this.webcli._logger.info("amqp_condig: signing into " + this.host + " as " + this.username);
+                    this.webcli._logger.info("amqp_config: signing into " + this.host + " as " + this.username);
                     var result: SigninMessage = await this.webcli.Send<SigninMessage>(msg);
                     this.webcli._logger.info("signed in to " + this.host + " as " + result.user.name + " with id " + result.user._id);
                     this.webcli.user = result.user;

VERSION

@@ -1 +1 @@
-1.1.23
+1.1.24

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: "cloudhack/openflow:1.1.19"
+    image: "cloudhack/openflow:1.1.24"
     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: "cloudhack/openflownodered:1.1.19"
+    image: "cloudhack/openflownodered:1.1.24"
     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: "cloudhack/openflow:1.1.19"
+    image: "cloudhack/openflow:1.1.24"
     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: "cloudhack/openflownodered:1.1.19"
+    image: "cloudhack/openflownodered:1.1.24"
     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: "cloudhack/openflow:1.1.19"
+    image: "cloudhack/openflow:1.1.24"
     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: "cloudhack/openflownodered:1.1.19"
+    image: "cloudhack/openflownodered:1.1.24"
     container_name: "nodered"
     environment:
       #      - nodered_id=1

docker-compose.yml

@@ -18,7 +18,7 @@ services:
       - "5672:5672"
       - "15672:15672"
   web:
-    image: "cloudhack/openflow:1.1.19"
+    image: "cloudhack/openflow:1.1.24"
     environment:
       - update_acl_based_on_groups=true
       - multi_tenant=false
@@ -52,7 +52,7 @@ services:
       - "80:80"
       - "5858:5858"
   nodered:
-    image: "cloudhack/openflownodered:1.1.19"
+    image: "cloudhack/openflownodered:1.1.24"
     environment:
       #      - nodered_id=1
       - nodered_sa=nodered1