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

package/CHANGELOG.md

@@ -14,6 +14,19 @@ All notable changes to `@homebridge-plugins/homebridge-ewelink` will be document
 - fix(zigbee): read the curtain motor's position, so home stops showing it opening (#810)
 - 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/eslint.config.js

@@ -32,10 +32,17 @@ export default antfu(
       'perfectionist/sort-named-imports': 'error',
       'quotes': ['error', 'single'],
       'sort-imports': 0,
-      'style/brace-style': ['error', '1tbs', { allowSingleLine: true }],
+      'style/brace-style': [
+        'error',
+        '1tbs',
+        { allowSingleLine: true },
+      ],
       'style/quote-props': ['error', 'consistent-as-needed'],
       'test/no-only-tests': 'error',
-      'unused-imports/no-unused-vars': ['error', { caughtErrors: 'none' }],
+      'unused-imports/no-unused-vars': [
+        'error',
+        { caughtErrors: 'none' },
+      ],
     },
     typescript: false,
   },

package/lib/connection/api.js

@@ -364,7 +364,9 @@ export default class {
           : false
         break
       case 'hue':
-        charName = accServ.testCharacteristic(this.hapChar.Hue) ? this.hapChar.Hue : false
+        charName = accServ.testCharacteristic(this.hapChar.Hue)
+          ? this.hapChar.Hue
+          : false
         break
       case 'speed':
         charName = accServ.testCharacteristic(this.hapChar.RotationSpeed)
@@ -372,7 +374,9 @@ export default class {
           : false
         break
       case 'state':
-        charName = accServ.testCharacteristic(this.hapChar.On) ? this.hapChar.On : false
+        charName = accServ.testCharacteristic(this.hapChar.On)
+          ? this.hapChar.On
+          : false
         break
       default:
         throw new Error(`Invalid characteristic specified for service:${servToUpdate}`)
@@ -455,7 +459,9 @@ export default class {
           throw new Error('Value must be \'low\', \'medium\' or \'high\' for characteristic:speed')
         }
         const inLevels = accServ.getCharacteristic(this.hapChar.RotationSpeed).props.maxValue <= 3
-        newHKStatus = inLevels ? levels[newValue] : levels[newValue] * 33
+        newHKStatus = inLevels
+          ? levels[newValue]
+          : levels[newValue] * 33
 
         // Check the accessory has a correct set handler for speed
         if (!accessory.control.internalSpeedUpdate) {

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
@@ -141,7 +157,9 @@ export default class {
         return await this.login()
       }
       if (body.msg) {
-        throw new Error(body.msg + (body.error ? ` [${body.error}]` : ''))
+        throw new Error(body.msg + (body.error
+          ? ` [${body.error}]`
+          : ''))
       } else {
         throw new Error(`${this.lang.noAuthRec}.\n${JSON.stringify(body, null, 2)}`)
       }

package/lib/connection/lan.js

@@ -161,7 +161,9 @@ export default class {
     // Log LAN discovery summary after 10 seconds
     setTimeout(() => {
       const total = this.deviceMap.size
-      const withIp = [...this.deviceMap.values()].filter(d => d.ip).length
+      const withIp = [
+        ...this.deviceMap.values(),
+      ].filter(d => d.ip).length
       this.log('LAN discovery: %s/%s devices found locally.', withIp, total)
     }, 10000)
   }
@@ -284,7 +286,10 @@ export default class {
       const iv = randomBytes(16)
       const enc = createCipheriv('aes-128-cbc', key, iv)
       const data = {
-        data: Buffer.concat([enc.update(JSON.stringify(params)), enc.final()]).toString('base64'),
+        data: Buffer.concat([
+          enc.update(JSON.stringify(params)),
+          enc.final(),
+        ]).toString('base64'),
         deviceid: json.deviceid,
         encrypt: true,
         iv: iv.toString('base64'),
@@ -301,7 +306,9 @@ export default class {
           'Content-Type': 'application/json',
         },
         data,
-        timeout: this.mode === 'lan' ? 9000 : 3000,
+        timeout: this.mode === 'lan'
+          ? 9000
+          : 3000,
       })
 
       // Check for any errors in the response

package/lib/connection/ws.js

@@ -70,7 +70,9 @@ export default class {
 
       // Fall back to static pconnect hosts
       const region = this.httpHost.split('-')[0]
-      const suffix = region === 'cn' ? 'coolkit.cn' : 'coolkit.cc'
+      const suffix = region === 'cn'
+        ? 'coolkit.cn'
+        : 'coolkit.cc'
       const fallback = `${region}-pconnect3.${suffix}`
       this.log.warn('%s [%s].', this.lang.errGetHost, fallback)
       return fallback
@@ -104,7 +106,9 @@ export default class {
         packMessage: data => JSON.stringify(data),
         unpackMessage: (data) => {
           data = data.toString()
-          return data === 'pong' ? data : JSON.parse(data)
+          return data === 'pong'
+            ? data
+            : JSON.parse(data)
         },
         timeout: 20000,
       })
@@ -341,7 +345,9 @@ export default class {
         })
 
         // Parse the response and see if any error has been reported back
-        res.error = hasProperty(res, 'error') ? res.error : -1
+        res.error = hasProperty(res, 'error')
+          ? res.error
+          : -1
 
         // Check if and which error has been reported back
         switch (res.error) {

package/lib/device/air-conditioner.js

@@ -166,10 +166,14 @@ export default class {
 
   async internalActiveUpdate(value) {
     try {
-      const newValue = value === 1 ? 'on' : 'off'
+      const newValue = value === 1
+        ? 'on'
+        : 'off'
 
       // Don't continue if the value is the same as before
-      const prevState = this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off'
+      const prevState = this.service.getCharacteristic(this.hapChar.Active).value === 1
+        ? 'on'
+        : 'off'
       if (prevState === newValue) {
         return
       }
@@ -258,7 +262,11 @@ export default class {
 
       // Throw a 'no response' error and set a timeout to revert this after 2 seconds
       setTimeout(() => {
-        const prevValue = this.cacheMode === 'heat' ? 1 : this.cacheMode === 'cool' ? 2 : 0
+        const prevValue = this.cacheMode === 'heat'
+          ? 1
+          : this.cacheMode === 'cool'
+            ? 2
+            : 0
         this.service.updateCharacteristic(this.hapChar.TargetHeaterCoolerState, prevValue)
       }, 2000)
       throw new this.hapErr(-70402)
@@ -372,7 +380,9 @@ export default class {
 
       // Update the active characteristic
       if (hasProperty(params, 'power')) {
-        const newState = params.power === 'on' ? 1 : 0
+        const newState = params.power === 'on'
+          ? 1
+          : 0
         this.service.updateCharacteristic(this.hapChar.Active, newState)
 
         // Update the current state
@@ -498,7 +508,9 @@ export default class {
     const toReturn = {}
     toReturn.services = ['heater-cooler']
     toReturn.heater_cooler = {
-      state: this.service.getCharacteristic(this.hapChar.Active).value === 1 ? 'on' : 'off',
+      state: this.service.getCharacteristic(this.hapChar.Active).value === 1
+        ? 'on'
+        : 'off',
       mode: this.cacheMode,
       target_temp: this.cacheTarg,
       current_temp: this.cacheTemp,

package/lib/device/curtain.js

@@ -191,7 +191,9 @@ export default class {
           // If we are to fully open/close the curtain we can use the switch param
           if ([0, 100].includes(value)) {
             // 'on' for fully open and 'off' for fully close
-            params.switch = value === 100 ? 'on' : 'off'
+            params.switch = value === 100
+              ? 'on'
+              : 'off'
           } else {
             // Otherwise, for a %-point we can use the 'setclose' param
             params.setclose = Math.abs(100 - value)
@@ -231,10 +233,14 @@ export default class {
       const params = {}
       switch (this.accessory.context.eweUIID) {
         case 11:
-          params.switch = value === 0 ? 'on' : 'off'
+          params.switch = value === 0
+            ? 'on'
+            : 'off'
           break
         case 67:
-          params.op = value === 0 ? 1 : 3
+          params.op = value === 0
+            ? 1
+            : 3
           break
         default:
           return
@@ -298,7 +304,9 @@ export default class {
             if (hasProperty(params, 'setclose')) {
               newPos = Math.abs(100 - params.setclose)
             } else if (params.switch) {
-              newPos = params.switch === 'on' ? 100 : 0
+              newPos = params.switch === 'on'
+                ? 100
+                : 0
             } else {
               return
             }

package/lib/device/diffuser.js

@@ -165,7 +165,9 @@ export default class {
       }
 
       // The new speed can be {50, 100} so use rounding on the new value
-      const newValue = value <= 50 ? 50 : 100
+      const newValue = value <= 50
+        ? 50
+        : 100
 
       // Check the rounded speed against the current cache value
       if (newValue === this.cacheSpeed) {
@@ -239,7 +241,9 @@ export default class {
 
       // Log the update if appropriate
       if (this.enableLogging) {
-        this.log('[%s] %s [%s%].', this.name, this.lang.curLight, value === 1 ? 'on' : 'off')
+        this.log('[%s] %s [%s%].', this.name, this.lang.curLight, value === 1
+          ? 'on'
+          : 'off')
       }
     } catch (err) {
       // Catch any errors and let the platform display them
@@ -409,7 +413,9 @@ export default class {
             '[%s] %s [%s%].',
             this.name,
             this.lang.curLight,
-            params.lightswitch === 1 ? 'on' : 'off',
+            params.lightswitch === 1
+              ? 'on'
+              : 'off',
           )
         }
       }

package/lib/device/fan-gear.js

@@ -175,7 +175,9 @@ export default class {
 
   async internalShakeUpdate(value) {
     try {
-      const newShake = value === this.hapChar.SwingMode.SWING_ENABLED ? 'on' : 'off'
+      const newShake = value === this.hapChar.SwingMode.SWING_ENABLED
+        ? 'on'
+        : 'off'
       if (newShake === this.cacheShake) {
         return
       }

package/lib/device/fan.js

@@ -66,7 +66,12 @@ export default class {
     this.service
       .getCharacteristic(this.hapChar.RotationSpeed)
       .setProps(this.speedAsPercent
-        ? { maxValue: 100, minStep: 33, minValue: 0, unit: 'percentage' }
+        ? {
+            maxValue: 100,
+            minStep: 33,
+            minValue: 0,
+            unit: 'percentage',
+          }
         : {
             maxValue: 3,
             minStep: 1,
@@ -151,11 +156,15 @@ export default class {
       })
       if (newState === 'on') {
         params.switches.push({
-          switch: this.cacheSpeed === 2 ? 'on' : 'off',
+          switch: this.cacheSpeed === 2
+            ? 'on'
+            : 'off',
           outlet: 2,
         })
         params.switches.push({
-          switch: this.cacheSpeed === 3 ? 'on' : 'off',
+          switch: this.cacheSpeed === 3
+            ? 'on'
+            : 'off',
           outlet: 3,
         })
       }
@@ -185,21 +194,29 @@ export default class {
       const params = {
         switches: [],
       }
-      const newState = value >= 1 ? 'on' : 'off'
+      const newState = value >= 1
+        ? 'on'
+        : 'off'
       const newSpeed = this.levelFromHK(value)
       if (newSpeed === this.cacheSpeed) {
         return
       }
       params.switches.push({
-        switch: newState === 'on' && newSpeed >= 1 ? 'on' : 'off',
+        switch: newState === 'on' && newSpeed >= 1
+          ? 'on'
+          : 'off',
         outlet: 1,
       })
       params.switches.push({
-        switch: newState === 'on' && newSpeed === 2 ? 'on' : 'off',
+        switch: newState === 'on' && newSpeed === 2
+          ? 'on'
+          : 'off',
         outlet: 2,
       })
       params.switches.push({
-        switch: newState === 'on' && newSpeed === 3 ? 'on' : 'off',
+        switch: newState === 'on' && newSpeed === 3
+          ? 'on'
+          : 'off',
         outlet: 3,
       })
       await this.platform.sendDeviceUpdate(this.accessory, params)
@@ -329,16 +346,22 @@ export default class {
   currentState() {
     const toReturn = {}
     const level = this.levelFromHK(this.service.getCharacteristic(this.hapChar.RotationSpeed).value)
-    const speedLabel = level === 0 ? 'off' : this.speed2label[level]
+    const speedLabel = level === 0
+      ? 'off'
+      : this.speed2label[level]
     toReturn.services = ['fan']
     toReturn.fan = {
-      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off',
+      state: this.service.getCharacteristic(this.hapChar.On).value
+        ? 'on'
+        : 'off',
       speed: speedLabel,
     }
     if (!this.hideLight) {
       toReturn.services.push('light')
       toReturn.light = {
-        state: this.lightService.getCharacteristic(this.hapChar.On).value ? 'on' : 'off',
+        state: this.lightService.getCharacteristic(this.hapChar.On).value
+          ? 'on'
+          : 'off',
       }
     }
     return toReturn
@@ -348,17 +371,25 @@ export default class {
   // scale 1-33 is low, 34-66 medium and 67-100 high
   levelFromHK(value) {
     if (!this.speedAsPercent) {
-      return value < 0 || value > 3 ? 0 : value
+      return value < 0 || value > 3
+        ? 0
+        : value
     }
     if (value <= 0) {
       return 0
     }
-    return value <= 33 ? 1 : value <= 66 ? 2 : 3
+    return value <= 33
+      ? 1
+      : value <= 66
+        ? 2
+        : 3
   }
 
   // A fan level as a HomeKit rotation speed, on whichever scale is in use
   levelToHK(level) {
-    return this.speedAsPercent && level ? level * 33 : level
+    return this.speedAsPercent && level
+      ? level * 33
+      : level
   }
 
   markStatus(isOnline) {

package/lib/device/group.js

@@ -72,13 +72,17 @@ export default class {
       }
       const params = {}
       if (this.isSCM) {
-        params.switches = [{ switch: newValue, outlet: 0 }]
+        params.switches = [
+          { switch: newValue, outlet: 0 },
+        ]
       } else {
         params.switch = newValue
       }
       await this.platform.sendGroupUpdate(this.accessory, params)
       this.cacheState = newValue
-      this.accessory.eveService.addEntry({ status: value ? 1 : 0 })
+      this.accessory.eveService.addEntry({
+        status: value ? 1 : 0,
+      })
       if (this.enableLogging) {
         this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
       }
@@ -96,7 +100,11 @@ export default class {
       if (!this.isSCM && params.switch && params.switch !== this.cacheState) {
         this.cacheState = params.switch
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-        this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
+        this.accessory.eveService.addEntry({
+          status: this.cacheState === 'on'
+            ? 1
+            : 0,
+        })
         if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
@@ -104,7 +112,11 @@ export default class {
       if (this.isSCM && params.switches?.[0] && params.switches[0].switch !== this.cacheState) {
         this.cacheState = params.switches[0].switch
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
-        this.accessory.eveService.addEntry({ status: this.cacheState === 'on' ? 1 : 0 })
+        this.accessory.eveService.addEntry({
+          status: this.cacheState === 'on'
+            ? 1
+            : 0,
+        })
         if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
         }
@@ -118,7 +130,9 @@ export default class {
     const toReturn = {}
     toReturn.services = ['switch']
     toReturn.switch = {
-      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off',
+      state: this.service.getCharacteristic(this.hapChar.On).value
+        ? 'on'
+        : 'off',
     }
     return toReturn
   }

package/lib/device/humidifier.js

@@ -124,7 +124,9 @@ export default class {
         return
       }
       const params = {}
-      const newState = value >= 1 ? 'on' : 'off'
+      const newState = value >= 1
+        ? 'on'
+        : 'off'
       params.switch = newState
       let newMode
       if (value > 0) {

package/lib/device/light-cct.js

@@ -336,7 +336,9 @@ export default class {
     const toReturn = {}
     toReturn.services = ['light']
     toReturn.light = {
-      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off',
+      state: this.service.getCharacteristic(this.hapChar.On).value
+        ? 'on'
+        : 'off',
       brightness: this.service.getCharacteristic(this.hapChar.Brightness).value,
       colourtemperature: this.service.getCharacteristic(this.hapChar.ColorTemperature).value,
       adaptivelighting:

package/lib/device/light-dimmer.js

@@ -272,9 +272,15 @@ export default class {
           this.log(
             '[%s] %s%s%s.',
             this.name,
-            power !== undefined ? `${this.lang.curPower} [${power}W]` : '',
-            voltage !== undefined ? ` ${this.lang.curVolt} [${voltage}V]` : '',
-            current !== undefined ? ` ${this.lang.curCurr} [${current}A]` : '',
+            power !== undefined
+              ? `${this.lang.curPower} [${power}W]`
+              : '',
+            voltage !== undefined
+              ? ` ${this.lang.curVolt} [${voltage}V]`
+              : '',
+            current !== undefined
+              ? ` ${this.lang.curCurr} [${current}A]`
+              : '',
           )
         }
       }
@@ -300,7 +306,9 @@ export default class {
     const toReturn = {}
     toReturn.services = ['light']
     toReturn.light = {
-      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off',
+      state: this.service.getCharacteristic(this.hapChar.On).value
+        ? 'on'
+        : 'off',
       brightness: this.service.getCharacteristic(this.hapChar.Brightness).value,
     }
     return toReturn

package/lib/device/light-rgb-cct.js

@@ -840,9 +840,13 @@ export default class {
     const toReturn = {}
     toReturn.services = ['light']
     toReturn.light = {
-      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off',
+      state: this.service.getCharacteristic(this.hapChar.On).value
+        ? 'on'
+        : 'off',
       brightness: this.service.getCharacteristic(this.hapChar.Brightness).value,
-      colourmode: this.cacheMode === 'white' ? 'colourtemperature' : 'hue',
+      colourmode: this.cacheMode === 'white'
+        ? 'colourtemperature'
+        : 'hue',
       hue: this.service.getCharacteristic(this.hapChar.Hue).value,
       saturation: this.service.getCharacteristic(this.hapChar.Saturation).value,
       colourtemperature: this.service.getCharacteristic(this.hapChar.ColorTemperature).value,

package/lib/device/light-rgb.js

@@ -210,7 +210,9 @@ export default class {
         this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
         this.service.updateCharacteristic(
           this.hapChar.Brightness,
-          this.cacheState === 'on' ? 100 : 0,
+          this.cacheState === 'on'
+            ? 100
+            : 0,
         )
         if (params.updateSource && this.enableLogging) {
           this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
@@ -278,7 +280,9 @@ export default class {
     const toReturn = {}
     toReturn.services = ['light']
     toReturn.light = {
-      state: this.service.getCharacteristic(this.hapChar.On).value ? 'on' : 'off',
+      state: this.service.getCharacteristic(this.hapChar.On).value
+        ? 'on'
+        : 'off',
       brightness: this.service.getCharacteristic(this.hapChar.Brightness).value,
       hue: this.service.getCharacteristic(this.hapChar.Hue).value,
       saturation: this.service.getCharacteristic(this.hapChar.Saturation).value,

package/lib/device/motor.js

@@ -211,10 +211,20 @@ export default class {
       // this.cachePos is 0 for closed and >0 for open
 
       const params = this.accessory.context.eweUIID === 211
-        ? { electromotor: value === 1 ? 2 : 0 }
-        : { location: value === 1 ? 0 : 100 }
+        ? {
+            electromotor: value === 1
+              ? 2
+              : 0,
+          }
+        : {
+            location: value === 1
+              ? 0
+              : 100,
+          }
       await this.platform.sendDeviceUpdate(this.accessory, params)
-      this.cacheTarg = value === 1 ? 0 : 100
+      this.cacheTarg = value === 1
+        ? 0
+        : 100
       if (this.enableLogging) {
         this.log('[%s] %s [%s%].', this.name, this.lang.curTarg, this.cacheTarg)
       }
@@ -236,7 +246,9 @@ export default class {
       }
 
       // Send the params to request the updates
-      await this.platform.sendDeviceUpdate(this.accessory, { uiActive: { outlet: 0, time: 120 } })
+      await this.platform.sendDeviceUpdate(this.accessory, {
+        uiActive: { outlet: 0, time: 120 },
+      })
     } catch (err) {
       this.log.error(err)
     }
@@ -363,9 +375,15 @@ export default class {
         this.log(
           '[%s] %s%s%s.',
           this.name,
-          power !== undefined ? `${this.lang.curPower} [${power}W]` : '',
-          voltage !== undefined ? ` ${this.lang.curVolt} [${voltage}V]` : '',
-          current !== undefined ? ` ${this.lang.curCurr} [${current}A]` : '',
+          power !== undefined
+            ? `${this.lang.curPower} [${power}W]`
+            : '',
+          voltage !== undefined
+            ? ` ${this.lang.curVolt} [${voltage}V]`
+            : '',
+          current !== undefined
+            ? ` ${this.lang.curCurr} [${current}A]`
+            : '',
         )
       }
     } catch (err) {