fixes

Author: skadefro

.gitignore

@@ -5,4 +5,5 @@ dist
 config
 temp
 .cache
-.npmrc
+.npmrc
+.openflowapicache

.npmignore

@@ -2,6 +2,7 @@
 .vscode
 .npmrc
 .cache
+.openflowapicache
 config
 docs
 node_modules

OpenFlow/src/Messages/Message.ts

@@ -2305,7 +2305,7 @@ export class Message {
                 let exists = known.filter((x: any) => x.id == id);
                 let item: any = {
                     id: client.id, user: client.user, clientagent: client.clientagent, clientversion: client.clientversion
-                    , lastheartbeat: client.lastheartbeat, _type: "socketclient", name: client.id,
+                    , lastheartbeat: client.lastheartbeat, _type: "socketclient", name: client.id, remoteip: client.remoteip,
                     queues: client._queues
                 };
                 if (client.user != null) {

OpenFlow/src/WebSocketServerClient.ts

@@ -90,7 +90,7 @@ export class WebSocketServerClient {
                 if (req.headers["x-real-ip"] != null) this.remoteip = req.headers["x-real-ip"];
             }
         }
-        logger.info("new client " + this.id);;
+        logger.info("new client " + this.id + " from " + this.remoteip);
         socketObject.on("open", (e: Event): void => this.open(e));
         socketObject.on("message", (e: string): void => this.message(e)); // e: MessageEvent
         socketObject.on("error", (e: Event): void => this.error(e));

OpenFlow/src/public/Sockets.html

@@ -10,6 +10,7 @@
       <th scope="col" ng-click="ctrl.ToggleOrder('name')"><b translate lib="web">name</b></th>
       <th scope="col" ng-click="ctrl.ToggleOrder('clientagent')"><b translate lib="web">clientagent</b></th>
       <th scope="col" ng-click="ctrl.ToggleOrder('queues')"><b translate lib="web">queues</b></th>
+      <th scope="col" ng-click="ctrl.ToggleOrder('remoteip')"><b translate lib="web">remoteip</b></th>
       <th scope="col" ng-click="ctrl.ToggleOrder('lastheartbeat')"><b translate lib="web">lastheartbeat</b></th>
       <th scope="col" ng-click="ctrl.ToggleOrder('_modified')"><b translate lib="web">updated</b></th>
     </tr>
@@ -19,6 +20,7 @@
       <td>{{model.name}}</td>
       <td>{{model.clientagent}}</td>
       <td>{{model.queuescount}} </td>
+      <td>{{model.remoteip}} </td>
       <td>
         <timesince ng-model="model.lastheartbeat" />
       </td>

OpenFlowNodeRED/src/nodered/nodes/rpa_nodes.ts

@@ -97,6 +97,7 @@ export class rpa_workflow_node {
     private localqueue: string = "";
     private _onsignedin: any = null;
     private _onsocketclose: any = null;
+    private originallocalqueue: string = "";
     constructor(public config: Irpa_workflow_node) {
         RED.nodes.createNode(this, config);
         try {
@@ -110,6 +111,9 @@ export class rpa_workflow_node {
 
             WebSocketClient.instance.events.on("onsignedin", this._onsignedin);
             WebSocketClient.instance.events.on("onclose", this._onsocketclose);
+            if (!NoderedUtil.IsNullEmpty(this.originallocalqueue) || this.originallocalqueue != this.config.localqueue) {
+                this.connect();
+            }
         } catch (error) {
             NoderedUtil.HandleError(this, error);
         }
@@ -248,7 +252,7 @@ export class rpa_workflow_node {
         }
     }
     async onclose(removed: boolean, done: any) {
-        if (!NoderedUtil.IsNullEmpty(this.localqueue) && removed) {
+        if ((!NoderedUtil.IsNullEmpty(this.localqueue) && removed) || this.originallocalqueue != this.config.localqueue) {
             NoderedUtil.CloseQueue(WebSocketClient.instance, this.localqueue);
             this.localqueue = "";
         }

VERSION

@@ -1 +1 @@
-1.1.11
+1.1.14