@homebridge-plugins/homebridge-ewelink 12.11.0 → 12.11.1-beta.0

package/CHANGELOG.md

@@ -2,6 +2,25 @@
 
 All notable changes to `@homebridge-plugins/homebridge-ewelink` will be documented in this file.
 
+## v12.11.1 (Pending Release)
+
+### Changed
+
+- fix: wrong parseInt radix in channel name lookup
+- fix: undefined variable in apiPort config check
+- fix: copy-paste errors in RGB color comparison
+- fix: color temp diff always zero in adaptive lighting
+- fix: hue cache overwritten to zero on CT update
+- fix: panel channel 2 returning channel 1 state
+- fix: wrong characteristic in outlet-multi cleanup
+- fix: incorrect bit shifts in DNS header parsing
+- fix: missing await in group update request
+- fix: fakegato unsubscribe removing wrong service
+- fix: fakegato immediate callback missing averaging
+- fix: string radix in fakegato toString call
+- fix: incorrect unit casing in eve characteristic
+- dependency updates + code lint fixes
+
 ## v12.11.0 (2026-02-28)
 
 ### Added

package/lib/connection/http.js

@@ -63,7 +63,7 @@ export default class {
           'X-CK-Appid': this.appId,
           'X-CK-Nonce': Math.random()
             .toString(36)
-            .substr(2, 8),
+            .substring(2, 10),
         },
       })
 
@@ -156,7 +156,7 @@ export default class {
           'X-CK-Appid': this.appId,
           'X-CK-Nonce': Math.random()
             .toString(36)
-            .substr(2, 8),
+            .substring(2, 10),
         },
       })
 
@@ -208,7 +208,7 @@ export default class {
             'X-CK-Appid': this.appId,
             'X-CK-Nonce': Math.random()
               .toString(36)
-              .substr(2, 8),
+              .substring(2, 10),
           },
           params: {
             num: 0,
@@ -292,7 +292,7 @@ export default class {
           'X-CK-Appid': this.appId,
           'X-CK-Nonce': Math.random()
             .toString(36)
-            .substr(2, 8),
+            .substring(2, 10),
         },
       },
     )

package/lib/connection/ws.js

@@ -42,8 +42,8 @@ export default class {
           appid: this.appId,
           nonce: Math.random()
             .toString(36)
-            .substr(2, 8),
-          ts: Math.floor(new Date().getTime() / 1000),
+            .substring(2, 10),
+          ts: Math.floor(Date.now() / 1000),
           version: 8,
         },
         timeout: 6000,
@@ -121,7 +121,7 @@ export default class {
           at: this.aToken,
           nonce: Math.random()
             .toString(36)
-            .substr(2, 8),
+            .substring(2, 10),
           sequence,
           ts: Math.floor(new Date() / 1000),
           userAgent: 'app',

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

@@ -483,7 +483,6 @@ export default class {
       this.cacheMired = value;
       [this.cacheHue] = hs
       this.cacheCT = scaledCT
-      this.cacheHue = 0
       switch (this.accessory.context.eweUIID) {
         case 33:
         case 59:
@@ -589,12 +588,12 @@ export default class {
             }
             if (
               params.colorR !== this.cacheR
-              || params.colorG !== this.cacheB
+              || params.colorG !== this.cacheG
               || params.colorB !== this.cacheB
             ) {
               const rgbDiff = Math.abs(params.colorR - this.cacheR)
                 + Math.abs(params.colorG - this.cacheG)
-                + Math.abs(params.colorG - this.cacheB)
+                + Math.abs(params.colorB - this.cacheB)
               this.cacheR = params.colorR
               this.cacheG = params.colorG
               this.cacheB = params.colorB
@@ -630,8 +629,8 @@ export default class {
               this.service.updateCharacteristic(this.cusChar.FestiveScene, false)
             }
             if (params.colorTemp !== this.cacheCTRaw && params.mode === 2) {
-              this.cacheCTRaw = params.colorTemp
               const ctDiff = Math.abs(params.colorTemp - this.cacheCTRaw)
+              this.cacheCTRaw = params.colorTemp
               this.cacheCT = 100 - params.colorTemp
               const ctToK = Math.round((this.cacheCT / 100) * 3800 + 2700)
               this.cacheMired = Math.max(Math.min(Math.round(1000000 / ctToK), 500), 140)

package/lib/device/outlet-multi.js

@@ -85,7 +85,7 @@ export default class {
     } else {
       // Remove unused Eve characteristics
       if (this.service.testCharacteristic(this.hapChar.OutletInUse)) {
-        this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.OutletInUse))
+        this.service.removeCharacteristic(this.service.getCharacteristic(this.hapChar.OutletInUse))
       }
       if (this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
         this.service.removeCharacteristic(

package/lib/device/panel.js

@@ -90,7 +90,7 @@ export default class {
           if (!this.isOnline) {
             throw new this.hapErr(-70402)
           }
-          return this.service1.getCharacteristic(this.hapChar.On).value
+          return this.service2.getCharacteristic(this.hapChar.On).value
         })
       }
     }

package/lib/device/rf-bridge.js

@@ -3,6 +3,8 @@ import axios from 'axios'
 import platformConsts from '../utils/constants.js'
 import { hasProperty, parseError, sleep } from '../utils/functions.js'
 
+const rfTrigRegex = /rfTrig/
+
 export default class {
   constructor(platform, accessory, devicesInHB) {
     // Set up variables from the platform
@@ -115,7 +117,7 @@ export default class {
       ) {
         // RF Sensor
         Object.keys(params)
-          .filter(name => /rfTrig/.test(name))
+          .filter(name => rfTrigRegex.test(name))
           .forEach(async (chan) => {
             try {
               this.devicesInHB.forEach((acc) => {
@@ -234,7 +236,7 @@ export default class {
                     }
                   }
 
-                  // Call any webhook that is defined in the config
+                  // Call any webhook defined in the config
                   if (deviceConf.sensorWebHook) {
                     try {
                       await axios.get(deviceConf.sensorWebHook, {
@@ -286,7 +288,7 @@ export default class {
 
                   const updateKey = Math.random()
                     .toString(36)
-                    .substr(2, 8)
+                    .substring(2, 10)
                   subAccessory.context.updateKey = updateKey
                   await sleep(sensorTimeLength * 1000)
                   if (updateKey !== subAccessory.context.updateKey) {

package/lib/device/switch-man.js

@@ -80,7 +80,7 @@ export default class {
         setTimeout(() => {
           this.timeouts[label] = false
         }, 1000)
-        const timeDiff = (new Date().getTime() - Date.parse(params.actionTime)) / 1000
+        const timeDiff = (Date.now() - Date.parse(params.actionTime)) / 1000
         if (timeDiff < 5) {
           const service = this[`service${label}`]
           service.updateCharacteristic(this.hapChar.ProgrammableSwitchEvent, params.key)

package/lib/device/switch-mate.js

@@ -65,7 +65,7 @@ export default class {
         setTimeout(() => {
           this.timeouts[params.outlet] = false
         }, 1000)
-        const timeDiff = (new Date().getTime() - Date.parse(params.actionTime)) / 1000
+        const timeDiff = (Date.now() - Date.parse(params.actionTime)) / 1000
         if (timeDiff < 5) {
           this.service.updateCharacteristic(this.hapChar.ProgrammableSwitchEvent, params.outlet)
           if (params.updateSource && this.enableLogging) {

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

@@ -88,7 +88,7 @@ export default class {
         && this.cacheState !== params.water
       ) {
         this.cacheState = params.water
-        const timeDiff = (new Date().getTime() - params.trigTime) / 1000
+        const timeDiff = (Date.now() - params.trigTime) / 1000
         const leakDetected = !!(
           params.updateSource
           && params.water === 1

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

@@ -88,7 +88,7 @@ export default class {
         && params.motion !== this.cacheState
       ) {
         this.cacheState = params.motion
-        const timeDiff = (new Date().getTime() - params.trigTime) / 1000
+        const timeDiff = (Date.now() - params.trigTime) / 1000
         const motionDetected = !!(
           params.updateSource
           && params.motion === 1

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

@@ -88,7 +88,7 @@ export default class {
         && params.occupancy !== this.cacheState
       ) {
         this.cacheState = params.occupancy
-        const timeDiff = (new Date().getTime() - params.trigTime) / 1000
+        const timeDiff = (Date.now() - params.trigTime) / 1000
         const occupancyDetected = !!(
           params.updateSource
           && params.occupancy === 1

package/lib/device/zigbee/switch-stateless.js

@@ -87,7 +87,7 @@ export default class {
         && [0, 1, 2].includes(params.key)
         && params.trigTime
       ) {
-        const timeDiff = (new Date().getTime() - params.trigTime) / 1000
+        const timeDiff = (Date.now() - params.trigTime) / 1000
         if (timeDiff < this.sensorTimeDifference) {
           this.service.updateCharacteristic(this.hapChar.ProgrammableSwitchEvent, params.key)
           if (params.updateSource && this.enableLogging) {

package/lib/fakegato/fakegato-history.js

@@ -39,7 +39,7 @@ export default function (homebridge) {
     return s
   }
 
-  const ucfirst = val => val.charAt(0).toUpperCase() + val.substr(1)
+  const ucfirst = val => val.charAt(0).toUpperCase() + val.substring(1)
 
   const precisionRound = (number, precision) => {
     const factor = 10 ** precision
@@ -370,9 +370,9 @@ export default function (homebridge) {
         avrg: {},
       }
       for (const h in backLog) {
-        if (Object.prototype.hasOwnProperty.call(backLog, h)) {
+        if (Object.hasOwn(backLog, h)) {
           for (const key in backLog[h]) {
-            if (Object.prototype.hasOwnProperty.call(backLog[h], key) && key !== 'time') {
+            if (Object.hasOwn(backLog[h], key) && key !== 'time') {
               if (!calc.sum[key]) {
                 calc.sum[key] = 0
               }
@@ -389,7 +389,7 @@ export default function (homebridge) {
       calc.avrg.time = Math.round(new Date().valueOf() / 1000)
 
       for (const key in previousAvrg) {
-        if (Object.prototype.hasOwnProperty.call(previousAvrg, key) && key !== 'time') {
+        if (Object.hasOwn(previousAvrg, key) && key !== 'time') {
           if (!backLog.length || calc.avrg[key] === undefined) {
             calc.avrg[key] = previousAvrg[key]
           }
@@ -798,7 +798,7 @@ export default function (homebridge) {
       const substring = valHex.substring(4, 12)
       const valInt = Number.parseInt(substring, 16)
       const address = swap32(valInt)
-      const hexAddress = address.toString('16')
+      const hexAddress = address.toString(16)
       this.log('[%s] FGH address req [%s].', this.accessoryName, hexAddress)
       this.sendHistory(address)
     }

package/lib/fakegato/fakegato-storage.js

@@ -71,7 +71,7 @@ export default class {
         '[%s] FGS write file [%s] [%s].',
         params.service.accessoryName,
         fileLoc,
-        params.data.substr(1, 80),
+        params.data.substring(1, 81),
       )
       writer.storageHandler.writeFile(fileLoc, params.data, 'utf8', (...args) => {
         this.writing = false

package/lib/fakegato/fakegato-timer.js

@@ -39,7 +39,9 @@ export default class {
 
   unsubscribe(service) {
     const index = this._getSubscriberIndex(service)
-    this.subscribedServices.splice(index, 1)
+    if (index !== -1) {
+      this.subscribedServices.splice(index, 1)
+    }
     if (this.subscribedServices.length === 0 && this.running) {
       this.stop()
     }
@@ -65,7 +67,7 @@ export default class {
     this.log('FGT executeCallbacks().')
     if (this.subscribedServices.length !== 0) {
       for (const s in this.subscribedServices) {
-        if (Object.prototype.hasOwnProperty.call(this.subscribedServices, s)) {
+        if (Object.hasOwn(this.subscribedServices, s)) {
           const service = this.subscribedServices[s]
           if (typeof service.callback === 'function') {
             service.previousAvrg = service.callback({
@@ -83,8 +85,9 @@ export default class {
   executeImmediateCallback(service) {
     this.log('[%s] FGT executeImmediateCallback().', service.accessoryName)
     if (typeof service.callback === 'function' && service.backLog.length) {
-      service.callback({
+      service.previousAvrg = service.callback({
         backLog: service.backLog,
+        previousAvrg: service.previousAvrg,
         timer: this,
         immediate: true,
       })

package/lib/fakegato/uuid.js

@@ -1,12 +1,13 @@
 // https://github.com/homebridge/HAP-NodeJS/blob/master/src/lib/util/uuid.ts
 
+const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
+const shortRegex = /^[0-9a-f]{1,8}$/i
+
 function isValid(UUID) {
-  const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
   return uuidRegex.test(UUID)
 }
 
 function toLongFormUUID(uuid, base = '-0000-1000-8000-0026BB765291') {
-  const shortRegex = /^[0-9a-f]{1,8}$/i
   if (isValid(uuid)) {
     return uuid.toUpperCase()
   }
@@ -16,12 +17,12 @@ function toLongFormUUID(uuid, base = '-0000-1000-8000-0026BB765291') {
   if (!isValid(`00000000${base}`)) {
     throw new TypeError('base was not a valid base UUID')
   }
-  return ((`00000000${uuid}`).substr(-8) + base).toUpperCase()
+  return ((`00000000${uuid}`).slice(-8) + base).toUpperCase()
 }
 
 function toShortFormUUID(uuid, base = '-0000-1000-8000-0026BB765291') {
   uuid = toLongFormUUID(uuid, base)
-  return uuid.substr(0, 8)
+  return uuid.substring(0, 8)
 }
 
 export { toLongFormUUID, toShortFormUUID }

package/lib/node-dns-sd/lib/dns-sd-parser.js

@@ -1,5 +1,7 @@
 import { createRequire } from 'node:module'
 
+const kvPairRegex = /^([^=]+)=(.*)/
+
 /* ------------------------------------------------------------------
 * node-dns-sd - dns-sd-parser.js
 *
@@ -53,8 +55,8 @@ DnsSdParser.prototype.parse = function (buf) {
     rd: (buf.readUInt8(2) & 0b00000001),
     ra: (buf.readUInt8(3) & 0b10000000) >> 7,
     z: (buf.readUInt8(3) & 0b01000000) >> 6,
-    ad: (buf.readUInt8(3) & 0b00100000) >> 6,
-    cd: (buf.readUInt8(3) & 0b00010000) >> 5,
+    ad: (buf.readUInt8(3) & 0b00100000) >> 5,
+    cd: (buf.readUInt8(3) & 0b00010000) >> 4,
     rc: (buf.readUInt8(3) & 0b00001111),
     questions: buf.readUInt16BE(4),
     answers: buf.readUInt16BE(6),
@@ -271,7 +273,7 @@ DnsSdParser.prototype._parseRdataTxt = function (buf, offset, len, buf_flag) {
     i += 1
     if (i + blen <= len) {
       const pair = buf.slice(offset + i, offset + i + blen).toString('utf8')
-      const m = pair.match(/^([^=]+)=(.*)/)
+      const m = pair.match(kvPairRegex)
       if (m) {
         labels[m[1]] = m[2]
         if (buf_flag) {

package/lib/node-dns-sd/lib/dns-sd.js

@@ -12,6 +12,19 @@ import mOs from 'node:os'
 import mDnsSdComposer from './dns-sd-composer.js'
 import mDnsSdParser from './dns-sd-parser.js'
 
+const appleTvRegex = /Apple TV/
+const deviceInfoRegex = /_device-info/
+const googlecastRegex = /_googlecast/
+const philipsHueRegex = /Philips hue/
+const canonRegex = /Canon/
+const appleTvDashRegex = /Apple-TV/
+const iPadRegex = /iPad/
+const spaceRegex = / /
+const leadingUnderscoreRegex = /^_/
+const typeValidRegex = /^[a-z0-9]{1,10}$/i
+const keyValidRegex = /^(?:address|fqdn)$/
+const ipv4Regex = /^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/
+
 /* ------------------------------------------------------------------
 * Constructor: DnsSd()
 * ---------------------------------------------------------------- */
@@ -116,26 +129,26 @@ DnsSd.prototype._createDeviceObject = function (packet) {
     const r = trecs.TXT[0]
     const d = r.rdata || {}
     const name = r.name || ''
-    if (/Apple TV/.test(name)) {
+    if (appleTvRegex.test(name)) {
       o.modelName = 'Apple TV'
       if (trecs.TXT) {
         for (let i = 0; i < trecs.TXT.length; i += 1) {
           const r = trecs.TXT[i]
-          if ((/_device-info/).test(r.name) && r.rdata && r.rdata.model) {
+          if (deviceInfoRegex.test(r.name) && r.rdata && r.rdata.model) {
             o.modelName = `Apple TV ${r.rdata.model}`
             break
           }
         }
       }
-    } else if (/_googlecast/.test(name)) {
+    } else if (googlecastRegex.test(name)) {
       o.modelName = d.md || null
       o.familyName = d.fn || null
-    } else if (/Philips hue/.test(name)) {
+    } else if (philipsHueRegex.test(name)) {
       o.modelName = 'Philips hue'
       if (d.md) {
         o.modelName += ` ${d.md}`
       }
-    } else if (/Canon/.test(name)) {
+    } else if (canonRegex.test(name)) {
       o.modelName = d.ty || null
     }
   }
@@ -143,9 +156,9 @@ DnsSd.prototype._createDeviceObject = function (packet) {
     if (trecs.A && trecs.A[0]) {
       const r = trecs.A[0]
       const { name } = r
-      if (/Apple-TV/.test(name)) {
+      if (appleTvDashRegex.test(name)) {
         o.modelName = 'Apple TV'
-      } else if (/iPad/.test(name)) {
+      } else if (iPadRegex.test(name)) {
         o.modelName = 'iPad'
       }
     }
@@ -154,7 +167,7 @@ DnsSd.prototype._createDeviceObject = function (packet) {
   if (!o.modelName) {
     if (o.fqdn) {
       const hostname = (o.fqdn.split('.')).shift()
-      if (hostname && / /.test(hostname)) {
+      if (hostname && spaceRegex.test(hostname)) {
         o.modelName = hostname
       }
     }
@@ -167,8 +180,8 @@ DnsSd.prototype._createDeviceObject = function (packet) {
     name_parts.reverse()
     o.service = {
       port: rec.rdata.port,
-      protocol: name_parts[1].replace(/^_/, ''),
-      type: name_parts[2].replace(/^_/, ''),
+      protocol: name_parts[1].replace(leadingUnderscoreRegex, ''),
+      type: name_parts[2].replace(leadingUnderscoreRegex, ''),
     }
   }
 
@@ -223,7 +236,7 @@ DnsSd.prototype._checkDiscoveryParameters = function (params) {
 
   if ('type' in params) {
     const v = params.type
-    if (typeof (v) !== 'string' || !(/^[a-z0-9]{1,10}$/i.test(v) || v === '*')) {
+    if (typeof (v) !== 'string' || !(typeValidRegex.test(v) || v === '*')) {
       return { error: new Error('The `type` is invalid.') }
     }
     p.type = v.toUpperCase()
@@ -231,7 +244,7 @@ DnsSd.prototype._checkDiscoveryParameters = function (params) {
 
   if ('key' in params) {
     let v = params.key
-    if (typeof (v) !== 'string' || !/^(?:address|fqdn)$/.test(v)) {
+    if (typeof (v) !== 'string' || !keyValidRegex.test(v)) {
       return { error: new Error('The `key` is invalid.') }
     }
     if (!v) {
@@ -443,7 +456,7 @@ DnsSd.prototype._getSourceAddressList = function () {
   for (const dev in netifs) {
     netifs[dev].forEach((info) => {
       if (info.family === 'IPv4' && info.internal === false) {
-        const m = info.address.match(/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/)
+        const m = info.address.match(ipv4Regex)
         if (m) {
           list.push(m[1])
         }

package/lib/platform.js

@@ -126,7 +126,7 @@ export default class {
       const [key, val] = entry
       switch (key) {
         case 'apiPort': {
-          if (typeof v === 'string') {
+          if (typeof val === 'string') {
             logQuotes(key)
           }
           const intVal = Number.parseInt(val, 10)
@@ -1845,7 +1845,7 @@ export default class {
           // Try and obtain the eWeLink channel name
           if (device?.tags?.ck_channel_name?.[Number.parseInt(switchNumber, 10) - 1]) {
             // Found the eWeLink channel name
-            newDeviceName = device.tags.ck_channel_name[Number.parseInt(switchNumber, 19) - 1]
+            newDeviceName = device.tags.ck_channel_name[Number.parseInt(switchNumber, 10) - 1]
           } else {
             // Didn't find the eWeLink channel name use generic SW channel
             newDeviceName += ` SW${switchNumber}`
@@ -2046,7 +2046,7 @@ export default class {
       accessory.logDebug(`${this.lang.updSend} ${JSON.stringify(params)}`)
 
       // Send the request via HTTP
-      this.httpClient.updateGroup(accessory.context.eweDeviceId, params)
+      await this.httpClient.updateGroup(accessory.context.eweDeviceId, params)
     })
   }
 
@@ -2134,7 +2134,7 @@ export default class {
     }
 
     // Update this new online/offline status for all switches of multichannel devices
-    if (reachableChange && accessory.context.hbDeviceId.substr(-1) !== 'X') {
+    if (reachableChange && accessory.context.hbDeviceId.slice(-1) !== 'X') {
       // Loop through to see which channels are in HB
       for (let i = 1; i <= accessory.context.channelCount; i += 1) {
         const uuid = this.api.hap.uuid.generate(`${deviceId}SW${i}`)

package/lib/utils/eve-chars.js

@@ -79,7 +79,7 @@ export default class {
         super('Reset Total', uuids.resetTotal)
         this.setProps({
           format: api.hap.Formats.UINT32,
-          unit: api.hap.Units.seconds,
+          unit: api.hap.Units.SECONDS,
           perms: [api.hap.Perms.PAIRED_READ, api.hap.Perms.NOTIFY, api.hap.Perms.PAIRED_WRITE],
         })
         this.value = this.getDefaultValue()

package/lib/utils/functions.js

@@ -7,7 +7,7 @@ function generateRandomString(length) {
   return nonce
 }
 
-const hasProperty = (obj, prop) => Object.prototype.hasOwnProperty.call(obj, prop)
+const hasProperty = (obj, prop) => Object.hasOwn(obj, prop)
 
 function parseDeviceId(deviceId) {
   return deviceId

package/package.json

@@ -3,7 +3,7 @@
   "displayName": "Homebridge eWeLink",
   "alias": "eWeLink",
   "type": "module",
-  "version": "12.11.0",
+  "version": "12.11.1-beta.0",
   "description": "Homebridge plugin to integrate eWeLink devices into HomeKit.",
   "author": {
     "name": "bwp91",
@@ -61,14 +61,14 @@
     "lint:fix": "npm run lint -- --fix"
   },
   "dependencies": {
-    "@homebridge/plugin-ui-utils": "^2.2.0",
-    "axios": "^1.13.6",
+    "@homebridge/plugin-ui-utils": "^2.2.3",
+    "axios": "^1.14.0",
     "node-persist": "^4.0.4",
-    "p-queue": "^9.1.0",
+    "p-queue": "^9.1.1",
     "websocket-as-promised": "^3.0.1",
-    "ws": "^8.19.0"
+    "ws": "^8.20.0"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^7.6.1"
+    "@antfu/eslint-config": "^8.0.0"
   }
 }