updates

skadefro · skadefro · commit e1fe47e81b3d · 2020-10-16T15:25:55.000+02:00
diff --git a/OpenFlow.code-workspace b/OpenFlow.code-workspace
@@ -3,9 +3,6 @@
 		{
 			"name": "OpenFlow",
 			"path": "."
-		},
-		{
-			"path": "..\\openflow-api"
 		}
 	]
 }
diff --git a/OpenFlow/src/public/Queue.html b/OpenFlow/src/public/Queue.html
@@ -12,6 +12,7 @@ <h1 translate lib="web">{{ctrl.model.name}}</h1>
       <th scope="col"><b translate lib="web">active</b></th>
       <th scope="col"><b translate lib="web">consumer_tag</b></th>
       <th scope="col"><b translate lib="web">clientname</b></th>
+      <th scope="col"><b translate lib="web">remoteip</b></th>
       <th scope="col"><b translate lib="web"></b></th>
     </tr>
   </thead>
@@ -21,6 +22,7 @@ <h1 translate lib="web">{{ctrl.model.name}}</h1>
       <td>{{model.active}}</td>
       <td>{{model.consumer_tag}}</td>
       <td>{{model.clientname}}</td>
+      <td>{{model.remoteip}}</td>
       <td class="btn-cell">
         <a href ng-click="ctrl.DeleteQueue(model)" ng-disabled="ctrl.loading==true"><i class="az-trash"></i></a>
       </td>
diff --git a/OpenFlowNodeRED/package.json b/OpenFlowNodeRED/package.json
@@ -1,6 +1,6 @@
 {
   "name": "openflow-nodered",
-  "version": "1.1.15",
+  "version": "1.1.17",
   "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": {
@@ -33,13 +33,12 @@
     "cookie-session": "^1.4.0",
     "envfile": "^6.12.0",
     "express": "^4.17.1",
-    "file-system-cache": "^1.0.5",
     "google-auth-library": "^6.0.6",
     "jsonwebtoken": "^8.5.1",
     "morgan": "^1.10.0",
     "node-red": "^1.2.1",
     "node-red-node-email": "^1.7.8",
-    "openflow-api": "^1.0.25",
+    "openflow-api": "^1.0.40",
     "os-service": "^2.2.0",
     "passport-saml": "^1.3.4",
     "passport-saml-metadata": "^2.3.0",
diff --git a/OpenFlowNodeRED/src/index.ts b/OpenFlowNodeRED/src/index.ts
@@ -7,8 +7,9 @@ import { Logger } from "./Logger";
 import { WebServer } from "./WebServer";
 import { Config } from "./Config";
 import { Crypt } from "./nodeclient/Crypt";
-const fileCache = require('file-system-cache').default;
-const backupStore = fileCache({ basePath: path.join(Config.logpath, '.cache') });
+import { FileSystemCache } from "openflow-api";
+
+const backupStore = new FileSystemCache(path.join(Config.logpath, '.cache'));
 const logger: winston.Logger = Logger.configure();
 logger.info("starting openflow nodered");
 
@@ -30,7 +31,7 @@ let server: http.Server = null;
 (async function (): Promise<void> {
     try {
         const filename: string = Config.nodered_id + "_flows.json";
-        const json = await backupStore.get(filename);
+        const json = await backupStore.get(filename, null);
         if (!NoderedUtil.IsNullEmpty(json)) {
             server = await WebServer.configure(logger, socket);
             var baseurl = Config.saml_baseurl;
diff --git a/OpenFlowNodeRED/src/node-red-contrib-auth-saml.ts b/OpenFlowNodeRED/src/node-red-contrib-auth-saml.ts
@@ -7,8 +7,8 @@ import * as retry from "async-retry";
 import { Logger } from "./Logger";
 import { Config } from "./Config";
 export const logger = Logger.configure();
-const fileCache = require('file-system-cache').default;
-const backupStore = fileCache({ basePath: path.join(Config.logpath, '.cache') });
+import { FileSystemCache } from "openflow-api";
+const backupStore = new FileSystemCache(path.join(Config.logpath, '.cache'));
 // tslint:disable-next-line: class-name
 export class samlauthstrategyoptions {
     public callbackUrl: string = "auth/strategy/callback/";
diff --git a/OpenFlowNodeRED/src/node-red-contrib-openflow-storage.ts b/OpenFlowNodeRED/src/node-red-contrib-openflow-storage.ts
@@ -6,8 +6,8 @@ import { nodered_settings } from "./nodered_settings";
 import { Config } from "./Config";
 import { WebSocketClient, NoderedUtil, Base } from "openflow-api";
 import * as nodered from "node-red";
-const fileCache = require('file-system-cache').default;
-const backupStore = fileCache({ basePath: path.join(Config.logpath, '.cache') });
+import { FileSystemCache } from "openflow-api";
+const backupStore = new FileSystemCache(path.join(Config.logpath, '.cache'));
 export class noderednpmrc {
     public _id: string;
     public _type: string = "npmrc";
@@ -310,7 +310,7 @@ export class noderedcontribopenflowstorage {
         try {
             const filename: string = Config.nodered_id + "_npmrc.txt";
             if (this.npmrc == null) {
-                const json = await backupStore.get(filename);
+                const json = await backupStore.get<string>(filename, null);
                 if (!NoderedUtil.IsNullEmpty(json)) {
                     this.npmrc = JSON.parse(json);
                 }
@@ -371,7 +371,7 @@ export class noderedcontribopenflowstorage {
         }
         const filename: string = Config.nodered_id + "_flows.json";
         if (result.length == 0) {
-            const json = await backupStore.get(filename);
+            const json = await backupStore.get<string>(filename, null);
             if (!NoderedUtil.IsNullEmpty(json)) {
                 this._flows = JSON.parse(json);
                 result = this._flows;
@@ -433,7 +433,7 @@ export class noderedcontribopenflowstorage {
         }
         const filename: string = Config.nodered_id + "_credentials";
         if (cred.length == 0) {
-            let json = await backupStore.get(filename);
+            let json = await backupStore.get<string>(filename, null);
             if (!NoderedUtil.IsNullEmpty(json)) {
                 json = noderedcontribopenflowstorage.decrypt(json);
                 this._credentials = JSON.parse(json);
@@ -517,7 +517,7 @@ export class noderedcontribopenflowstorage {
         }
         if (settings == null) {
             settings = {};
-            const json = await backupStore.get(filename);
+            const json = await backupStore.get<string>(filename, null);
             if (!NoderedUtil.IsNullEmpty(json)) {
                 this._settings = JSON.parse(json);
                 settings = this._settings;
@@ -761,7 +761,7 @@ export class noderedcontribopenflowstorage {
         }
         const filename: string = Config.nodered_id + "_sessions";
         if (item == null || item.length == 0) {
-            const json = await backupStore.get(filename);
+            const json = await backupStore.get<string>(filename, null);
             if (!NoderedUtil.IsNullEmpty(json)) {
                 item = JSON.parse(json);
             }
diff --git a/OpenFlowNodeRED/src/nodered/nodes/api_nodes.ts b/OpenFlowNodeRED/src/nodered/nodes/api_nodes.ts
@@ -5,8 +5,8 @@ import { Config } from "../../Config";
 import { Logger } from "../../Logger";
 import { NoderedUtil, SigninMessage, TokenUser, Message, WebSocketClient, Base, mapFunc, reduceFunc, finalizeFunc, UpdateOneMessage } from "openflow-api";
 import * as path from "path";
-const fileCache = require('file-system-cache').default;
-const backupStore = fileCache({ basePath: path.join(Config.logpath, '.cache') });
+import { FileSystemCache } from "openflow-api";
+const backupStore = new FileSystemCache(path.join(Config.logpath, '.cache'));
 
 export interface Iapi_credentials {
 }
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.1.15
+1.1.17
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "openiap",
-  "version": "1.1.15",
+  "version": "1.1.17",
   "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": {
@@ -62,7 +62,7 @@
     "multer": "^1.4.2",
     "multer-gridfs-storage": "^4.2.0",
     "oauth2-server": "^3.1.1",
-    "openflow-api": "^1.0.25",
+    "openflow-api": "^1.0.40",
     "os-service": "^2.2.0",
     "passport": "^0.4.1",
     "passport-google-oauth20": "^2.0.0",

Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,6 @@`
`3`	`3`	`{`
`4`	`4`	`"name": "OpenFlow",`
`5`	`5`	`"path": "."`
`6`		`- },`
`7`		`- {`
`8`		`- "path": "..\\openflow-api"`
`9`	`6`	`}`
`10`	`7`	`]`
`11`	`8`	`}`