@homebridge-plugins/homebridge-ecovacs 7.0.2 → 7.1.4-beta.0

package/CHANGELOG.md

@@ -2,11 +2,53 @@
 
 All notable changes to homebridge-ecovacs will be documented in this file.
 
-This project tries to adhere to [Semantic Versioning](http://semver.org/). In practice, this means that the version number will be incremented based on the following:
+## v7.2.4 (Unreleased)
 
-- `MAJOR` version when a minimum supported version of `homebridge` or `node` is increased to a new major version, or when a breaking change is made to the plugin config
-- `MINOR` version when a new device type is added, or when a new feature is added that is backwards-compatible
-- `PATCH` version when backwards-compatible bug fixes are implemented
+### Changes
+
+- updated dependencies
+- option to expose as a vacuum robot in homekit
+
+## v7.2.3 (2025-07-24)
+
+### Other Changes
+
+- dependency updates
+
+## v7.2.2 (2025-07-18)
+
+### Other Changes
+
+- add maintainer message
+
+## v7.2.1 (2025-07-16)
+
+### Other Changes
+
+- clear cache values on reset, fix go charge on
+
+## v7.2.0 (2025-07-13)
+
+### Notable Changes
+
+- fix custom plugin config modal styles in ui 5
+- fix custom characteristics for hb 2
+
+### Other Changes
+
+- add `lint` step to build workflow
+- add permissions to workflows
+- improvements to the deprecate workflow
+
+## v7.1.0 (2025-07-12)
+
+### Notable Changes
+
+- set `strictValidation` to `true` in the config schema file
+
+### Other Changes
+
+- github repo maintenance
 
 ## v7.0.2 (2025-07-11)
 
@@ -296,7 +338,7 @@ This project tries to adhere to [Semantic Versioning](http://semver.org/). In pr
 
 - Ignore `Robot is operational` error in log
 - Updated `ecovacs-deebot` library to v0.6.3
-- Remove `node-machine-id` in favour of generating a client id based on ECOVACS username
+- Remove `node-machine-id` in favour of generating a client id based on Ecovacs username
 
 ## v4.1.0 (2021-08-30)
 
@@ -338,7 +380,7 @@ _Unpublished_
 
 ### Added
 
-- Support for cleaning 'Spot Areas' customised in the ECOVACS app
+- Support for cleaning 'Spot Areas' customised in the Ecovacs app
 
 ## v3.3.1 (2021-07-18)
 
@@ -442,7 +484,7 @@ _Unpublished_
 
 - Configuration settings per Deebot device
 - Support for Chinese server login
-- Enter your ECOVACS password as a base64 encoded string and use the option `encodedPassword` to let the plugin know
+- Enter your Ecovacs password as a base64 encoded string and use the option `encodedPassword` to let the plugin know
 - More viewable information in the Homebridge plugin-ui:
   - Device model, company and an image of your device in case you didn't know what it looked like
 

package/README.md

@@ -5,7 +5,7 @@
 
 # homebridge-ecovacs
 
-Homebridge plugin to integrate ECOVACS Deebot or Yeedi devices into HomeKit
+Homebridge plugin to integrate Ecovacs Deebot or Yeedi devices into HomeKit
 
 [![npm](https://img.shields.io/npm/v/@homebridge-plugins/homebridge-ecovacs/latest?label=latest)](https://www.npmjs.com/package/@homebridge-plugins/homebridge-ecovacs)
 [![npm](https://img.shields.io/npm/v/@homebridge-plugins/homebridge-ecovacs/beta?label=beta)](https://github.com/homebridge-plugins/homebridge-ecovacs/wiki/Beta-Version)
@@ -20,10 +20,12 @@ Homebridge plugin to integrate ECOVACS Deebot or Yeedi devices into HomeKit
 
 ### Plugin Information
 
-- This plugin allows you to view and control your ECOVACS or Yeedi devices within HomeKit. The plugin:
-  - requires your ECOVACS or Yeedi credentials to function
+- This plugin allows you to view and control your Ecovacs or Yeedi devices within HomeKit. The plugin:
+  - requires your Ecovacs or Yeedi credentials to function
   - uses a cloud-based connection (i.e. requires the internet)
 
+> I'm looking for some lovely people to help maintain this plugin, please get in touch on GitHub or Discord if you'd like to help out 😄
+
 ### Prerequisites
 
 - To use this plugin, you will need to already have:
@@ -59,5 +61,5 @@ Homebridge plugin to integrate ECOVACS Deebot or Yeedi devices into HomeKit
 
 ### Disclaimer
 
-- I am in no way affiliated with ECOVACS/Deebot/Yeedi and this plugin is a personal project that I maintain in my free time.
+- I am in no way affiliated with Ecovacs/Deebot/Yeedi and this plugin is a personal project that I maintain in my free time.
 - Use this plugin entirely at your own risk - please see licence for more information.

package/config.schema.json

@@ -2,6 +2,7 @@
   "pluginAlias": "Deebot",
   "pluginType": "platform",
   "singular": true,
+  "strictValidation": true,
   "customUi": true,
   "customUiPath": "./lib/homebridge-ui",
   "headerDisplay": "<p align=\"center\"><img width=\"60%\" src=\"https://user-images.githubusercontent.com/43026681/101321841-f0eb5280-385d-11eb-8dd4-f57113f6e078.png\"></p><p align=\"center\">For help and support please visit our <a href=\"https://github.com/homebridge-plugins/homebridge-ecovacs/wiki\">GitHub Wiki</a>. We hope you find this plugin useful!</p>",
@@ -16,7 +17,7 @@
       "useYeedi": {
         "title": "Use Yeedi Login",
         "type": "boolean",
-        "description": "Enable this for Yeedi login instead of ECOVACS."
+        "description": "Enable this for Yeedi login instead of Ecovacs."
       },
       "countryCode": {
         "title": "Country Code",
@@ -25,13 +26,13 @@
         "required": true
       },
       "username": {
-        "title": "ECOVACS/Yeedi Username",
+        "title": "Ecovacs/Yeedi Username",
         "required": true,
         "type": "string",
-        "description": "Your username, if your account is based in China you should use your ECOVACS ID."
+        "description": "Your username, if your account is based in China you should use your Ecovacs ID."
       },
       "password": {
-        "title": "ECOVACS/Yeedi Password",
+        "title": "Ecovacs/Yeedi Password",
         "required": true,
         "type": "string",
         "description": "Your password, can also be a base64 encoded version of your password."
@@ -56,7 +57,7 @@
             "deviceId": {
               "title": "Device ID",
               "type": "string",
-              "description": "ECOVACS Device ID of the device these settings apply to, can be of format E2000000000000000000 or 11111111-aaaa-bbbb-2222-cccccccccccc."
+              "description": "Ecovacs Device ID of the device these settings apply to, can be of format E2000000000000000000 or 11111111-aaaa-bbbb-2222-cccccccccccc."
             },
             "ignoreDevice": {
               "type": "boolean",
@@ -70,7 +71,7 @@
               "title": "Polling Interval",
               "type": "integer",
               "placeholder": 120,
-              "description": "An interval (in seconds) in which this device will refresh with ECOVACS. Set to 0 to disable, otherwise must be 30 or more."
+              "description": "An interval (in seconds) in which this device will refresh with Ecovacs. Set to 0 to disable, otherwise must be 30 or more."
             },
             "hideMotionSensor": {
               "title": "Hide Motion Sensor",

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

@@ -1,3 +1,39 @@
+<style>
+  .dark-mode {
+    background-color: #242424;
+    color: lightgrey;
+
+    .form-control {
+      background-color: #333333 !important;
+      border: none !important;
+      color: #eeeeee !important;
+    }
+
+    thead, tbody, tr {
+      border-style: hidden;
+    }
+
+    th {
+      color: #eeeeee !important;
+      font-weight: 500 !important;
+    }
+  }
+  select {
+    background-image:
+      linear-gradient(45deg, transparent 50%, gray 50%),
+      linear-gradient(135deg, gray 50%, transparent 50%),
+      linear-gradient(to right, #ccc, #ccc);
+    background-position:
+      calc(100% - 20px) calc(1em + 2px),
+      calc(100% - 15px) calc(1em + 2px),
+      calc(100% - 2.5em) 0.5em;
+    background-size:
+      5px 5px,
+      5px 5px,
+      1px 1.5em;
+    background-repeat: no-repeat;
+  }
+</style>
 <p class="text-center">
   <img
     src="https://user-images.githubusercontent.com/43026681/101321841-f0eb5280-385d-11eb-8dd4-f57113f6e078.png"
@@ -7,7 +43,7 @@
 </p>
 <div id="pageIntro" class="text-center" style="display: none;">
   <p class="lead">Thank you for installing <strong>homebridge-ecovacs</strong></p>
-  <p>You will need to enter your ECOVACS username, password and region on the next page</p>
+  <p>You will need to enter your Ecovacs username, password and region on the next page</p>
   <button type="button" class="btn btn-primary" id="introContinue">Continue &rarr;</button>
 </div>
 <div
@@ -28,7 +64,7 @@
         <select class="form-control" id="deviceSelect"></select>
       </div>
     </form>
-    <table class="table w-100" id="deviceTable" style="display: none;">
+    <table class="table w-100 mt-3" id="deviceTable" style="display: none;">
       <thead>
         <tr class="table-active">
           <th scope="col" style="width: 40%;">Device Name</th>
@@ -161,7 +197,7 @@
   <h4>Disclaimer</h4>
   <ul>
     <li>
-      I am in no way affiliated with ECOVACS and this plugin is a personal project that I maintain
+      I am in no way affiliated with Ecovacs and this plugin is a personal project that I maintain
       in my free time.
     </li>
     <li>Use this plugin entirely at your own risk - please see licence for more information.</li>

package/lib/platform.js

@@ -13,6 +13,7 @@ const require = createRequire(import.meta.url)
 const plugin = require('../package.json')
 
 const devicesInHB = new Map()
+const matterDevicesInHB = new Map()
 
 export default class {
   constructor(log, config, api) {
@@ -26,6 +27,9 @@ export default class {
       this.log = log
       this.isBeta = plugin.version.includes('beta')
 
+      // Check if Matter is available and enabled
+      this.matterEnabled = api.isMatterAvailable?.() && api.isMatterEnabled?.()
+
       // Configuration objects for accessories
       this.deviceConf = {}
       this.ignoredDevices = []
@@ -363,7 +367,7 @@ export default class {
       // Require any libraries that the accessory instances use
       this.cusChar = new platformChars(this.api)
 
-      // Connect to ECOVACS/Yeedi
+      // Connect to Ecovacs/Yeedi
       this.ecovacsAPI = new EcoVacsAPI(
         EcoVacsAPI.getDeviceId(this.api.hap.uuid.generate(this.config.username)),
         this.config.countryCode,
@@ -374,7 +378,14 @@ export default class {
       // Display version of the ecovacs-deebot library in the log
       this.log('%s v%s.', platformLang.ecovacsLibVersion, this.ecovacsAPI.getVersion())
 
-      // Attempt to log in to ECOVACS/Yeedi
+      // Log Matter availability
+      if (this.matterEnabled) {
+        this.log('Matter support is enabled - vacuums will be exposed via both HAP and Matter.')
+      } else {
+        this.log('Matter support is not available - vacuums will be exposed via HAP only.')
+      }
+
+      // Attempt to log in to Ecovacs/Yeedi
       try {
         await this.ecovacsAPI.connect(this.config.username, EcoVacsAPI.md5(this.config.password))
       } catch (err) {
@@ -393,7 +404,7 @@ export default class {
         }
       }
 
-      // Get a device list from ECOVACS/Yeedi
+      // Get a device list from Ecovacs/Yeedi
       const deviceList = await this.ecovacsAPI.devices()
 
       // Check the request for device list was successful
@@ -402,7 +413,7 @@ export default class {
       }
 
       // Initialise each device into Homebridge
-      this.log('[%s] %s.', deviceList.length, platformLang.deviceCount(this.config.useYeedi ? 'Yeedi' : 'ECOVACS'))
+      this.log('[%s] %s.', deviceList.length, platformLang.deviceCount(this.config.useYeedi ? 'Yeedi' : 'Ecovacs'))
       for (let i = 0; i < deviceList.length; i += 1) {
         await this.initialiseDevice(deviceList[i])
       }
@@ -429,7 +440,7 @@ export default class {
         clearInterval(this.refreshIntervals[id])
       })
 
-      // Disconnect from each ECOVACS/Yeedi device
+      // Disconnect from each Ecovacs/Yeedi device
       devicesInHB.forEach((accessory) => {
         if (accessory.control?.is_ready) {
           accessory.control.disconnect()
@@ -440,6 +451,230 @@ export default class {
     }
   }
 
+  createMatterRVCAccessory(device, accessory) {
+    // Create a Matter RVC (Robotic Vacuum Cleaner) accessory config
+    const serialNumber = device.did
+    const displayName = device.nick || device.did
+
+    // Get device types we need
+    const RoboticVacuumCleanerType = this.api.matter.deviceTypes.RoboticVacuumCleaner
+
+    // Create bound handler functions that preserve the platform context
+    const boundHandlers = {
+      rvcRunMode: {
+        changeToMode: (request) => {
+          return this.handleMatterRunModeChange(accessory, request)
+        },
+      },
+      rvcOperationalState: {
+        pause: () => {
+          return this.handleMatterPause(accessory)
+        },
+        stop: () => {
+          return this.handleMatterStop(accessory)
+        },
+        start: () => {
+          return this.handleMatterStart(accessory)
+        },
+        resume: () => {
+          return this.handleMatterResume(accessory)
+        },
+        goHome: () => {
+          return this.handleMatterGoHome(accessory)
+        },
+      },
+    }
+
+    return {
+      uuid: this.api.matter.uuid.generate(serialNumber),
+      displayName,
+      deviceType: RoboticVacuumCleanerType,
+      serialNumber,
+      manufacturer: device.company || 'Ecovacs',
+      model: device.deviceModel || 'Deebot',
+      firmwareRevision: '1.0.0',
+      hardwareRevision: '1.0.0',
+
+      context: {
+        hapAccessoryUUID: accessory.UUID,
+        deviceId: device.did,
+      },
+
+      clusters: {
+        // Run Mode: Idle or Cleaning
+        rvcRunMode: {
+          supportedModes: [
+            { label: 'Idle', mode: 0, modeTags: [{ value: 16384 }] }, // RvcRunMode.ModeTag.Idle
+            { label: 'Cleaning', mode: 1, modeTags: [{ value: 16385 }] }, // RvcRunMode.ModeTag.Cleaning
+          ],
+          currentMode: 0, // Start as Idle
+        },
+        // Clean Mode: Just Vacuum mode
+        rvcCleanMode: {
+          supportedModes: [
+            { label: 'Vacuum', mode: 0, modeTags: [{ value: 16385 }] }, // RvcCleanMode.ModeTag.Vacuum
+          ],
+          currentMode: 0,
+        },
+        // Operational State
+        rvcOperationalState: {
+          operationalStateList: [
+            { operationalStateId: 0, operationalStateLabel: 'Stopped' },
+            { operationalStateId: 1, operationalStateLabel: 'Running' },
+            { operationalStateId: 2, operationalStateLabel: 'Paused' },
+            { operationalStateId: 3, operationalStateLabel: 'Error' },
+            { operationalStateId: 64, operationalStateLabel: 'Seeking Charger' },
+            { operationalStateId: 65, operationalStateLabel: 'Charging' },
+            { operationalStateId: 66, operationalStateLabel: 'Docked' },
+          ],
+          operationalState: 66, // Start docked
+        },
+      },
+
+      handlers: boundHandlers,
+    }
+  }
+
+  async handleMatterRunModeChange(accessory, request) {
+    try {
+      const { newMode } = request
+      accessory.logDebug(`Matter: ChangeToMode (run) request received: mode=${newMode}`)
+
+      if (newMode === 1) {
+        // Switching to Cleaning mode - start cleaning
+        await this.internalCleanUpdate(accessory, true)
+      } else if (newMode === 0) {
+        // Switching to Idle mode - stop or return to dock
+        await this.internalChargeUpdate(accessory, true)
+      }
+    } catch (err) {
+      accessory.logWarn(`Matter: Run mode change failed ${parseError(err)}`)
+    }
+  }
+
+  async handleMatterPause(accessory) {
+    try {
+      accessory.logDebug('Matter: Pause request received')
+      // Stop the vacuum
+      // TODO work out which devices have a pause and implement properly
+      await this.internalCleanUpdate(accessory, false)
+
+      // Update Matter states immediately
+      this.updateMatterRunMode(accessory, 0) // idle
+      this.updateMatterOperationalState(accessory, 0) // stopped
+    } catch (err) {
+      accessory.logWarn(`Matter: Pause failed ${parseError(err)}`)
+    }
+  }
+
+  async handleMatterStop(accessory) {
+    try {
+      accessory.logDebug('Matter: Stop request received')
+      await this.internalCleanUpdate(accessory, false)
+
+      // Update Matter states immediately
+      this.updateMatterRunMode(accessory, 0) // idle
+      this.updateMatterOperationalState(accessory, 0) // stopped
+    } catch (err) {
+      accessory.logWarn(`Matter: Stop failed ${parseError(err)}`)
+    }
+  }
+
+  async handleMatterStart(accessory) {
+    try {
+      accessory.logDebug('Matter: Start request received')
+      await this.internalCleanUpdate(accessory, true)
+    } catch (err) {
+      accessory.logWarn(`Matter: Start failed ${parseError(err)}`)
+    }
+  }
+
+  async handleMatterResume(accessory) {
+    try {
+      accessory.logDebug('Matter: Resume request received')
+      await this.internalCleanUpdate(accessory, true)
+    } catch (err) {
+      accessory.logWarn(`Matter: Resume failed ${parseError(err)}`)
+    }
+  }
+
+  async handleMatterGoHome(accessory) {
+    try {
+      accessory.logDebug('Matter: GoHome request received')
+      await this.internalChargeUpdate(accessory, true)
+    } catch (err) {
+      accessory.logWarn(`Matter: GoHome failed ${parseError(err)}`)
+    }
+  }
+
+  updateMatterOperationalState(accessory, state) {
+    // Update Matter operational state if Matter is enabled and accessory has Matter UUID
+    if (!this.matterEnabled || !accessory.matterUUID || !accessory.matterReady) {
+      return
+    }
+
+    try {
+      this.api.matter.updateAccessoryState(accessory.matterUUID, 'rvcOperationalState', {
+        operationalState: state,
+      })
+      accessory.logDebug(`Matter: Operational state updated to ${state}`)
+    } catch (err) {
+      accessory.logError(`Matter: Failed to update operational state: ${parseError(err)}`)
+    }
+  }
+
+  updateMatterRunMode(accessory, mode) {
+    // Update Matter run mode if Matter is enabled and accessory has Matter UUID
+    if (!this.matterEnabled || !accessory.matterUUID || !accessory.matterReady) {
+      return
+    }
+
+    try {
+      this.api.matter.updateAccessoryState(accessory.matterUUID, 'rvcRunMode', {
+        currentMode: mode,
+      })
+      accessory.logDebug(`Matter: Run mode updated to ${mode}`)
+    } catch (err) {
+      accessory.logError(`Matter: Failed to update run mode: ${parseError(err)}`)
+    }
+  }
+
+  updateMatterStateFromHAP(accessory) {
+    // Sync current HAP state to Matter when Matter becomes ready
+    if (!this.matterEnabled || !accessory.matterUUID || !accessory.matterReady) {
+      return
+    }
+
+    try {
+      // Sync cleaning state
+      const isActive = ['auto', 'clean', 'edge', 'spot', 'spotarea', 'customarea'].includes(
+        (accessory.context.cacheClean || '').toLowerCase().replace(/[^a-z]+/g, ''),
+      )
+      if (isActive) {
+        this.updateMatterRunMode(accessory, 1) // Cleaning
+        this.updateMatterOperationalState(accessory, 1) // Running
+      } else {
+        this.updateMatterRunMode(accessory, 0) // Idle
+      }
+
+      // Sync charging state
+      const chargeStateLower = (accessory.context.cacheCharge || '').toLowerCase()
+      if (chargeStateLower === 'charging') {
+        this.updateMatterOperationalState(accessory, 65) // charging
+      } else if (chargeStateLower === 'returning') {
+        this.updateMatterOperationalState(accessory, 64) // seeking charger
+      } else if (chargeStateLower === 'idle') {
+        this.updateMatterOperationalState(accessory, 66) // docked
+      } else if (!isActive) {
+        this.updateMatterOperationalState(accessory, 0) // stopped
+      }
+
+      accessory.logDebug('Matter: Initial state synchronized from HAP')
+    } catch (err) {
+      accessory.logError(`Matter: Failed to sync initial state: ${parseError(err)}`)
+    }
+  }
+
   initialiseDevice(device) {
     try {
       // Generate the Homebridge UUID from the device id
@@ -453,7 +688,7 @@ export default class {
         return
       }
 
-      // Load the device control information from ECOVACS/Yeedi
+      // Load the device control information from Ecovacs/Yeedi
       const loadedDevice = this.ecovacsAPI.getVacBot(
         this.ecovacsAPI.uid,
         EcoVacsAPI.REALM,
@@ -495,6 +730,21 @@ export default class {
       accessory.context.isOnline = false
       accessory.context.lastMsg = ''
 
+      // Remove the existing cache values from the context
+      // accessory.context.cacheClean
+      // accessory.context.cacheCharge
+      // accessory.context.cacheAirDrying
+      // accessory.context.cacheSpeed
+      // accessory.context.cacheBattery
+      const cacheKeys = [
+        'cacheClean',
+        'cacheCharge',
+        'cacheAirDrying',
+        'cacheSpeed',
+        'cacheBattery',
+      ]
+      cacheKeys.forEach(key => delete accessory.context[key])
+
       // Add the 'clean' switch service if it doesn't already exist
       const cleanService = accessory.getService('Clean') || accessory.addService(this.hapServ.Switch, 'Clean', 'clean')
       if (!cleanService.testCharacteristic(this.hapChar.ConfiguredName)) {
@@ -774,6 +1024,49 @@ export default class {
       this.api.updatePlatformAccessories([accessory])
       devicesInHB.set(accessory.UUID, accessory)
 
+      // Register Matter RVC accessory if Matter is enabled
+      if (this.matterEnabled) {
+        try {
+          const matterUUID = this.api.matter.uuid.generate(device.did)
+
+          // Check if this Matter accessory already exists
+          const existingMatterAccessory = matterDevicesInHB.get(matterUUID)
+
+          if (!existingMatterAccessory) {
+            // Create and publish new Matter RVC accessory
+            const matterAccessory = this.createMatterRVCAccessory(device, accessory)
+
+            // Mark Matter accessory as not ready yet
+            accessory.matterReady = false
+            accessory.matterUUID = matterUUID
+
+            // Publish the accessory and listen for the READY event
+            const published = this.api.matter.publishExternalAccessories(plugin.name, [matterAccessory])
+
+            // Listen for when the Matter accessory is ready
+            if (published && published[0] && published[0]._eventEmitter) {
+              published[0]._eventEmitter.on('ready', () => {
+                accessory.matterReady = true
+                accessory.log('Matter RVC accessory is ready.')
+
+                // Update initial state now that it's ready
+                this.updateMatterStateFromHAP(accessory)
+              })
+            }
+
+            matterDevicesInHB.set(matterUUID, matterAccessory)
+            this.log('[%s] Matter RVC accessory published.', accessory.displayName)
+          } else {
+            // Matter accessory already exists, just link it
+            accessory.matterUUID = matterUUID
+            accessory.matterReady = true // Assume existing accessories are ready
+            accessory.logDebug('Matter RVC accessory already registered.')
+          }
+        } catch (err) {
+          accessory.logWarn(`Failed to register Matter RVC accessory: ${parseError(err)}`)
+        }
+      }
+
       // Log configuration and device initialisation
       this.log(
         '[%s] %s: %s.',
@@ -897,31 +1190,38 @@ export default class {
   }
 
   configureAccessory(accessory) {
-    // Add the configured accessory to our global map
+    this.log.debug(`[${accessory.displayName}] loading cached hap accessory.`)
     devicesInHB.set(accessory.UUID, accessory)
-    accessory
-      .getService('Clean')
-      .getCharacteristic(this.api.hap.Characteristic.On)
-      .onSet(() => {
-        this.log.warn('[%s] %s.', accessory.displayName, platformLang.accNotReady)
-        throw new this.api.hap.HapStatusError(-70402)
-      })
-      .updateValue(new this.api.hap.HapStatusError(-70402))
-    accessory
-      .getService('Go Charge')
-      .getCharacteristic(this.api.hap.Characteristic.On)
-      .onSet(() => {
-        this.log.warn('[%s] %s.', accessory.displayName, platformLang.accNotReady)
-        throw new this.api.hap.HapStatusError(-70402)
-      })
-      .updateValue(new this.api.hap.HapStatusError(-70402))
+  }
+
+  configureMatterAccessory(accessory) {
+    this.log.debug(`[${accessory.displayName}] loading cached matter accessory.`)
+    matterDevicesInHB.set(accessory.uuid, accessory)
   }
 
   removeAccessory(accessory) {
     // Remove an accessory from Homebridge
     try {
+      // Remove HAP accessory
       this.api.unregisterPlatformAccessories(plugin.name, plugin.alias, [accessory])
       devicesInHB.delete(accessory.UUID)
+
+      // Remove corresponding Matter accessory if it exists
+      if (this.matterEnabled && accessory.context.ecoDeviceId) {
+        try {
+          const matterUUID = this.api.matter.uuid.generate(accessory.context.ecoDeviceId)
+          const matterAccessory = matterDevicesInHB.get(matterUUID)
+
+          if (matterAccessory) {
+            this.api.matter.unpublishExternalAccessories([matterAccessory])
+            matterDevicesInHB.delete(matterUUID)
+            this.log.debug('[%s] Matter RVC accessory removed.', accessory.displayName)
+          }
+        } catch (matterErr) {
+          this.log.warn('[%s] Failed to remove Matter accessory: %s', accessory.displayName, parseError(matterErr))
+        }
+      }
+
       this.log('[%s] %s.', accessory.displayName, platformLang.devRemove)
     } catch (err) {
       // Catch any errors during remove
@@ -949,7 +1249,7 @@ export default class {
       const order = value ? `Clean${accessory.context.commandSuffix}` : 'Stop'
 
       // Log the update
-      accessory.log(`${platformLang.curCleaning} [${value ? platformLang.cleaning : platformLang.stop}}]`)
+      accessory.log(`${platformLang.curCleaning} [${value ? platformLang.cleaning : platformLang.stop}]`)
 
       // Send the command
       accessory.logDebug(`${platformLang.sendCmd} [${order}]`)
@@ -1023,7 +1323,7 @@ export default class {
       // Avoid quick switching with this function
       const updateKey = Math.random()
         .toString(36)
-        .substr(2, 8)
+        .slice(2, 10)
       accessory.context.lastCommandKey = updateKey
       await sleep(1)
       if (updateKey !== accessory.context.lastCommandKey) {
@@ -1135,7 +1435,7 @@ export default class {
       setTimeout(() => {
         accessory
           .getService('Go Charge')
-          .updateCharacteristic(this.hapChar.On, accessory.context.cacheCharge === 'charging')
+          .updateCharacteristic(this.hapChar.On, accessory.context.cacheCharge === 'returning')
       }, 2000)
       throw new this.hapErr(-70402)
     }
@@ -1240,15 +1540,25 @@ export default class {
 
       // Check if the new cleaning state is different from the cached state
       if (accessory.context.cacheClean !== newVal) {
-        // State is different so update service
+        const isActive = ['auto', 'clean', 'edge', 'spot', 'spotarea', 'customarea'].includes(
+          newVal.toLowerCase().replace(/[^a-z]+/g, ''),
+        )
+
+        // State is different so update HAP service
         accessory
           .getService('Clean')
-          .updateCharacteristic(
-            this.hapChar.On,
-            ['auto', 'clean', 'edge', 'spot', 'spotarea', 'customarea'].includes(
-              newVal.toLowerCase().replace(/[^a-z]+/g, ''),
-            ),
-          )
+          .updateCharacteristic(this.hapChar.On, isActive)
+
+        // Update Matter states
+        if (isActive) {
+          // Vacuum is cleaning
+          this.updateMatterRunMode(accessory, 1) // Cleaning mode
+          this.updateMatterOperationalState(accessory, 1) // Running state
+        } else {
+          // Vacuum is not cleaning - could be idle or stopped
+          this.updateMatterRunMode(accessory, 0) // Idle mode
+          this.updateMatterOperationalState(accessory, 0) // Stopped state
+        }
 
         // Log the change
         accessory.log(`${platformLang.curCleaning} [${newVal}]`)
@@ -1341,7 +1651,7 @@ export default class {
 
       // Check if the new charging state is different from the cached state
       if (accessory.context.cacheCharge !== newVal) {
-        // State is different so update service
+        // State is different so update HAP service
         accessory
           .getService('Go Charge')
           .updateCharacteristic(this.hapChar.On, newVal === 'returning')
@@ -1350,6 +1660,19 @@ export default class {
           .getService(this.hapServ.Battery)
           .updateCharacteristic(this.hapChar.ChargingState, chargeState)
 
+        // Update Matter operational state based on charge state
+        const chargeStateLower = newVal.toLowerCase()
+        if (chargeStateLower === 'charging') {
+          this.updateMatterRunMode(accessory, 0) // Idle mode
+          this.updateMatterOperationalState(accessory, 65) // Charging
+        } else if (chargeStateLower === 'returning') {
+          this.updateMatterRunMode(accessory, 0) // Idle mode
+          this.updateMatterOperationalState(accessory, 64) // Seeking Charger
+        } else if (chargeStateLower === 'idle') {
+          this.updateMatterRunMode(accessory, 0) // Idle mode
+          this.updateMatterOperationalState(accessory, 66) // Docked
+        }
+
         // Log the change
         accessory.log(`${platformLang.curCharging} [${newVal}]`)
       }

package/lib/utils/custom-chars.js

@@ -1,50 +1,51 @@
-import { inherits } from 'node:util'
-
 export default class {
   constructor(api) {
-    this.hapChar = api.hap.Characteristic
     this.uuids = {
       maxSpeed: 'E963F001-079E-48FF-8F27-9C2605A29F52',
       predefinedArea: 'E963F002-079E-48FF-8F27-9C2605A29F52',
       trueDetect: 'E963F003-079E-48FF-8F27-9C2605A29F52',
     }
-    const self = this
-    this.MaxSpeed = function MaxSpeed() {
-      self.hapChar.call(this, 'Max Speed', self.uuids.maxSpeed)
-      this.setProps({
-        format: api.hap.Formats.BOOL,
-        perms: [api.hap.Perms.PAIRED_READ, api.hap.Perms.PAIRED_WRITE, api.hap.Perms.NOTIFY],
-      })
-      this.value = this.getDefaultValue()
+    const uuids = this.uuids
+
+    this.MaxSpeed = class extends api.hap.Characteristic {
+      constructor() {
+        super('Max Speed', uuids.maxSpeed)
+        this.setProps({
+          format: api.hap.Formats.BOOL,
+          perms: [api.hap.Perms.PAIRED_READ, api.hap.Perms.PAIRED_WRITE, api.hap.Perms.NOTIFY],
+        })
+        this.value = this.getDefaultValue()
+      }
     }
 
-    this.PredefinedArea = function PredefinedArea() {
-      self.hapChar.call(this, 'Predefined Area', self.uuids.predefinedArea)
-      this.setProps({
-        format: api.hap.Formats.UINT8,
-        perms: [api.hap.Perms.PAIRED_READ, api.hap.Perms.PAIRED_WRITE, api.hap.Perms.NOTIFY],
-        minValue: 0,
-        maxValue: 15,
-        minStep: 1,
-        validValues: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15],
-      })
-      this.value = this.getDefaultValue()
+    this.PredefinedArea = class extends api.hap.Characteristic {
+      constructor() {
+        super('Predefined Area', uuids.predefinedArea)
+        this.setProps({
+          format: api.hap.Formats.UINT8,
+          perms: [api.hap.Perms.PAIRED_READ, api.hap.Perms.PAIRED_WRITE, api.hap.Perms.NOTIFY],
+          minValue: 0,
+          maxValue: 15,
+          minStep: 1,
+          validValues: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15],
+        })
+        this.value = this.getDefaultValue()
+      }
     }
 
-    this.TrueDetect = function TrueDetect() {
-      self.hapChar.call(this, 'TrueDetect', self.uuids.trueDetect)
-      this.setProps({
-        format: api.hap.Formats.BOOL,
-        perms: [api.hap.Perms.PAIRED_READ, api.hap.Perms.PAIRED_WRITE, api.hap.Perms.NOTIFY],
-      })
-      this.value = this.getDefaultValue()
+    this.TrueDetect = class extends api.hap.Characteristic {
+      constructor() {
+        super('TrueDetect', uuids.trueDetect)
+        this.setProps({
+          format: api.hap.Formats.BOOL,
+          perms: [api.hap.Perms.PAIRED_READ, api.hap.Perms.PAIRED_WRITE, api.hap.Perms.NOTIFY],
+        })
+        this.value = this.getDefaultValue()
+      }
     }
 
-    inherits(this.MaxSpeed, this.hapChar)
-    inherits(this.PredefinedArea, this.hapChar)
-    inherits(this.TrueDetect, this.hapChar)
-    this.MaxSpeed.UUID = this.uuids.maxSpeed
     this.PredefinedArea.UUID = this.uuids.predefinedArea
     this.TrueDetect.UUID = this.uuids.trueDetect
+    this.MaxSpeed.UUID = this.uuids.maxSpeed
   }
 }

package/lib/utils/lang-en.js

@@ -74,6 +74,6 @@ export default {
   speedFail: 'sending speed update failed as',
   stop: 'stop',
   typeForArea: 'Type for predefined area',
-  welcome: 'This plugin has been made with ♥ by bwp91, please consider a ☆ on GitHub if you are finding it useful!',
+  welcome: 'I\'m looking for some lovely people to help maintain this plugin, please get in touch on GitHub or Discord if you\'d like to help out 😄',
   unknownCommandTypeForArea: 'Unknown command type for predefined area',
 }

package/package.json

@@ -3,8 +3,8 @@
   "displayName": "Homebridge Ecovacs",
   "alias": "Deebot",
   "type": "module",
-  "version": "7.0.2",
-  "description": "Homebridge plugin to integrate ECOVACS Deebot devices into HomeKit.",
+  "version": "7.1.4-beta.0",
+  "description": "Homebridge plugin to integrate Ecovacs Deebot devices into HomeKit.",
   "author": {
     "name": "bwp91",
     "email": "bwp91@icloud.com"
@@ -57,21 +57,21 @@
     "node": "^20 || ^22 || ^24"
   },
   "scripts": {
-    "lint": "eslint . --fix",
-    "postinstall": "patch-package",
-    "rebuild": "rm -rf package-lock.json && rm -rf node_modules && npm install"
+    "lint": "eslint . --max-warnings=0",
+    "lint:fix": "npm run lint -- --fix",
+    "postinstall": "patch-package"
   },
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^2.1.0",
-    "ecovacs-deebot": "^0.9.6-beta.8",
-    "patch-package": "^8.0.0"
+    "ecovacs-deebot": "^0.9.6-beta.12",
+    "patch-package": "^8.0.1"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^4.16.2"
+    "@antfu/eslint-config": "^6.1.0"
   },
   "overrides": {
-    "ecovacs-deebot": {
-      "axios": "^1.10.0"
+    "request": {
+      "form-data": "^2.5.4"
     }
   }
 }

package/patches/{ecovacs-deebot+0.9.6-beta.8.patch → ecovacs-deebot+0.9.6-beta.12.patch}

@@ -1,5 +1,5 @@
 diff --git a/node_modules/ecovacs-deebot/library/tools.js b/node_modules/ecovacs-deebot/library/tools.js
-index d484ba1..1ad1f14 100644
+index d484ba1..eb8e866 100644
 --- a/node_modules/ecovacs-deebot/library/tools.js
 +++ b/node_modules/ecovacs-deebot/library/tools.js
 @@ -369,11 +369,13 @@ function envLogRaw(message) {