Add custom ping interval

skadefro · skadefro · commit 22255dfa9936 · 2022-03-29T09:19:02.000+02:00
diff --git a/OpenFlow/src/Config.ts b/OpenFlow/src/Config.ts
@@ -63,6 +63,7 @@ export class Config {
         Config.auto_create_user_from_jwt = Config.parseBoolean(Config.getEnv("auto_create_user_from_jwt", "false"));
         Config.auto_create_domains = Config.parseArray(Config.getEnv("auto_create_domains", ""));
         Config.persist_user_impersonation = Config.parseBoolean(Config.getEnv("persist_user_impersonation", "true"));
+        Config.ping_clients_interval = parseInt(Config.getEnv("ping_clients_interval", (10000).toString())); // 12 seconds
         Config.allow_personal_nodered = Config.parseBoolean(Config.getEnv("allow_personal_nodered", "false"));
         Config.use_ingress_beta1_syntax = Config.parseBoolean(Config.getEnv("use_ingress_beta1_syntax", "true"));
         Config.auto_create_personal_nodered_group = Config.parseBoolean(Config.getEnv("auto_create_personal_nodered_group", "false"));
@@ -236,6 +237,8 @@ export class Config {
     public static auto_create_user_from_jwt: boolean = Config.parseBoolean(Config.getEnv("auto_create_user_from_jwt", "false"));
     public static auto_create_domains: string[] = Config.parseArray(Config.getEnv("auto_create_domains", ""));
     public static persist_user_impersonation: boolean = Config.parseBoolean(Config.getEnv("persist_user_impersonation", "true"));
+    public static ping_clients_interval: number = parseInt(Config.getEnv("ping_clients_interval", (10000).toString())); // 12 seconds
+
     public static allow_personal_nodered: boolean = Config.parseBoolean(Config.getEnv("allow_personal_nodered", "false"));
     public static use_ingress_beta1_syntax: boolean = Config.parseBoolean(Config.getEnv("use_ingress_beta1_syntax", "true"));
     public static auto_create_personal_nodered_group: boolean = Config.parseBoolean(Config.getEnv("auto_create_personal_nodered_group", "false"));
diff --git a/OpenFlow/src/DatabaseConnection.ts b/OpenFlow/src/DatabaseConnection.ts
@@ -80,7 +80,9 @@ export class DatabaseConnection extends events.EventEmitter {
     public static mongodb_query: ValueRecorder;
     public static mongodb_aggregate: ValueRecorder;
     public static mongodb_insert: ValueRecorder;
+    public static mongodb_insertmany: ValueRecorder;
     public static mongodb_update: ValueRecorder;
+    public static mongodb_updatemany: ValueRecorder;
     public static mongodb_replace: ValueRecorder;
     public static mongodb_delete: ValueRecorder;
     public static mongodb_deletemany: ValueRecorder;
@@ -103,10 +105,18 @@ export class DatabaseConnection extends events.EventEmitter {
                 description: 'Duration for mongodb inserts',
                 boundaries: Logger.otel.default_boundaries
             });
+            DatabaseConnection.mongodb_insertmany = Logger.otel.meter.createValueRecorder('openflow_mongodb_insertmany_seconds', {
+                description: 'Duration for mongodb insert many',
+                boundaries: Logger.otel.default_boundaries
+            });
             DatabaseConnection.mongodb_update = Logger.otel.meter.createValueRecorder('openflow_mongodb_update_seconds', {
                 description: 'Duration for mongodb updates',
                 boundaries: Logger.otel.default_boundaries
             });
+            DatabaseConnection.mongodb_updatemany = Logger.otel.meter.createValueRecorder('openflow_mongodb_updatemany_seconds', {
+                description: 'Duration for mongodb update many',
+                boundaries: Logger.otel.default_boundaries
+            });
             DatabaseConnection.mongodb_replace = Logger.otel.meter.createValueRecorder('openflow_mongodb_replace_seconds', {
                 description: 'Duration for mongodb replaces',
                 boundaries: Logger.otel.default_boundaries
@@ -1456,15 +1466,15 @@ export class DatabaseConnection extends events.EventEmitter {
                     const mongodbspan_inner: Span = Logger.otel.startSubSpan("mongodb.bulkexecute", span);
                     tempresult = tempresult.concat(bulkInsert.execute())
                     Logger.otel.endSpan(mongodbspan_inner);
-                    Logger.otel.endTimer(ot_end_inner, DatabaseConnection.mongodb_insert, { collection: collectionname });
+                    Logger.otel.endTimer(ot_end_inner, DatabaseConnection.mongodb_insertmany, { collection: collectionname });
                     bulkInsert = this.db.collection(collectionname).initializeUnorderedBulkOp()
                 }
             }
             const ot_end = Logger.otel.startTimer();
             const mongodbspan: Span = Logger.otel.startSubSpan("mongodb.bulkexecute", span);
             tempresult = tempresult.concat(bulkInsert.execute())
             Logger.otel.endSpan(mongodbspan);
-            Logger.otel.endTimer(ot_end, DatabaseConnection.mongodb_insert, { collection: collectionname });
+            Logger.otel.endTimer(ot_end, DatabaseConnection.mongodb_insertmany, { collection: collectionname });
 
             for (let y = 0; y < items.length; y++) {
                 let item = items[y];
diff --git a/OpenFlow/src/LoginProvider.ts b/OpenFlow/src/LoginProvider.ts
@@ -422,6 +422,7 @@ export class LoginProvider {
                     enable_web_tours: Config.enable_web_tours,
                     collections_with_text_index: DatabaseConnection.collections_with_text_index,
                     timeseries_collections: DatabaseConnection.timeseries_collections,
+                    ping_clients_interval: Config.ping_clients_interval,
                 }
                 res.end(JSON.stringify(res2));
             } catch (error) {
diff --git a/OpenFlow/src/WebSocketServer.ts b/OpenFlow/src/WebSocketServer.ts
@@ -79,7 +79,7 @@ export class WebSocketServer {
                 }) // "agent", "clientid"
             }
             // setInterval(this.pingClients, 10000);
-            setTimeout(this.pingClients.bind(this), 10000);
+            setTimeout(this.pingClients.bind(this), Config.ping_clients_interval);
         } catch (error) {
             span?.recordException(error);
             Logger.instanse.error(error);
@@ -89,6 +89,7 @@ export class WebSocketServer {
         }
 
     }
+    private static lastUserUpdate = Date.now();
     private static async pingClients(): Promise<void> {
         const span: Span = (Config.otel_trace_pingclients ? Logger.otel.startSpan("WebSocketServer.pingClients") : null);
         try {
@@ -183,10 +184,12 @@ export class WebSocketServer {
                     console.error(error);
                 }
             }
+
             if (bulkUpdates.length > 0) {
+                this.lastUserUpdate = Date.now();
                 let ot_end: any = Logger.otel.startTimer();
                 var bulkresult = await Config.db.db.collection("users").bulkWrite(bulkUpdates);
-                Logger.otel.endTimer(ot_end, DatabaseConnection.mongodb_update, { collection: "users" });
+                Logger.otel.endTimer(ot_end, DatabaseConnection.mongodb_updatemany, { collection: "users" });
             }
 
             if (!NoderedUtil.IsNullUndefinded(WebSocketServer.p_all)) {
@@ -201,7 +204,7 @@ export class WebSocketServer {
             Logger.instanse.error(error);
         } finally {
             Logger.otel.endSpan(span);
-            setTimeout(this.pingClients.bind(this), 10000);
+            setTimeout(this.pingClients.bind(this), Config.ping_clients_interval);
         }
     }
 }
diff --git a/OpenFlow/src/public/Controllers.ts b/OpenFlow/src/public/Controllers.ts
@@ -4638,7 +4638,7 @@ export class ClientsCtrl extends entitiesCtrl<unattendedclient> {
                 if (this.show == "webapp") this.basequery = { "_webheartbeat": { "$exists": true } };
                 if (this.show == "all") this.basequery = { _heartbeat: { "$exists": true } };
             } else {
-                dt.setMinutes(dt.getMinutes() - 1);
+                dt.setMilliseconds(dt.getMilliseconds() - (WebSocketClientService.ping_clients_interval + 20000));
                 this.basequery = { "$or": [] };
                 if (this.show == "openrpa") this.basequery = { "_rpaheartbeat": { "$gte": dt } };
                 if (this.show == "nodered") this.basequery = { "_noderedheartbeat": { "$gte": dt } };
diff --git a/OpenFlow/src/public/WebSocketClientService.ts b/OpenFlow/src/public/WebSocketClientService.ts
@@ -43,6 +43,9 @@ export class WebSocketClientService {
                 if (data.collections_with_text_index) this.collections_with_text_index = data.collections_with_text_index;
                 if (data.timeseries_collections) this.timeseries_collections = data.timeseries_collections;
 
+                this.ping_clients_interval = data.ping_clients_interval;
+
+
 
                 if (NoderedUtil.IsNullUndefinded(WebSocketClient.instance)) {
                     const cli: WebSocketClient = new WebSocketClient(this.logger, wsurl);
@@ -182,6 +185,7 @@ export class WebSocketClientService {
     public enable_web_tours: boolean;
     public collections_with_text_index: string[] = [];
     public timeseries_collections: string[] = [];
+    public ping_clients_interval: number = 10000;
 
     getJSON(url: string, callback: any): void {
         const xhr: XMLHttpRequest = new XMLHttpRequest();

Original file line number	Diff line number	Diff line change
`@@ -422,6 +422,7 @@ export class LoginProvider {`
`422`	`422`	`enable_web_tours: Config.enable_web_tours,`
`423`	`423`	`collections_with_text_index: DatabaseConnection.collections_with_text_index,`
`424`	`424`	`timeseries_collections: DatabaseConnection.timeseries_collections,`
	`425`	`+ ping_clients_interval: Config.ping_clients_interval,`
`425`	`426`	`}`
`426`	`427`	`res.end(JSON.stringify(res2));`
`427`	`428`	`} catch (error) {`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ export class WebSocketServer {`
`79`	`79`	`}) // "agent", "clientid"`
`80`	`80`	`}`
`81`	`81`	`// setInterval(this.pingClients, 10000);`
`82`		`- setTimeout(this.pingClients.bind(this), 10000);`
	`82`	`+ setTimeout(this.pingClients.bind(this), Config.ping_clients_interval);`
`83`	`83`	`} catch (error) {`
`84`	`84`	`span?.recordException(error);`
`85`	`85`	`Logger.instanse.error(error);`
`@@ -89,6 +89,7 @@ export class WebSocketServer {`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`}`
	`92`	`+ private static lastUserUpdate = Date.now();`
`92`	`93`	`private static async pingClients(): Promise<void> {`
`93`	`94`	`const span: Span = (Config.otel_trace_pingclients ? Logger.otel.startSpan("WebSocketServer.pingClients") : null);`
`94`	`95`	`try {`
`@@ -183,10 +184,12 @@ export class WebSocketServer {`
`183`	`184`	`console.error(error);`
`184`	`185`	`}`
`185`	`186`	`}`
	`187`	`+`
`186`	`188`	`if (bulkUpdates.length > 0) {`
	`189`	`+ this.lastUserUpdate = Date.now();`
`187`	`190`	`let ot_end: any = Logger.otel.startTimer();`
`188`	`191`	`var bulkresult = await Config.db.db.collection("users").bulkWrite(bulkUpdates);`
`189`		`- Logger.otel.endTimer(ot_end, DatabaseConnection.mongodb_update, { collection: "users" });`
	`192`	`+ Logger.otel.endTimer(ot_end, DatabaseConnection.mongodb_updatemany, { collection: "users" });`
`190`	`193`	`}`
`191`	`194`
`192`	`195`	`if (!NoderedUtil.IsNullUndefinded(WebSocketServer.p_all)) {`
`@@ -201,7 +204,7 @@ export class WebSocketServer {`
`201`	`204`	`Logger.instanse.error(error);`
`202`	`205`	`} finally {`
`203`	`206`	`Logger.otel.endSpan(span);`
`204`		`- setTimeout(this.pingClients.bind(this), 10000);`
	`207`	`+ setTimeout(this.pingClients.bind(this), Config.ping_clients_interval);`
`205`	`208`	`}`
`206`	`209`	`}`
`207`	`210`	`}`