Per-device duration for smart lights

tsightler · Apr 25, 2022 · 6fd8c46 · 6fd8c46
1 parent 835ab9d
commit 6fd8c46
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 12 deletions.
diff --git a/config.json b/config.json
@@ -1,7 +1,6 @@
 {
     "mqtt_url": "mqtt://localhost:1883",
     "disarm_code": "",
-    "beam_duration": 0,
     "livestream_user": "",
     "livestream_pass": "",
     "enable_cameras": true,

diff --git a/devices/beam.js b/devices/beam.js
@@ -5,6 +5,8 @@ class Beam extends RingSocketDevice {
     constructor(deviceInfo) {
         super(deviceInfo, 'lighting')
 
+        this.data = {}
+
         // Setup device topics based on capabilities.
         switch (this.device.data.deviceType) {
             case 'group.light-group.beams':
@@ -38,6 +40,14 @@ class Beam extends RingSocketDevice {
     }
 
     initLightEntity() {
+        const savedState = this.getSavedState()
+
+        if (savedState?.beam_duration) {
+            this.data.beam_duration = savedState?.beam_duration
+        } else {
+            this.data.beam_duration = this.device.data.hasOwnProperty('onDuration') ? this.device.data.onDuration : 0
+        }
+
         this.entity.light = {
             component: 'light',
             ...this.device.data.deviceType === 'switch.multilevel.beams' ? { brightness_scale: 100 } : {}
@@ -52,11 +62,14 @@ class Beam extends RingSocketDevice {
             icon: 'hass:timer'
         }
 
-        if (utils.config.hasOwnProperty('beam_duration') && utils.config.beam_duration > 0) {
-            this.entity.beam_duration.state = utils.config.beam_duration
-        } else {
-            this.entity.beam_duration.state = this.device.data.hasOwnProperty('onDuration') ? this.device.data.onDuration : 0
+        this.updateDeviceState()
+    }
+
+    updateDeviceState() {
+        const stateData = {
+            beam_duration: this.data.beam_duration
         }
+        this.setSavedState(stateData)
     }
 
     publishState() {
@@ -71,7 +84,7 @@ class Beam extends RingSocketDevice {
                 const switchLevel = (this.device.data.level && !isNaN(this.device.data.level) ? Math.round(100 * this.device.data.level) : 0)
                 this.mqttPublish(this.entity.light.brightness_state_topic, switchLevel.toString())
             }
-            this.mqttPublish(this.entity.beam_duration.state_topic, this.entity.beam_duration.state.toString())
+            this.mqttPublish(this.entity.beam_duration.state_topic, this.data.beam_duration)
         }
         if (!this.isLightGroup) {
             this.publishAttributes()
@@ -109,7 +122,7 @@ class Beam extends RingSocketDevice {
         switch(command) {
             case 'on':
             case 'off': {
-                const duration = this.entity.beam_duration.state ? Math.min(this.entity.beam_duration.state, 32767) : undefined
+                const duration = this.data.beam_duration ? Math.min(this.data.beam_duration, 32767) : undefined
                 const on = command === 'on' ? true : false
                 if (this.isLightGroup && this.groupId) {
                     this.device.location.setLightGroup(this.groupId, on, duration)
@@ -145,8 +158,8 @@ class Beam extends RingSocketDevice {
         } else if (!(duration >= 0 && duration <= 32767)) {
             this.debug('Light duration command received but out of range (0-32767)')
         } else {
-            this.entity.beam_duration.state = parseInt(duration)
-            this.mqttPublish(this.entity.beam_duration.state_topic, this.entity.beam_duration.state.toString())            
+            this.data.beam_duration = parseInt(duration)
+            this.mqttPublish(this.entity.beam_duration.state_topic, this.data.beam_duration)            
         }
     }
 }

diff --git a/lib/config.js b/lib/config.js
@@ -48,7 +48,6 @@ class Config {
         if (!this.data.enable_cameras) { this.data.enable_cameras = false }
         if (!this.data.enable_modes) { this.data.enable_modes = false }
         if (!this.data.enable_panic) { this.data.enable_panic = false }
-        if (!this.data.beam_duration) { this.data.beam_duration = 0 }
         if (!this.data.disarm_code) { this.data.disarm_code = '' }
 
         // Export MQTTURL environment variable even if only using config file (standalone install)
@@ -85,7 +84,6 @@ class Config {
             "ring_topic": process.env.MQTTRINGTOPIC,
             "hass_topic": process.env.MQTTHASSTOPIC,
             "disarm_code": process.env.DISARMCODE,
-            "beam_duration": process.env.BEAMDURATION,
             "enable_cameras": process.env.ENABLECAMERAS,
             "livestream_user": process.env.LIVESTREAMUSER,
             "livestream_pass": process.env.LIVESTREAMPASSWORD,
@@ -127,7 +125,14 @@ class Config {
 
     async updateConfig() {
         try {
-            delete this.data.ring_token
+            if (this.data.hasOwnProperty('ring_token')) {
+                delete this.data.ring_token
+            }
+
+            if (this.data.hasOwnProperty('beam_duration')) {
+                delete this.data.beam_duration
+            }
+
             await writeFileAtomic(this.file, JSON.stringify(this.data, null, 4))
             debug('Successfully saved updated config file: '+this.file)
         } catch (err) {