@homebridge-plugins/homebridge-ewelink 12.19.1-beta.4 → 12.19.1-beta.5

package/CHANGELOG.md

@@ -15,6 +15,18 @@ All notable changes to `@homebridge-plugins/homebridge-ewelink` will be document
 - fix(zigbee): keep a curtain motor shown as a garage door in step with its door
 - fix(zigbee): flip the zbu-curt-7006 position, which counts 0 as open (#810)
 - chore(deps): dependency updates
+- fix: stop live updates dropping readings like light level, child lock and fan oscillation
+- fix: show power readings on the 226 and 7032 when they are shown as an outlet
+- fix: read inched power devices in hundredths, so a powr316 or s61 no longer shows 5500w for 55w
+- fix: log in again when the cloud reports an expired token, so group commands keep working
+- feat(zigbee): add the snzb-02b and snzb-02m temperature and humidity sensors
+- feat(zigbee): add the snzb-06p24 presence sensor, with occupancy and light level
+- feat(zigbee): add the mini-zb1gp switch, with power readings
+- feat: add the mini-1gsp switch, with power readings
+- feat: add the nspanel86pb relay, as a two-channel switch
+- feat(zigbee): add the second generation trvzb radiator valve, on the existing thermostat
+- feat(zigbee): add the swv-zf2e two-zone irrigation valve, with a valve for each zone
+- feat: show pm2.5 and pm10 on the air quality sensors that measure them
 
 ## v12.19.0 (2026-10-18)
 

package/lib/connection/http.js

@@ -34,15 +34,22 @@ export default class {
     // A timeout surfaces as ECONNABORTED/ETIMEDOUT, which the retry logic handles.
     this.axiosClient = axios.create({ timeout: 30000 })
     this.axiosClient.interceptors.response.use(
-      res => res,
+      async (res) => {
+        // eWeLink normally reports an expired token inside an ordinary response,
+        // as error 401 or 402, rather than as an http 401
+        if ([401, 402].includes(res.data?.error) && !res.config._retried) {
+          try {
+            return await this.retryWithNewToken(res.config)
+          } catch (loginErr) {
+            return res
+          }
+        }
+        return res
+      },
       async (err) => {
         if (err.response?.status === 401 && !err.config._retried) {
-          err.config._retried = true
           try {
-            const authData = await this.login()
-            this.aToken = authData.aToken
-            err.config.headers.Authorization = `Bearer ${this.aToken}`
-            return this.axiosClient(err.config)
+            return await this.retryWithNewToken(err.config)
           } catch (loginErr) {
             throw err
           }
@@ -52,6 +59,15 @@ export default class {
     )
   }
 
+  async retryWithNewToken(config) {
+    // Log in again for a fresh token, then send the request once more
+    config._retried = true
+    const authData = await this.login()
+    this.aToken = authData.aToken
+    config.headers.Authorization = `Bearer ${this.aToken}`
+    return this.axiosClient(config)
+  }
+
   async login() {
     try {
       // Used to log the user in and obtain the user api key and token

package/lib/device/outlet-single-inched.js

@@ -61,6 +61,9 @@ export default class {
     this.service = this.accessory.getService(this.hapServ.Outlet)
       || this.accessory.addService(this.hapServ.Outlet)
 
+    // Some models provide a power reading in different decimals
+    this.divisor = 1
+
     switch (this.accessory.context.eweUIID) {
       case 5:
         // Add Eve power characteristics
@@ -91,7 +94,11 @@ export default class {
       case 32:
       case 182:
       case 190:
+      case 226:
       case 276:
+      case 283:
+      case 7032:
+      case 7054:
         // Add Eve power characteristics
         this.powerReadings = true
         if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
@@ -112,6 +119,10 @@ export default class {
         if (!this.service.testCharacteristic(this.eveChar.ResetTotal)) {
           this.service.addCharacteristic(this.eveChar.ResetTotal)
         }
+
+        if ([190, 276, 283, 7032, 7054].includes(this.accessory.context.eweUIID)) {
+          this.divisor = 100
+        }
         break
       default:
         // Remove unused Eve characteristics
@@ -355,6 +366,24 @@ export default class {
       if (!this.powerReadings) {
         return
       }
+
+      // Some models (e.g. uiid 226) report their readings under phase names
+      if (hasProperty(params, 'phase_0_p')) {
+        params.power = params.phase_0_p
+      }
+      if (hasProperty(params, 'phase_0_v')) {
+        params.voltage = params.phase_0_v
+      }
+      if (hasProperty(params, 'phase_0_c')) {
+        params.current = params.phase_0_c
+      }
+
+      // Some models report their readings in hundredths
+      for (const reading of ['power', 'voltage', 'current']) {
+        if (hasProperty(params, reading)) {
+          params[reading] = Math.round((Number.parseFloat(params[reading]) * 100) / this.divisor) / 100
+        }
+      }
       let logger = false
       if (hasProperty(params, 'power')) {
         const power = Number.parseFloat(params.power)

package/lib/device/outlet-single.js

@@ -94,7 +94,11 @@ export default class {
       case 32:
       case 182:
       case 190:
+      case 226:
       case 276:
+      case 283:
+      case 7032:
+      case 7054:
         // Add Eve power characteristics
         this.powerReadings = true
         if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
@@ -115,7 +119,7 @@ export default class {
         if (!this.service.testCharacteristic(this.eveChar.ResetTotal)) {
           this.service.addCharacteristic(this.eveChar.ResetTotal)
         }
-        if ([190, 276].includes(this.accessory.context.eweUIID)) {
+        if ([190, 276, 283, 7032, 7054].includes(this.accessory.context.eweUIID)) {
           this.divisor = 100
         }
         break
@@ -329,6 +333,17 @@ export default class {
       if (!this.powerReadings) {
         return
       }
+
+      // Some models (e.g. uiid 226) report their readings under phase names
+      if (hasProperty(params, 'phase_0_p')) {
+        params.power = params.phase_0_p
+      }
+      if (hasProperty(params, 'phase_0_v')) {
+        params.voltage = params.phase_0_v
+      }
+      if (hasProperty(params, 'phase_0_c')) {
+        params.current = params.phase_0_c
+      }
       let logger = false
       let power
       let voltage

package/lib/device/sensor-air-quality.js

@@ -205,6 +205,40 @@ export default class {
           }
         }
       }
+
+      // Some models (e.g. SAWF-07P) also measure particles, in µg/m³. The
+      // readings are only added to the sensor once the device reports them.
+      const particles = [
+        [
+          'pm2_5',
+          'cachePM25',
+          this.hapChar.PM2_5Density,
+          this.lang.curPM25,
+        ],
+        [
+          'pm10',
+          'cachePM10',
+          this.hapChar.PM10Density,
+          this.lang.curPM10,
+        ],
+      ]
+      particles.forEach(([param, cacheKey, char, label]) => {
+        if (!hasProperty(params, param)) {
+          return
+        }
+        const newValue = Math.max(Math.min(Number.parseInt(params[param], 10), 1000), 0)
+        if (Number.isNaN(newValue) || newValue === this[cacheKey]) {
+          return
+        }
+        this[cacheKey] = newValue
+        if (!this.airQualityService.testCharacteristic(char)) {
+          this.airQualityService.addCharacteristic(char)
+        }
+        this.airQualityService.updateCharacteristic(char, newValue)
+        if (params.updateSource && this.enableLogging) {
+          this.log('[%s] %s [%s µg/m³].', this.name, label, newValue)
+        }
+      })
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }

package/lib/device/switch-single-inched.js

@@ -61,6 +61,9 @@ export default class {
     this.service = this.accessory.getService(this.hapServ.Switch)
       || this.accessory.addService(this.hapServ.Switch)
 
+    // Some models provide a power reading in different decimals
+    this.divisor = 1
+
     switch (this.accessory.context.eweUIID) {
       case 5:
         // Add Eve power characteristics
@@ -85,6 +88,11 @@ export default class {
       case 32:
       case 182:
       case 190:
+      case 226:
+      case 276:
+      case 283:
+      case 7032:
+      case 7054:
         // Add Eve power characteristics
         this.powerReadings = true
         if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
@@ -99,6 +107,10 @@ export default class {
         if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
           this.service.addCharacteristic(this.eveChar.Voltage)
         }
+
+        if ([190, 276, 283, 7032, 7054].includes(this.accessory.context.eweUIID)) {
+          this.divisor = 100
+        }
         break
       default:
         // Remove unused Eve characteristics
@@ -283,6 +295,24 @@ export default class {
       if (!this.powerReadings) {
         return
       }
+
+      // Some models (e.g. uiid 226) report their readings under phase names
+      if (hasProperty(params, 'phase_0_p')) {
+        params.power = params.phase_0_p
+      }
+      if (hasProperty(params, 'phase_0_v')) {
+        params.voltage = params.phase_0_v
+      }
+      if (hasProperty(params, 'phase_0_c')) {
+        params.current = params.phase_0_c
+      }
+
+      // Some models report their readings in hundredths
+      for (const reading of ['power', 'voltage', 'current']) {
+        if (hasProperty(params, reading)) {
+          params[reading] = Math.round((Number.parseFloat(params[reading]) * 100) / this.divisor) / 100
+        }
+      }
       let logger = false
       if (hasProperty(params, 'power')) {
         this.service.updateCharacteristic(this.eveChar.CurrentConsumption, Number.parseFloat(params.power))

package/lib/device/switch-single.js

@@ -90,7 +90,9 @@ export default class {
       case 190:
       case 226:
       case 276:
+      case 283:
       case 7032:
+      case 7054:
         // Add Eve power characteristics
         this.powerReadings = true
         if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
@@ -106,7 +108,7 @@ export default class {
           this.service.addCharacteristic(this.eveChar.Voltage)
         }
 
-        if ([190, 276, 7032].includes(this.accessory.context.eweUIID)) {
+        if ([190, 276, 283, 7032, 7054].includes(this.accessory.context.eweUIID)) {
           this.divisor = 100
         }
         break

package/lib/device/zigbee/sensor-occupancy.js

@@ -54,8 +54,8 @@ export default class {
       || this.accessory.addService(this.hapServ.Battery)
 
     // SNZB-06P (uiid 7016) also reports a binary bright/dark light level, and
-    // SNZB-03PR2 (uiid 7055) a numeric illumination reading
-    if ([7016, 7055].includes(accessory.context.eweUIID)) {
+    // SNZB-06P24 (uiid 7051) and SNZB-03PR2 (uiid 7055) a numeric illumination reading
+    if ([7016, 7051, 7055].includes(accessory.context.eweUIID)) {
       this.lightService = this.accessory.getService(this.hapServ.LightSensor)
         || this.accessory.addService(this.hapServ.LightSensor)
     } else if (this.accessory.getService(this.hapServ.LightSensor)) {

package/lib/device/zigbee/zigbee-water-valve.js

@@ -35,158 +35,182 @@ export default class {
     }
 
     // The newer SWV-ZNE irrigation valve (uiid 7047) reports and accepts its
-    // state under 'switch_00' rather than 'switch' (#778)
-    this.switchParam = accessory.context.eweUIID === 7047
-      ? 'switch_00'
-      : 'switch'
+    // state under 'switch_00' rather than 'switch' (#778). The two-zone
+    // SWV-ZF2E (uiid 7048) does the same, with its second valve on 'switch_01'.
+    if (accessory.context.eweUIID === 7048) {
+      this.zones = [
+        { param: 'switch_00', label: 'Valve 1', subtype: 'valve1' },
+        { param: 'switch_01', label: 'Valve 2', subtype: 'valve2' },
+      ]
+    } else {
+      this.zones = [
+        {
+          param: accessory.context.eweUIID === 7047
+            ? 'switch_00'
+            : 'switch',
+        },
+      ]
+    }
+    this.zones.forEach(zone => this.setUpZone(zone))
+
+    this.log('[%s] initialized as a Zigbee Smart Water Valve.', this.name)
+  }
 
-    // Initialize cache state
-    this.cacheState = false
+  setUpZone(zone) {
+    // Initialize cache state and timer references
+    zone.cacheState = false
+    zone.timer = null
+    zone.updateInterval = null
 
-    // Initialize timer references
-    this.timer = null
-    this.updateInterval = null
+    // A single valve keeps the service, name and saved timer it has always had
+    zone.name = zone.label
+      ? `${this.name} ${zone.label}`
+      : this.name
+    zone.timerKey = zone.subtype
+      ? `timerEndTime_${zone.subtype}`
+      : 'timerEndTime'
 
     // Set up the Valve Service for HomeKit
-    this.service = this.accessory.getService(this.hapServ.Valve)
-    if (!this.service) {
-      this.service = this.accessory.addService(this.hapServ.Valve)
-      this.service.updateCharacteristic(this.hapChar.Active, 0)
-      this.service.updateCharacteristic(this.hapChar.InUse, 0)
-      this.service.updateCharacteristic(this.hapChar.ValveType, 1) // 1 = Irrigation
-      this.service.updateCharacteristic(this.hapChar.SetDuration, 30) // Default timer duration
-      this.service.addCharacteristic(this.hapChar.RemainingDuration)
+    zone.service = zone.subtype
+      ? this.accessory.getServiceById(this.hapServ.Valve, zone.subtype)
+      : this.accessory.getService(this.hapServ.Valve)
+    if (!zone.service) {
+      zone.service = zone.subtype
+        ? this.accessory.addService(this.hapServ.Valve, zone.label, zone.subtype)
+        : this.accessory.addService(this.hapServ.Valve)
+      zone.service.updateCharacteristic(this.hapChar.Active, 0)
+      zone.service.updateCharacteristic(this.hapChar.InUse, 0)
+      zone.service.updateCharacteristic(this.hapChar.ValveType, 1) // 1 = Irrigation
+      zone.service.updateCharacteristic(this.hapChar.SetDuration, 30) // Default timer duration
+      zone.service.addCharacteristic(this.hapChar.RemainingDuration)
     }
 
     // Restore timer state if it exists
-    if (this.accessory.context.timerEndTime) {
+    if (this.accessory.context[zone.timerKey]) {
       const now = Date.now()
-      if (now < this.accessory.context.timerEndTime) {
+      if (now < this.accessory.context[zone.timerKey]) {
         // Timer should still be running
-        const remainingTime = Math.round((this.accessory.context.timerEndTime - now) / 1000)
-        this.service.updateCharacteristic(this.hapChar.RemainingDuration, remainingTime)
-        this.startTimer(remainingTime)
+        const remainingTime = Math.round((this.accessory.context[zone.timerKey] - now) / 1000)
+        zone.service.updateCharacteristic(this.hapChar.RemainingDuration, remainingTime)
+        this.startTimer(zone, remainingTime)
       } else {
         // Timer has expired, clean up
-        this.service.updateCharacteristic(this.hapChar.Active, 0)
-        this.service.updateCharacteristic(this.hapChar.InUse, 0)
-        this.service.updateCharacteristic(this.hapChar.RemainingDuration, 0)
-        delete this.accessory.context.timerEndTime
+        zone.service.updateCharacteristic(this.hapChar.Active, 0)
+        zone.service.updateCharacteristic(this.hapChar.InUse, 0)
+        zone.service.updateCharacteristic(this.hapChar.RemainingDuration, 0)
+        delete this.accessory.context[zone.timerKey]
       }
     }
 
     // Set up event handlers for Active characteristic
-    this.service
+    zone.service
       .getCharacteristic(this.hapChar.Active)
       .onSet(async (value) => {
-        const prevState = this.cacheState
+        const prevState = zone.cacheState
         try {
           const newState = value === 1
 
           // HomeKit can send the same command several times over, so ignore
           // anything that asks the valve to do what it is already doing (#778)
-          if (newState === this.cacheState) {
+          if (newState === zone.cacheState) {
             return
           }
 
           // Claim the new state before sending, so repeats that arrive while
           // this command is still in flight are ignored too
-          this.cacheState = newState
+          zone.cacheState = newState
 
           // The device can echo a superseded state back after a newer command
           // has been sent, flipping HomeKit to a state we have already left
           // behind - suppress incoming updates around a command, the same way
           // the other device types do (#778)
-          const timerKey = generateRandomString(5)
-          this.updateTimeout = timerKey
-          setTimeout(() => {
-            if (this.updateTimeout === timerKey) {
-              this.updateTimeout = false
-            }
-          }, 5000)
+          this.suppressUpdates(zone)
 
           if (this.enableLogging) {
-            this.log('[%s] Setting valve to [%s]', this.name, newState ? 'On' : 'Off')
+            this.log('[%s] Setting valve to [%s]', zone.name, newState ? 'On' : 'Off')
           }
 
           // Send command to the device
           await this.platform.sendDeviceUpdate(this.accessory, {
-            [this.switchParam]: newState,
+            [zone.param]: newState,
           })
 
           // Update InUse characteristic to match Active
-          this.service.updateCharacteristic(this.hapChar.InUse, value)
+          zone.service.updateCharacteristic(this.hapChar.InUse, value)
 
           if (value === 1) {
             // If turning on, start the timer
-            const duration = this.service.getCharacteristic(this.hapChar.SetDuration).value
-            this.startTimer(duration)
+            const duration = zone.service.getCharacteristic(this.hapChar.SetDuration).value
+            this.startTimer(zone, duration)
           } else {
             // If turning off, clear the timer and reset remaining duration
-            this.clearTimer()
+            this.clearTimer(zone)
           }
         } catch (err) {
           // Revert the characteristic state on error
-          this.cacheState = prevState
+          zone.cacheState = prevState
           const prevValue = prevState ? 1 : 0
-          this.service.updateCharacteristic(this.hapChar.Active, prevValue)
-          this.service.updateCharacteristic(this.hapChar.InUse, prevValue)
+          zone.service.updateCharacteristic(this.hapChar.Active, prevValue)
+          zone.service.updateCharacteristic(this.hapChar.InUse, prevValue)
           this.platform.deviceUpdateError(this.accessory, err, false)
           throw new this.hapErr(-70402)
         }
       })
 
     // Set up handler for SetDuration characteristic
-    this.service.getCharacteristic(this.hapChar.SetDuration)
+    zone.service.getCharacteristic(this.hapChar.SetDuration)
       .onSet((value) => {
-        if (this.service.getCharacteristic(this.hapChar.InUse).value === 1) {
+        if (zone.service.getCharacteristic(this.hapChar.InUse).value === 1) {
           // Update timer with new duration if valve is currently active
-          this.startTimer(value)
+          this.startTimer(zone, value)
         }
       })
+  }
 
-    this.log('[%s] initialized as a Zigbee Smart Water Valve.', this.name)
+  suppressUpdates(zone) {
+    // Ignore this valve's incoming state for a few seconds
+    const timerKey = generateRandomString(5)
+    zone.updateTimeout = timerKey
+    setTimeout(() => {
+      if (zone.updateTimeout === timerKey) {
+        zone.updateTimeout = false
+      }
+    }, 5000)
   }
 
-  startTimer(duration) {
+  startTimer(zone, duration) {
     // Clear any existing timer
-    this.clearTimer()
+    this.clearTimer(zone)
 
     // Set timer end time and store it in context
-    this.accessory.context.timerEndTime = Date.now() + (duration * 1000)
+    this.accessory.context[zone.timerKey] = Date.now() + (duration * 1000)
 
     // Update remaining duration
-    this.service.updateCharacteristic(this.hapChar.RemainingDuration, duration)
+    zone.service.updateCharacteristic(this.hapChar.RemainingDuration, duration)
 
     // Set new timer
-    this.timer = setTimeout(async () => {
+    zone.timer = setTimeout(async () => {
       try {
         // Suppress incoming updates around this command too, so an echo of
         // the earlier On cannot land after the Off we are about to send (#778)
-        const timerKey = generateRandomString(5)
-        this.updateTimeout = timerKey
-        setTimeout(() => {
-          if (this.updateTimeout === timerKey) {
-            this.updateTimeout = false
-          }
-        }, 5000)
+        this.suppressUpdates(zone)
 
         // Send explicit command to turn off the valve
         await this.platform.sendDeviceUpdate(this.accessory, {
-          [this.switchParam]: false,
+          [zone.param]: false,
         })
 
         // Update HomeKit characteristics
-        this.service.updateCharacteristic(this.hapChar.Active, 0)
-        this.service.updateCharacteristic(this.hapChar.InUse, 0)
-        this.service.updateCharacteristic(this.hapChar.RemainingDuration, 0)
-        delete this.accessory.context.timerEndTime
+        zone.service.updateCharacteristic(this.hapChar.Active, 0)
+        zone.service.updateCharacteristic(this.hapChar.InUse, 0)
+        zone.service.updateCharacteristic(this.hapChar.RemainingDuration, 0)
+        delete this.accessory.context[zone.timerKey]
 
         // Update cache state
-        this.cacheState = false
+        zone.cacheState = false
 
         if (this.enableLogging) {
-          this.log('[%s] Timer finished - turning valve [OFF]', this.name)
+          this.log('[%s] Timer finished - turning valve [OFF]', zone.name)
         }
       } catch (err) {
         this.platform.deviceUpdateError(this.accessory, err, false)
@@ -194,69 +218,71 @@ export default class {
     }, duration * 1000)
 
     // Start a periodic update of remaining duration
-    if (this.updateInterval) {
-      clearInterval(this.updateInterval)
-      this.updateInterval = null
+    if (zone.updateInterval) {
+      clearInterval(zone.updateInterval)
+      zone.updateInterval = null
     }
-    this.updateInterval = setInterval(() => {
-      const remaining = Math.round((this.accessory.context.timerEndTime - Date.now()) / 1000)
+    zone.updateInterval = setInterval(() => {
+      const remaining = Math.round((this.accessory.context[zone.timerKey] - Date.now()) / 1000)
       if (remaining > 0) {
-        this.service.updateCharacteristic(this.hapChar.RemainingDuration, remaining)
+        zone.service.updateCharacteristic(this.hapChar.RemainingDuration, remaining)
       } else {
-        clearInterval(this.updateInterval)
-        this.updateInterval = null
+        clearInterval(zone.updateInterval)
+        zone.updateInterval = null
       }
     }, 1000)
   }
 
-  clearTimer() {
-    if (this.timer) {
-      clearTimeout(this.timer)
-      this.timer = null
+  clearTimer(zone) {
+    if (zone.timer) {
+      clearTimeout(zone.timer)
+      zone.timer = null
     }
-    if (this.updateInterval) {
-      clearInterval(this.updateInterval)
-      this.updateInterval = null
+    if (zone.updateInterval) {
+      clearInterval(zone.updateInterval)
+      zone.updateInterval = null
     }
-    delete this.accessory.context.timerEndTime
-    this.service.updateCharacteristic(this.hapChar.RemainingDuration, 0)
+    delete this.accessory.context[zone.timerKey]
+    zone.service.updateCharacteristic(this.hapChar.RemainingDuration, 0)
   }
 
   async externalUpdate(params) {
     try {
-      // Ignore updates while a command we sent is settling - they can carry
-      // the state we have just moved away from (#778)
-      if (this.updateTimeout) {
-        return
-      }
+      this.zones.forEach((zone) => {
+        // Ignore updates while a command we sent is settling - they can carry
+        // the state we have just moved away from (#778)
+        if (zone.updateTimeout || !hasProperty(params, zone.param)) {
+          return
+        }
 
-      // Handle On/Off state
-      if (hasProperty(params, this.switchParam)) {
-        const newState = !!params[this.switchParam]
-        if (newState !== this.cacheState) {
-          this.cacheState = newState
+        // Handle On/Off state
+        const newState = !!params[zone.param]
+        if (newState !== zone.cacheState) {
+          zone.cacheState = newState
           const value = newState ? 1 : 0
-          this.service.updateCharacteristic(this.hapChar.Active, value)
-          this.service.updateCharacteristic(this.hapChar.InUse, value)
+          zone.service.updateCharacteristic(this.hapChar.Active, value)
+          zone.service.updateCharacteristic(this.hapChar.InUse, value)
 
           if (!newState) {
             // If turned off externally, clear timer
-            this.clearTimer()
+            this.clearTimer(zone)
           }
 
           if (params.updateSource && this.enableLogging) {
-            this.log('[%s] Valve state updated to [%s]', this.name, newState ? 'On' : 'Off')
+            this.log('[%s] Valve state updated to [%s]', zone.name, newState ? 'On' : 'Off')
           }
         }
-      }
+      })
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }
   }
 
   destroy() {
-    clearTimeout(this.timer)
-    clearInterval(this.updateInterval)
+    this.zones.forEach((zone) => {
+      clearTimeout(zone.timer)
+      clearInterval(zone.updateInterval)
+    })
   }
 
   markStatus(isOnline) {

package/lib/utils/constants.js

@@ -363,7 +363,7 @@ export default {
       209,
       264,
     ],
-    switchSCMPower: [182, 190, 276, 7032],
+    switchSCMPower: [182, 190, 276, 283, 7032, 7054],
     switchSinglePower: [5, 32],
     switchMulti: [
       2,
@@ -392,6 +392,7 @@ export default {
       212,
       262,
       275,
+      278,
       2256,
       3256,
       4256,
@@ -433,15 +434,24 @@ export default {
     zbLightCCT: [1258],
     zbLightRGBCCT: [3258, 7009],
     zbMotor: [1514, 7006, 7034],
-    zbSensorAmbient: [242, 1770, 1771, 7014, 7033, 7038],
+    zbSensorAmbient: [
+      242,
+      1770,
+      1771,
+      7014,
+      7033,
+      7038,
+      7052,
+      7057,
+    ],
     zbSensorMotion: [2026, 7002],
-    zbSensorOccupancy: [7016, 7055],
+    zbSensorOccupancy: [7016, 7051, 7055],
     zbSensorContact: [3026, 7003],
     zbSensorWater: [4026, 7019],
     zbSensorSmoke: [5026],
     zbSiren: [7056],
-    zbThermostat: [7017],
-    zbWaterValve: [7027, 7047],
+    zbThermostat: [7017, 7049],
+    zbWaterValve: [7027, 7047, 7048],
     group: [5000],
     template: [], // Currently unused
     cannotSupport: [
@@ -462,12 +472,15 @@ export default {
   paramsToKeep: [
     'actionTime',
     'actPow_',
+    'alarmSetting',
     'battery',
     'bright',
+    'brState',
     'brightness',
     'calibState',
     'cctBrightness',
     'channel',
+    'childLock',
     'cmd',
     'co2',
     'color',
@@ -484,6 +497,7 @@ export default {
     'currentTemperature',
     'current_',
     'currLocation',
+    'dusty',
     'autoTargetTemp',
     'curTargetTemp',
     'manTargetTemp',
@@ -491,6 +505,8 @@ export default {
     'hue',
     'human',
     'humidity',
+    'illumination',
+    'indoor_temperature',
     'key',
     'light',
     'lightbright',
@@ -509,6 +525,11 @@ export default {
     'online',
     'outlet',
     'per',
+    'pm10',
+    'pm2_5',
+    'phase_0_c',
+    'phase_0_p',
+    'phase_0_v',
     'percentageControl',
     'power',
     'op',
@@ -518,11 +539,13 @@ export default {
     'rgbBrightness',
     'saturation',
     'setclose',
+    'shake',
     'smoke',
     'speed',
     'state',
     'switch',
     'switch_00',
+    'switch_01',
     'switches',
     'targetTemp',
     'temperature',
@@ -533,6 +556,7 @@ export default {
     'voltage_',
     'water',
     'white',
+    'wind_speed',
     'workMode',
     'workState',
     'zyx_mode',
@@ -631,8 +655,10 @@ export default {
     275: 2, // MINI-2GS (2-channel switch)
     276: 1, // S61STPF (Smart plug with power monitoring, cloud-only)
     277: 1, // MINI-DIM (Dimmer with power monitoring)
+    278: 2, // NSPanel86PB relay (2-channel switch)
+    283: 1, // MINI-1GSP (Single channel switch with power monitoring)
     262: 4, // CK-BL602-SWP1-02 (4-channel switch with power monitoring)
-    266: 1, // SAWF-08P Air Quality Sensor (CO2, Temperature, Humidity)
+    266: 1, // SAWF-08P and SAWF-07P Air Quality Sensors (CO2, Temperature, Humidity, and PM on the 07P)
     1000: 1, // "zigbee_ON_OFF_SWITCH_1000" (button device)
     1009: 1, // "" (Some sort of single switch device)
     1256: 1, // "ZIGBEE_SINGLE_SWITCH"
@@ -673,8 +699,14 @@ export default {
     7038: 1, // SONOFF AirGuard TH Zigbee temperature and humidity sensor (#767)
     7040: 2, // SONOFF MINI DUO 2-gang Zigbee switch (#768)
     7047: 1, // SONOFF Zigbee Irrigation Valve (#778)
+    7048: 1, // SWV-ZF2E two-zone Zigbee irrigation valve
+    7049: 1, // TRVZB gen 2 Zigbee thermostatic radiator valve
+    7051: 1, // SNZB-06P24 Zigbee presence sensor with light level
+    7052: 1, // SNZB-02B Zigbee temperature and humidity sensor
+    7054: 1, // MINI-ZB1GP Zigbee switch with power monitoring
     7055: 1, // SNZB-03PR2 Zigbee presence sensor with light level
     7056: 1, // SNZB-09P Zigbee indoor siren
+    7057: 1, // SNZB-02M Zigbee temperature and humidity sensor
     20001: 1, // iHost sub-device single switch
     20004: 4, // iHost sub-device 4-channel switch
     20006: 1, // single-colour dimmable LED controller (#780)

package/lib/utils/lang-en.js

@@ -33,6 +33,8 @@ export default {
   curHumid: 'current humidifying',
   curLight: 'current light',
   curMode: 'current mode',
+  curPM10: 'current PM10',
+  curPM25: 'current PM2.5',
   curPos: 'current position',
   curPower: 'current power',
   curPur: 'current purifying',

package/lib/utils/lang-fr.js

@@ -32,6 +32,8 @@ export default {
   curHumid: 'humidification actuelle',
   curLight: 'lumière actuelle',
   curMode: 'mode actuel',
+  curPM10: 'PM10 actuel',
+  curPM25: 'PM2.5 actuel',
   curPos: 'position actuelle',
   curPower: 'alimentation actuelle',
   curPur: 'purification actuelle',

package/lib/utils/lang-th.js

@@ -32,6 +32,8 @@ export default {
   curHumid: 'ค่าความชื้นในตอนนี้',
   curLight: 'แสงตอนนี้',
   curMode: 'โหมดตอนนี้',
+  curPM10: 'PM10 ตอนนี้',
+  curPM25: 'PM2.5 ตอนนี้',
   curPos: 'ตำแหน่งตอนนี้',
   curPower: 'กำลังไฟตอนนี้',
   curPur: 'การทำให้บริสุทธิ์ในตอนนี้',

package/package.json

@@ -3,7 +3,7 @@
   "displayName": "Homebridge eWeLink",
   "alias": "eWeLink",
   "type": "module",
-  "version": "12.19.1-beta.4",
+  "version": "12.19.1-beta.5",
   "description": "Homebridge plugin to integrate eWeLink devices into HomeKit.",
   "author": {
     "name": "bwp91",