update readme, bug fix kubernetes detection

skadefro · skadefro · commit 9a75e927ebdc · 2021-05-04T10:49:04.000+02:00
diff --git a/OpenFlow/src/Messages/Message.ts b/OpenFlow/src/Messages/Message.ts
@@ -1205,17 +1205,26 @@ export class Message {
         Logger.otel.endSpan(span);
         return name;
     }
-    private async EnsureNoderedInstance(cli: WebSocketServerClient, parent: Span): Promise<void> {
+    private async DetectDocker() {
         if (Message.detectdocker) {
-            try {
-                const docker = new Docker();
-                Message.usedocker = true;
-            } catch (error) {
-                console.log(error);
-                Message.usedocker = false;
+            if (!NoderedUtil.isKubernetes() && NoderedUtil.isDocker()) {
+                if (NoderedUtil.IsNullEmpty(process.env["KUBERNETES_SERVICE_HOST"])) {
+                    try {
+                        const docker = new Docker();
+                        var list = await docker.listContainers();
+                        Message.usedocker = true;
+                    } catch (error) {
+                        console.log(error);
+                        Message.usedocker = false;
+                    }
+
+                }
             }
             Message.detectdocker = false;
         }
+    }
+    private async EnsureNoderedInstance(cli: WebSocketServerClient, parent: Span): Promise<void> {
+        await this.DetectDocker();
         if (Message.usedocker) {
             this.DockerEnsureNoderedInstance(cli, parent);
         } else {
@@ -1872,16 +1881,7 @@ export class Message {
         Logger.otel.endSpan(span);
     }
     private async DeleteNoderedInstance(cli: WebSocketServerClient, parent: Span): Promise<void> {
-        if (Message.detectdocker) {
-            try {
-                const docker = new Docker();
-                Message.usedocker = true;
-            } catch (error) {
-                console.log(error);
-                Message.usedocker = false;
-            }
-            Message.detectdocker = false;
-        }
+        await this.DetectDocker();
         if (Message.usedocker) {
             this.dockerDeleteNoderedInstance(cli, parent);
         } else {
@@ -1923,16 +1923,7 @@ export class Message {
         this.Send(cli);
     }
     private async DeleteNoderedPod(cli: WebSocketServerClient, parent: Span): Promise<void> {
-        if (Message.detectdocker) {
-            try {
-                const docker = new Docker();
-                Message.usedocker = true;
-            } catch (error) {
-                console.log(error);
-                Message.usedocker = false;
-            }
-            Message.detectdocker = false;
-        }
+        await this.DetectDocker();
         if (Message.usedocker) {
             this.dockerDeleteNoderedPod(cli, parent);
         } else {
@@ -2036,16 +2027,7 @@ export class Message {
         this.Send(cli);
     }
     private async RestartNoderedInstance(cli: WebSocketServerClient, parent: Span): Promise<void> {
-        if (Message.detectdocker) {
-            try {
-                const docker = new Docker();
-                Message.usedocker = true;
-            } catch (error) {
-                console.log(error);
-                Message.usedocker = false;
-            }
-            Message.detectdocker = false;
-        }
+        await this.DetectDocker();
         if (Message.usedocker) {
             this.DockerRestartNoderedInstance(cli, parent);
         } else {
@@ -2179,16 +2161,7 @@ export class Message {
     private static detectdocker: boolean = true;
     private static usedocker: boolean = false;
     private async GetNoderedInstance(cli: WebSocketServerClient, parent: Span): Promise<void> {
-        if (Message.detectdocker) {
-            try {
-                const docker = new Docker();
-                Message.usedocker = true;
-            } catch (error) {
-                console.log(error);
-                Message.usedocker = false;
-            }
-            Message.detectdocker = false;
-        }
+        await this.DetectDocker();
         if (Message.usedocker) {
             this.dockerGetNoderedInstance(cli, parent);
         } else {
@@ -2334,16 +2307,7 @@ export class Message {
         this.Send(cli);
     }
     private async GetNoderedInstanceLog(cli: WebSocketServerClient, parent: Span): Promise<void> {
-        if (Message.detectdocker) {
-            try {
-                const docker = new Docker();
-                Message.usedocker = true;
-            } catch (error) {
-                console.log(error);
-                Message.usedocker = false;
-            }
-            Message.detectdocker = false;
-        }
+        await this.DetectDocker();
         if (Message.usedocker) {
             this.DockerGetNoderedInstanceLog(cli, parent);
         } else {
diff --git a/OpenFlowNodeRED/package.json b/OpenFlowNodeRED/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openiap/nodered",
-  "version": "1.2.100",
+  "version": "1.2.102",
   "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": {
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.2.101
+1.2.102
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openiap/openflow",
-  "version": "1.2.100",
+  "version": "1.2.102",
   "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": {
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@kubernetes/client-node": "0.14.1",
-    "@openiap/openflow-api": "^1.0.63",
+    "@openiap/openflow-api": "^1.0.64",
     "@opentelemetry/api": "^0.18.1",
     "@opentelemetry/core": "^0.18.2",
     "@opentelemetry/exporter-collector-grpc": "^0.18.2",
diff --git a/readme.md b/readme.md
@@ -2,6 +2,8 @@
 Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scalable NodeRed implementation.
 Also the "backend" for [OpenRPA](https://github.com/open-rpa/OpenRPA)
 
+Test it in a single user installation [here](https://app.openiap.io/)
+
 Join rocket chat [#openrpa](https://rocket.openiap.io/)
 or check out the [community forum](https://nn.openiap.io/)
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@openiap/nodered",`
`3`		`- "version": "1.2.100",`
	`3`	`+ "version": "1.2.102",`
`4`	`4`	`"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)",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`