fixing #89

nicoduj · Mar 10, 2019 · f20f290 · f20f290
1 parent 644578b
commit f20f290
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -109,6 +109,8 @@ See [Logitech Harmony Sequence Configuration](https://support.myharmony.com/en-u
 
 ## Changelog
 
+- 0.4.9
+  - [FIX] #89 This callback function has already been called by someone else when publishDevicesAsIndividualAccessories is set to true (default value :( sorry ! )
 - 0.4.8
   - [NEW] Input hiding handling #85
   - [NEW] huge refactoring to enhance code quality (I hope there won't be too much bugs ! )

diff --git a/harmonyBase.js b/harmonyBase.js
@@ -166,7 +166,7 @@ HarmonyBase.prototype = {
           'INFO - Hub config : ' + JSON.stringify(response)
         );
         harmonyPlatform.readAccessories(response, callback);
-      }); /*
+      })
       .catch(e => {
         harmonyPlatform.log(
           'Error - Error retrieving info from hub : ' + e.message
@@ -176,7 +176,7 @@ HarmonyBase.prototype = {
         setTimeout(function() {
           that.configureAccessories(harmonyPlatform, callback);
         }, HarmonyConst.DELAY_BEFORE_RECONNECT);
-      });*/
+      });
   },
 
   refreshCurrentActivity: function(harmonyPlatform, callback) {
@@ -347,12 +347,9 @@ HarmonyBase.prototype = {
     return commandFunctions;
   },
 
-  handleDefaultCommandMode: function(
-    harmonyPlatform,
-    controlGroup,
-    device,
-    services
-  ) {
+  handleDefaultCommandMode: function(harmonyPlatform, controlGroup, device) {
+    let services = [];
+
     let accessoryName = harmonyPlatform.name + '-' + device.label;
     let switchName = harmonyPlatform.devMode
       ? 'DEV' + device.label
@@ -417,15 +414,17 @@ HarmonyBase.prototype = {
         }
       }
     }
+    return services;
   },
 
   handleSpecificCommandMode: function(
     harmonyPlatform,
     commands,
     controlGroup,
-    device,
-    services
+    device
   ) {
+    let services = [];
+
     let accessoryName = harmonyPlatform.name + '-' + device.label;
     let switchName = harmonyPlatform.devMode
       ? 'DEV' + device.label
@@ -488,6 +487,8 @@ HarmonyBase.prototype = {
         services = [];
       }
     }
+
+    return services;
   },
 
   getDevicesAccessories: function(harmonyPlatform, data) {
@@ -520,21 +521,23 @@ HarmonyBase.prototype = {
 
             //default mode
             if (commands.length === 1) {
-              this.handleDefaultCommandMode(
-                harmonyPlatform,
-                controlGroup,
-                devices[i],
-                services
+              services.concat(
+                this.handleDefaultCommandMode(
+                  harmonyPlatform,
+                  controlGroup,
+                  devices[i]
+                )
               );
             }
             //specifc command or list mode
             else {
-              this.handleSpecificCommandMode(
-                harmonyPlatform,
-                commands,
-                controlGroup,
-                devices[i],
-                services
+              services.concat(
+                this.handleSpecificCommandMode(
+                  harmonyPlatform,
+                  commands,
+                  controlGroup,
+                  devices[i]
+                )
               );
             }
           }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-harmony",
-  "version": "0.4.8",
+  "version": "0.4.9",
   "author": "Nicolas Dujardin",
   "description": "Publish your harmony activities as homekit accessories",
   "main": "index.js",