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

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

@@ -72,6 +72,10 @@
         </tr>
       </thead>
       <tbody>
+        <tr>
+          <th scope="row">Protocol</th>
+          <td id="deviceProtocol"></td>
+        </tr>
         <tr>
           <th scope="row">Device ID</th>
           <td id="deviceId"></td>
@@ -231,12 +235,20 @@
         document.getElementById('menuSettings').classList.add('btn-primary')
         document.getElementById('pageSupport').style.display = 'none'
         document.getElementById('pageDevices').style.display = 'block'
-        const cachedAccessories =
+        const [cachedAccessories, cachedMatterAccessories] = await Promise.all([
           typeof homebridge.getCachedAccessories === 'function'
-            ? await homebridge.getCachedAccessories()
-            : await homebridge.request('/getCachedAccessories')
-        if (cachedAccessories.length > 0) {
-          cachedAccessories.sort((a, b) => {
+            ? homebridge.getCachedAccessories()
+            : homebridge.request('/getCachedAccessories'),
+          typeof homebridge.getCachedMatterAccessories === 'function'
+            ? homebridge.getCachedMatterAccessories()
+            : Promise.resolve([])
+        ])
+        const allAccessories = [
+          ...cachedAccessories.map(a => ({ ...a, protocol: 'HAP' })),
+          ...cachedMatterAccessories.map(a => ({ ...a, protocol: 'Matter' }))
+        ]
+        if (allAccessories.length > 0) {
+          allAccessories.sort((a, b) => {
             return a.displayName.toLowerCase() > b.displayName.toLowerCase()
               ? 1
               : b.displayName.toLowerCase() > a.displayName.toLowerCase()
@@ -246,17 +258,19 @@
         }
         const deviceSelect = document.getElementById('deviceSelect')
         deviceSelect.innerHTML = ''
-        cachedAccessories.forEach(a => {
+        allAccessories.forEach(a => {
           const option = document.createElement('option')
-          option.text = a.displayName
-          option.value = a.context.ecoDeviceId
+          option.text = a.protocol === 'Matter' ? a.displayName + ' (Matter)' : a.displayName
+          option.value = a.context.ecoDeviceId + '|' + a.protocol
           deviceSelect.add(option)
         })
-        showDeviceInfo = async deviceId => {
+        showDeviceInfo = async deviceValue => {
           homebridge.showSpinner()
-          const thisAcc = cachedAccessories.find(x => x.context.ecoDeviceId === deviceId)
+          const [deviceId, protocol] = deviceValue.split('|')
+          const thisAcc = allAccessories.find(x => x.context.ecoDeviceId === deviceId && x.protocol === protocol)
           const context = thisAcc.context
           document.getElementById('displayName').innerHTML = thisAcc.displayName
+          document.getElementById('deviceProtocol').innerHTML = thisAcc.protocol
           document.getElementById('deviceId').innerHTML = context.ecoDeviceId || 'N/A'
           document.getElementById('deviceOnline').innerHTML = context.isOnline
             ? '<i class="fas fa-circle mr-1 green-text"></i> Online'
@@ -275,8 +289,8 @@
           homebridge.hideSpinner()
         }
         deviceSelect.addEventListener('change', event => showDeviceInfo(event.target.value))
-        if (cachedAccessories.length > 0) {
-          showDeviceInfo(cachedAccessories[0].context.ecoDeviceId)
+        if (allAccessories.length > 0) {
+          showDeviceInfo(allAccessories[0].context.ecoDeviceId + '|' + allAccessories[0].protocol)
         } else {
           const option = document.createElement('option')
           option.text = 'No Devices'

package/package.json

@@ -3,7 +3,7 @@
   "displayName": "Homebridge Ecovacs",
   "alias": "Deebot",
   "type": "module",
-  "version": "7.2.4-beta.0",
+  "version": "7.2.4-beta.1",
   "description": "Homebridge plugin to integrate Ecovacs Deebot devices into HomeKit.",
   "author": {
     "name": "bwp91",
@@ -62,7 +62,7 @@
     "postinstall": "patch-package"
   },
   "dependencies": {
-    "@homebridge/plugin-ui-utils": "^2.1.0",
+    "@homebridge/plugin-ui-utils": "^2.1.1-beta.0",
     "ecovacs-deebot": "^0.9.6-beta.12",
     "patch-package": "^8.0.1"
   },