Merge pull request #2 from balansse/feature/EventStreamStability

Increase stability of event stream; Dynamically add and remove accessories; Remove excessive logging; Add object mapping using dictionary;
balansse · Jun 26, 2020 · a44e999 · a44e999
2 parents bd98b0f + 9931eca
commit a44e999
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 16 deletions.
diff --git a/index.js b/index.js
@@ -63,17 +63,22 @@ module.exports = function (homebridge) {
       this.vivintApiPromise = VivintApi.login({username: config.username, password: config.password}, 1)
       let apiLoginRefreshSecs = config.apiLoginRefreshSecs || 1200 // once per 20 minutes default
 
-
       this.deviceSetPromise = this.vivintApiPromise.then((vivintApi) => {
         let DeviceSet = DeviceSetModule(config, log, homebridge, vivintApi, ThermostatCharacteristics, setInterval, Date)
         let deviceSet = new DeviceSet()
+
         setInterval(() => {
           vivintApi.renew()
-            .then((_) => vivintApi.renewSystemInfo())
-            .then((_) => deviceSet.handleSnapshot(vivintApi.deviceSnapshot(), vivintApi.deviceSnapshotTs()))
-            .catch((err) => log("Error refreshing", err))
+            .catch((err) => log("Error refreshing login info", err))
         }, apiLoginRefreshSecs * 1000)
 
+        //Setting up the system info refresh to keep the notification stream active
+        setInterval(() => {
+            vivintApi.renewSystemInfo()
+              .then((vivintApi) => deviceSet.handleSnapshot(vivintApi.deviceSnapshot(), vivintApi.deviceSnapshotTs()))
+              .catch((err) => log("Error getting system info", err))
+        }, (apiLoginRefreshSecs / 20) * 1000)
+
         return {deviceSet, DeviceSet}
       })
 
@@ -84,24 +89,37 @@ module.exports = function (homebridge) {
 
       Promise.all([pubNubPromise, this.vivintApiPromise, this.cachedAccessories.result, this.deviceSetPromise]).then(
         ([pubNub, vivintApi, cachedAccessories, {DeviceSet, deviceSet}]) => {
-          // add any new devices
-          let cachedIds = cachedAccessories.map((acc) => acc.context.id)
-          let newAccessories = vivintApi.deviceSnapshot().Devices
-              .filter((data) => data.Id && !cachedIds.includes(data.Id))
+
+          let snapshotDevices = vivintApi.deviceSnapshot().Devices
+          let snapshotAccessories = snapshotDevices
+              .filter((data) => data.Id)
               .map((deviceData) => DeviceSet.createDeviceAccessory(deviceData))
               .filter((dvc) => dvc)
+
+          let snapshotAccessoriesIds = snapshotAccessories.map((acc) => acc.context.id)
+          let removedAccessories = cachedAccessories
+              .filter((acc) => !snapshotAccessoriesIds.includes(acc.context.id))
+
+          let cachedIds = cachedAccessories.map((acc) => acc.context.id)
+          let newAccessories = snapshotAccessories
+              .filter((acc) => !cachedIds.includes(acc.context.id))
+
+          log("Removing " + removedAccessories.length + " stale accessories")
+          removedAccessories.forEach((acc) => log(acc.context))
+
           log("Adding " + newAccessories.length + " new accessories")
           newAccessories.forEach((acc) => log(acc.context))
 
+          api.unregisterPlatformAccessories(PluginName, PlatformName, removedAccessories)
           api.registerPlatformAccessories(PluginName, PlatformName, newAccessories)
-          // Todo - remove cachedAccessories not in the snapshot anymore, and don't bind them
 
+          cachedAccessories = cachedAccessories.filter((el) => !removedAccessories.includes(el));
           cachedAccessories.forEach((accessory) => deviceSet.bindAccessory(accessory))
           newAccessories.forEach((accessory) => deviceSet.bindAccessory(accessory))
 
           pubNub.addListener({
             status: function(statusEvent) {
-              //Log unsuccesful 
+              //Log unsuccesful event, PubNub SDK will reconnect automatically
               if (statusEvent.category !== 'PNConnectedCategory')
                 log("Could not connect to Pubnub, reconnecting...", statusEvent)
             },

diff --git a/lib/device_set.js b/lib/device_set.js
@@ -49,7 +49,7 @@ function DeviceSetModule(config, log, homebridge, vivintApi, ThermostatCharacter
 
     handleSnapshot(deviceData, timestamp) {
       this.lastSnapshotTime = timestamp
-      log("Handling incoming device snapshot for timestamp", timestamp)
+      //log("Handling incoming device snapshot for timestamp", timestamp)
 
       // update armed status
       this.handleSecurity(deviceData.Status)

diff --git a/lib/vivint_api.js b/lib/vivint_api.js
@@ -96,7 +96,7 @@ function VivintApiModule(config, log) {
     renewSystemInfo() {
       return VivintApi.getSystemInfo(this.cookie, this.panelId).then((sysInfo) => {
         this.systemInfo = sysInfo
-        return true
+        return this
       })
     }
 
@@ -175,9 +175,12 @@ function VivintApiModule(config, log) {
     request({
       "url": "https://vivintsky.com/api/systems/" + panelId,
       "headers": {
-        "Cookie": cookie
+        "Cookie": cookie,
+        "Cache-Control": "no-store"
       }
-    }).then((sysInfo) => { return mapObject(JSON.parse(sysInfo), VivintDict) })
+    }).then((sysInfo) => { 
+      return mapObject(JSON.parse(sysInfo), VivintDict) 
+    })
 
 
   VivintApi.login = (creds, persistent = 0) => {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-vivint",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "Control Vivint with HomeBridge",
   "license": "ISC",
   "author": "Tim Harper <[email protected]>",