add workflow auto cleanup

skadefro · skadefro · commit dedd574f5b44 · 2020-07-24T11:49:57.000+02:00
diff --git a/OpenFlowNodeRED/src/Config.ts b/OpenFlowNodeRED/src/Config.ts
@@ -38,6 +38,7 @@ export class Config {
 
         Config.flow_refresh_interval = parseInt(Config.getEnv("flow_refresh_interval", "60000"));
         Config.flow_refresh_initial_interval = parseInt(Config.getEnv("flow_refresh_initial_interval", "60000"));
+        Config.workflow_node_auto_cleanup = Config.parseBoolean(Config.getEnv("workflow_node_auto_cleanup", "true"));
 
         Config.api_ws_url = Config.getEnv("api_ws_url", "ws://localhost:3000");
         Config.amqp_url = Config.getEnv("amqp_url", "amqp://localhost");
@@ -82,6 +83,7 @@ export class Config {
 
     public static flow_refresh_interval: number = parseInt(Config.getEnv("flow_refresh_interval", "60000"));
     public static flow_refresh_initial_interval: number = parseInt(Config.getEnv("flow_refresh_initial_interval", "60000"));
+    public static workflow_node_auto_cleanup: boolean = Config.parseBoolean(Config.getEnv("workflow_node_auto_cleanup", "true"));
 
     public static api_ws_url: string = Config.getEnv("api_ws_url", "ws://localhost:3000");
     public static amqp_url: string = Config.getEnv("amqp_url", "amqp://localhost");
diff --git a/OpenFlowNodeRED/src/node-red-contrib-openflow-storage.ts b/OpenFlowNodeRED/src/node-red-contrib-openflow-storage.ts
@@ -152,6 +152,9 @@ export class noderedcontribopenflowstorage {
     private _credentials: any[] = null;
     private _settings: any[] = null;
     public async CheckUpdates() {
+        console.log("***************************************");
+        console.log("* CheckUpdates:: begin                *");
+        console.log("***************************************");
         try {
             let oldsettings: any[] = null;
             if (this._settings != null) oldsettings = JSON.parse(JSON.stringify(this._settings));
@@ -217,6 +220,9 @@ export class noderedcontribopenflowstorage {
         } catch (error) {
             this._logger.error(error);
         }
+        console.log("***************************************");
+        console.log("* CheckUpdates:: end                  *");
+        console.log("***************************************");
         setTimeout(this.CheckUpdates.bind(this), Config.flow_refresh_interval);
     }
     public async init(settings: any): Promise<boolean> {
@@ -375,7 +381,7 @@ export class noderedcontribopenflowstorage {
             else { this._logger.error(error); }
         }
     }
-    // private firstrun: boolean = true;
+    private firstrun: boolean = true;
     public async _getSettings(): Promise<any> {
         var settings: any = null;
         try {
@@ -443,7 +449,10 @@ export class noderedcontribopenflowstorage {
             }
             this._settings = settings;
         }
-        setTimeout(this.CheckUpdates.bind(this), Config.flow_refresh_initial_interval);
+        if (this.firstrun) {
+            setTimeout(this.CheckUpdates.bind(this), Config.flow_refresh_initial_interval);
+            this.firstrun = false;
+        }
         return settings;
     }
     public async _saveSettings(settings: any): Promise<void> {
diff --git a/OpenFlowNodeRED/src/nodered/nodes/rpa_nodes.ts b/OpenFlowNodeRED/src/nodered/nodes/rpa_nodes.ts
@@ -24,7 +24,7 @@ export class rpa_detector_node {
             WebSocketClient.instance.events.on("onclose", (message) => {
                 if (message == null) message = "";
                 this.node.status({ fill: "red", shape: "dot", text: "Disconnected " + message });
-                this.onclose(null);
+                this.onclose(false, null);
             });
             this.connect();
         } catch (error) {
@@ -66,9 +66,9 @@ export class rpa_detector_node {
             NoderedUtil.HandleError(this, error);
         }
     }
-    async onclose(done: any) {
-        if (!NoderedUtil.IsNullEmpty(this.localqueue)) {
-            await NoderedUtil.CloseQueue(WebSocketClient.instance, this.localqueue);
+    async onclose(removed: boolean, done: any) {
+        if (!NoderedUtil.IsNullEmpty(this.localqueue) && removed) {
+            NoderedUtil.CloseQueue(WebSocketClient.instance, this.localqueue);
             this.localqueue = "";
         }
         if (done != null) done();
@@ -101,7 +101,7 @@ export class rpa_workflow_node {
             WebSocketClient.instance.events.on("onclose", (message) => {
                 if (message == null) message = "";
                 this.node.status({ fill: "red", shape: "dot", text: "Disconnected " + message });
-                this.onclose();
+                this.onclose(false, null);
             });
             this.connect();
         } catch (error) {
@@ -233,11 +233,12 @@ export class rpa_workflow_node {
             }
         }
     }
-    onclose() {
-        if (!NoderedUtil.IsNullEmpty(this.localqueue)) {
+    async onclose(removed: boolean, done: any) {
+        if (!NoderedUtil.IsNullEmpty(this.localqueue) && removed) {
             NoderedUtil.CloseQueue(WebSocketClient.instance, this.localqueue);
             this.localqueue = "";
         }
+        if (done != null) done();
     }
 }
 
diff --git a/OpenFlowNodeRED/src/nodered/nodes/workflow_nodes.ts b/OpenFlowNodeRED/src/nodered/nodes/workflow_nodes.ts
@@ -32,7 +32,7 @@ export class workflow_in_node {
             WebSocketClient.instance.events.on("onclose", (message) => {
                 if (message == null) message = "";
                 this.node.status({ fill: "red", shape: "dot", text: "Disconnected " + message });
-                this.onclose();
+                this.onclose(false, null);
             });
             this.connect();
         } catch (error) {
@@ -251,11 +251,22 @@ export class workflow_in_node {
             }
         }
     }
-    onclose() {
-        if (!NoderedUtil.IsNullEmpty(this.localqueue)) {
+    async onclose(removed: boolean, done: any) {
+        if (!NoderedUtil.IsNullEmpty(this.localqueue) && removed) {
             NoderedUtil.CloseQueue(WebSocketClient.instance, this.localqueue);
             this.localqueue = "";
         }
+        if (removed && Config.workflow_node_auto_cleanup) {
+            let res = await NoderedUtil.Query("workflow", { "queue": this.localqueue }, null, null, 1, 0, null);
+            if (res.length > 0) {
+                await NoderedUtil.DeleteOne("workflow", res[0]._id, null);
+            }
+            res = await NoderedUtil.Query("users", { "_type": "role", "$or": [{ "workflowid": this.workflow._id }, { "name": this.localqueue + "users" }] }, null, null, 1, 0, null);
+            if (res.length > 0) {
+                await NoderedUtil.DeleteOne("workflow", res[0]._id, null);
+            }
+        }
+        if (done != null) done();
     }
 }
 
@@ -452,7 +463,7 @@ export class assign_workflow_node {
         WebSocketClient.instance.events.on("onclose", (message) => {
             if (message == null) message = "";
             this.node.status({ fill: "red", shape: "dot", text: "Disconnected " + message });
-            this.onclose();
+            this.onclose(false, null);
         });
         this.connect();
     }
@@ -598,10 +609,11 @@ export class assign_workflow_node {
             NoderedUtil.HandleError(this, error);
         }
     }
-    onclose() {
-        if (!NoderedUtil.IsNullEmpty(this.localqueue)) {
+    async onclose(removed: boolean, done: any) {
+        if (!NoderedUtil.IsNullEmpty(this.localqueue) && removed) {
             NoderedUtil.CloseQueue(WebSocketClient.instance, this.localqueue);
             this.localqueue = "";
         }
+        if (done != null) done();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,9 @@ export class noderedcontribopenflowstorage {`
`152`	`152`	`private _credentials: any[] = null;`
`153`	`153`	`private _settings: any[] = null;`
`154`	`154`	`public async CheckUpdates() {`
	`155`	`+ console.log("***************************************");`
	`156`	`+ console.log("* CheckUpdates:: begin *");`
	`157`	`+ console.log("***************************************");`
`155`	`158`	`try {`
`156`	`159`	`let oldsettings: any[] = null;`
`157`	`160`	`if (this._settings != null) oldsettings = JSON.parse(JSON.stringify(this._settings));`
`@@ -217,6 +220,9 @@ export class noderedcontribopenflowstorage {`
`217`	`220`	`} catch (error) {`
`218`	`221`	`this._logger.error(error);`
`219`	`222`	`}`
	`223`	`+ console.log("***************************************");`
	`224`	`+ console.log("* CheckUpdates:: end *");`
	`225`	`+ console.log("***************************************");`
`220`	`226`	`setTimeout(this.CheckUpdates.bind(this), Config.flow_refresh_interval);`
`221`	`227`	`}`
`222`	`228`	`public async init(settings: any): Promise<boolean> {`
`@@ -375,7 +381,7 @@ export class noderedcontribopenflowstorage {`
`375`	`381`	`else { this._logger.error(error); }`
`376`	`382`	`}`
`377`	`383`	`}`
`378`		`- // private firstrun: boolean = true;`
	`384`	`+ private firstrun: boolean = true;`
`379`	`385`	`public async _getSettings(): Promise<any> {`
`380`	`386`	`var settings: any = null;`
`381`	`387`	`try {`
`@@ -443,7 +449,10 @@ export class noderedcontribopenflowstorage {`
`443`	`449`	`}`
`444`	`450`	`this._settings = settings;`
`445`	`451`	`}`
`446`		`- setTimeout(this.CheckUpdates.bind(this), Config.flow_refresh_initial_interval);`
	`452`	`+ if (this.firstrun) {`
	`453`	`+ setTimeout(this.CheckUpdates.bind(this), Config.flow_refresh_initial_interval);`
	`454`	`+ this.firstrun = false;`
	`455`	`+ }`
`447`	`456`	`return settings;`
`448`	`457`	`}`
`449`	`458`	`public async _saveSettings(settings: any): Promise<void> {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ export class rpa_detector_node {`
`24`	`24`	`WebSocketClient.instance.events.on("onclose", (message) => {`
`25`	`25`	`if (message == null) message = "";`
`26`	`26`	`this.node.status({ fill: "red", shape: "dot", text: "Disconnected " + message });`
`27`		`- this.onclose(null);`
	`27`	`+ this.onclose(false, null);`
`28`	`28`	`});`
`29`	`29`	`this.connect();`
`30`	`30`	`} catch (error) {`
`@@ -66,9 +66,9 @@ export class rpa_detector_node {`
`66`	`66`	`NoderedUtil.HandleError(this, error);`
`67`	`67`	`}`
`68`	`68`	`}`
`69`		`- async onclose(done: any) {`
`70`		`- if (!NoderedUtil.IsNullEmpty(this.localqueue)) {`
`71`		`- await NoderedUtil.CloseQueue(WebSocketClient.instance, this.localqueue);`
	`69`	`+ async onclose(removed: boolean, done: any) {`
	`70`	`+ if (!NoderedUtil.IsNullEmpty(this.localqueue) && removed) {`
	`71`	`+ NoderedUtil.CloseQueue(WebSocketClient.instance, this.localqueue);`
`72`	`72`	`this.localqueue = "";`
`73`	`73`	`}`
`74`	`74`	`if (done != null) done();`
`@@ -101,7 +101,7 @@ export class rpa_workflow_node {`
`101`	`101`	`WebSocketClient.instance.events.on("onclose", (message) => {`
`102`	`102`	`if (message == null) message = "";`
`103`	`103`	`this.node.status({ fill: "red", shape: "dot", text: "Disconnected " + message });`
`104`		`- this.onclose();`
	`104`	`+ this.onclose(false, null);`
`105`	`105`	`});`
`106`	`106`	`this.connect();`
`107`	`107`	`} catch (error) {`
`@@ -233,11 +233,12 @@ export class rpa_workflow_node {`
`233`	`233`	`}`
`234`	`234`	`}`
`235`	`235`	`}`
`236`		`- onclose() {`
`237`		`- if (!NoderedUtil.IsNullEmpty(this.localqueue)) {`
	`236`	`+ async onclose(removed: boolean, done: any) {`
	`237`	`+ if (!NoderedUtil.IsNullEmpty(this.localqueue) && removed) {`
`238`	`238`	`NoderedUtil.CloseQueue(WebSocketClient.instance, this.localqueue);`
`239`	`239`	`this.localqueue = "";`
`240`	`240`	`}`
	`241`	`+ if (done != null) done();`
`241`	`242`	`}`
`242`	`243`	`}`
`243`	`244`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ export class workflow_in_node {`
`32`	`32`	`WebSocketClient.instance.events.on("onclose", (message) => {`
`33`	`33`	`if (message == null) message = "";`
`34`	`34`	`this.node.status({ fill: "red", shape: "dot", text: "Disconnected " + message });`
`35`		`- this.onclose();`
	`35`	`+ this.onclose(false, null);`
`36`	`36`	`});`
`37`	`37`	`this.connect();`
`38`	`38`	`} catch (error) {`
`@@ -251,11 +251,22 @@ export class workflow_in_node {`
`251`	`251`	`}`
`252`	`252`	`}`
`253`	`253`	`}`
`254`		`- onclose() {`
`255`		`- if (!NoderedUtil.IsNullEmpty(this.localqueue)) {`
	`254`	`+ async onclose(removed: boolean, done: any) {`
	`255`	`+ if (!NoderedUtil.IsNullEmpty(this.localqueue) && removed) {`
`256`	`256`	`NoderedUtil.CloseQueue(WebSocketClient.instance, this.localqueue);`
`257`	`257`	`this.localqueue = "";`
`258`	`258`	`}`
	`259`	`+ if (removed && Config.workflow_node_auto_cleanup) {`
	`260`	`+ let res = await NoderedUtil.Query("workflow", { "queue": this.localqueue }, null, null, 1, 0, null);`
	`261`	`+ if (res.length > 0) {`
	`262`	`+ await NoderedUtil.DeleteOne("workflow", res[0]._id, null);`
	`263`	`+ }`
	`264`	`+ res = await NoderedUtil.Query("users", { "_type": "role", "$or": [{ "workflowid": this.workflow._id }, { "name": this.localqueue + "users" }] }, null, null, 1, 0, null);`
	`265`	`+ if (res.length > 0) {`
	`266`	`+ await NoderedUtil.DeleteOne("workflow", res[0]._id, null);`
	`267`	`+ }`
	`268`	`+ }`
	`269`	`+ if (done != null) done();`
`259`	`270`	`}`
`260`	`271`	`}`
`261`	`272`
`@@ -452,7 +463,7 @@ export class assign_workflow_node {`
`452`	`463`	`WebSocketClient.instance.events.on("onclose", (message) => {`
`453`	`464`	`if (message == null) message = "";`
`454`	`465`	`this.node.status({ fill: "red", shape: "dot", text: "Disconnected " + message });`
`455`		`- this.onclose();`
	`466`	`+ this.onclose(false, null);`
`456`	`467`	`});`
`457`	`468`	`this.connect();`
`458`	`469`	`}`
`@@ -598,10 +609,11 @@ export class assign_workflow_node {`
`598`	`609`	`NoderedUtil.HandleError(this, error);`
`599`	`610`	`}`
`600`	`611`	`}`
`601`		`- onclose() {`
`602`		`- if (!NoderedUtil.IsNullEmpty(this.localqueue)) {`
	`612`	`+ async onclose(removed: boolean, done: any) {`
	`613`	`+ if (!NoderedUtil.IsNullEmpty(this.localqueue) && removed) {`
`603`	`614`	`NoderedUtil.CloseQueue(WebSocketClient.instance, this.localqueue);`
`604`	`615`	`this.localqueue = "";`
`605`	`616`	`}`
	`617`	`+ if (done != null) done();`
`606`	`618`	`}`
`607`	`619`	`}`