Update agent for nodered

Author: skadefro

OpenFlow/src/WebSocketServerClient.ts

@@ -113,6 +113,8 @@ export class WebSocketServerClient {
                 qname = "webapp." + Math.random().toString(36).substr(2, 9); autoDelete = true;
             } else if (this.clientagent == "web") {
                 qname = "web." + Math.random().toString(36).substr(2, 9); autoDelete = true;
+            } else if (this.clientagent == "openrpa") {
+                qname = "openrpa." + Math.random().toString(36).substr(2, 9); autoDelete = true;
             } else {
                 qname = "unknown." + Math.random().toString(36).substr(2, 9); autoDelete = true;
             }

OpenFlow/src/cli.ts

@@ -42,13 +42,12 @@ function getToken(): Promise<string> {
     return new Promise<string>(async (resolve, reject) => {
         logger.info("wsurl " + Config.api_ws_url);
         var socket: WebSocketClient = new WebSocketClient(logger, Config.api_ws_url);
+        socket.agent = "openflow-cli";
+        socket.version = Config.version;
         socket.events.on("onopen", async () => {
             try {
                 var username: string = readlineSync.question('username? ');
                 var password: string = readlineSync.question('password? ', { hideEchoBack: true });
-
-                socket.version = Config.version;
-                socket.agent = "nodered-cli";
                 var result = await NoderedUtil.SigninWithUsername(username, password, null, true);
                 logger.info("signed in as " + result.user.name + " with id " + result.user._id);
                 WebSocketClient.instance.user = result.user;

OpenFlow/src/public/Controllers.ts

@@ -2,6 +2,7 @@ import { userdata, api, entityCtrl, entitiesCtrl } from "./CommonControllers";
 import { TokenUser, QueueMessage, SigninMessage, Ace, NoderedUser, Billing, stripe_customer, stripe_list, stripe_base, stripe_plan, stripe_subscription_item, Base, NoderedUtil, WebSocketClient, Role, NoderedConfig, Resources, ResourceValues, stripe_invoice } from "openflow-api";
 import { RPAWorkflow, Provider, Form, WorkflowInstance, Workflow, unattendedclient } from "./Entities";
 import { WebSocketClientService } from "./WebSocketClientService";
+import * as jsondiffpatch from "jsondiffpatch";
 
 function treatAsUTC(date): number {
     var result = new Date(date);
@@ -12,7 +13,6 @@ function daysBetween(startDate, endDate): number {
     var millisecondsPerDay = 24 * 60 * 60 * 1000;
     return (treatAsUTC(endDate) - treatAsUTC(startDate)) / millisecondsPerDay;
 }
-declare var jsondiffpatch: any;
 declare var Formio: any;
 declare var FileSaver: any;
 export class RPAWorkflowCtrl extends entityCtrl<RPAWorkflow> {
@@ -3014,6 +3014,8 @@ export class AuditlogsCtrl extends entitiesCtrl<Role> {
             if (model.clientagent == 'samlverify') model.fa = 'fab fa-windows';
             if (model.clientagent == 'aiotwebapp') model.fa = 'fas fa-globe';
             if (model.clientagent == 'aiotmobileapp') model.fa = 'fas fa-mobile-alt';
+            if (model.clientagent == 'nodered-cli') model.fa = 'fab fa-node-js';
+            if (model.clientagent == 'openflow-cli') model.fa = 'fab fa-node-js';
 
             if (model.impostorname != '' && model.impostorname != null) model.fa2 = 'fas fa-user-secret';
         }

OpenFlow/src/public/WebSocketClientService.ts

@@ -36,7 +36,8 @@ export class WebSocketClientService {
                 if (WebSocketClient.instance == null) {
                     var cli: WebSocketClient;
                     cli = new WebSocketClient(this.logger, wsurl);
-                    WebSocketClient.instance.version = data.version;
+                    cli.agent = "webapp";
+                    cli.version = data.version;
                 }
                 cli.events.on('connect', () => {
                     this.logger.info('connected to ' + wsurl);

OpenFlowNodeRED/src/cli.ts

@@ -70,13 +70,13 @@ function getToken(): Promise<string> {
     return new Promise<string>(async (resolve, reject) => {
         logger.info("wsurl " + Config.api_ws_url);
         var socket: WebSocketClient = new WebSocketClient(logger, Config.api_ws_url);
+        socket.agent = "nodered-cli";
+        socket.version = Config.version;
         socket.events.on("onopen", async () => {
             try {
                 var username: string = readlineSync.question('username? ');
                 var password: string = readlineSync.question('password? ', { hideEchoBack: true });
 
-                socket.version = Config.version;
-                socket.agent = "nodered-cli";
                 var result = await NoderedUtil.SigninWithUsername(username, password, null, true);
                 logger.info("signed in as " + result.user.name + " with id " + result.user._id);
                 WebSocketClient.instance.user = result.user;

OpenFlowNodeRED/src/index.ts

@@ -27,6 +27,8 @@ rejectionEmitter.on("rejectionHandled", (error, promise) => {
     try {
         var c = Config;
         var socket: WebSocketClient = new WebSocketClient(logger, Config.api_ws_url);
+        socket.agent = "nodered";
+        socket.version = Config.version;
         logger.info("VERSION: " + Config.version);
         socket.events.on("onopen", async () => {
             try {

OpenFlowNodeRED/src/nodered/nodes/amqp_nodes.ts

@@ -31,11 +31,13 @@ export class amqp_connection {
         this.host = this.config.host;
         if (!NoderedUtil.IsNullUndefinded(this.host)) {
             this.webcli = new WebSocketClient(WebSocketClient.instance._logger, this.host);
+            this.webcli.agent = "remotenodered";
+            this.webcli.version = Config.version;
             this.webcli._logger.info("amqp_condig: connecting to " + this.host);
             this.webcli.events.on("onopen", async () => {
                 try {
                     var q: SigninMessage = new SigninMessage();
-                    q.clientagent = "nodered";
+                    q.clientagent = "remotenodered";
                     q.clientversion = Config.version;
                     q.username = this.username;
                     q.password = this.password;