rate per client, not total

Author: skadefro

OpenFlow/src/WebSocketServerClient.ts

@@ -146,16 +146,16 @@ export class WebSocketServerClient {
         let username: string = "Unknown";
         try {
             try {
-
                 if (!NoderedUtil.IsNullUndefinded(this.user)) { username = this.user.username; }
-
-                // await this.consume("me");
-                var res = await BaseRateLimiter.consume("me");
+                var res = await BaseRateLimiter.consume(this.id);
                 // console.log("SOCKET_NO_RATE_LIMIT consumedPoints: " + res.consumedPoints + " remainingPoints: " + res.remainingPoints);
                 this._message(message);
             } catch (error) {
-                this._logger.debug("[" + username + "/" + this.clientagent + "/" + this.id + "] SOCKET_RATE_LIMIT consumedPoints: " + error.consumedPoints + " remainingPoints: " + error.remainingPoints + " msBeforeNext: " + error.msBeforeNext);
-                setTimeout(() => { this.message(message); }, Math.floor(Math.random() * 10) * 100);
+                if (error.consumedPoints) {
+                    if ((error.consumedPoints % 100) == 0) this._logger.debug("[" + username + "/" + this.clientagent + "/" + this.id + "] SOCKET_RATE_LIMIT consumedPoints: " + error.consumedPoints + " remainingPoints: " + error.remainingPoints + " msBeforeNext: " + error.msBeforeNext);
+                    setTimeout(() => { this.message(message); }, 250);
+                }
+                // setTimeout(() => { this.message(message); }, Math.floor(Math.random() * 10) * 100);
             }
         } catch (error) {
             this._logger.error("[" + username + "/" + this.clientagent + "/" + this.id + "] WebSocket error encountered " + (error.message ? error.message : error));

OpenFlowNodeRED/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openflow-nodered",
-  "version": "1.1.62",
+  "version": "1.1.64",
   "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": {

VERSION

@@ -1 +1 @@
-1.1.62
+1.1.64

docker-compose-toolbox.yml

@@ -82,7 +82,7 @@ services:
       - "traefik.http.routers.nodered.rule=Host(`nodered1.toolbox.openrpa.dk`)"
       - "traefik.http.routers.nodered.entrypoints=web"
       - "traefik.http.services.nodered.loadbalancer.server.port=1880"
-    image: "cloudhack/openflownodered:1.1.62"
+    image: "cloudhack/openflownodered:1.1.64"
     container_name: "nodered"
     environment:
       #      - nodered_id=1

docker-compose-traefik-letsencrypt.yml

@@ -107,7 +107,7 @@ services:
       - "traefik.http.routers.nodered.entrypoints=web,websecure"
       - "traefik.http.services.nodered.loadbalancer.server.port=1880"
       - "traefik.http.routers.nodered.tls.certresolver=myresolver"
-    image: "cloudhack/openflownodered:1.1.62"
+    image: "cloudhack/openflownodered:1.1.64"
     container_name: "nodered"
     environment:
       #      - nodered_id=1

docker-compose-traefik.yml

@@ -82,7 +82,7 @@ services:
       - "traefik.http.routers.nodered.rule=Host(`nodered1.localhost.openrpa.dk`)"
       - "traefik.http.routers.nodered.entrypoints=web"
       - "traefik.http.services.nodered.loadbalancer.server.port=1880"
-    image: "cloudhack/openflownodered:1.1.62"
+    image: "cloudhack/openflownodered:1.1.64"
     container_name: "nodered"
     environment:
       #      - nodered_id=1

docker-compose.yml

@@ -18,7 +18,7 @@ services:
       - "5672:5672"
       - "15672:15672"
   web:
-    image: "cloudhack/openflow:1.1.59"
+    image: "cloudhack/openflow:1.1.64"
     environment:
       - update_acl_based_on_groups=true
       - multi_tenant=false
@@ -52,7 +52,7 @@ services:
       - "80:80"
       - "5858:5858"
   nodered:
-    image: "cloudhack/openflownodered:1.1.62"
+    image: "cloudhack/openflownodered:1.1.63"
     environment:
       #      - nodered_id=1
       - nodered_sa=nodered1

package.json

@@ -1,6 +1,6 @@
 {
   "name": "openiap",
-  "version": "1.1.62",
+  "version": "1.1.64",
   "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": {