More robustness for dynamic IP

ChrisTerBeke · Apr 24, 2024 · 8760c18 · 8760c18
1 parent 014de50
commit 8760c18
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 16 deletions.
diff --git a/app.json b/app.json
@@ -77,8 +77,11 @@
           "label": {
             "en": "IP Address"
           },
-          "type": "text",
-          "required": true
+          "type": "label",
+          "required": false,
+          "hint": {
+            "en": "The IP address of the device."
+          }
         }
       ]
     }

diff --git a/drivers/uponor/device.ts b/drivers/uponor/device.ts
@@ -17,39 +17,46 @@ class UponorThermostatDevice extends Device {
 
     async onAdded(): Promise<void> {
         const { address } = this.getSettings()
-        await this._updateAddress(address)
+        await this._init(address)
+    }
+
+    async onUninit(): Promise<void> {
+        await this._uninit()
     }
 
     onDiscoveryResult(discoveryResult: DiscoveryResult) {
         return this.getData().id.includes(discoveryResult.id)
     }
 
     async onDiscoveryAvailable(discoveryResult: DiscoveryResultMAC) {
-        await this._updateAddress(discoveryResult.address)
+        await this._init(discoveryResult.address)
     }
 
     async onDiscoveryAddressChanged(discoveryResult: DiscoveryResultMAC): Promise<void> {
-        await this._updateAddress(discoveryResult.address)
+        await this._init(discoveryResult.address)
     }
 
     async onDiscoveryLastSeenChanged(discoveryResult: DiscoveryResultMAC): Promise<void> {
-        await this._updateAddress(discoveryResult.address)
+        await this._init(discoveryResult.address)
     }
 
     async onDeleted(): Promise<void> {
-        clearInterval(this._syncInterval as NodeJS.Timeout)
-        this._syncInterval = undefined
-        this._client = undefined
+        await this._uninit()
     }
 
-    async _updateAddress(newAddress: string): Promise<void> {
+    async _init(newAddress: string): Promise<void> {
         // TODO: validate new IP address is correct before updating everything (ARP is not always reliable)
-        clearInterval(this._syncInterval as NodeJS.Timeout)
+        await this._uninit()
         await this.setSettings({ address: newAddress })
-        const { address } = this.getSettings()
-        this._client = new UponorHTTPClient(address)
-        await this._syncAttributes()
+        this._client = new UponorHTTPClient(newAddress)
         this._syncInterval = setInterval(this._syncAttributes.bind(this), POLL_INTERVAL_MS)
+        await this._syncAttributes()
+    }
+
+    async _uninit() {
+        clearInterval(this._syncInterval as NodeJS.Timeout)
+        this._syncInterval = undefined
+        this._client = undefined
     }
 
     private async _syncAttributes() {

diff --git a/drivers/uponor/driver.compose.json b/drivers/uponor/driver.compose.json
@@ -41,8 +41,11 @@
             "label": {
                 "en": "IP Address"
             },
-            "type": "text",
-            "required": true
+            "type": "label",
+            "required": false,
+            "hint": {
+                "en": "The IP address of the device."
+            }
         }
     ]
 }