@homebridge-plugins/homebridge-ecovacs 7.2.4-beta.1 → 7.2.4-beta.2

package/lib/platform.js

@@ -14,6 +14,7 @@ const plugin = require('../package.json')
 
 const devicesInHB = new Map()
 const matterDevicesInHB = new Map()
+const deviceControls = new Map()
 
 export default class {
   constructor(log, config, api) {
@@ -441,9 +442,9 @@ export default class {
       })
 
       // Disconnect from each Ecovacs/Yeedi device
-      devicesInHB.forEach((accessory) => {
-        if (accessory.control?.is_ready) {
-          accessory.control.disconnect()
+      deviceControls.forEach((control) => {
+        if (control?.is_ready) {
+          control.disconnect()
         }
       })
     } catch (err) {
@@ -451,6 +452,11 @@ export default class {
     }
   }
 
+  getControl(accessory) {
+    // Get the device control from the shared deviceControls map
+    return deviceControls.get(accessory.context.ecoDeviceId)
+  }
+
   createMatterRVCAccessory(device, accessory) {
     // Create a Matter RVC (Robotic Vacuum Cleaner) accessory config
     const serialNumber = device.did
@@ -497,7 +503,12 @@ export default class {
 
       context: {
         hapAccessoryUUID: accessory.UUID,
-        deviceId: device.did,
+        ecoDeviceId: device.did,
+        ecoCompany: device.company || 'Ecovacs',
+        ecoModel: device.deviceModel || 'Deebot',
+        ecoClass: device.class,
+        ecoResource: device.resource,
+        ecoImage: device.deviceImageURL,
       },
 
       clusters: {
@@ -876,99 +887,99 @@ export default class {
         accessory.removeService(accessory.getService('TrueDetect'))
       }
 
-      // Save the device control information to the accessory
-      accessory.control = loadedDevice
+      // Save the device control information to the shared deviceControls map
+      deviceControls.set(device.did, loadedDevice)
 
       // Some models can use a V2 for supported commands
-      accessory.context.commandSuffix = accessory.control.is950type_V2()
+      accessory.context.commandSuffix = loadedDevice.is950type_V2()
         ? '_V2'
         : ''
 
       // Set up a listener for the device 'ready' event
-      accessory.control.on('ready', (event) => {
+      loadedDevice.on('ready', (event) => {
         if (event) {
           this.externalReadyUpdate(accessory)
         }
       })
 
       // Set up a listener for the device 'CleanReport' event
-      accessory.control.on('CleanReport', (newVal) => {
+      loadedDevice.on('CleanReport', (newVal) => {
         this.externalCleanUpdate(accessory, newVal)
       })
 
       // Set up a listener for the device 'CurrentCustomAreaValues' event
-      accessory.control.on('CurrentCustomAreaValues', (newVal) => {
+      loadedDevice.on('CurrentCustomAreaValues', (newVal) => {
         accessory.logDebug(`CurrentCustomAreaValues: ${JSON.stringify(newVal)}`)
       })
 
       // Set up a listener for the device 'CleanSpeed' event
-      accessory.control.on('CleanSpeed', (newVal) => {
+      loadedDevice.on('CleanSpeed', (newVal) => {
         this.externalSpeedUpdate(accessory, newVal)
       })
 
       // Set up a listener for the device 'BatteryInfo' event
-      accessory.control.on('BatteryInfo', async (newVal) => {
+      loadedDevice.on('BatteryInfo', async (newVal) => {
         await this.externalBatteryUpdate(accessory, newVal)
       })
 
       // Set up a listener for the device 'AirDryingState' event
       // Only if the service exists
       if (accessory.getService('Air Drying')) {
-        accessory.control.on('AirDryingState', (newVal) => {
+        loadedDevice.on('AirDryingState', (newVal) => {
           this.externalAirDryingUpdate(accessory, newVal)
         })
       }
 
       // Set up a listener for the device 'ChargeState' event
-      accessory.control.on('ChargeState', (newVal) => {
+      loadedDevice.on('ChargeState', (newVal) => {
         this.externalChargeUpdate(accessory, newVal)
       })
 
       // Set up a listener for the device 'NetInfoIP' event
-      accessory.control.on('NetInfoIP', (newVal) => {
+      loadedDevice.on('NetInfoIP', (newVal) => {
         this.externalIPUpdate(accessory, newVal)
       })
 
       // Set up a listener for the device 'NetInfoMAC' event
-      accessory.control.on('NetInfoMAC', (newVal) => {
+      loadedDevice.on('NetInfoMAC', (newVal) => {
         this.externalMacUpdate(accessory, newVal)
       })
 
       if (accessory.context.rawConfig.supportTrueDetect) {
         // Set up a listener for the device 'TrueDetect' event
-        accessory.control.on('TrueDetect', (newVal) => {
+        loadedDevice.on('TrueDetect', (newVal) => {
           this.externalTrueDetectUpdate(accessory, newVal)
         })
       }
 
       // Set up a listener for the device 'message' event
-      accessory.control.on('message', async (msg) => {
+      loadedDevice.on('message', async (msg) => {
         await this.externalMessageUpdate(accessory, msg)
       })
 
       // Set up a listener for the device 'Error' event
-      accessory.control.on('Error', async (err) => {
+      loadedDevice.on('Error', async (err) => {
         if (err) {
           await this.externalErrorUpdate(accessory, err)
         }
       })
 
       // Set up listeners for map data if accessory debug logging is on
-      accessory.control.on('Maps', (maps) => {
+      loadedDevice.on('Maps', (maps) => {
         if (maps) {
           accessory.logDebug(`Maps: ${JSON.stringify(maps)}`)
           Object.keys(maps.maps).forEach((key) => {
-            accessory.control.run('GetSpotAreas', maps.maps[key].mapID)
-            accessory.control.run('GetVirtualBoundaries', maps.maps[key].mapID)
+            loadedDevice.run('GetSpotAreas', maps.maps[key].mapID)
+            loadedDevice.run('GetVirtualBoundaries', maps.maps[key].mapID)
           })
         }
       })
 
-      accessory.control.on('MapSpotAreas', (spotAreas) => {
+      loadedDevice.on('MapSpotAreas', (spotAreas) => {
         if (spotAreas) {
           accessory.logDebug(`MapSpotAreas: ${JSON.stringify(spotAreas)}`)
           Object.keys(spotAreas.mapSpotAreas).forEach((key) => {
-            accessory.control.run(
+            loadedDevice.run(
               'GetSpotAreaInfo',
               spotAreas.mapID,
               spotAreas.mapSpotAreas[key].mapSpotAreaID,
@@ -977,13 +988,13 @@ export default class {
         }
       })
 
-      accessory.control.on('MapSpotAreaInfo', (area) => {
+      loadedDevice.on('MapSpotAreaInfo', (area) => {
         if (area) {
           accessory.logDebug(`MapSpotAreaInfo: ${JSON.stringify(area)}`)
         }
       })
 
-      accessory.control.on('MapVirtualBoundaries', (vbs) => {
+      loadedDevice.on('MapVirtualBoundaries', (vbs) => {
         if (vbs) {
           accessory.logDebug(`MapVirtualBoundaries: ${JSON.stringify(vbs)}`)
           const vbsCombined = [...vbs.mapVirtualWalls, ...vbs.mapNoMopZones]
@@ -992,7 +1003,7 @@ export default class {
             virtualBoundaryArray[vbsCombined[key].mapVirtualBoundaryID] = vbsCombined[key]
           })
           Object.keys(virtualBoundaryArray).forEach((key) => {
-            accessory.control.run(
+            loadedDevice.run(
               'GetVirtualBoundaryInfo',
               vbs.mapID,
               virtualBoundaryArray[key].mapVirtualBoundaryID,
@@ -1002,21 +1013,21 @@ export default class {
         }
       })
 
-      accessory.control.on('MapVirtualBoundaryInfo', (vb) => {
+      loadedDevice.on('MapVirtualBoundaryInfo', (vb) => {
         if (vb) {
           accessory.logDebug(`MapVirtualBoundaryInfo: ${JSON.stringify(vb)}`)
         }
       })
 
       // Connect to the device
-      accessory.control.connect()
+      loadedDevice.connect()
 
       // Refresh the current state of all the accessories
       this.refreshAccessory(accessory)
       const { pollInterval } = accessory.context.rawConfig[device] || platformConsts.defaultValues
       if (pollInterval > 0) {
         this.refreshIntervals[device.did] = setInterval(() => {
-          devicesInHB.get(this.api.hap.uuid.generate(device.did)).control?.refresh()
+          deviceControls.get(device.did)?.refresh()
         }, pollInterval * 1000)
       }
 
@@ -1099,7 +1110,8 @@ export default class {
   refreshAccessory(accessory) {
     try {
       // Check the device has initialised already
-      if (!accessory.control) {
+      const control = this.getControl(accessory)
+      if (!control) {
         return
       }
 
@@ -1108,29 +1120,29 @@ export default class {
 
       // Run the commands to get the state of the device
       accessory.logDebug(`${platformLang.sendCmd} [GetBatteryState]`)
-      accessory.control.run('GetBatteryState')
+      control.run('GetBatteryState')
 
       accessory.logDebug(`${platformLang.sendCmd} [GetChargeState]`)
-      accessory.control.run('GetChargeState')
+      control.run('GetChargeState')
 
       if (accessory.getService('Air Drying')) {
         accessory.logDebug(`${platformLang.sendCmd} [GetAirDrying]`)
-        accessory.control.run('GetAirDrying')
+        control.run('GetAirDrying')
       }
 
       accessory.logDebug(`${platformLang.sendCmd} [GetCleanState${accessory.context.commandSuffix}]`)
-      accessory.control.run(`GetCleanState${accessory.context.commandSuffix}`)
+      control.run(`GetCleanState${accessory.context.commandSuffix}`)
 
       accessory.logDebug(`${platformLang.sendCmd} [GetCleanSpeed]`)
-      accessory.control.run('GetCleanSpeed')
+      control.run('GetCleanSpeed')
 
       accessory.logDebug(`${platformLang.sendCmd} [GetNetInfo]`)
-      accessory.control.run('GetNetInfo')
+      control.run('GetNetInfo')
 
       // TrueDetect if the accessory supports it
       if (accessory.context.rawConfig.supportTrueDetect) {
         accessory.logDebug(`${platformLang.sendCmd} [GetTrueDetect]`)
-        accessory.control.run('GetTrueDetect')
+        control.run('GetTrueDetect')
       }
 
       setTimeout(() => {
@@ -1206,6 +1218,11 @@ export default class {
       this.api.unregisterPlatformAccessories(plugin.name, plugin.alias, [accessory])
       devicesInHB.delete(accessory.UUID)
 
+      // Remove device control if it exists
+      if (accessory.context.ecoDeviceId) {
+        deviceControls.delete(accessory.context.ecoDeviceId)
+      }
+
       // Remove corresponding Matter accessory if it exists
       if (this.matterEnabled && accessory.context.ecoDeviceId) {
         try {
@@ -1232,10 +1249,11 @@ export default class {
   async internalCleanUpdate(accessory, value) {
     try {
       // Don't continue if we can't send commands to the device
-      if (!accessory.control) {
+      const control = this.getControl(accessory)
+      if (!control) {
         throw new Error(platformLang.errNotInit)
       }
-      if (!accessory.control.is_ready) {
+      if (!control.is_ready) {
         throw new Error(platformLang.errNotReady)
       }
 
@@ -1253,7 +1271,16 @@ export default class {
 
       // Send the command
       accessory.logDebug(`${platformLang.sendCmd} [${order}]`)
-      accessory.control.run(order)
+      control.run(order)
+
+      // Update Matter states immediately to keep in sync
+      if (value) {
+        this.updateMatterRunMode(accessory, 1) // Cleaning
+        this.updateMatterOperationalState(accessory, 1) // Running
+      } else {
+        this.updateMatterRunMode(accessory, 0) // Idle
+        this.updateMatterOperationalState(accessory, 0) // Stopped
+      }
     } catch (err) {
       // Catch any errors during the process
       accessory.logWarn(`${platformLang.cleanFail} ${parseError(err, [platformLang.errNotInit, platformLang.errNotReady])}`)
@@ -1271,10 +1298,11 @@ export default class {
   async internalSpeedUpdate(accessory, value) {
     try {
       // Don't continue if we can't send commands to the device
-      if (!accessory.control) {
+      const control = this.getControl(accessory)
+      if (!control) {
         throw new Error(platformLang.errNotInit)
       }
-      if (!accessory.control.is_ready) {
+      if (!control.is_ready) {
         throw new Error(platformLang.errNotReady)
       }
 
@@ -1286,7 +1314,7 @@ export default class {
 
       // Send the command
       accessory.logDebug(`${platformLang.sendCmd} [SetCleanSpeed: ${command}]`)
-      accessory.control.run('SetCleanSpeed', command)
+      control.run('SetCleanSpeed', command)
     } catch (err) {
       // Catch any errors during the process
       accessory.logWarn(`${platformLang.speedFail} ${parseError(err, [platformLang.errNotInit, platformLang.errNotReady])}`)
@@ -1304,10 +1332,11 @@ export default class {
   async internalPredefinedAreaUpdate(accessory, value) {
     try {
       // Don't continue if we can't send commands to the device
-      if (!accessory.control) {
+      const control = this.getControl(accessory)
+      if (!control) {
         throw new Error(platformLang.errNotInit)
       }
-      if (!accessory.control.is_ready) {
+      if (!control.is_ready) {
         throw new Error(platformLang.errNotReady)
       }
 
@@ -1359,9 +1388,9 @@ export default class {
           accessory.logDebug(`${platformLang.sendCmd} [SpotArea${accessory.context.commandSuffix}: ${command}]`)
 
           if (accessory.context.commandSuffix === '_V2') {
-            accessory.control.run('SpotArea_V2', command)
+            control.run('SpotArea_V2', command)
           } else {
-            accessory.control.run('SpotArea', 'start', command)
+            control.run('SpotArea', 'start', command)
           }
           break
 
@@ -1369,9 +1398,9 @@ export default class {
           accessory.logDebug(`${platformLang.sendCmd} [CustomArea${accessory.context.commandSuffix}: ${command}]`)
 
           if (accessory.context.commandSuffix === '_V2') {
-            accessory.control.run('CustomArea_V2', command)
+            control.run('CustomArea_V2', command)
           } else {
-            accessory.control.run('CustomArea', 'start', command)
+            control.run('CustomArea', 'start', command)
           }
           break
 
@@ -1402,10 +1431,11 @@ export default class {
   async internalChargeUpdate(accessory, value) {
     try {
       // Don't continue if we can't send commands to the device
-      if (!accessory.control) {
+      const control = this.getControl(accessory)
+      if (!control) {
         throw new Error(platformLang.errNotInit)
       }
-      if (!accessory.control.is_ready) {
+      if (!control.is_ready) {
         throw new Error(platformLang.errNotReady)
       }
 
@@ -1426,7 +1456,16 @@ export default class {
 
       // Send the command
       accessory.logDebug(`${platformLang.sendCmd} [${order}]`)
-      accessory.control.run(order)
+      control.run(order)
+
+      // Update Matter states immediately to keep in sync
+      if (value) {
+        this.updateMatterRunMode(accessory, 0) // Idle
+        this.updateMatterOperationalState(accessory, 64) // Seeking Charger
+      } else {
+        this.updateMatterRunMode(accessory, 0) // Idle
+        this.updateMatterOperationalState(accessory, 0) // Stopped
+      }
     } catch (err) {
       // Catch any errors during the process
       accessory.logWarn(`${platformLang.chargeFail} ${parseError(err, [platformLang.errNotInit, platformLang.errNotReady])}`)
@@ -1444,10 +1483,11 @@ export default class {
   async internalAirDryingUpdate(accessory, value) {
     try {
       // Don't continue if we can't send commands to the device
-      if (!accessory.control) {
+      const control = this.getControl(accessory)
+      if (!control) {
         throw new Error(platformLang.errNotInit)
       }
-      if (!accessory.control.is_ready) {
+      if (!control.is_ready) {
         throw new Error(platformLang.errNotReady)
       }
 
@@ -1459,7 +1499,7 @@ export default class {
 
       // Send the command
       accessory.logDebug(`${platformLang.sendCmd} [${order}]`)
-      accessory.control.run(order)
+      control.run(order)
     } catch (err) {
       // Catch any errors during the process
       accessory.logWarn(`${platformLang.airDryingFail} ${parseError(err, [platformLang.errNotInit, platformLang.errNotReady])}`)
@@ -1477,10 +1517,11 @@ export default class {
   async internalTrueDetectUpdate(accessory, value) {
     try {
       // Don't continue if we can't send commands to the device
-      if (!accessory.control) {
+      const control = this.getControl(accessory)
+      if (!control) {
         throw new Error(platformLang.errNotInit)
       }
-      if (!accessory.control.is_ready) {
+      if (!control.is_ready) {
         throw new Error(platformLang.errNotReady)
       }
 
@@ -1492,7 +1533,7 @@ export default class {
 
       // Send the command
       accessory.logDebug(`${platformLang.sendCmd} [${command}]`)
-      accessory.control.run(command)
+      control.run(command)
     } catch (err) {
       // Catch any errors during the process
       accessory.logWarn(`${platformLang.cleanFail} ${parseError(err, [platformLang.errNotInit, platformLang.errNotReady])}`)
@@ -1510,23 +1551,28 @@ export default class {
   externalReadyUpdate(accessory) {
     try {
       // Called on the 'ready' event sent by the device so request update for states
+      const control = this.getControl(accessory)
+      if (!control) {
+        return
+      }
+
       accessory.logDebug(`${platformLang.sendCmd} [GetBatteryState]`)
-      accessory.control.run('GetBatteryState')
+      control.run('GetBatteryState')
 
       accessory.log(`${platformLang.sendCmd} [GetChargeState]`)
-      accessory.control.run('GetChargeState')
+      control.run('GetChargeState')
 
       accessory.logDebug(`${platformLang.sendCmd} [GetCleanState${accessory.context.commandSuffix}]`)
-      accessory.control.run(`GetCleanState${accessory.context.commandSuffix}`)
+      control.run(`GetCleanState${accessory.context.commandSuffix}`)
 
       accessory.logDebug(`${platformLang.sendCmd} [GetCleanSpeed]`)
-      accessory.control.run('GetCleanSpeed')
+      control.run('GetCleanSpeed')
 
       accessory.logDebug(`${platformLang.sendCmd} [GetNetInfo]`)
-      accessory.control.run('GetNetInfo')
+      control.run('GetNetInfo')
 
       accessory.logDebug(`${platformLang.sendCmd} [GetMaps]`)
-      accessory.control.run('GetMaps')
+      control.run('GetMaps')
     } catch (err) {
       // Catch any errors during the process
       accessory.logWarn(`${platformLang.inRdyFail} ${parseError(err)}`)

package/package.json

@@ -3,7 +3,7 @@
   "displayName": "Homebridge Ecovacs",
   "alias": "Deebot",
   "type": "module",
-  "version": "7.2.4-beta.1",
+  "version": "7.2.4-beta.2",
   "description": "Homebridge plugin to integrate Ecovacs Deebot devices into HomeKit.",
   "author": {
     "name": "bwp91",