@homebridge-plugins/homebridge-ewelink 12.18.3 → 12.18.4-beta.1

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to `@homebridge-plugins/homebridge-ewelink` will be documented in this file.
 
+## v12.18.4 (Pending Release)
+
+### Changed
+
+- feat(zigbee): add the snzb-03pr2 presence sensor, with occupancy and light level
+- feat(zigbee): add the snzb-09p indoor siren, as a switch that sounds the alarm
+- chore(deps): dependency updates
+- fix: match multi-channel updates by outlet, so a partial update changes the right channel (#804)
+
 ## v12.18.3 (2026-08-11)
 
 ### Changed

package/lib/device/outlet-multi.js

@@ -1,5 +1,5 @@
 import platformConsts from '../utils/constants.js'
-import { hasProperty, sleep } from '../utils/functions.js'
+import { hasProperty, sleep, switchForChannel } from '../utils/functions.js'
 
 export default class {
   constructor(platform, accessory, devicesInHB) {
@@ -327,10 +327,13 @@ export default class {
         if (this.devicesInHB.has(uuid)) {
           const subAccessory = this.devicesInHB.get(uuid)
           const service = subAccessory.getService(this.hapServ.Outlet)
-          if (params.switches && params.switches[i - 1]) {
+          // By `outlet` where the device gives it - a partial update holds only
+          // the channel that changed, at position 0 (#804)
+          const channelEntry = switchForChannel(params.switches, i - 1)
+          if (channelEntry) {
             const currentState = service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
             if (subAccessory.context.isInched) {
-              if (params.switches[i - 1].switch === 'on' && !subAccessory.context.ignoreUpdates) {
+              if (channelEntry.switch === 'on' && !subAccessory.context.ignoreUpdates) {
                 subAccessory.context.ignoreUpdates = true
                 setTimeout(() => {
                   subAccessory.context.ignoreUpdates = false
@@ -349,28 +352,33 @@ export default class {
                 }
               }
             } else {
-              if (params.switches[i - 1].switch === 'on') {
+              if (channelEntry.switch === 'on') {
                 primaryState = true
               }
-              if (!params.updateSource || params.switches[i - 1].switch !== currentState) {
+              if (!params.updateSource || channelEntry.switch !== currentState) {
                 service.updateCharacteristic(
                   this.hapChar.On,
-                  params.switches[i - 1].switch === 'on',
+                  channelEntry.switch === 'on',
                 )
                 subAccessory.eveService.addEntry({
-                  status: params.switches[i - 1].switch === 'on' ? 1 : 0,
+                  status: channelEntry.switch === 'on' ? 1 : 0,
                 })
                 if (params.updateSource && this.enableLogging) {
                   this.log(
                     '[%s] %s [%s].',
                     subAccessory.displayName,
                     this.lang.curState,
-                    params.switches[i - 1].switch,
+                    channelEntry.switch,
                   )
                 }
               }
             }
           }
+          // The master tile is on when ANY channel is on, so it has to read every
+          // channel's resulting state - a partial update names only one (#804)
+          if (service.getCharacteristic(this.hapChar.On).value) {
+            primaryState = true
+          }
           if (this.powerReadings) {
             let logger = false
             let power

package/lib/device/switch-multi.js

@@ -1,5 +1,5 @@
 import platformConsts from '../utils/constants.js'
-import { hasProperty, sleep } from '../utils/functions.js'
+import { hasProperty, sleep, switchForChannel } from '../utils/functions.js'
 
 export default class {
   constructor(platform, accessory, devicesInHB) {
@@ -322,10 +322,13 @@ export default class {
         if (this.devicesInHB.has(uuid)) {
           const subAccessory = this.devicesInHB.get(uuid)
           const service = subAccessory.getService(this.hapServ.Switch)
-          if (params.switches && params.switches[i - 1]) {
+          // By `outlet` where the device gives it - a partial update holds only
+          // the channel that changed, at position 0 (#804)
+          const channelEntry = switchForChannel(params.switches, i - 1)
+          if (channelEntry) {
             const currentState = service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off'
             if (subAccessory.context.isInched) {
-              if (params.switches[i - 1].switch === 'on' && !subAccessory.context.ignoreUpdates) {
+              if (channelEntry.switch === 'on' && !subAccessory.context.ignoreUpdates) {
                 subAccessory.context.ignoreUpdates = true
                 setTimeout(() => {
                   subAccessory.context.ignoreUpdates = false
@@ -344,28 +347,33 @@ export default class {
                 }
               }
             } else {
-              if (params.switches[i - 1].switch === 'on') {
+              if (channelEntry.switch === 'on') {
                 primaryState = true
               }
-              if (!params.updateSource || params.switches[i - 1].switch !== currentState) {
+              if (!params.updateSource || channelEntry.switch !== currentState) {
                 service.updateCharacteristic(
                   this.hapChar.On,
-                  params.switches[i - 1].switch === 'on',
+                  channelEntry.switch === 'on',
                 )
                 subAccessory.eveService.addEntry({
-                  status: params.switches[i - 1].switch === 'on' ? 1 : 0,
+                  status: channelEntry.switch === 'on' ? 1 : 0,
                 })
                 if (params.updateSource && this.enableLogging) {
                   this.log(
                     '[%s] %s [%s].',
                     subAccessory.displayName,
                     this.lang.curState,
-                    params.switches[i - 1].switch,
+                    channelEntry.switch,
                   )
                 }
               }
             }
           }
+          // The master tile is on when ANY channel is on, so it has to read every
+          // channel's resulting state - a partial update names only one (#804)
+          if (service.getCharacteristic(this.hapChar.On).value) {
+            primaryState = true
+          }
           if (this.powerReadings) {
             let logger = false
             let power

package/lib/device/zigbee/index.js

@@ -8,6 +8,7 @@ import deviceSensorLeak from './sensor-leak.js'
 import deviceSensorMotion from './sensor-motion.js'
 import deviceSensorOccupancy from './sensor-occupancy.js'
 import deviceSensorSmoke from './sensor-smoke.js'
+import deviceSiren from './siren.js'
 import deviceSwitchStateless from './switch-stateless.js'
 import deviceThermostat from './thermostat.js'
 import deviceZigbeeWaterValve from './zigbee-water-valve.js'
@@ -23,6 +24,7 @@ export default {
   deviceSensorMotion,
   deviceSensorOccupancy,
   deviceSensorSmoke,
+  deviceSiren,
   deviceSwitchStateless,
   deviceThermostat,
   deviceZigbeeWaterValve,

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

@@ -53,8 +53,9 @@ export default class {
     this.battService = this.accessory.getService(this.hapServ.Battery)
       || this.accessory.addService(this.hapServ.Battery)
 
-    // SNZB-06P models also report a binary bright/dark light level (uiid 7016)
-    if (accessory.context.eweUIID === 7016) {
+    // 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)) {
       this.lightService = this.accessory.getService(this.hapServ.LightSensor)
         || this.accessory.addService(this.hapServ.LightSensor)
     } else if (this.accessory.getService(this.hapServ.LightSensor)) {
@@ -90,6 +91,18 @@ export default class {
           }
         }
       }
+      if (this.lightService && hasProperty(params, 'illumination')) {
+        // Some models report a numeric light reading instead of a binary one.
+        // HomeKit accepts 0.0001 to 100000 lux, so keep it inside that
+        const newLux = Math.max(Math.min(Number(params.illumination), 100000), 0.0001)
+        if (Number.isFinite(newLux) && newLux !== this.cacheLux) {
+          this.cacheLux = newLux
+          this.lightService.updateCharacteristic(this.hapChar.CurrentAmbientLightLevel, this.cacheLux)
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s].', this.name, this.lang.curLightLevel, this.cacheLux)
+          }
+        }
+      }
       if (hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
         this.cacheBatt = params.battery
         this.cacheBattScaled = Math.max(Math.min(this.cacheBatt, 100), 0)
@@ -102,17 +115,17 @@ export default class {
           this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
         }
       }
-      if (
-        hasProperty(params, 'human')
-        && hasProperty(params, 'trigTime')
-        && params.human !== this.cacheState
-      ) {
+      if (hasProperty(params, 'human') && params.human !== this.cacheState) {
         this.cacheState = params.human
-        const timeDiff = (Date.now() - params.trigTime) / 1000
+        // A report that carries a timestamp can be checked for staleness; the
+        // models that report live state without one are taken at face value
+        const isFresh = hasProperty(params, 'trigTime')
+          ? (Date.now() - params.trigTime) / 1000 < this.sensorTimeDifference
+          : true
         const occupancyDetected = !!(
           params.updateSource
           && params.human === 1
-          && timeDiff < this.sensorTimeDifference
+          && isFresh
         )
         this.service.updateCharacteristic(this.hapChar.OccupancyDetected, occupancyDetected)
         if (occupancyDetected) {

package/lib/device/zigbee/siren.js

@@ -0,0 +1,132 @@
+import platformConsts from '../../utils/constants.js'
+import { hasProperty } from '../../utils/functions.js'
+
+// How long the HomeKit tile stays on after a trigger. The device runs its
+// siren for whatever duration is configured in the eWeLink app and turns
+// itself off without reporting that it has, so the tile resets itself rather
+// than waiting for a state that never arrives.
+const TILE_RESET_MS = 3000
+
+export default class {
+  constructor(platform, accessory) {
+    // Set up variables from the platform
+    this.hapChar = platform.api.hap.Characteristic
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
+    this.lang = platform.lang
+    this.log = platform.log
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Set up custom variables for this device type
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {}
+    this.lowBattThreshold = deviceConf.lowBattThreshold
+      ? Math.min(deviceConf.lowBattThreshold, 100)
+      : platformConsts.defaultValues.lowBattThreshold
+
+    // Set the correct logging variables for this accessory
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true
+        this.enableDebugLogging = false
+        break
+      case 'debug':
+        this.enableLogging = true
+        this.enableDebugLogging = true
+        break
+      case 'disable':
+        this.enableLogging = false
+        this.enableDebugLogging = false
+        break
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging
+        this.enableDebugLogging = false
+        break
+    }
+
+    // Add the switch service if it doesn't already exist
+    this.service = this.accessory.getService(this.hapServ.Switch)
+      || this.accessory.addService(this.hapServ.Switch)
+    this.service.updateCharacteristic(this.hapChar.On, false)
+
+    // Add the battery service if it doesn't already exist
+    this.battService = this.accessory.getService(this.hapServ.Battery)
+      || this.accessory.addService(this.hapServ.Battery)
+
+    // Set up the handler for the switch
+    this.service.getCharacteristic(this.hapChar.On).onSet(async (value) => {
+      try {
+        if (!value) {
+          // The device stops on its own after its configured duration and
+          // offers no early-stop command, so an off is only the tile resetting
+          return
+        }
+
+        // The trigger rides on the device's own alarm settings, so send the
+        // last reported settings back with the trigger flag added - a bare
+        // flag could otherwise reset the volume and duration to defaults
+        const setting = { ...(this.accessory.context.cacheAlarmSetting || {}), test: true }
+        await this.platform.sendDeviceUpdate(this.accessory, { alarmSetting: setting })
+
+        if (this.enableLogging) {
+          this.log('[%s] %s [on].', this.name, this.lang.curState)
+        }
+
+        // Reset the tile shortly after - see TILE_RESET_MS
+        clearTimeout(this.resetTimer)
+        this.resetTimer = setTimeout(() => {
+          this.service.updateCharacteristic(this.hapChar.On, false)
+        }, TILE_RESET_MS)
+      } catch (err) {
+        this.platform.deviceUpdateError(this.accessory, err, false)
+        setTimeout(() => {
+          this.service.updateCharacteristic(this.hapChar.On, false)
+        }, 2000)
+        throw new this.hapErr(-70402)
+      }
+    })
+
+    // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable'
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+      lowBattThreshold: this.lowBattThreshold,
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+  }
+
+  async externalUpdate(params) {
+    try {
+      // Keep the device's own alarm settings so a trigger can send them back
+      if (hasProperty(params, 'alarmSetting') && typeof params.alarmSetting === 'object') {
+        this.accessory.context.cacheAlarmSetting = { ...params.alarmSetting }
+        delete this.accessory.context.cacheAlarmSetting.test
+      }
+      if (hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
+        this.cacheBatt = params.battery
+        this.cacheBattScaled = Math.max(Math.min(this.cacheBatt, 100), 0)
+        this.battService.updateCharacteristic(this.hapChar.BatteryLevel, this.cacheBattScaled)
+        this.battService.updateCharacteristic(
+          this.hapChar.StatusLowBattery,
+          this.cacheBattScaled < this.lowBattThreshold ? 1 : 0,
+        )
+        if (params.updateSource && this.enableLogging) {
+          this.log('[%s] %s [%s%].', this.name, this.lang.curBatt, this.cacheBattScaled)
+        }
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+
+  destroy() {
+    clearTimeout(this.resetTimer)
+  }
+
+  markStatus(isOnline) {
+    this.isOnline = isOnline
+  }
+}

package/lib/homebridge-ui/server.js

@@ -33,6 +33,7 @@ const categoryToArray = {
   zbSensorContact: 'sensorDevices',
   zbSensorWater: 'sensorDevices',
   zbSensorSmoke: 'sensorDevices',
+  zbSiren: 'switchDevices',
 }
 
 class PluginUiServer extends HomebridgePluginUiServer {

package/lib/platform.js

@@ -1729,6 +1729,16 @@ export default class {
         this.applyAccessoryLogging(accessory)
         accessory.control = new deviceTypes.zb.deviceSensorSmoke(this, accessory)
         /** */
+      } else if (platformConsts.devices.zbSiren.includes(uiid)) {
+        /**
+         **************
+         ZB SIREN
+         ***************
+         */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`)
+        this.applyAccessoryLogging(accessory)
+        accessory.control = new deviceTypes.zb.deviceSiren(this, accessory)
+        /** */
       } else if (platformConsts.devices.zbThermostat.includes(uiid)) {
         /**
          *******************

package/lib/utils/constants.js

@@ -377,10 +377,11 @@ export default {
     zbMotor: [1514, 7006, 7034],
     zbSensorAmbient: [242, 1770, 1771, 7014, 7033, 7038],
     zbSensorMotion: [2026, 7002],
-    zbSensorOccupancy: [7016],
+    zbSensorOccupancy: [7016, 7055],
     zbSensorContact: [3026, 7003],
     zbSensorWater: [4026, 7019],
     zbSensorSmoke: [5026],
+    zbSiren: [7056],
     zbThermostat: [7017],
     zbWaterValve: [7027, 7047],
     group: [5000],
@@ -604,6 +605,8 @@ 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)
+    7055: 1, // SNZB-03PR2 Zigbee presence sensor with light level
+    7056: 1, // SNZB-09P Zigbee indoor siren
     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/functions.js

@@ -24,6 +24,30 @@ function parseError(err, hideStack = []) {
   return toReturn
 }
 
+/**
+ * The entry for one channel in a device's `switches` array.
+ *
+ * A full report lists every channel in order, so position used to be enough.
+ * But some devices (SmartWise two-channel switches, for one) send a partial
+ * update holding only the channel that changed - always at position 0, with
+ * its real channel in `outlet`. Reading by position then applied channel 2's
+ * change to channel 1 (#804). When the entries carry `outlet`, match on it;
+ * only a list without `outlet` numbers falls back to position.
+ *
+ * @param {Array<{outlet?: number, switch: string}>} switches the reported array
+ * @param {number} index the zero-based channel wanted
+ * @returns {{outlet?: number, switch: string}|undefined} that channel's entry
+ */
+function switchForChannel(switches, index) {
+  if (!Array.isArray(switches)) {
+    return undefined
+  }
+  if (switches.some(entry => typeof entry?.outlet === 'number')) {
+    return switches.find(entry => entry?.outlet === index)
+  }
+  return switches[index]
+}
+
 function sleep(ms) {
   return new Promise((resolve) => {
     setTimeout(resolve, ms)
@@ -36,4 +60,5 @@ export {
   parseDeviceId,
   parseError,
   sleep,
+  switchForChannel,
 }

package/package.json

@@ -3,7 +3,7 @@
   "displayName": "Homebridge eWeLink",
   "alias": "eWeLink",
   "type": "module",
-  "version": "12.18.3",
+  "version": "12.18.4-beta.1",
   "description": "Homebridge plugin to integrate eWeLink devices into HomeKit.",
   "author": {
     "name": "bwp91",
@@ -66,8 +66,8 @@
     "changelog:sync": "node .github/scripts/sync-changelog.mjs"
   },
   "dependencies": {
-    "@homebridge/plugin-ui-utils": "^2.2.5",
-    "axios": "^1.19.0",
+    "@homebridge/plugin-ui-utils": "^2.2.6",
+    "axios": "^1.20.0",
     "node-persist": "^4.0.4",
     "p-queue": "^9.3.3",
     "websocket-as-promised": "^3.0.1",
@@ -75,7 +75,7 @@
   },
   "devDependencies": {
     "@antfu/eslint-config": "^9.3.0",
-    "@vitest/coverage-v8": "^4.1.10",
-    "vitest": "^4.1.10"
+    "@vitest/coverage-v8": "^4.1.11",
+    "vitest": "^4.1.11"
   }
 }