@homebridge-plugins/homebridge-ewelink 12.3.3 → 12.4.1

package/lib/device/switch-mate.js

@@ -43,7 +43,7 @@ export default class {
 
     // Add the stateless switch service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.StatelessProgrammableSwitch)
-    || this.accessory.addService(this.hapServ.StatelessProgrammableSwitch)
+      || this.accessory.addService(this.hapServ.StatelessProgrammableSwitch)
 
     // Output the customised options to the log
     const normalLogging = this.enableLogging ? 'standard' : 'disable'

package/lib/device/switch-multi.js

@@ -61,7 +61,7 @@ export default class {
 
     // 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.accessory.addService(this.hapServ.Switch)
 
     if (platformConsts.devices.switchMultiPower.includes(this.accessory.context.eweUIID)) {
       // Add Eve power characteristics

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

@@ -59,7 +59,7 @@ export default class {
 
     // 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.accessory.addService(this.hapServ.Switch)
 
     switch (this.accessory.context.eweUIID) {
       case 5:

package/lib/device/switch-single.js

@@ -58,7 +58,7 @@ export default class {
 
     // 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.accessory.addService(this.hapServ.Switch)
 
     // Some models provide a power reading in different decimals
     this.divisor = 1

package/lib/device/thermostat.js

@@ -67,7 +67,7 @@ export default class {
 
     // Add the thermostat service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.Thermostat)
-    || this.accessory.addService(this.hapServ.Thermostat)
+      || this.accessory.addService(this.hapServ.Thermostat)
 
     // Set custom properties of the current temperature characteristic
     this.service.getCharacteristic(this.hapChar.CurrentTemperature).setProps({

package/lib/device/zigbee/index.js

@@ -10,6 +10,7 @@ import deviceSensorOccupancy from './sensor-occupancy.js'
 import deviceSensorSmoke from './sensor-smoke.js'
 import deviceSwitchStateless from './switch-stateless.js'
 import deviceThermostat from './thermostat.js'
+import deviceZigbeeWaterValve from './zigbee-water-valve.js'
 
 export default {
   deviceLightCCT,
@@ -24,4 +25,5 @@ export default {
   deviceSensorSmoke,
   deviceSwitchStateless,
   deviceThermostat,
+  deviceZigbeeWaterValve,
 }

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

@@ -48,7 +48,7 @@ export default class {
 
     // Add the lightbulb service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.Lightbulb)
-    || this.accessory.addService(this.hapServ.Lightbulb)
+      || this.accessory.addService(this.hapServ.Lightbulb)
 
     // If adaptive lighting has just been disabled then remove and re-add service to hide AL icon
     if (this.alShift === -1 && this.accessory.context.adaptiveLighting) {

package/lib/device/zigbee/light-dimmer.js

@@ -43,7 +43,7 @@ export default class {
 
     // Add the lightbulb service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.Lightbulb)
-    || this.accessory.addService(this.hapServ.Lightbulb)
+      || this.accessory.addService(this.hapServ.Lightbulb)
 
     // Add the get/set handler to the lightbulb on/off characteristic
     this.service

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

@@ -48,7 +48,7 @@ export default class {
 
     // Add the lightbulb service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.Lightbulb)
-    || this.accessory.addService(this.hapServ.Lightbulb)
+      || this.accessory.addService(this.hapServ.Lightbulb)
 
     // If adaptive lighting has just been disabled then remove and re-add service to hide AL icon
     if (this.alShift === -1 && this.accessory.context.adaptiveLighting) {

package/lib/device/zigbee/motor.js

@@ -48,7 +48,7 @@ export default class {
 
     // Add the battery service if it doesn't already exist
     this.battService = this.accessory.getService(this.hapServ.Battery)
-    || this.accessory.addService(this.hapServ.Battery)
+      || this.accessory.addService(this.hapServ.Battery)
     this.cacheBatt = this.battService.getCharacteristic(this.hapChar.BatteryLevel).value
 
     // Add the window covering service if it doesn't already exist

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

@@ -48,7 +48,7 @@ export default class {
 
     // Add the temperature sensor service if it doesn't already exist
     this.tempService = this.accessory.getService(this.hapServ.TemperatureSensor)
-    || this.accessory.addService(this.hapServ.TemperatureSensor)
+      || this.accessory.addService(this.hapServ.TemperatureSensor)
 
     // Add options to the current temperature characteristic
     this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
@@ -59,11 +59,11 @@ export default class {
 
     // Add the humidity sensor service if it doesn't already exist
     this.humiService = this.accessory.getService(this.hapServ.HumiditySensor)
-    || this.accessory.addService(this.hapServ.HumiditySensor)
+      || this.accessory.addService(this.hapServ.HumiditySensor)
 
     // Add the battery service if it doesn't already exist
     this.battService = this.accessory.getService(this.hapServ.Battery)
-    || this.accessory.addService(this.hapServ.Battery)
+      || this.accessory.addService(this.hapServ.Battery)
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('weather', this.accessory, {

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

@@ -60,7 +60,7 @@ export default class {
 
     // Add the battery service if it doesn't already exist
     this.battService = this.accessory.getService(this.hapServ.Battery)
-    || this.accessory.addService(this.hapServ.Battery)
+      || this.accessory.addService(this.hapServ.Battery)
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('door', this.accessory, {

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

@@ -51,7 +51,7 @@ export default class {
 
     // Add the battery service if it doesn't already exist
     this.battService = this.accessory.getService(this.hapServ.Battery)
-    || this.accessory.addService(this.hapServ.Battery)
+      || this.accessory.addService(this.hapServ.Battery)
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('motion', this.accessory, {

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

@@ -51,7 +51,7 @@ export default class {
 
     // Add the battery service if it doesn't already exist
     this.battService = this.accessory.getService(this.hapServ.Battery)
-    || this.accessory.addService(this.hapServ.Battery)
+      || this.accessory.addService(this.hapServ.Battery)
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('motion', this.accessory, {

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

@@ -51,7 +51,7 @@ export default class {
 
     // Add the battery service if it doesn't already exist
     this.battService = this.accessory.getService(this.hapServ.Battery)
-    || this.accessory.addService(this.hapServ.Battery)
+      || this.accessory.addService(this.hapServ.Battery)
 
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('motion', this.accessory, {

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

@@ -43,11 +43,11 @@ export default class {
 
     // Add the smoke sensor service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.SmokeSensor)
-    || this.accessory.addService(this.hapServ.SmokeSensor)
+      || this.accessory.addService(this.hapServ.SmokeSensor)
 
     // Add the battery service if it doesn't already exist
     this.battService = this.accessory.getService(this.hapServ.Battery)
-    || this.accessory.addService(this.hapServ.Battery)
+      || this.accessory.addService(this.hapServ.Battery)
 
     // Output the customised options to the log
     const normalLogging = this.enableLogging ? 'standard' : 'disable'

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

@@ -44,7 +44,7 @@ export default class {
 
     // Add the stateless switch service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.StatelessProgrammableSwitch)
-    || this.accessory.addService(this.hapServ.StatelessProgrammableSwitch)
+      || this.accessory.addService(this.hapServ.StatelessProgrammableSwitch)
 
     // Hide the double and long press options if the user wants
     if (this.hideLongDouble) {
@@ -55,7 +55,7 @@ export default class {
 
     // Add the battery service if it doesn't already exist
     this.battService = this.accessory.getService(this.hapServ.Battery)
-    || this.accessory.addService(this.hapServ.Battery)
+      || this.accessory.addService(this.hapServ.Battery)
 
     // Output the customised options to the log
     const normalLogging = this.enableLogging ? 'standard' : 'disable'

package/lib/device/zigbee/thermostat.js

@@ -75,7 +75,7 @@ export default class {
 
     // Add the thermostat service if it doesn't already exist
     this.service = this.accessory.getService(this.hapServ.Thermostat)
-    || this.accessory.addService(this.hapServ.Thermostat)
+      || this.accessory.addService(this.hapServ.Thermostat)
 
     // Set custom properties of the current temperature characteristic
     this.service.getCharacteristic(this.hapChar.CurrentTemperature).setProps({

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

@@ -0,0 +1,195 @@
+import { hasProperty } from '../../utils/functions.js'
+
+export default class {
+  constructor(platform, accessory) {
+    this.hapChar = platform.api.hap.Characteristic
+    this.hapServ = platform.api.hap.Service
+    this.hapErr = platform.api.hap.HapStatusError
+    this.log = platform.log
+    this.platform = platform
+    this.lang = platform.lang
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Set up custom variables for this device type
+    this.enableLogging = !platform.config.disableDeviceLogging
+
+    // Initialize cache state
+    this.cacheState = false
+
+    // Initialize timer references
+    this.timer = null
+    this.updateInterval = null
+
+    // 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)
+    }
+
+    // Restore timer state if it exists
+    if (this.accessory.context.timerEndTime) {
+      const now = Date.now()
+      if (now < this.accessory.context.timerEndTime) {
+        // 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)
+      } 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
+      }
+    }
+
+    // Set up event handlers for Active characteristic
+    this.service
+      .getCharacteristic(this.hapChar.Active)
+      .onSet(async (value) => {
+        try {
+          const newState = value === 1
+          if (this.enableLogging) {
+            this.log('[%s] Setting valve to [%s]', this.name, newState ? 'On' : 'Off')
+          }
+
+          // Send command to the device
+          await this.platform.sendDeviceUpdate(this.accessory, {
+            switch: newState,
+          })
+
+          // Update InUse characteristic to match Active
+          this.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)
+          } else {
+            // If turning off, clear the timer and reset remaining duration
+            this.clearTimer()
+          }
+
+          // Update cache after successful command
+          this.cacheState = newState
+        } catch (err) {
+          // Revert the characteristic state on error
+          this.service.updateCharacteristic(this.hapChar.Active, this.cacheState)
+          this.service.updateCharacteristic(this.hapChar.InUse, this.cacheState)
+          this.platform.deviceUpdateError(this.accessory, err, false)
+          throw new this.hapErr(-70402)
+        }
+      })
+
+    // Set up handler for SetDuration characteristic
+    this.service.getCharacteristic(this.hapChar.SetDuration)
+      .onSet((value) => {
+        if (this.service.getCharacteristic(this.hapChar.InUse).value === 1) {
+          // Update timer with new duration if valve is currently active
+          this.startTimer(value)
+        }
+      })
+
+    this.log('[%s] initialized as a Zigbee Smart Water Valve.', this.name)
+  }
+
+  startTimer(duration) {
+    // Clear any existing timer
+    this.clearTimer()
+
+    // Set timer end time and store it in context
+    this.accessory.context.timerEndTime = Date.now() + (duration * 1000)
+
+    // Update remaining duration
+    this.service.updateCharacteristic(this.hapChar.RemainingDuration, duration)
+
+    // Set new timer
+    this.timer = setTimeout(async () => {
+      try {
+        // Send explicit command to turn off the valve
+        await this.platform.sendDeviceUpdate(this.accessory, {
+          switch: 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
+
+        // Update cache state
+        this.cacheState = false
+
+        if (this.enableLogging) {
+          this.log('[%s] Timer finished - turning valve [OFF]', this.name)
+        }
+      } catch (err) {
+        this.platform.deviceUpdateError(this.accessory, err, false)
+      }
+    }, duration * 1000)
+
+    // Start a periodic update of remaining duration
+    if (this.updateInterval) {
+      clearInterval(this.updateInterval)
+      this.updateInterval = null
+    }
+    this.updateInterval = setInterval(() => {
+      const remaining = Math.round((this.accessory.context.timerEndTime - Date.now()) / 1000)
+      if (remaining > 0) {
+        this.service.updateCharacteristic(this.hapChar.RemainingDuration, remaining)
+      } else {
+        clearInterval(this.updateInterval)
+        this.updateInterval = null
+      }
+    }, 1000)
+  }
+
+  clearTimer() {
+    if (this.timer) {
+      clearTimeout(this.timer)
+      this.timer = null
+    }
+    if (this.updateInterval) {
+      clearInterval(this.updateInterval)
+      this.updateInterval = null
+    }
+    delete this.accessory.context.timerEndTime
+    this.service.updateCharacteristic(this.hapChar.RemainingDuration, 0)
+  }
+
+  async externalUpdate(params) {
+    try {
+      // Handle On/Off state
+      if (hasProperty(params, 'switch')) {
+        const newState = !!params.switch
+        if (newState !== this.cacheState) {
+          this.cacheState = newState
+          const value = newState ? 1 : 0
+          this.service.updateCharacteristic(this.hapChar.Active, value)
+          this.service.updateCharacteristic(this.hapChar.InUse, value)
+
+          if (!newState) {
+            // If turned off externally, clear timer
+            this.clearTimer()
+          }
+
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] Valve state updated to [%s]', this.name, newState ? 'On' : 'Off')
+          }
+        }
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+
+  markStatus(isOnline) {
+    this.isOnline = isOnline
+  }
+}

package/lib/fakegato/fakegato-history.js

@@ -1,5 +1,6 @@
 import { Buffer } from 'node:buffer'
 import { format as Format } from 'node:util'
+
 import FakeGatoStorage from './fakegato-storage.js'
 import FakeGatoTimer from './fakegato-timer.js'
 import { toLongFormUUID, toShortFormUUID } from './uuid.js'
@@ -50,7 +51,7 @@ export default function (homebridge) {
       super('S2R1', S2R1Characteristic.UUID)
       this.setProps({
         format: homebridge.hap.Formats.DATA,
-        perms: [homebridge.hap.Perms.READ, homebridge.hap.Perms.NOTIFY, homebridge.hap.Perms.HIDDEN],
+        perms: [homebridge.hap.Perms.PAIRED_READ, homebridge.hap.Perms.NOTIFY, homebridge.hap.Perms.HIDDEN],
       })
     }
   }
@@ -62,7 +63,7 @@ export default function (homebridge) {
       super('S2R2', S2R2Characteristic.UUID)
       this.setProps({
         format: homebridge.hap.Formats.DATA,
-        perms: [homebridge.hap.Perms.READ, homebridge.hap.Perms.NOTIFY, homebridge.hap.Perms.HIDDEN],
+        perms: [homebridge.hap.Perms.PAIRED_READ, homebridge.hap.Perms.NOTIFY, homebridge.hap.Perms.HIDDEN],
       })
     }
   }
@@ -74,7 +75,7 @@ export default function (homebridge) {
       super('S2W1', S2W1Characteristic.UUID)
       this.setProps({
         format: homebridge.hap.Formats.DATA,
-        perms: [homebridge.hap.Perms.WRITE, homebridge.hap.Perms.HIDDEN],
+        perms: [homebridge.hap.Perms.PAIRED_WRITE, homebridge.hap.Perms.HIDDEN],
       })
     }
   }
@@ -86,7 +87,7 @@ export default function (homebridge) {
       super('S2W2', S2W2Characteristic.UUID)
       this.setProps({
         format: homebridge.hap.Formats.DATA,
-        perms: [homebridge.hap.Perms.WRITE, homebridge.hap.Perms.HIDDEN],
+        perms: [homebridge.hap.Perms.PAIRED_WRITE, homebridge.hap.Perms.HIDDEN],
       })
     }
   }

package/lib/homebridge-ui/public/index.html

@@ -226,6 +226,7 @@
         const introContinue = document.getElementById('introContinue')
         introContinue.addEventListener('click', () => {
           homebridge.showSpinner()
+          homebridge.disableSaveButton?.()
           document.getElementById('pageIntro').style.display = 'none'
           document.getElementById('menuWrapper').style.display = 'inline-flex'
           showSettings()
@@ -235,6 +236,7 @@
       }
       showDevices = async () => {
         homebridge.showSpinner()
+        homebridge.disableSaveButton?.()
         homebridge.hideSchemaForm()
         document.getElementById('menuHome').classList.remove('btn-elegant')
         document.getElementById('menuHome').classList.add('btn-primary')
@@ -306,6 +308,7 @@
       }
       showSupport = () => {
         homebridge.showSpinner()
+        homebridge.disableSaveButton?.()
         homebridge.hideSchemaForm()
         document.getElementById('menuHome').classList.add('btn-elegant')
         document.getElementById('menuHome').classList.remove('btn-primary')
@@ -319,6 +322,7 @@
       }
       showSettings = () => {
         homebridge.showSpinner()
+        homebridge.enableSaveButton?.()
         document.getElementById('menuHome').classList.remove('btn-elegant')
         document.getElementById('menuHome').classList.add('btn-primary')
         document.getElementById('menuDevices').classList.remove('btn-elegant')

package/lib/homebridge-ui/server.js

@@ -1,4 +1,5 @@
 import fs from 'node:fs'
+
 import { HomebridgePluginUiServer } from '@homebridge/plugin-ui-utils'
 
 class PluginUiServer extends HomebridgePluginUiServer {

package/lib/index.js

@@ -1,4 +1,5 @@
 import { createRequire } from 'node:module'
+
 import ewelinkPlatform from './platform.js'
 
 const require = createRequire(import.meta.url)

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

@@ -15,7 +15,7 @@ import { createRequire } from 'node:module'
 
 const require = createRequire(import.meta.url)
 
-const DnsSdComposer = function () {
+function DnsSdComposer() {
   this._CLASSES = require('./dns-sd-classes.json')
   this._TYPES = require('./dns-sd-types.json')
 }

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

@@ -23,7 +23,7 @@ const require = createRequire(import.meta.url)
 /* ------------------------------------------------------------------
 * Constructor: DnsSdParser()
 * ---------------------------------------------------------------- */
-const DnsSdParser = function () {
+function DnsSdParser() {
   this._CLASSES = require('./dns-sd-classes.json')
   this._CLASS_MAP = {}
   Object.keys(this._CLASSES).forEach((k) => {

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

@@ -8,13 +8,14 @@
 
 import mDgram from 'node:dgram'
 import mOs from 'node:os'
+
 import mDnsSdComposer from './dns-sd-composer.js'
 import mDnsSdParser from './dns-sd-parser.js'
 
 /* ------------------------------------------------------------------
 * Constructor: DnsSd()
 * ---------------------------------------------------------------- */
-const DnsSd = function () {
+function DnsSd() {
   // Public
   this.ondata = () => { }
 

package/lib/platform.js

@@ -2,8 +2,10 @@ import { createServer } from 'node:http'
 import { createRequire } from 'node:module'
 import { join } from 'node:path'
 import process from 'node:process'
+
 import storage from 'node-persist'
 import PQueue from 'p-queue'
+
 import apiClient from './connection/api.js'
 import httpClient from './connection/http.js'
 import lanClient from './connection/lan.js'
@@ -1479,7 +1481,7 @@ export default class {
 
           // Get the sub accessory if it's new or hasn't been removed above
           subAccessory = devicesInHB.get(uuidsub)
-          || this.addAccessory(device, fullDeviceId, false, subExtraContext, 'rf_sub')
+            || this.addAccessory(device, fullDeviceId, false, subExtraContext, 'rf_sub')
 
           // Add context information to the sub accessory
           subAccessory.context.firmware = device.params.fwVersion || plugin.version
@@ -1644,6 +1646,16 @@ export default class {
         this.applyAccessoryLogging(accessory)
         accessory.control = new deviceTypes.zb.deviceThermostat(this, accessory)
         /** */
+      } else if (platformConsts.devices.zbWaterValve.includes(uiid)) {
+        /**
+         *******************
+         ZB WATER VALVE
+         ********************
+         */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`)
+        this.applyAccessoryLogging(accessory)
+        accessory.control = new deviceTypes.zb.deviceZigbeeWaterValve(this, accessory)
+        /** */
       } else if (platformConsts.devices.group.includes(uiid)) {
         /**
          ***********
@@ -1846,16 +1858,15 @@ export default class {
 
       // Add helpful context values to the accessory
       accessory.context = {
-        ...{
-          hbDeviceId,
-          eweDeviceId: device.deviceid,
-          eweUIID: device.extra.uiid,
-          eweModel: device.productModel,
-          eweApiKey: device.apikey,
-          switchNumber,
-          channelCount,
-          hidden,
-        },
+
+        hbDeviceId,
+        eweDeviceId: device.deviceid,
+        eweUIID: device.extra.uiid,
+        eweModel: device.productModel,
+        eweApiKey: device.apikey,
+        switchNumber,
+        channelCount,
+        hidden,
         ...extraContext,
       }
 
@@ -1903,16 +1914,15 @@ export default class {
 
       // Add helpful context values to the accessory
       accessory.context = {
-        ...{
-          hbDeviceId,
-          eweDeviceId: device.deviceid,
-          eweUIID: device.extra.uiid,
-          eweModel: device.productModel,
-          eweApiKey: device.apikey,
-          switchNumber: hbDeviceId.split('SW')[1].toString(),
-          channelCount: platformConsts.supportedDevices[device.extra.uiid],
-          hidden: false,
-        },
+
+        hbDeviceId,
+        eweDeviceId: device.deviceid,
+        eweUIID: device.extra.uiid,
+        eweModel: device.productModel,
+        eweApiKey: device.apikey,
+        switchNumber: hbDeviceId.split('SW')[1].toString(),
+        channelCount: platformConsts.supportedDevices[device.extra.uiid],
+        hidden: false,
       }
 
       // Register the accessory

package/lib/utils/constants.js

@@ -284,7 +284,7 @@ export default {
       211,
       212,
     ],
-    switchSingle: [1, 6, 14, 24, 27, 1009, 1256, 7004, 7005],
+    switchSingle: [1, 6, 14, 24, 27, 226, 1009, 1256, 7004, 7005, 7010],
     switchSCM: [77, 78, 81, 107, 112, 138, 160, 191, 209],
     switchSCMPower: [182, 190],
     switchSinglePower: [5, 32],
@@ -347,6 +347,7 @@ export default {
     zbSensorWater: [4026],
     zbSensorSmoke: [5026],
     zbThermostat: [7017],
+    zbWaterValve: [7027],
     group: [5000],
     template: [130], // SPM sub unit
     cannotSupport: [0, 65, 118, 119, 120, 121],
@@ -505,6 +506,7 @@ export default {
     210: 2, // Sonoff Ultimate Switch T5-2C-86
     211: 3, // Sonoff Ultimate Switch T5-3C-86
     212: 4, // Sonoff Ultimate Switch T5-4C-86
+    226: 1, // https://github.com/homebridge-plugins/homebridge-ewelink/issues/636
     243: 1, // Zigbee Bridge Ultra
     1000: 1, // "zigbee_ON_OFF_SWITCH_1000" (button device)
     1009: 1, // "" (Some sort of single switch device)
@@ -529,9 +531,11 @@ export default {
     7004: 1, // Zigbee Single-Channel Switch ­_Support OTA
     7005: 1, // Some switch, not entirely sure
     7006: 1, // Zigbee Curtain_Support OTA
+    7010: 1, // Zigbee Micro https://github.com/homebridge-plugins/homebridge-ewelink/issues/630
     7014: 1, // some sensor https://github.com/homebridge-plugins/homebridge-ewelink/issues/494
     7016: 1, // https://sonoff.tech/product/gateway-and-sensors/snzb-06p/
     7017: 1, // https://github.com/homebridge-plugins/homebridge-ewelink/issues/518
+    7027: 1, // Zigbee Smart Water Valve
   },
 
   cannotSupportDevices: {