bump

Author: skadefro

OpenFlowNodeRED/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openflow-nodered",
-  "version": "1.1.35",
+  "version": "1.1.36",
   "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/node-red-contrib-openflow-storage.ts

@@ -7,7 +7,7 @@ import { Config } from "./Config";
 import { WebSocketClient, NoderedUtil, Base } from "openflow-api";
 import * as nodered from "node-red";
 import { FileSystemCache } from "openflow-api";
-import { StopService, StartService, servicename } from "./nodeclient/cliutil";
+import { RestartService, servicename } from "./nodeclient/cliutil";
 export class noderednpmrc {
     public _id: string;
     public _type: string = "npmrc";
@@ -740,8 +740,7 @@ export class noderedcontribopenflowstorage {
                             if (servicename != "service-name-not-set") {
                                 var _servicename = path.basename(servicename)
                                 this._logger.info("Restarting service " + _servicename);
-                                StopService(_servicename);
-                                StartService(_servicename);
+                                RestartService(_servicename);
                                 process.exit(1);
                             } else {
                                 this._logger.info("Not running in docker, nor started as a service, please restart Node-Red manually");
@@ -801,7 +800,10 @@ export class noderedcontribopenflowstorage {
                 const key = keys[i];
                 if (key != "node-red") {
                     const val = settings.nodes[key];
-                    if (val.pending_version) {
+                    if (val == null) {
+                        this._logger.info("noderedcontribopenflowstorage::_saveSettings:: key " + key + " is null?");
+                    } else if (val.pending_version) {
+                        this._logger.info("noderedcontribopenflowstorage::_saveSettings:: key " + key + " has a pending_version " + val.pending_version);
                         exitprocess = true;
                     }
                 }
@@ -814,8 +816,7 @@ export class noderedcontribopenflowstorage {
                     if (servicename != "service-name-not-set") {
                         var _servicename = path.basename(servicename)
                         this._logger.info("Restarting service " + _servicename);
-                        StopService(_servicename);
-                        StartService(_servicename);
+                        RestartService(_servicename);
                         process.exit(1);
                     } else {
                         this._logger.info("Not running in docker, nor started as a service, please restart Node-Red manually");

OpenFlowNodeRED/src/nodeclient/cliutil.ts

@@ -50,6 +50,20 @@ export function StopService(servicename: string) {
         logger.info(error.message);
     }
 }
+export function RestartService(servicename: string) {
+    try {
+        if (isWin()) {
+            cp.execSync(`net stop "${servicename}" & net start "${servicename}"`);
+        } else if (isMac()) {
+            // https://medium.com/craftsmenltd/building-a-cross-platform-background-service-in-node-js-791cfcd3be60
+            // cp.execSync(`sudo launchctl unload ${LAUNCHD_PLIST_PATH}`);
+        } else {
+            cp.execSync(`service ${servicename} restart`);
+        }
+    } catch (error) {
+        logger.info(error.message);
+    }
+}
 export function RemoveService(servicename: string) {
     StopService(servicename);
     logger.info("Uninstalling service" + servicename);

VERSION

@@ -1 +1 @@
-1.1.35
+1.1.36

package.json

@@ -1,6 +1,6 @@
 {
   "name": "openiap",
-  "version": "1.1.35",
+  "version": "1.1.36",
   "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": {