Merge branch 'master' into upgrade-gladys-gateway-js

server/lib/gateway/gateway.forwardDeviceStateToGoogleHome.js

@@ -1,7 +1,16 @@
+const Bottleneck = require('bottleneck');
 const logger = require('../../utils/logger');
 const { EVENTS } = require('../../utils/constants');
 const { queryDeviceConverter } = require('../../services/google-actions/lib/utils/googleActions.queryDeviceConverter');
 
+// We want to avoid spamming the Gladys Gateway
+// So we limit to 2 concurrent calls + max 5 calls/seconds to Gladys Gateway
+// @ts-ignore
+const limiter = new Bottleneck({
+  maxConcurrent: 2,
+  minTime: 200,
+});
+
 /**
  * @description send a current state to google
  * @param {Object} stateManager - The state manager.
@@ -43,6 +52,8 @@ async function sendCurrentState(stateManager, gladysGatewayClient, deviceFeature
   }
 }
 
+const sendCurrentStateWithRateLimit = limiter.wrap(sendCurrentState);
+
 /**
  * @description Forward websocket message to Gateway.
  * @param {Object} event - Websocket event.
@@ -67,7 +78,7 @@ async function forwardDeviceStateToGoogleHome(event) {
       clearTimeout(this.forwardStateToGoogleHomeTimeouts.get(event.device_feature));
     }
     const newTimeout = setTimeout(() => {
-      sendCurrentState(this.stateManager, this.gladysGatewayClient, event.device_feature);
+      sendCurrentStateWithRateLimit(this.stateManager, this.gladysGatewayClient, event.device_feature);
     }, this.googleHomeForwardStateTimeout);
     this.forwardStateToGoogleHomeTimeouts.set(event.device_feature, newTimeout);
   }

server/package.json

@@ -79,6 +79,7 @@
     "axios": "^0.21.1",
     "bcrypt": "^5.0.1",
     "bluebird": "^3.5.3",
+    "bottleneck": "^2.19.5",
     "compression": "^1.7.4",
     "cross-env": "^5.2.0",
     "dayjs": "^1.10.4",