@switchbot/homebridge-switchbot 5.0.0 → 5.0.2

package/.github/scripts/normalize-changelog-header.cjs

@@ -0,0 +1,86 @@
+#!/usr/bin/env node
+
+const child_process = require('node:child_process')
+const fs = require('node:fs')
+
+const changelogPath = 'CHANGELOG.md'
+
+function normalizeChangelogHeader(content) {
+  const headerStart = content.indexOf('# Changelog\n')
+  if (headerStart <= 0) {
+    return content
+  }
+
+  const nextSectionStart = content.indexOf('\n## ', headerStart + 1)
+  const headerBlock = (nextSectionStart === -1 ? content.slice(headerStart) : content.slice(headerStart, nextSectionStart)).trim()
+  const prependedEntries = content.slice(0, headerStart).trim()
+  const remainingEntries = (nextSectionStart === -1 ? '' : content.slice(nextSectionStart)).trim()
+
+  return [headerBlock, prependedEntries, remainingEntries].filter(Boolean).join('\n\n') + '\n'
+}
+
+function getRepoUrl() {
+  try {
+    const pkg = JSON.parse(fs.readFileSync('package.json', 'utf8'))
+    let url = (typeof pkg.repository === 'string' ? pkg.repository : pkg.repository?.url) || ''
+    url = url.replace(/^git\+/, '').replace(/\.git$/, '')
+    if (url.startsWith('https://')) return url
+  } catch {}
+  try {
+    const remote = child_process.execSync('git remote get-url origin').toString().trim()
+    return remote.replace(/^git\+/, '').replace(/\.git$/, '').replace(/^git@github\.com:/, 'https://github.com/')
+  } catch {}
+  return ''
+}
+
+function getPreviousTag() {
+  try {
+    const tags = child_process
+      .execSync('git tag --sort=-version:refname')
+      .toString()
+      .trim()
+      .split('\n')
+      .filter(Boolean)
+    return tags[0] || ''
+  } catch {
+    return ''
+  }
+}
+
+function appendFullChangelogLink(content, currentTag, repoUrl) {
+  const prefix = `**Full Changelog**: ${repoUrl}/compare/`
+  // Find the bounds of the first release section (the newly generated one)
+  const firstSectionStart = content.indexOf('\n## ')
+  if (firstSectionStart === -1) return content
+  const firstSectionEnd = content.indexOf('\n## ', firstSectionStart + 1)
+  const firstSection = firstSectionEnd === -1 ? content.slice(firstSectionStart) : content.slice(firstSectionStart, firstSectionEnd)
+
+  // Skip if a Full Changelog link is already present in that section
+  if (firstSection.includes(prefix)) return content
+
+  const prevTag = getPreviousTag()
+  if (!prevTag) return content
+
+  const link = `**Full Changelog**: ${repoUrl}/compare/${prevTag}...${currentTag}`
+  if (firstSectionEnd === -1) {
+    return content.trimEnd() + '\n\n' + link + '\n'
+  }
+  return content.slice(0, firstSectionEnd).trimEnd() + '\n\n' + link + '\n' + content.slice(firstSectionEnd)
+}
+
+exports.preCommit = (props) => {
+  if (!fs.existsSync(changelogPath)) {
+    return
+  }
+
+  let content = fs.readFileSync(changelogPath, 'utf8')
+  content = normalizeChangelogHeader(content)
+
+  const repoUrl = getRepoUrl()
+  const currentTag = props?.tag || ''
+  if (repoUrl && currentTag) {
+    content = appendFullChangelogLink(content, currentTag, repoUrl)
+  }
+
+  fs.writeFileSync(changelogPath, content)
+}

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

@@ -0,0 +1,201 @@
+#!/usr/bin/env node
+
+/**
+ * Standalone ESM implementation — self-contained so this file can be copied
+ * into other repos without pulling any other files.
+ */
+
+import assert from 'node:assert'
+import child_process from 'node:child_process'
+import fs from 'node:fs'
+import process from 'node:process'
+// Minimal, in-file semver utilities used by this script.
+// This avoids an external dependency so the script can run in environments
+// where `semver` isn't installed.
+const semver = {
+	// Very small validation: match major.minor.patch with optional prerelease/build
+	valid(v) {
+		return /^\d+\.\d+\.\d+(?:-[0-9A-Za-z-.]+)?(?:\+[0-9A-Za-z-.]+)?$/.test(v)
+	},
+	// Return prerelease identifiers array or null
+	prerelease(v) {
+		const m = v.match(/^\d+\.\d+\.\d+-(.+)$/)
+		return m ? m[1].split('.') : null
+	},
+	// Compare two semver strings in reverse order (for rcompare use)
+	rcompare(a, b) {
+		// Use standard semver precedence rules for major.minor.patch; ignore prerelease complexity except that prerelease is lower than release
+		const pa = a.split('-')
+		const pb = b.split('-')
+		const aCore = pa[0].split('.').map(Number)
+		const bCore = pb[0].split('.').map(Number)
+		for (let i = 0; i < 3; i++) {
+			if (aCore[i] > bCore[i]) return -1
+			if (aCore[i] < bCore[i]) return 1
+		}
+		// equal core; releases (no prerelease) are greater than prerelease
+		if (pa.length === 1 && pb.length > 1) return -1
+		if (pa.length > 1 && pb.length === 1) return 1
+		// both same prerelease status: compare as strings
+		if (a > b) return -1
+		if (a < b) return 1
+		return 0
+	},
+	// Increment version by 'major'|'minor'|'patch'
+	inc(v, level) {
+		if (!this.valid(v)) throw new Error(`Invalid semver passed to inc: ${v}`)
+		// strip prerelease/build
+		const core = v.split('-')[0].split('+')[0]
+		const parts = core.split('.').map(Number)
+		switch (level) {
+			case 'major':
+				parts[0] += 1
+				parts[1] = 0
+				parts[2] = 0
+				break
+			case 'minor':
+				parts[1] += 1
+				parts[2] = 0
+				break
+			case 'patch':
+			default:
+				parts[2] += 1
+				break
+		}
+		return parts.join('.')
+	}
+}
+
+const BRANCH_VERSION_PATTERN = /^([A-Z]+)-(\d+\.\d+\.\d+)$/i
+
+// Load package.json
+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}.`)))
+			.reduce((_, current) => current, '')
+	} catch (e) {
+		console.error(`Failed to query the npm registry for the latest version for tag: ${tag}`, e)
+		// throw e;
+		return ''
+	}
+}
+
+function getLatestStableVersionFromNpm() {
+	try {
+		const versions = JSON.parse(child_process.execSync(`npm info ${packageJSON.name} versions --json`).toString('utf8').trim())
+		if (!Array.isArray(versions) || versions.length === 0) return ''
+
+		// Only consider stable semver versions (no prerelease)
+		const stable = versions.filter(v => semver.valid(v) && !semver.prerelease(v))
+		if (stable.length === 0) return ''
+
+		// Sort descending and return the highest
+		const sorted = stable.sort(semver.rcompare)
+		return sorted[0]
+	} catch (e) {
+		console.error('Failed to query the npm registry for published versions', 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].toLowerCase() !== tagArgument.toLowerCase()) {
+			console.warn(`The base branch name (${results[1]}) differs from the tag name ${tagArgument}`)
+		}
+
+		return results[2]
+	}
+
+	if (branchName === 'latest') {
+		// For latest branch, start with package.json version as base
+		return packageJSON.version
+	}
+
+	throw new Error(`Malformed branch name for ref: ${ref}. Must be beta-x.x.x, alpha-x.x.x, or 'latest'`)
+}
+
+function bumpVersion(baseVersion, level) {
+	const normalizedLevel = (level || 'patch').toLowerCase()
+	if (!semver.valid(baseVersion)) {
+		throw new Error(`Invalid base version passed to bumpVersion: ${baseVersion}`)
+	}
+
+	switch (normalizedLevel) {
+		case 'major':
+			return semver.inc(baseVersion, 'major')
+		case 'minor':
+			return semver.inc(baseVersion, 'minor')
+		case 'patch':
+		default:
+			return semver.inc(baseVersion, 'patch')
+	}
+}
+
+const baseVersion = desiredTargetVersion(refArgument)
+let publishTag = baseVersion
+
+if (refArgument.includes('latest')) {
+	// For latest branch, determine next version based on npm and bump patch.
+	const latestPublishedStable = getLatestStableVersionFromNpm()
+	if (latestPublishedStable) {
+		console.warn(`Latest published stable version is ${latestPublishedStable}; bumping patch`)
+		publishTag = bumpVersion(latestPublishedStable, 'patch')
+	} else {
+		console.warn('No published stable versions found; bumping package.json version patch')
+		publishTag = bumpVersion(baseVersion, 'patch')
+	}
+} else {
+	// For alpha/beta, query npm for latest
+	const latestReleasedVersion = getTagVersionFromNpm(baseVersion, tagArgument)
+	if (latestReleasedVersion) {
+		console.warn(`Latest published version for ${baseVersion} with tag ${tagArgument} is ${latestReleasedVersion}`)
+		publishTag = latestReleasedVersion
+	} else {
+		console.warn(`No published versions for ${baseVersion} with tag ${tagArgument}`)
+	}
+}
+
+if (packageJSON.version !== publishTag) {
+	console.warn(`Updating version in package.json from ${packageJSON.version} to ${publishTag}`)
+	packageJSON.version = publishTag
+	fs.writeFileSync('package.json', JSON.stringify(packageJSON, null, 2))
+
+	// 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))
+} else {
+	console.warn(`Version in package.json is already ${packageJSON.version}`)
+}
+
+console.log(publishTag)

package/.github/scripts/resolve-version-bump-esm.js

@@ -0,0 +1,118 @@
+#!/usr/bin/env node
+
+import fs from 'node:fs'
+import https from 'node:https'
+import process from 'node:process'
+
+const allowed = new Set(['major', 'minor', 'patch'])
+
+function setOutput(name, value) {
+  if (process.env.GITHUB_OUTPUT) {
+    fs.appendFileSync(process.env.GITHUB_OUTPUT, `${name}=${value}\n`)
+  }
+  console.log(`${name}=${value}`)
+}
+
+function resolveFromLabels(labels) {
+  const majorLabels = new Set(['major', 'semver:major', 'release:major', 'breaking', 'breaking-change'])
+  const minorLabels = new Set(['minor', 'semver:minor', 'release:minor', 'feature'])
+  const patchLabels = new Set(['patch', 'semver:patch', 'release:patch', 'fix'])
+
+  if (labels.some(label => majorLabels.has(label))) return 'major'
+  if (labels.some(label => minorLabels.has(label))) return 'minor'
+  if (labels.some(label => patchLabels.has(label))) return 'patch'
+  return 'patch'
+}
+
+function listPrsForCommit(owner, repo, sha, token) {
+  return new Promise((resolve, reject) => {
+    const path = `/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/commits/${sha}/pulls`
+    const req = https.request(
+      {
+        hostname: 'api.github.com',
+        method: 'GET',
+        path,
+        headers: {
+          Accept: 'application/vnd.github+json',
+          Authorization: `Bearer ${token}`,
+          'User-Agent': 'homebridge-resolve-version-bump',
+          'X-GitHub-Api-Version': '2022-11-28',
+        },
+      },
+      (res) => {
+        let body = ''
+        res.setEncoding('utf8')
+        res.on('data', (chunk) => {
+          body += chunk
+        })
+        res.on('end', () => {
+          if (res.statusCode < 200 || res.statusCode >= 300) {
+            reject(new Error(`GitHub API request failed (${res.statusCode}): ${body}`))
+            return
+          }
+          try {
+            const parsed = JSON.parse(body)
+            resolve(Array.isArray(parsed) ? parsed : [])
+          } catch (error) {
+            reject(new Error(`Failed to parse GitHub API response: ${error.message}`))
+          }
+        })
+      },
+    )
+
+    req.on('error', reject)
+    req.end()
+  })
+}
+
+async function main() {
+  const manualInput = (process.argv[2] || '').trim().toLowerCase()
+  if (manualInput) {
+    if (!allowed.has(manualInput)) {
+      console.error(`Invalid version bump '${manualInput}'. Use major, minor, or patch.`)
+      process.exit(1)
+    }
+    console.error(`Using manual version bump input: ${manualInput}`)
+    setOutput('version_bump', manualInput)
+    return
+  }
+
+  const repository = process.env.GITHUB_REPOSITORY || ''
+  const sha = process.env.GITHUB_SHA || ''
+  const token = process.env.GITHUB_TOKEN || ''
+
+  if (!repository || !sha || !token || !repository.includes('/')) {
+    console.error('Missing GITHUB_REPOSITORY, GITHUB_SHA, or GITHUB_TOKEN. Defaulting to patch.')
+    setOutput('version_bump', 'patch')
+    return
+  }
+
+  const [owner, repo] = repository.split('/')
+
+  try {
+    const prs = await listPrsForCommit(owner, repo, sha, token)
+    const pr = prs.find((candidate) => candidate.merged_at) || prs[0]
+
+    if (!pr) {
+      console.error('No PR associated with commit; defaulting to patch.')
+      setOutput('version_bump', 'patch')
+      return
+    }
+
+    const labels = (pr.labels || [])
+      .map((label) => (typeof label === 'string' ? label : label.name || ''))
+      .map((label) => label.toLowerCase())
+
+    const bump = resolveFromLabels(labels)
+    console.error(`Resolved bump '${bump}' from PR #${pr.number} labels: ${labels.join(', ') || '(none)'}`)
+    setOutput('version_bump', bump)
+  } catch (error) {
+    console.error(`Failed to inspect PR labels, defaulting to patch: ${error.message}`)
+    setOutput('version_bump', 'patch')
+  }
+}
+
+main().catch((error) => {
+  console.error(error)
+  process.exit(1)
+})

package/.github/workflows/release.yml

@@ -7,13 +7,54 @@ on:
       - 'beta'
       - 'latest'
   workflow_dispatch:
+    inputs:
+      release_type:
+        description: Release channel
+        required: true
+        type: choice
+        options:
+          - latest
+          - beta
+          - alpha
+        default: latest
+      is_esm:
+        description: Package is ESM
+        required: true
+        type: boolean
+        default: true
+      version_override:
+        description: Exact version (for example 2.1.0). Leave empty for auto bump.
+        required: false
+        type: string
+      version_bump:
+        description: Auto bump type when version_override is empty
+        required: false
+        type: choice
+        options:
+          - patch
+          - minor
+          - major
+        default: patch
+      max_attempts:
+        description: Max retries for prerelease collision handling
+        required: false
+        type: number
+        default: 5
+
+# Cancel any in-progress workflow for the same branch. A new push should
+# supersede the previous run rather than racing it to publish.
+concurrency:
+  group: release-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
-  # ─── BETA RELEASE (branches starting with "beta") ────────────────────────────
+  # ─── QUALITY GATE (all branches) ────────────────────────────────────────────
+  # Build and test run for EVERY push, regardless of branch. Both the beta
+  # and stable release paths depend on these passing before anything is
+  # published or version-bumped.
 
   # 1️⃣ Build and test
   build_and_test:
-    if: startsWith(github.ref_name, 'beta')
     uses: homebridge/.github/.github/workflows/nodejs-build-and-test.yml@latest
     with:
       enable_coverage: false
@@ -22,10 +63,12 @@ jobs:
 
   # 2️⃣ Lint
   lint:
-    if: startsWith(github.ref_name, 'beta')
     needs: build_and_test
     uses: homebridge/.github/.github/workflows/eslint.yml@latest
 
+
+  # ─── BETA RELEASE (branches starting with "beta") ────────────────────────────
+
   # 3️⃣ Publish beta to NPM (OIDC — id-token required here and in the reusable workflow)
   beta-publish:
     if: startsWith(github.ref_name, 'beta')
@@ -54,23 +97,26 @@ jobs:
 
   # ─── STABLE RELEASE (branch: "latest") ───────────────────────────────────────
 
-  # 1️⃣ Determine release type, ESM status, and branch name
+  # 3️⃣ Determine release type, ESM status, and branch name
   determine-release-type:
     if: github.ref_name == 'latest'
+    needs: lint
     uses: homebridge/.github/.github/workflows/determine-release-type.yml@latest
     with:
       ref_name: ${{ github.ref_name }}
 
-  # 2️⃣ Update version and changelog using the scripts
+  # 4️⃣ Update version and changelog using the scripts
   update-version:
     if: github.ref_name == 'latest'
     needs: determine-release-type
     uses: homebridge/.github/.github/workflows/update-version.yml@latest
     with:
-      release_type: ${{ needs.determine-release-type.outputs.release_type }}
-      is_esm: ${{ needs.determine-release-type.outputs.is_esm == 'true' }}
+      release_type: ${{ needs.determine-release-type.outputs.release_type || inputs.release_type }}
+      is_esm: ${{ needs.determine-release-type.outputs.is_esm == 'true' || inputs.is_esm == 'true' }}
+      version_override: ${{ inputs.version_override }}
+      version_bump: ${{ inputs.version_bump }}
 
-  # 3️⃣ Publish to NPM and create GitHub release (OIDC — id-token required here and in the reusable workflow)
+  # 5️⃣ Publish to NPM and create GitHub release (OIDC — id-token required here and in the reusable workflow)
   publish-release:
     if: github.ref_name == 'latest'
     needs: [determine-release-type, update-version]
@@ -82,10 +128,13 @@ jobs:
       release_type: ${{ needs.determine-release-type.outputs.release_type }}
       version: ${{ needs.update-version.outputs.version }}
       is_esm: ${{ needs.determine-release-type.outputs.is_esm == 'true' }}
+      version_override: ${{ inputs.version_override || '' }}
+      version_bump: ${{ inputs.version_bump || 'patch' }}
+      max_attempts: ${{ inputs.max_attempts || 5 }}
     secrets:
       NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
-  # 4️⃣ Promote branch if this is a prerelease (alpha/beta)
+  # 6️⃣ Promote branch if this is a prerelease (alpha/beta)
   promote-branch:
     if: ${{ github.ref_name == 'latest' && needs.determine-release-type.outputs.release_type != 'latest' && needs.determine-release-type.outputs.release_type != 'skip' }}
     needs: [determine-release-type, publish-release]
@@ -93,19 +142,19 @@ jobs:
     with:
       branch_name: ${{ needs.determine-release-type.outputs.branch_name }}
       release_type: ${{ needs.determine-release-type.outputs.release_type }}
-      is_esm: ${{ needs.determine-release-type.outputs.is_esm == 'true' }}
+      is_esm: ${{ needs.determine-release-type.outputs.is_esm == 'true' || inputs.is_esm == 'true' }}
 
-  # 5️⃣ Notify if any stable-release job fails
+  # 7️⃣ Notify if any job fails
   workflow-failure:
     if: failure()
-    needs: [determine-release-type, update-version, publish-release, promote-branch]
+    needs: [build_and_test, lint, determine-release-type, update-version, publish-release, promote-branch]
     uses: homebridge/.github/.github/workflows/report-failure.yml@latest
     with:
       workflow_name: ${{ github.workflow }}
       job_name: ${{ github.job }}
       run_url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
 
-  # 6️⃣ Post to Discord (Beta + Stable)
+  # 8️⃣ Post to Discord (Beta + Stable)
   discord:
     name: Release Notifications
     if: ${{ always() && ((startsWith(github.ref_name, 'beta') && needs.beta-publish.result == 'success') || (github.ref_name == 'latest' && needs.publish-release.result == 'success')) }}

package/CHANGELOG.md

@@ -1,29 +1,42 @@
+## [5.0.1](https://github.com/OpenWonderLabs/homebridge-switchbot/compare/v4.3.14...v5.0.1) (2026-04-17)
+
+
+### Bug Fixes
+
+* preserve LockTargetState during in-flight lock/unlock commands ([#1345](https://github.com/OpenWonderLabs/homebridge-switchbot/issues/1345)) ([cf6d7ae](https://github.com/OpenWonderLabs/homebridge-switchbot/commit/cf6d7aeb7d9d6a3ea4c26fb6abaa0ea39fb08d8e))
+
+
+
 # Changelog
 
 All notable changes to this project will be documented in this file. This project uses [Semantic Versioning](https://semver.org/)
 
 ## [5.0.0](https://github.com/OpenWonderLabs/homebridge-switchbot/compare/v4.3.1...v5.0.0) (2026-04-10)
 
-### What's Changed
-- Upgrade `node-switchbot` dependency from v4 beta to stable `^4.0.0`.
+### ⚠️ Breaking Changes
+- Upgrade `node-switchbot` dependency to `^4.0.0` with improved resilience and connection intelligence.
+- Matter support: The plugin now supports **Matter child bridge** platform mode for Matter-compatible smart home ecosystems.
+  - New `SwitchBotMatterPlatform` platform type for Matter protocol support.
+  - Matter devices are registered via the Discovery + Configuration merge model: discovered devices are supplemented by per-device config overrides.
+  - Stale accessories (previously registered but no longer discovered/configured) are automatically removed by default. Use `keepStaleAccessories` option to preserve them.
+- Device discovery and registration behavior has changed:
+  - Matter platform defaults to discovery-first registration with optional config-only device support via `allowConfigOnlyDevices`.
+  - Per-device configuration is now merged with discovered device properties (by `deviceId`) instead of being stored separately.
+
+#### Other Changes
 - Align SwitchBot client init options with stable v4 (`scanTimeout` and `enableConnectionIntelligence`).
 - Improve runtime use of node-switchbot v4 device manager by reusing managed devices and reducing redundant discovery calls.
 - Harden client teardown by cancelling and rejecting pending debounced writes during shutdown.
-- Refresh release docs from beta wording to stable v4 release wording.
-
-- Matter platform: register only devices discovered via the SwitchBot OpenAPI by default. Per-device config overrides (by deviceId) are correctly merged into discovered devices.
 - Add `options.allowConfigOnlyDevices` (boolean) to opt-in to registering devices that exist only in config (not discovered).
-- Add unit tests for per-device merging and config-only behavior.
-- Matter (Matter platform): default to discovery-first registration and automatically remove previously-registered "stale" accessories that are no longer discovered or configured.
 - Add `options.keepStaleAccessories` (Advanced Settings) to opt-in to preserving previously-registered accessories when set to true. Default: false (stale accessories are removed automatically).
 - Implement per-device OpenAPI polling with tracked timers and proper lifecycle cleanup (timers and BLE handlers cleared on unregister/shutdown).
 - Centralize OpenAPI/BLE -> Matter mapping and expand BLE/OpenAPI parsing to include PM2.5/PM10/VOC/CO2, temperature/humidity, improved color parsing, and additional sensor/robot-vacuum fields.
 - Prefer accessory-specific update helpers where available; fall back to generic Matter updates otherwise.
-- Add unit tests covering BLE parsing, stale-accessory behavior, mapping helpers, and lifecycle cleanup.
 - Add `options.dailyApiResetLocalMidnight` (boolean) to control whether the daily API budget resets at local midnight (true) or UTC midnight (false, default).
 - Fix configuration schema placement for the "Reset Daily Counter at Local Midnight" option: remove erroneous insertion inside IR remote type list and expose it correctly under platform `options`.
 - Fix UI discovery OpenAPI credential gating to require both token and secret before cloud discovery calls.
 - Enable node-switchbot v4 resilience options (`enableConnectionIntelligence` and `enableCircuitBreaker`) for UI discovery clients.
+- Add unit tests for per-device merging, config-only behavior, BLE parsing, stale-accessory behavior, and mapping helpers, and lifecycle cleanup.
 
 **Full Changelog**: https://github.com/OpenWonderLabs/homebridge-switchbot/compare/v4.3.1...v5.0.0
 

package/dist/homebridge-ui/public/css/styles.css

@@ -201,7 +201,7 @@ label {
 }
 
 input {
-  width: 100%;
+  margin-right: 4px;
   max-width: 400px;
   padding: 6px 8px;
   border: 1px solid #d1d5db;

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

@@ -81,10 +81,6 @@
     <button id="discoverBtn" onclick="discoverDevices()" style="margin-bottom: 8px">
       🔍 Discover
     </button>
-    <button id="cancelDiscoverBtn"
-      style="margin-left: 6px; margin-bottom: 8px; display: none; padding: 6px 10px; font-size: 11px" class="secondary">
-      Cancel
-    </button>
     <div id="discoverStatus" style="margin-bottom: 6px; font-size: 11px"></div>
     <div id="discoverDevicesFound" style="margin-bottom: 6px; font-size: 11px; display: none"></div>
     <div id="discoverPhaseProgress" class="discover-phase-progress" style="display: none">

package/dist/homebridge-ui/public/js/api.d.ts

@@ -53,6 +53,7 @@ export declare function addDevicesInBulk(devices: Array<{
     address?: string;
     model?: string;
 }>): Promise<any>;
+export declare function normalizeBulkAddDevicesResponse(resp: any): any;
 export declare function updateDevice(deviceId: string, configDeviceName?: string, configDeviceType?: string, options?: {
     refreshRate?: number;
     connectionPreference?: string;

package/dist/homebridge-ui/public/js/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../../src/homebridge-ui/public/js/api.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../../src/homebridge-ui/public/js/api.ts"],"names":[],"mappings":"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"}

package/dist/homebridge-ui/public/js/api.js

@@ -194,7 +194,20 @@ export async function addDevicesInBulk(devices) {
     if (!resp || resp.success === false) {
         throw new Error(resp?.data?.message || 'Bulk add failed');
     }
-    return resp.data || resp;
+    return normalizeBulkAddDevicesResponse(resp);
+}
+export function normalizeBulkAddDevicesResponse(resp) {
+    const payload = resp?.data && typeof resp.data === 'object' ? resp.data : resp;
+    const addedCount = Number(payload?.addedCount ?? payload?.added ?? 0);
+    const skippedCount = Number(payload?.skippedCount ?? payload?.skipped ?? 0);
+    const updatedCount = Number(payload?.updatedCount ?? payload?.updated ?? 0);
+    return {
+        ...payload,
+        success: resp?.success ?? true,
+        addedCount,
+        skippedCount,
+        updatedCount,
+    };
 }
 export async function updateDevice(deviceId, configDeviceName, configDeviceType, options) {
     if (typeof homebridge.getPluginConfig !== 'function' || typeof homebridge.updatePluginConfig !== 'function') {