add ocket_rate_limit_points_disconnect

Author: skadefro

OpenFlow/src/Config.ts

@@ -59,6 +59,7 @@ export class Config {
         Config.api_rate_limit_duration = parseInt(Config.getEnv("api_rate_limit_duration", "1"));
         Config.socket_rate_limit = Config.parseBoolean(Config.getEnv("socket_rate_limit", "true"));
         Config.socket_rate_limit_points = parseInt(Config.getEnv("socket_rate_limit_points", "30"));
+        Config.socket_rate_limit_points_disconnect = parseInt(Config.getEnv("socket_rate_limit_points_disconnect", "600"));
         Config.socket_rate_limit_duration = parseInt(Config.getEnv("socket_rate_limit_duration", "1"));
 
         Config.client_heartbeat_timeout = parseInt(Config.getEnv("client_heartbeat_timeout", "60"));
@@ -173,6 +174,7 @@ export class Config {
     public static api_rate_limit_duration: number = parseInt(Config.getEnv("api_rate_limit_duration", "1"));
     public static socket_rate_limit: boolean = Config.parseBoolean(Config.getEnv("socket_rate_limit", "true"));
     public static socket_rate_limit_points: number = parseInt(Config.getEnv("socket_rate_limit_points", "30"));
+    public static socket_rate_limit_points_disconnect: number = parseInt(Config.getEnv("socket_rate_limit_points_disconnect", "600"));
     public static socket_rate_limit_duration: number = parseInt(Config.getEnv("socket_rate_limit_duration", "1"));
 
     public static client_heartbeat_timeout: number = parseInt(Config.getEnv("client_heartbeat_timeout", "60"));

OpenFlow/src/Messages/Message.ts

@@ -75,7 +75,7 @@ export class Message {
                 if (error.consumedPoints) {
                     if (!NoderedUtil.IsNullUndefinded(WebSocketServer.websocket_rate_limit)) WebSocketServer.websocket_rate_limit.bind({ ...otel.defaultlabels, command: command }).add(1);
                     if ((error.consumedPoints % 100) == 0) cli._logger.debug("[" + username + "/" + cli.clientagent + "/" + cli.id + "] SOCKET_RATE_LIMIT consumedPoints: " + error.consumedPoints + " remainingPoints: " + error.remainingPoints + " msBeforeNext: " + error.msBeforeNext);
-                    if (error.consumedPoints > (Config.socket_rate_limit_points * 2)) {
+                    if (error.consumedPoints >= Config.socket_rate_limit_points_disconnect) {
                         cli._logger.debug("[" + username + "/" + cli.clientagent + "/" + cli.id + "] SOCKET_RATE_LIMIT: Disconnecing client ! consumedPoints: " + error.consumedPoints + " remainingPoints: " + error.remainingPoints + " msBeforeNext: " + error.msBeforeNext);
                         cli.Close();
                     }

OpenFlow/src/index.ts

@@ -284,11 +284,31 @@ process.on('warning', (warning) => {
     console.warn(warning.message); // Print the warning message
     console.warn(warning.stack);   // Print the stack trace
 });
-function handle(signal) {
-    console.log(`Received ${signal}`);
+// The signals we want to handle
+// NOTE: although it is tempting, the SIGKILL signal (9) cannot be intercepted and handled
+var signals = {
+    'SIGHUP': 1,
+    'SIGINT': 2,
+    'SIGTERM': 15
+};
+function handle(signal, value) {
+    console.trace(`process received a ${signal} signal with value ${value}`);
+    try {
+        server.close((err) => {
+            console.log(`server stopped by ${signal} with value ${value}`);
+            console.error(err);
+            process.exit(128 + value);
+        })
+    } catch (error) {
+        console.error(error);
+        console.log(`server stopped by ${signal} with value ${value}`);
+        process.exit(128 + value);
+    }
 }
-process.on('SIGTERM', handle);
-process.on('SIGINT', handle);
+Object.keys(signals).forEach((signal) => process.on(signal, handle));
+
+// process.on('SIGTERM', handle);
+// process.on('SIGINT', handle);
 // process.on('SIGUSR1', handle);
 // process.on('SIGPIPE', handle);
 // process.on('SIGHUP', handle);
@@ -330,11 +350,12 @@ const originalStderrWrite = process.stderr.write.bind(process.stderr);
 // write(str: string, encoding?: string, cb?: (err?: Error | null) => void): boolean;
 
 // https://medium.com/kubernetes-tutorials/monitoring-your-kubernetes-deployments-with-prometheus-5665eda54045
+var server: http.Server = null;
 (async function (): Promise<void> {
     try {
         await initamqp();
         logger.info("VERSION: " + Config.version);
-        const server: http.Server = await WebServer.configure(logger, Config.baseurl(), _otel);
+        server = await WebServer.configure(logger, Config.baseurl(), _otel);
         if (GrafanaProxy != null) {
             const grafana = await GrafanaProxy.GrafanaProxy.configure(logger, WebServer.app, _otel);
         }

OpenFlowNodeRED/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openiap/nodered",
-  "version": "1.2.23",
+  "version": "1.2.24",
   "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/index.ts

@@ -72,11 +72,31 @@ process.on('warning', (warning) => {
     console.warn(warning.message); // Print the warning message
     console.warn(warning.stack);   // Print the stack trace
 });
-function handle(signal) {
-    console.log(`Received ${signal}`);
+
+// The signals we want to handle
+// NOTE: although it is tempting, the SIGKILL signal (9) cannot be intercepted and handled
+var signals = {
+    'SIGHUP': 1,
+    'SIGINT': 2,
+    'SIGTERM': 15
+};
+function handle(signal, value) {
+    console.trace(`process received a ${signal} signal with value ${value}`);
+    try {
+        server.close((err) => {
+            console.log(`server stopped by ${signal} with value ${value}`);
+            console.error(err);
+            process.exit(128 + value);
+        })
+    } catch (error) {
+        console.error(error);
+        console.log(`server stopped by ${signal} with value ${value}`);
+        process.exit(128 + value);
+    }
 }
-process.on('SIGTERM', handle);
-process.on('SIGINT', handle);
+Object.keys(signals).forEach((signal) => process.on(signal, handle));
+// process.on('SIGTERM', handle);
+// process.on('SIGINT', handle);
 // process.on('SIGUSR1', handle);
 // process.on('SIGPIPE', handle);
 // process.on('SIGHUP', handle);

VERSION

@@ -1 +1 @@
-1.2.23
+1.2.24

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openiap/openflow",
-  "version": "1.2.23",
+  "version": "1.2.24",
   "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": {