homey-api 3.0.14 → 3.0.15

package/lib/HomeyAPI/HomeyAPIV3/Manager.js

@@ -189,19 +189,22 @@ class Manager extends EventEmitter {
               path = `${path}?${queryString}`;
             }
 
+            const pendingCallId = `${operationId}::${path}`
+
             if (
               operation.method.toLowerCase() === 'get' &&
               $cache === true &&
-              this.__pendingCalls[path] != null &&
+              this.__pendingCalls[pendingCallId] != null &&
               Object.keys(body).length === 0
             ) {
-              this.__debug(`Reusing pending call ${operationId}`);
-              const result = await this.__pendingCalls[path];
+              this.__debug(`Reusing pending call ${pendingCallId}`);
+
+              const result = await this.__pendingCalls[pendingCallId];
 
               return result;
             }
 
-            this.__pendingCalls[path] = (async () => {
+            const pendingCall = (async () => {
               const result = await this.__request({
                 $validate,
                 $cache,
@@ -217,11 +220,21 @@ class Manager extends EventEmitter {
               });
 
               return result;
-            })().finally(() => {
-              delete this.__pendingCalls[path];
-            });
+            })();
+
+            if (
+              operation.method.toLowerCase() === 'get' &&
+              $cache === true &&
+              this.__pendingCalls[pendingCallId] == null &&
+              Object.keys(body).length === 0
+            ) {
+              this.__pendingCalls[pendingCallId] = pendingCall;
+              this.__pendingCalls[pendingCallId].finally(() => {
+                delete this.__pendingCalls[pendingCallId];
+              });
+            }
 
-            const result = await this.__pendingCalls[path];
+            const result = await pendingCall;
 
             return result;
           },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homey-api",
-  "version": "3.0.14",
+  "version": "3.0.15",
   "description": "Homey API",
   "main": "index.js",
   "files": [