@switchbot/homebridge-switchbot 5.2.0 → 5.2.1-beta.1

package/.github/copilot-instructions.md

@@ -150,192 +150,95 @@ node -p "const v=require('./package.json').version.split('.'); v[2]=parseInt(v[2
 3. Proceed with patch increment as fallback
 4. Create or target the appropriate beta branch based on version increment
 
+## Following node-switchbot Changes
+
+node-switchbot tracks [pySwitchbot](https://github.com/sblibs/pySwitchbot). After node-switchbot
+ships a change, this repo usually needs a follow-up PR so the plugin can use it:
+
+1. Read the node-switchbot PR/release and list what consumers see: new device types, renamed or
+   split model identities (`modelName`, OpenAPI `deviceType`), new status fields, new commands.
+2. Update `src/device-types.ts` (`DEVICE_TYPES`, `DEVICE_TYPE_NORMALIZATION_MAP`, including
+   lowercase product codes such as `woplugjp`), `DEVICE_CLASS_MAP` in `src/deviceFactory.ts`, and
+   accessory behaviour in `src/devices/genericDevice.ts`.
+3. Make sure no existing saved `configDeviceType` stops resolving (normalization map or
+   `src/homebridge-ui/utils/device-migration.ts`).
+4. Bump `node-switchbot` in `package.json` only to a version already published on npm.
+5. Add `createDevice` tests under `test/device/` asserting each affected type's accessory class.
+6. Run build, test and lint; commit the regenerated `config.schema.json` if `DEVICE_TYPES` changed.
+
 ## Working Effectively
 
-### Bootstrap and Build Process
-Run these commands in sequence to set up and build the project:
-
-1. **Install dependencies:**
-   ```bash
-   npm install --legacy-peer-deps
-   ```
-   - CRITICAL: Must use `--legacy-peer-deps` flag due to TypeDoc dependency conflicts
-   - Takes approximately 30-45 seconds
-   - This is a known workaround documented in the codebase
-
-2. **Build the project:**
-   ```bash
-   npm run build
-   ```
-   - Takes approximately 7-10 seconds
-   - Compiles TypeScript and copies UI files
-   - Output goes to `dist/` directory
-
-3. **Run tests:**
-   ```bash
-   npm run test
-   ```
-   - Takes approximately 2-3 seconds  
-   - Currently minimal test suite (1 test file)
-   - Use `npm run test:watch` for continuous testing during development
-
-4. **Generate documentation:**
-   ```bash
-   npm run docs
-   ```
-   - Takes approximately 5-10 seconds
-   - Generates TypeDoc documentation in `docs/` directory
-
-### Full Build and Validation Workflow
-Complete validation workflow (approximately 30-45 seconds total):
-```bash
-npm install --legacy-peer-deps && npm run build && npm run test && npm run docs && npm run docs:lint && npm run docs:theme
-```
-- NEVER CANCEL: Set timeout to 90+ seconds for this complete workflow
-- This validates TypeScript compilation, plugin loading, and documentation generation
-
-### Development Commands
-
-- **Watch mode for development:**
-  ```bash
-  npm run watch
-  ```
-  - Builds, links plugin locally, and starts nodemon for file watching
-  - Requires local Homebridge installation
-
-- **Clean build artifacts:**
-  ```bash
-  npm run clean
-  ```
-  - Removes `dist/` directory
-
-- **Check for outdated dependencies:**
-  ```bash
-  npm run check
-  ```
-  - WARNING: This will fail due to dependency conflicts - use with `--legacy-peer-deps`
-
-### Known Issues and Workarounds
-
-- **Linting fails:** `npm run lint` and `npm run lint:fix` currently fail due to ESLint configuration conflicts with import/extensions rule. Document any code style issues manually.
-
-- **Dependency conflicts:** Always use `--legacy-peer-deps` flag for npm install due to TypeDoc theme dependency version mismatches.
-
-- **Coverage and docs artifacts:** Add `coverage/` and `docs/` to `.gitignore` to prevent committing build artifacts.
-
-## Validation Scenarios
-
-### Manual Plugin Validation
-After making changes, ALWAYS run these validation steps:
-
-1. **Verify plugin builds and loads:**
-   ```bash
-   npm run build && node -e "
-   try {
-     const plugin = require('./dist/index.js');
-     console.log('Plugin loads successfully');
-     console.log('Plugin type:', typeof plugin.default);
-   } catch (e) {
-     console.error('Plugin load failed:', e.message);
-   }"
-   ```
-
-2. **Test plugin registration:**
-   - Plugin exports a default function that registers with Homebridge
-   - Uses `PLUGIN_NAME = '@switchbot/homebridge-switchbot'` and `PLATFORM_NAME = 'SwitchBot'`
-   - Main platform class is `SwitchBotPlatform`
-
-3. **Validate TypeScript compilation:**
-   - Must have no TypeScript errors
-   - Check `dist/` directory contains all expected `.js`, `.d.ts`, and `.map` files
-
-4. **Test documentation generation:**
-   ```bash
-   npm run docs:lint
-   ```
-   - Must pass without warnings when using `--treatWarningsAsErrors`
-
-### Code Coverage Validation
-Run comprehensive test coverage analysis:
+Node `^22 || ^24`. Run these in order; each must pass before you commit:
+
 ```bash
-npm run test-coverage
+npm ci            # CI uses: npm ci --legacy-peer-deps
+npm run build     # syncs DEVICE_TYPES into config.schema.json, cleans dist/, tsc, copies + builds the plugin UI
+npm run test      # vitest run
+npm run lint      # eslint (src, test, UI html/js) then tsc --noEmit
 ```
-- Current coverage is minimal (~1.36% overall)
-- Coverage reports generated in `coverage/` directory
+
+- `npm run lint:fix` fixes most style issues.
+- `npm run build` needs `rsync` (used by `plugin-ui`).
+- `npm run docs` / `npm run docs:lint` generate and check TypeDoc output; `prepublishOnly` runs them.
+- `npm run watch` builds, links the plugin and runs nodemon against a local Homebridge;
+  `npm run watch:ui` also starts a dev Homebridge with Config UI X.
+
+### Known pitfalls
+
+- **Never commit compiled output under `src/`.** `.gitignore` excludes `src/**/*.js` and
+  `src/**/*.js.map`. Vitest resolves `./foo.js` imports to a real `src/foo.js` before `src/foo.ts`,
+  so a stale compiled copy silently replaces the source in tests.
+- **`config.schema.json` is generated** from `DEVICE_TYPES` in `src/device-types.ts` during
+  `npm run build`. When `DEVICE_TYPES` changes, commit the regenerated schema in the same change.
+- **`DEVICE_CLASS_MAP` keys in `src/deviceFactory.ts` are lowercase.** Unmapped types fall back to
+  `GenericDevice`, so add a test for every new type.
 
 ## Codebase Navigation
 
 ### Project Structure
 ```
-├── src/                     # Source TypeScript files
-│   ├── device/             # Device implementations (21 files)
-│   │   ├── device.ts       # Base device class (deviceBase)
-│   │   ├── bot.ts          # SwitchBot Bot device
-│   │   ├── curtain.ts      # SwitchBot Curtain device
-│   │   └── ...             # Other device implementations
-│   ├── irdevice/           # IR device implementations (10 files)
-│   │   ├── irdevice.ts     # Base IR device class
-│   │   ├── tv.ts           # TV IR control
-│   │   └── ...             # Other IR device implementations
-│   ├── homebridge-ui/      # Plugin configuration UI
-│   │   ├── server.ts       # UI backend server
-│   │   └── public/         # UI frontend files
-│   ├── platform.ts         # Main platform class (SwitchBotPlatform)
-│   ├── settings.ts         # Configuration interfaces and constants
-│   ├── utils.ts            # Utility functions
-│   └── index.ts            # Plugin entry point
-├── config.schema.json      # Homebridge configuration schema
-├── dist/                   # Compiled JavaScript output
-├── docs/                   # Generated TypeDoc documentation  
-└── coverage/               # Test coverage reports
+├── src/
+│   ├── index.ts                    # Plugin entry point (registers one platform that proxies HAP or Matter)
+│   ├── SwitchBotHAPPlatform.ts     # HomeKit (HAP) platform
+│   ├── SwitchBotMatterPlatform.ts  # Matter platform
+│   ├── switchbotClient.ts          # Wrapper around node-switchbot (BLE + OpenAPI)
+│   ├── deviceFactory.ts            # Device type -> accessory class (DEVICE_CLASS_MAP, createDevice)
+│   ├── device-types.ts             # DEVICE_TYPES (valid types) + DEVICE_TYPE_NORMALIZATION_MAP (aliases)
+│   ├── deviceCommandMapper.ts      # Per-type command handlers
+│   ├── devices/
+│   │   ├── deviceBase.ts           # Base accessory class
+│   │   └── genericDevice.ts        # GenericDevice and every concrete accessory class
+│   ├── homebridge-ui/              # Config UI X custom UI (server, endpoints, utils, public/)
+│   ├── settings.ts                 # Config interfaces and constants
+│   ├── errors.ts
+│   └── utils.ts
+├── test/                           # Vitest specs (client, device, platform, homebridge-ui, utils, e2e)
+├── scripts/                        # sync-device-types, build-ui, free-dev-ports
+├── config.schema.json              # Homebridge config schema (configDeviceType enum is generated)
+└── dist/                           # Build output (not committed)
 ```
 
-### Key Development Areas
-
-- **Adding new devices:** Extend `src/device/device.ts` base class, implement in new file under `src/device/`
-- **Adding IR devices:** Extend `src/irdevice/irdevice.ts` base class, implement in new file under `src/irdevice/`
-- **Configuration changes:** Update `src/settings.ts` and `config.schema.json`
-- **Platform modifications:** Edit `src/platform.ts` (main class with 2800+ lines)
-- **Utility functions:** Modify `src/utils.ts` for shared functionality
-
-### Device Connection Types
-This plugin supports two connection methods to SwitchBot devices:
-1. **OpenAPI Connection:** Requires SwitchBot Cloud API token/secret, works through SwitchBot Hub
-2. **BLE (Bluetooth Low Energy):** Direct device connection, requires device MAC addresses
-
 ### Common Development Tasks
 
-- **Testing device implementations:** Focus on `src/device/` and `src/irdevice/` directories
-- **Configuration UI changes:** Modify `src/homebridge-ui/` files and rebuild with `npm run plugin-ui`
-- **Platform logic changes:** Edit `src/platform.ts` - the main orchestration file
-- **Adding device support:** Create new device class extending `deviceBase` or IR device class
-
-### Important File Relationships
-- Always update both device implementation AND platform.ts when adding new device types
-- Configuration schema changes require updates to settings.ts interfaces
-- Device MAC address validation is handled in utils.ts (`formatDeviceIdAsMac`)
-- BLE connection handling is in the base device classes
-
-## Build Time Expectations
+- **New device type or identity from node-switchbot:** add it to `DEVICE_TYPES` and/or
+  `DEVICE_TYPE_NORMALIZATION_MAP` in `src/device-types.ts`, map it in `DEVICE_CLASS_MAP` in
+  `src/deviceFactory.ts`, then add a `createDevice` test under `test/device/`.
+- **New accessory behaviour:** add or extend a class in `src/devices/genericDevice.ts`.
+- **Saved configs that would stop resolving:** handle them in the normalization map or
+  `src/homebridge-ui/utils/device-migration.ts`.
+- **Config UI changes:** edit `src/homebridge-ui/`, then `npm run build`.
+- **node-switchbot upgrades:** bump the dependency only to a version already published on npm.
 
-- **npm install --legacy-peer-deps:** 30-45 seconds
-- **npm run build:** 7-10 seconds  
-- **npm run test:** 2-3 seconds
-- **npm run docs:** 5-10 seconds
-- **Complete validation workflow:** 30-45 seconds total
-- **NEVER CANCEL:** Always wait for builds to complete, set timeouts to 90+ seconds for safety
+### Device Connection Types
+1. **OpenAPI:** SwitchBot Cloud token/secret; works through a SwitchBot Hub.
+2. **BLE:** direct Bluetooth connection via node-switchbot (Linux/macOS).
 
 ## CI/CD Integration
 
-The project uses GitHub Actions for CI:
-- **Build workflow:** `.github/workflows/build.yml` runs Node.js build and test, then ESLint
-- **Required checks:** Build must pass, tests must pass
-- **Known CI issue:** ESLint currently fails due to configuration conflicts
-
-Always run the complete validation workflow locally before committing:
-```bash
-npm run build && npm run test && npm run docs:lint
-```
+- `.github/workflows/ci.yml`: build, test and lint on Node 22 and 24 for pushes to `latest`/`beta-*`
+  and PRs to `latest`/`beta-*`.
+- `.github/workflows/release.yml`: pushes to `beta-*` publish a beta to npm; pushes to `latest`
+  publish a stable release.
 
 ## Complete Workflow Examples
 

package/.github/npm-version-script-esm.js

@@ -0,0 +1,100 @@
+#!/bin/env node
+
+/**
+ * This scripts queries the npm registry to pull out the latest version for a given tag.
+ */
+
+import assert from 'node:assert'
+import child_process from 'node:child_process'
+import fs from 'node:fs'
+import process from 'node:process'
+
+const BRANCH_VERSION_PATTERN = /^([A-Z]+)-(\d+\.\d+\.\d+)$/i
+
+// Load the contents of the package.json file
+const packageJSON = JSON.parse(fs.readFileSync('package.json', 'utf8'))
+
+const refArgument = process.argv[2]
+const tagArgument = process.argv[3] || 'latest'
+
+if (!refArgument) {
+  console.error('ref argument is missing')
+  console.error('Usage: npm-version-script-esm.js <ref> [tag]')
+  process.exit(1)
+}
+
+/**
+ * Queries the NPM registry for the latest version for the provided base version and tag.
+ * If the tag is latest, then the base version is returned if it exists. For other tags, the latest
+ * version found for that base version and tag is returned.
+ * @param baseVersion The base version to query for, e.g. 2.0.0
+ * @param tag The tag to query for, e.g. beta or latest
+ * @returns {string} Returns the version, or '' if not found
+ */
+function getTagVersionFromNpm(baseVersion, tag) {
+  try {
+    return JSON.parse(child_process.execSync(`npm info ${packageJSON.name} versions --json`).toString('utf8').trim())
+      .filter(v => tag === 'latest' ? v === baseVersion : v.startsWith(`${baseVersion}-${tag}.`)) // find all published versions for this base version and tag
+      .reduce((_, current) => current, '') // choose the last as they're sorted in ascending order, or '' if there are none
+  } catch (e) {
+    console.error(`Failed to query the npm registry for the latest version for tag: ${tag}`, e)
+    // throw e;
+    return ''
+  }
+}
+
+function desiredTargetVersion(ref) {
+  // ref is a GitHub action ref string
+  if (ref.startsWith('refs/pull/')) {
+    throw new Error('The version script was executed inside a PR!')
+  }
+
+  assert(ref.startsWith('refs/heads/'))
+  const branchName = ref.slice('refs/heads/'.length)
+
+  const results = branchName.match(BRANCH_VERSION_PATTERN)
+  if (results !== null) {
+    if (results[1] !== tagArgument) {
+      console.warn(`The base branch name (${results[1]}) differs from the tag name ${tagArgument}`)
+    }
+
+    return results[2]
+  }
+
+  throw new Error(`Malformed branch name for ref: ${ref}. Can't derive the base version. Use a branch name like: beta-x.x.x or alpha-x.x.x`)
+}
+
+// derive the base version from the branch ref
+const baseVersion = desiredTargetVersion(refArgument)
+
+// query the npm registry for the latest version of the provided tag name
+const latestReleasedVersion = getTagVersionFromNpm(baseVersion, tagArgument) // e.g. 0.7.0-beta.12
+
+let publishTag
+
+if (latestReleasedVersion) {
+  console.warn(`Latest published version for ${baseVersion} with tag ${tagArgument} is ${latestReleasedVersion}`)
+  publishTag = latestReleasedVersion // set this released beta or alpha to be incremented
+} else {
+  console.warn(`No published versions for ${baseVersion} with tag ${tagArgument}`)
+  publishTag = baseVersion // start off with a new beta or alpha version
+}
+
+if (packageJSON.version !== publishTag) {
+  // report the change for CI
+  console.warn(`Changing version in package.json from ${packageJSON.version} to ${publishTag}`)
+
+  // save the package.json
+  // JSON.stringify does not end with a newline, but npm writes both of these
+  // files with one. Leaving it off makes the file fail an eol-last lint rule,
+  // which breaks any repo whose prepublishOnly lints the whole tree.
+  packageJSON.version = publishTag
+  fs.writeFileSync('package.json', `${JSON.stringify(packageJSON, null, 2)}\n`)
+
+  // perform the same change to the package-lock.json
+  const packageLockJSON = JSON.parse(fs.readFileSync('package-lock.json', 'utf8'))
+  packageLockJSON.version = publishTag
+  fs.writeFileSync('package-lock.json', `${JSON.stringify(packageLockJSON, null, 2)}\n`)
+} else {
+  console.warn(`Leaving version in package.json at ${packageJSON.version}`)
+}

package/.github/workflows/ci.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches: ["main", "latest", "beta-*"]
   pull_request:
-    branches: ["main", "latest"]
+    branches: ["main", "latest", "beta-*"]
 
 permissions:
   contents: read
@@ -33,3 +33,6 @@ jobs:
 
       - name: Run tests
         run: npm run test
+
+      - name: Lint
+        run: npm run lint

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+# [5.2.0](https://github.com/OpenWonderLabs/homebridge-switchbot/compare/v5.1.1...v5.2.0) (2026-10-09)
+
+
+### Features
+
+* add a CarbonDioxideSensor service for the Meter Pro (CO2) ([#1413](https://github.com/OpenWonderLabs/homebridge-switchbot/issues/1413)) ([588a59d](https://github.com/OpenWonderLabs/homebridge-switchbot/commit/588a59d8adcde2d77a6c3fb1bf703c1d5cf2cf01)), closes [#1197](https://github.com/OpenWonderLabs/homebridge-switchbot/issues/1197) [#1112](https://github.com/OpenWonderLabs/homebridge-switchbot/issues/1112) [#1197](https://github.com/OpenWonderLabs/homebridge-switchbot/issues/1197)
+
+
+
 # [5.2.0](https://github.com/OpenWonderLabs/homebridge-switchbot/compare/v5.1.0...v5.2.0) (2026-10-08)
 
 ### Bug Fixes

package/CLAUDE.md

@@ -0,0 +1,13 @@
+# homebridge-switchbot
+
+The project guide is shared with Copilot and imported here. It covers reference priority, branch
+targeting, following node-switchbot changes, commands, structure and pitfalls:
+
+@.github/copilot-instructions.md
+
+## Claude-specific notes
+
+- Conventional Commits (`feat:`, `fix:`, `docs:`, `test:`, `chore:`).
+- If the right target branch is unclear, ask before opening the PR.
+- PR description: what changed, why (link the node-switchbot PR/release), and any config migration
+  users need.

package/README.md

@@ -176,6 +176,8 @@ Click **Save Advanced Settings** to apply changes. These settings match the opti
     - [SwitchBot Hub Mini](https://www.switch-bot.com/products/switchbot-hub-mini), [SwitchBot Hub 2](https://us.switch-bot.com/products/switchbot-hub-2), or [SwitchBot Hub 3](https://us.switch-bot.com/products/switchbot-hub-3) Required
     - Enable Cloud Services for Device on SwitchBot App
 - [SwitchBot Bot](https://www.switch-bot.com/products/switchbot-bot)
+  - **Bot HomeKit Display** (`botDisplay` in `config.json`) can show a Bot as a Switch, Door, Garage Door, Window, Window Covering, Lock, Outlet, Fan, Faucet, or Stateful Programmable Switch. The default is Switch. The legacy per-device `type` setting still works. Stateful Programmable Switch needs a third-party Home app.
+  - Set **Bot Physical Mode** (`mode`) to match the SwitchBot app: **Press** sends one `press` command when activated and returns HomeKit to its resting state; **Switch** sends `turnOn`/`turnOff`. If unset, Door uses Press and other displays use Switch. A Bot has no sensor for the door, window, lock, or other object it operates; their HomeKit state reflects only the Bot control, not the object's physical state.
   - Supports OpenAPI & Bluetooth Low Energy (BLE) Connections
   - If using OpenAPI:
     - [SwitchBot Hub Mini](https://www.switch-bot.com/products/switchbot-hub-mini), [SwitchBot Hub 2](https://us.switch-bot.com/products/switchbot-hub-2), or [SwitchBot Hub 3](https://us.switch-bot.com/products/switchbot-hub-3) Required

package/config.schema.json

@@ -169,6 +169,36 @@
                 "remote with screen"
               ]
             },
+            "botDisplay": {
+              "type": "string",
+              "title": "Bot HomeKit Display",
+              "description": "For a Bot only: choose its HomeKit service. This changes the Home app presentation, not the Bot's physical mode. The Bot cannot measure the position or state of the device it presses.",
+              "enum": [
+                "switch",
+                "door",
+                "garagedoor",
+                "window",
+                "windowcovering",
+                "lock",
+                "outlet",
+                "fan",
+                "faucet",
+                "stateful"
+              ],
+              "default": "switch"
+            },
+            "mode": {
+              "type": "string",
+              "title": "Bot Physical Mode",
+              "description": "For a Bot only: match its mode in the SwitchBot app. Press sends one press and returns the HomeKit control to its resting state. Switch sends turnOn/turnOff. Legacy Multi-Press currently sends one press. If unset, Door uses Press and other displays use Switch.",
+              "enum": [
+                "",
+                "press",
+                "switch",
+                "multipress"
+              ],
+              "default": ""
+            },
             "connectionPreference": {
               "type": "string",
               "title": "Connection Preference",

package/dist/SwitchBotHAPPlatform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SwitchBotHAPPlatform.d.ts","sourceRoot":"","sources":["../src/SwitchBotHAPPlatform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAA;AAC1D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAO7D;;;;;;;;;;;;;;;;;;;GAmBG;AACH,qBAAa,oBAAoB;IAC/B,8BAA8B;IAC9B,GAAG,EAAE,GAAG,GAAG,SAAS,CAAA;IACpB,iCAAiC;IACjC,GAAG,EAAE,MAAM,CAAA;IACX,2BAA2B;IAC3B,MAAM,EAAE,qBAAqB,CAAA;IAC7B,mCAAmC;IACnC,OAAO,EAAE,GAAG,EAAE,CAAK;IACnB,gDAAgD;IAChD,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC7B,sDAAsD;IACtD,OAAO,CAAC,cAAc,CAAa;IACnC,0CAA0C;IAC1C,OAAO,CAAC,oBAAoB,CAA8B;IAC1D,4EAA4E;IAC5E,OAAO,CAAC,cAAc,CAA0H;IAEhJ,4CAA4C;IAC5C,OAAO,CAAC,iBAAiB,CAAyC;IAClE,wCAAwC;IACxC,OAAO,CAAC,iBAAiB,CAA8B;IACvD,2CAA2C;IAC3C,OAAO,CAAC,oBAAoB,CAAI;IAChC,yDAAyD;IACzD,OAAO,CAAC,gBAAgB,CAAI;IAE5B;;;;;OAKG;gBACS,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,CAAC,EAAE,GAAG;IA2C1D;;;;;;OAMG;IACG,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAgElC;;;;;;;;;;;;;;;;;;;;OAoBG;YACW,sBAAsB;IAiKpC;;;OAGG;IACH,mBAAmB,IAAI,MAAM;IAI7B;;;OAGG;IACH,mBAAmB,IAAI,IAAI;IAS3B;;;OAGG;IACH,OAAO,CAAC,aAAa;IAUrB;;;;;;OAMG;YACW,qBAAqB;IAiCnC;;;;OAIG;IACH,QAAQ,IAAI,IAAI;IAQhB;;;;;OAKG;IACH;;;;;OAKG;YACW,gBAAgB;IA8B9B;;;OAGG;IACH,OAAO,CAAC,cAAc;IAMtB,OAAO,CAAC,oBAAoB;IAoI5B;;;;OAIG;IACG,kBAAkB,CAAC,SAAS,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAUvD;;;;OAIG;IACH,wBAAwB,CAAC,CAAC,SAAS,EAAE,GAAG,GAAG,IAAI;CAShD;AAED,eAAe,oBAAoB,CAAA"}
+{"version":3,"file":"SwitchBotHAPPlatform.d.ts","sourceRoot":"","sources":["../src/SwitchBotHAPPlatform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAA;AAC1D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAO7D;;;;;;;;;;;;;;;;;;;GAmBG;AACH,qBAAa,oBAAoB;IAC/B,8BAA8B;IAC9B,GAAG,EAAE,GAAG,GAAG,SAAS,CAAA;IACpB,iCAAiC;IACjC,GAAG,EAAE,MAAM,CAAA;IACX,2BAA2B;IAC3B,MAAM,EAAE,qBAAqB,CAAA;IAC7B,mCAAmC;IACnC,OAAO,EAAE,GAAG,EAAE,CAAK;IACnB,gDAAgD;IAChD,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC7B,sDAAsD;IACtD,OAAO,CAAC,cAAc,CAAa;IACnC,0CAA0C;IAC1C,OAAO,CAAC,oBAAoB,CAA8B;IAC1D,4EAA4E;IAC5E,OAAO,CAAC,cAAc,CAA0H;IAEhJ,4CAA4C;IAC5C,OAAO,CAAC,iBAAiB,CAAyC;IAClE,wCAAwC;IACxC,OAAO,CAAC,iBAAiB,CAA8B;IACvD,2CAA2C;IAC3C,OAAO,CAAC,oBAAoB,CAAI;IAChC,yDAAyD;IACzD,OAAO,CAAC,gBAAgB,CAAI;IAE5B;;;;;OAKG;gBACS,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,CAAC,EAAE,GAAG;IA2C1D;;;;;;OAMG;IACG,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAgElC;;;;;;;;;;;;;;;;;;;;OAoBG;YACW,sBAAsB;IA+KpC;;;OAGG;IACH,mBAAmB,IAAI,MAAM;IAI7B;;;OAGG;IACH,mBAAmB,IAAI,IAAI;IAS3B;;;OAGG;IACH,OAAO,CAAC,aAAa;IAYrB;;;;;;OAMG;YACW,qBAAqB;IAiCnC;;;;OAIG;IACH,QAAQ,IAAI,IAAI;IAQhB;;;;;OAKG;IACH;;;;;OAKG;YACW,gBAAgB;IA8B9B;;;OAGG;IACH,OAAO,CAAC,cAAc;IAMtB,OAAO,CAAC,oBAAoB;IAoI5B;;;;OAIG;IACG,kBAAkB,CAAC,SAAS,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAUvD;;;;OAIG;IACH,wBAAwB,CAAC,CAAC,SAAS,EAAE,GAAG,GAAG,IAAI;CAShD;AAED,eAAe,oBAAoB,CAAA"}

package/dist/SwitchBotHAPPlatform.js

@@ -285,9 +285,11 @@ export class SwitchBotHAPPlatform {
                             continue;
                         }
                         const service = accessory.getService(Service) || accessory.addService(Service);
-                        const charNames = Object.keys(s.characteristics || {});
+                        const characteristicUUIDs = new Set(Object.keys(s.characteristics || {})
+                            .map(name => hap.Characteristic[name]?.UUID)
+                            .filter(Boolean));
                         for (const existingChar of service.characteristics.slice()) {
-                            if (!charNames.includes(existingChar.displayName)) {
+                            if (!characteristicUUIDs.has(existingChar.UUID)) {
                                 service.removeCharacteristic(existingChar);
                             }
                         }
@@ -316,21 +318,32 @@ export class SwitchBotHAPPlatform {
                                 service.getCharacteristic(Characteristic).onSet(async (value) => {
                                     await getterSetter.set(value);
                                     const refreshAfterSet = Array.isArray(getterSetter.refreshAfterSet) ? getterSetter.refreshAfterSet : [];
-                                    for (const refreshCharName of refreshAfterSet) {
-                                        const refreshGetterSetter = (s.characteristics || {})[refreshCharName];
-                                        if (!refreshGetterSetter || typeof refreshGetterSetter.get !== 'function') {
-                                            continue;
-                                        }
-                                        const RefreshCharacteristic = hap.Characteristic[refreshCharName];
-                                        if (!RefreshCharacteristic) {
-                                            continue;
-                                        }
-                                        try {
-                                            service.getCharacteristic(RefreshCharacteristic).updateValue(await refreshGetterSetter.get());
-                                        }
-                                        catch (e) {
-                                            this.log.debug?.(`Failed to refresh ${refreshCharName} after setting ${charName}`, e);
-                                        }
+                                    // HAP stores the requested value after onSet resolves. Refresh on the next tick
+                                    // so a momentary control can return to its resting value.
+                                    if (refreshAfterSet.length > 0 || typeof getterSetter.afterSet === 'function') {
+                                        setTimeout(async () => {
+                                            for (const refreshCharName of refreshAfterSet) {
+                                                const refreshGetterSetter = (s.characteristics || {})[refreshCharName];
+                                                const RefreshCharacteristic = hap.Characteristic[refreshCharName];
+                                                if (!RefreshCharacteristic || typeof refreshGetterSetter?.get !== 'function') {
+                                                    continue;
+                                                }
+                                                try {
+                                                    service.getCharacteristic(RefreshCharacteristic).updateValue(await refreshGetterSetter.get());
+                                                }
+                                                catch (e) {
+                                                    this.log.debug?.(`Failed to refresh ${refreshCharName} after setting ${charName}`, e);
+                                                }
+                                            }
+                                            if (typeof getterSetter.afterSet === 'function') {
+                                                try {
+                                                    await getterSetter.afterSet(value, service, hap);
+                                                }
+                                                catch (e) {
+                                                    this.log.debug?.(`Failed afterSet for ${charName}`, e);
+                                                }
+                                            }
+                                        }, 0);
                                     }
                                 });
                             }
@@ -387,6 +400,8 @@ export class SwitchBotHAPPlatform {
             id: d.deviceId ?? d.id,
             type: d.configDeviceType ?? d.type,
             name: d.configDeviceName ?? d.name,
+            botDisplay: d.botDisplay ?? d.type,
+            mode: d.mode,
         })));
     }
     /**