@homebridge-plugins/homebridge-resideo 3.1.4 → 3.2.0-beta.0

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## v3.2.0 (Pending Release)
+
+### Changed
+
+- feat(ui): add, remove and hide devices from the config via the devices tab
+
+## v3.1.5 (2026-07-24)
+
+### Changed
+
+- fix(ui): spell out that the sign-in window wants the resideo app account, not the developer account (#930) (@dash16)
+
 ## v3.1.4 (2026-07-20)
 
 ### Changed

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

@@ -1,3 +1,19 @@
+<style>
+   .min-w-50 {
+      min-width: 50px;
+   }
+   .action-desc {
+      font-size: 0.85rem;
+   }
+   .dark-mode .list-group-item {
+      background-color: #333333;
+      border-color: #444444;
+      color: #eeeeee;
+   }
+   .dark-mode .text-muted {
+      color: #aaaaaa !important;
+   }
+</style>
 <p class="text-center">
    <img
       src="https://raw.githubusercontent.com/homebridge-plugins/homebridge-resideo/latest/branding/Homebridge_x_Resideo.svg"
@@ -7,8 +23,13 @@
    <p class="lead text-center">Thank you for installing <strong>homebridge-resideo</strong></p>
    <p class="lead text-center">Before continuing:</p>
    <ol>
-      <li class="mb-3">Login / create an account at <a href="https://developer.honeywellhome.com/user" target="_blank"
-            rel="noreferrer noopener">https://developer.honeywellhome.com/user</a>.</li>
+      <li class="mb-3">Login / create a <strong>developer</strong> account at <a
+            href="https://developer.honeywellhome.com/user" target="_blank"
+            rel="noreferrer noopener">https://developer.honeywellhome.com/user</a>.
+         <br>
+         <small class="text-muted">This is a separate account from the one you use in the Honeywell Home / Resideo
+            app. It is only used to generate the key and secret below.</small>
+      </li>
       <li class="mb-3">Click <strong>Create New App</strong>.</li>
       <li class="mb-3">
          Give your application a name, and enter the 'Callback URL' exactly as it is displayed below.
@@ -63,6 +84,17 @@
       <label for="inputConsumerSecret">Consumer Secret <span class="text-danger">*</span></label>
       <input type="text" class="form-control" id="inputConsumerSecret">
    </div>
+   <div class="alert alert-info">
+      <strong>Which account does the next window want?</strong>
+      <br>
+      Continuing opens a Honeywell/Resideo sign-in window. Sign in there with your
+      <strong>Honeywell Home / Resideo app</strong> account &mdash; the same email and password you use in the phone
+      app to see your thermostats. That is <em>not</em> the developer account you used above, and your browser may try
+      to autofill the wrong one.
+      <br>
+      <small>If that account will not sign in even though the password is right, use <strong>Forgot
+            password</strong> in that window and reset it &mdash; that has fixed it for others.</small>
+   </div>
    <div class="form-group text-center">
       <button type="button" class="btn btn-primary" id="backToIntro">&larr;</button>
       <button type="button" class="btn btn-primary" id="linkButton">Continue &rarr;</button>
@@ -72,11 +104,46 @@
 <div id="pageDevices" class="mt-4" style="display: none;">
    <div id="deviceInfo">
       <form>
-         <div class="form-group">
+         <div class="form-group mb-0">
             <select class="form-control" id="deviceSelect"></select>
          </div>
       </form>
-      <table class="table w-100" id="deviceTable" style="display: none;">
+      <ul class="list-group mt-4 mb-4 mx-0" id="configActionList" style="display: none;">
+         <li class="list-group-item">
+            <div class="d-flex justify-content-between align-items-center">
+               <div class="pr-2">
+                  <div>Add All Devices</div>
+                  <div class="text-muted action-desc">Add all devices to the config that are not already in the config.</div>
+               </div>
+               <button type="button" class="btn btn-primary m-0 ml-3 py-1 min-w-50" id="addAllBtn" aria-label="Add all devices to the config">
+                  <i aria-hidden="true" class="fas fa-arrow-right"></i>
+               </button>
+            </div>
+         </li>
+         <li class="list-group-item">
+            <div class="d-flex justify-content-between align-items-center">
+               <div class="pr-2">
+                  <div id="deviceConfigTitle">Add This Device</div>
+                  <div class="text-muted action-desc" id="deviceConfigText">Add this device to the plugin config.</div>
+               </div>
+               <button type="button" class="btn btn-primary m-0 ml-3 py-1 min-w-50" id="deviceConfigBtn" aria-label="Add this device to the config">
+                  <i aria-hidden="true" class="fas fa-arrow-right"></i>
+               </button>
+            </div>
+         </li>
+         <li class="list-group-item">
+            <div class="d-flex justify-content-between align-items-center">
+               <div class="pr-2">
+                  <div id="hideDeviceTitle">Hide This Device</div>
+                  <div class="text-muted action-desc" id="hideDeviceText">Hide this device from HomeKit. This adds the device to the config if needed.</div>
+               </div>
+               <button type="button" class="btn btn-primary m-0 ml-3 py-1 min-w-50" id="hideDeviceBtn" aria-label="Hide this device from HomeKit">
+                  <i aria-hidden="true" class="fas fa-arrow-right"></i>
+               </button>
+            </div>
+         </li>
+      </ul>
+      <table class="table w-100 mt-0" id="deviceTable" style="display: none;">
          <thead>
             <tr class="table-active">
                <th scope="col" style="width: 40%;">Device Name</th>
@@ -165,6 +232,227 @@
    ; (async () => {
       try {
          const currentConfig = await homebridge.getPluginConfig()
+
+         // ===== Device picker (add/remove/hide config entries from the Devices tab) =====
+         // The control state is always computed from a fresh getPluginConfig() call,
+         // so staged-but-unsaved edits made in the Settings tab are respected
+         let pickerAccessories = []
+         let removeConfirmTimer
+
+         // The action buttons always show the settings-page arrow; the row text
+         // (and the button's aria-label) says what the arrow will do
+         const actionArrow = '<i aria-hidden="true" class="fas fa-arrow-right"></i>'
+
+         // The platform merges device config by exact trimmed id, so the
+         // picker mirrors that rather than a looser comparison
+         const cleanId = id => (id || '').toString().trim()
+
+         const getConfigBlocks = async () => {
+            const blocks = await homebridge.getPluginConfig()
+            if (!blocks.length) {
+               blocks.push({ name: 'Resideo' })
+            }
+            return blocks
+         }
+
+         // The devices array lives nested under options
+         const getDevicesArray = (config, create) => {
+            if (!config.options || typeof config.options !== 'object') {
+               if (!create) {
+                  return null
+               }
+               config.options = {}
+            }
+            if (!Array.isArray(config.options.devices)) {
+               if (!create) {
+                  return null
+               }
+               config.options.devices = []
+            }
+            return config.options.devices
+         }
+
+         const findInConfig = (config, deviceID) => {
+            const target = cleanId(deviceID)
+            const devices = getDevicesArray(config, false)
+            if (!devices) {
+               return null
+            }
+            const index = devices.findIndex(entry => entry && cleanId(entry.deviceID) === target)
+            return index === -1 ? null : { index }
+         }
+
+         const selectedAccessory = () => {
+            const uuid = document.getElementById('deviceSelect').value
+            return pickerAccessories.find(x => x.UUID === uuid)
+         }
+
+         const setHideControl = hidden => {
+            const btn = document.getElementById('hideDeviceBtn')
+            btn.dataset.hidden = hidden ? 'yes' : 'no'
+            btn.innerHTML = actionArrow
+            btn.setAttribute('aria-label', hidden ? 'Show this device in HomeKit' : 'Hide this device from HomeKit')
+            document.getElementById('hideDeviceTitle').innerHTML = hidden ? 'Show This Device' : 'Hide This Device'
+            document.getElementById('hideDeviceText').innerHTML = hidden
+               ? 'Show this device in HomeKit again. The config entry is kept.'
+               : 'Hide this device from HomeKit. This adds the device to the config if needed.'
+         }
+
+         const setConfigButton = inConfig => {
+            const btn = document.getElementById('deviceConfigBtn')
+            clearTimeout(removeConfirmTimer)
+            delete btn.dataset.confirm
+            btn.dataset.state = inConfig ? 'remove' : 'add'
+            btn.classList.remove('btn-danger')
+            btn.classList.add('btn-primary')
+            btn.innerHTML = actionArrow
+            btn.setAttribute('aria-label', inConfig ? 'Remove this device from the config' : 'Add this device to the config')
+            document.getElementById('deviceConfigTitle').innerHTML = inConfig ? 'Remove This Device' : 'Add This Device'
+            document.getElementById('deviceConfigText').innerHTML = inConfig
+               ? 'Remove this device from the plugin config.'
+               : 'Add this device to the plugin config.'
+         }
+
+         const addDeviceToConfig = (config, acc) => {
+            const devices = getDevicesArray(config, true)
+            // configDeviceName is included so the entry is identifiable in the
+            // config editor; it matches the current name so nothing is renamed
+            devices.push({ deviceID: acc.context.deviceID, configDeviceName: acc.displayName })
+         }
+
+         document.getElementById('deviceConfigBtn').addEventListener('click', async () => {
+            try {
+               const btn = document.getElementById('deviceConfigBtn')
+               const acc = selectedAccessory()
+               if (!acc) {
+                  return
+               }
+               const blocks = await getConfigBlocks()
+               const config = blocks[0]
+               const found = findInConfig(config, acc.context.deviceID)
+               if (btn.dataset.state === 'add') {
+                  // The config may have changed since the button was drawn, so
+                  // re-check and never add a duplicate - just correct the button
+                  if (found) {
+                     setConfigButton(true)
+                     setHideControl(!!config.options.devices[found.index].hide_device)
+                     homebridge.toast.info(acc.displayName + ' is already in the config.', 'Not Added')
+                     return
+                  }
+                  addDeviceToConfig(config, acc)
+                  await homebridge.updatePluginConfig(blocks)
+                  setConfigButton(true)
+                  setHideControl(false)
+                  homebridge.toast.success(acc.displayName + ' added - press Save to apply.', 'Added To Config')
+               } else {
+                  if (!found) {
+                     setConfigButton(false)
+                     setHideControl(false)
+                     homebridge.toast.info(acc.displayName + ' is not in the config.', 'Not Removed')
+                     return
+                  }
+                  const entry = config.options.devices[found.index]
+                  const extraKeys = Object.keys(entry).filter(k => !['deviceID', 'configDeviceName'].includes(k))
+                  if (extraKeys.length > 0 && btn.dataset.confirm !== 'yes') {
+                     // The entry has settings beyond id and name which would be
+                     // lost, so ask for a second click within five seconds
+                     btn.dataset.confirm = 'yes'
+                     btn.classList.remove('btn-primary')
+                     btn.classList.add('btn-danger')
+                     btn.innerHTML = actionArrow
+                     btn.setAttribute('aria-label', 'Confirm removing this device from the config')
+                     document.getElementById('deviceConfigText').innerHTML = 'This entry has extra settings which will be lost. Click again to remove it.'
+                     removeConfirmTimer = setTimeout(() => setConfigButton(true), 5000)
+                     return
+                  }
+                  config.options.devices.splice(found.index, 1)
+                  if (config.options.devices.length === 0) {
+                     delete config.options.devices
+                  }
+                  await homebridge.updatePluginConfig(blocks)
+                  setConfigButton(false)
+                  setHideControl(false)
+                  homebridge.toast.success(acc.displayName + ' removed - press Save to apply.', 'Removed From Config')
+               }
+            } catch (err) {
+               homebridge.toast.error(err.message, 'Error')
+            }
+         })
+
+         document.getElementById('hideDeviceBtn').addEventListener('click', async () => {
+            try {
+               const acc = selectedAccessory()
+               if (!acc) {
+                  return
+               }
+               const blocks = await getConfigBlocks()
+               const config = blocks[0]
+               let found = findInConfig(config, acc.context.deviceID)
+               const currentlyHidden = document.getElementById('hideDeviceBtn').dataset.hidden === 'yes'
+               if (!currentlyHidden) {
+                  // Hiding needs a config entry to carry the flag, so create
+                  // one if the device is not in the config yet
+                  if (!found) {
+                     addDeviceToConfig(config, acc)
+                     found = findInConfig(config, acc.context.deviceID)
+                  }
+                  config.options.devices[found.index].hide_device = true
+                  await homebridge.updatePluginConfig(blocks)
+                  setConfigButton(true)
+                  setHideControl(true)
+                  homebridge.toast.success(acc.displayName + ' will be hidden from HomeKit - press Save to apply.', 'Device Hidden')
+               } else {
+                  if (found) {
+                     // Drop the flag rather than storing hide_device false, to
+                     // keep the entry clean
+                     delete config.options.devices[found.index].hide_device
+                     await homebridge.updatePluginConfig(blocks)
+                  }
+                  setConfigButton(!!found)
+                  setHideControl(false)
+                  homebridge.toast.success(acc.displayName + ' will be shown in HomeKit - press Save to apply.', 'Device Unhidden')
+               }
+            } catch (err) {
+               homebridge.toast.error(err.message, 'Error')
+            }
+         })
+
+         document.getElementById('addAllBtn').addEventListener('click', async () => {
+            try {
+               const blocks = await getConfigBlocks()
+               const config = blocks[0]
+               let added = 0
+               let skipped = 0
+               pickerAccessories.forEach(acc => {
+                  if (!acc.context?.deviceID) {
+                     return
+                  }
+                  if (findInConfig(config, acc.context.deviceID)) {
+                     skipped += 1
+                     return
+                  }
+                  addDeviceToConfig(config, acc)
+                  added += 1
+               })
+               if (added > 0) {
+                  await homebridge.updatePluginConfig(blocks)
+                  homebridge.toast.success(added + ' device(s) added, ' + skipped + ' already in the config - press Save to apply.', 'Added To Config')
+               } else {
+                  homebridge.toast.info('All devices are already in the config.', 'Nothing To Add')
+               }
+               const acc = selectedAccessory()
+               if (acc) {
+                  const nowFound = findInConfig(config, acc.context.deviceID)
+                  setConfigButton(!!nowFound)
+                  if (nowFound) {
+                     setHideControl(!!config.options.devices[nowFound.index].hide_device)
+                  }
+               }
+            } catch (err) {
+               homebridge.toast.error(err.message, 'Error')
+            }
+         })
+         // ===== End device picker =====
          const hostname = window.location.hostname
          try {
             await homebridge.request('Start Resideo Login Server')
@@ -287,6 +575,7 @@
                         : 0
                })
             }
+            pickerAccessories = cachedAccessories
             const deviceSelect = document.getElementById('deviceSelect')
             deviceSelect.innerHTML = ''
             cachedAccessories.forEach(a => {
@@ -304,6 +593,11 @@
                document.getElementById('model').innerHTML = context.model
                document.getElementById('firmwareRevision').innerHTML = context.firmwareRevision || 'N/A'
                document.getElementById('deviceTable').style.display = 'inline-table'
+               const configBlocks = await getConfigBlocks()
+               const configEntry = findInConfig(configBlocks[0], context.deviceID)
+               setConfigButton(!!configEntry)
+               setHideControl(!!(configEntry && configBlocks[0].options.devices[configEntry.index].hide_device))
+               document.getElementById('configActionList').style.display = 'block'
                homebridge.hideSpinner()
             }
             deviceSelect.addEventListener('change', event => showDeviceInfo(event.target.value))
@@ -314,6 +608,7 @@
                option.text = 'No Devices'
                deviceSelect.add(option)
                deviceSelect.disabled = true
+               document.getElementById('configActionList').style.display = 'none'
             }
             homebridge.hideSpinner()
          }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@homebridge-plugins/homebridge-resideo",
   "displayName": "Resideo",
   "type": "module",
-  "version": "3.1.4",
+  "version": "3.2.0-beta.0",
   "description": "The Resideo plugin allows you to access your Resideo device(s) from HomeKit.",
   "author": {
     "name": "bwp91",
@@ -45,6 +45,7 @@
   },
   "keywords": [
     "homebridge-plugin",
+    "supports-matter",
     "homebridge-matter",
     "honeywell",
     "honeywell-home",