@linanw/homebridge-mijia-remote-camera 0.4.1 → 0.4.3

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.4.3 — 2026-10-24
+
+- Name the existing HomeKit night-vision control 手动夜视 and add 自动夜视, with distinct `Name` and `ConfiguredName` values and the original service identity preserved.
+- Reflect manual, automatic and off policies as two mutually exclusive switches. Serialize fresh mode checks and conditional changes with other camera-control requests, so an already-off switch does not disable the other mode.
+- Synchronize both controls from confirmed Xiaomi/UI/Matter mode observations and prevent an older in-flight read from overwriting a newer observed mode.
+
+## 0.4.2 — 2026-10-24
+
+- Publish explicit HomeKit `ConfiguredName` values for the four camera direction switches: 云台向上, 云台向下, 云台向左 and 云台向右.
+- Repair default service names in place while preserving existing custom configured names, service identifiers, pairing and automation targets.
+
 ## 0.4.1 — 2026-10-24
 
 - Accept the trusted Homebridge storage alias used by Synology Docker during GUI component import. User-selected descendants still reject symbolic links and directory escapes.

package/README.md

@@ -8,7 +8,7 @@
 
 要求 **Linux x86_64、Node.js 22.13.1+（22.x）或 24.x、Homebridge 1.11.4+（1.x）或 2.x**，以及支持自定义插件设置页的 Homebridge UI。适用 Synology DS1618+ 上以 host 网络运行的 Homebridge Docker。运行组件提供 glibc 和 musl 版本；ARM、macOS 和 Windows 不支持。
 
-这是独立开发的插件，与小米、Apple 和 Homebridge 项目没有隶属关系。当前尚未获得 Homebridge Verified 或 Matter 认证。
+这是独立开发的插件，与小米、Apple 和 Homebridge 项目没有隶属关系。[0.4.1](https://github.com/linanw/homebridge-mijia-remote-camera/releases/tag/v0.4.1) 已公开发布；Homebridge 认证申请 [#1296](https://github.com/homebridge/plugins/issues/1296) 已提交，正在等待官方审核。当前尚未获得 Homebridge Verified 或 Matter 认证。
 
 ## 安装和首次导入
 
@@ -16,7 +16,7 @@
 
 1. 在 Homebridge UI 的“插件”页搜索完整包名 `@linanw/homebridge-mijia-remote-camera` 并安装。迁移时先停用此前连接同一摄像头的 viewer／relay 或旧插件，避免重复占用运行目录。
 2. 将你已持有的 `homebridge-mijia-remote-camera-0.1.0.tgz` 放入 **Homebridge 持久化存储目录**，容器内通常为 `/homebridge`。也支持放在该目录内的匹配版本 `assets` 目录。插件不会提供或下载这些组件。
-3. 打开插件设置页的“导入已有的运行包”，填写存储目录内的相对路径，例如 `homebridge-mijia-remote-camera-0.1.0.tgz`，点击“导入并校验组件”，等待结果。此过程无需终端，也无需让 Homebridge 在 TTY 中启动。绝对路径也必须位于同一存储目录内；越界路径、符号链接与不匹配的组件会被拒绝。
+3. 打开插件设置页的“导入已有的运行包”，填写存储目录内的相对路径，例如 `homebridge-mijia-remote-camera-0.1.0.tgz`，点击“导入并校验组件”，等待结果。此过程无需终端，也无需让 Homebridge 在 TTY 中启动。绝对路径也必须位于同一配置存储目录内；Homebridge 指定的根目录可以是别名链接，但用户选择的子路径中的符号链接、越界路径与不匹配的组件会被拒绝。
 4. 点击“启用并保存配置”，按界面提示从 Homebridge 首页重新启动，再回到设置页登录。
 
 导入只读取运行文件、核验固定 SHA-256，并保留组件的 legal 目录；目标为 `<Homebridge storage>/mijia-remote-camera/runtime`。它不导入旧包的插件代码、凭据或配置。已有有效组件会保留；目录正被运行中的插件占用时返回 `runtime_in_use`。此时先停用平台并正常重启，待旧进程退出后再导入。损坏的已有目录也不会被覆盖，请先备份后处理。
@@ -69,9 +69,13 @@ mijia-camera-setup --from /homebridge/homebridge-mijia-remote-camera-0.1.0.tgz -
 
 默认开启现场声音、双向对讲和夜视开关。升级后重启摄像头子桥即可，保留已有 HomeKit 配对。在“家庭”直播页面使用对讲按钮，并允许 iPhone 访问麦克风；松开或结束对讲后会停止向摄像头发送声音。声音静音和音量控制会作用于实际音频转发。插件设置页显示是否已收到真实摄像头声音，以及当前协议是否支持对讲。
 
-设置页可修改“收听摄像头现场声音”“允许双向对讲”“在家庭中显示夜视开关”；保存后需重启摄像头子桥。对应配置项为 `enableAudio`、`enableTalkback`、`enableNightVision`，默认均为 `true`。关闭现场声音也会禁用对讲。
+设置页可修改“收听摄像头现场声音”“允许双向对讲”“在家庭中显示手动／自动夜视开关”；保存后需重启摄像头子桥。对应配置项为 `enableAudio`、`enableTalkback`、`enableNightVision`，默认均为 `true`。关闭现场声音也会禁用对讲。
 
-夜视目前仅支持已核对 MIOT 定义的 `chuangmi.camera.061a01`／`chuangmi.camera.061a03`。插件设置页先读取设备实际状态，再选择“自动／开启／关闭”并应用；写入后会回读确认。Apple“家庭”的“夜视”开关表示允许夜视：自动模式显示为开，重复开不会把自动改为强制开启；关掉后重新打开会设置为始终开启。需要恢复自动时，请在插件设置页选择。该开关表示夜视策略，不表示红外灯此刻是否点亮。启动和轮询只读状态，不更改策略。
+夜视目前仅支持已核对 MIOT 定义的 `chuangmi.camera.061a01`／`chuangmi.camera.061a03`。插件设置页先读取设备实际状态，再选择“自动／开启／关闭”并应用；写入后会回读确认。
+
+0.4.3 起 Apple“家庭”提供两个互斥开关：“手动夜视”开启时设置为始终开启；“自动夜视”开启时由摄像头按环境光自动决定是否启用红外。关闭当前开启的开关会关闭夜视，两者均显示关。重复关闭已经关闭的开关会保留另一个模式。两个开关反映夜视策略，不表示红外灯此刻是否点亮；米家 App、插件设置或 Matter 修改模式后，它们会同步更新。启动和轮询只读状态，不更改策略。
+
+原夜视开关保留配对和服务编号，名称改为“手动夜视”；自动模式下它现在显示关，“自动夜视”显示开。已有自动化中打开原开关表示强制开启夜视；需要自动模式的场景请使用新增开关。
 
 ## 云台方向控制（0.3.0）
 
@@ -79,6 +83,8 @@ mijia-camera-setup --from /homebridge/homebridge-mijia-remote-camera-0.1.0.tgz -
 
 需要在 Apple“家庭”中操作时，在插件设置页勾选“在 Apple家庭中显示四个云台方向开关”，保存并重启摄像头子桥。对应 `enablePtzSwitches: true`，默认关闭。每个开关打开后只发一次方向指令，随后自动回到关闭状态；关闭开关不会再次移动摄像头。无需重新配对。
 
+0.4.2 为四个方向补充 Apple“家庭”使用的独立配置名称：“云台向上”“云台向下”“云台向左”“云台向右”。已有配对和方向服务标识不变。升级并重启摄像头子桥后，重新打开“家庭”查看；Apple 已保存的自定义别名可能需要在该开关设置中手动调整，无需移除摄像头。
+
 MatterDesk 使用摄像头端点上的厂商方向步进接口 `MijiaPtzStep`（cluster `0xFFF1FC01`）。客户端需要先读取型号支持与当前可用状态；方向命令仅接受上、下、左、右，不提供任意设备指令入口。它没有将固定步进冒充为标准 Matter 机械角度控制；其他 Matter 客户端可能只显示视频功能。
 
 ## Matter 摄像头（实验性）
@@ -129,7 +135,9 @@ Matter 信令及 WebRTC 播放目前面向同一局域网，无外部 STUN／TUR
 
 0.4.0 在所选自有家庭完成真实云端往返：中文临时名称写入、独立读取并恢复原名；移到同家庭另一个现有房间、独立读取并恢复原房间。最终名称／房间和原凭据均保持原值。云端去除 emoji 的案例未被误报为确认成功。该验证不覆盖所有名称字符、家庭权限或摄像头型号。
 
-2026-10-24 的完整本地测试在 Node 22.22.1 和 Node 24.19.0、Homebridge 2.4.0 下分别为 325 项：324 通过、1 项仅 root 用户适用的所有权测试跳过、0 失败；包含私有组件和独立 Matter 控制器集成。无私有组件的公开源码测试另见 [验证记录](docs/verification.md)，两者不能互相替代。
+2026-10-24，0.4.1 的完整本地测试在 Node 22.22.1 和 Node 24.19.0、Homebridge 2.4.0 下分别为 328 项：327 通过、1 项仅 root 用户适用的所有权测试跳过、0 失败；包含已持有的运行组件和独立 Matter 控制器集成。[公开 CI](https://github.com/linanw/homebridge-mijia-remote-camera/actions/runs/40076759349) 的 Node 22.13.1／22.x／24.x × Homebridge 1.11.4／2.4.0 六个组合全部通过；公开 CI 不含私有组件，依赖这些组件的测试会明确跳过。
+
+0.4.1 已通过从公开 npm 匿名全新安装到非 root 用户环境、无平台配置启动 Homebridge 和生产依赖审计（0 个漏洞）。这些检查不表示新用户无需本地运行组件即可播放视频。详细验证范围见 [验证记录](docs/verification.md)。
 
 远程中继仍可能间歇断开并自动重连，重连期间预览和直播可能暂不可用。目前尚未完成长时间稳定性验证。
 
@@ -145,4 +153,6 @@ mijia-camera-diagnose --storage /var/lib/homebridge
 
 能在插件中收到视频、但 Apple“家庭”添加失败时，请检查摄像头日志中的独立 HomeKit 端口及 Setup Code；摄像头端口与主桥／子桥端口不同。
 
-公开仓库与认证准备、兼容性矩阵及已知限制见 [verification.md](docs/verification.md)，组件权利说明见 [THIRD_PARTY_NOTICES.md](THIRD_PARTY_NOTICES.md)。
+相关的 [homebridge-xiaomi-camera-native](https://github.com/Kosztyk/homebridge-xiaomi-camera-native) 已提出认证申请 [#1289](https://github.com/homebridge/plugins/issues/1289)，截至 2026-10-24 尚待最终审核。它的 README 描述直接局域网 MISS/CS2 视频、快照与云台，不含音频／双向对讲。本插件针对已验证的跨网络摄像头传输、音频／对讲和米家／Matter 资料接口；存在功能重叠，不代表整体功能优于其他项目。
+
+公开发布与认证审核状态、兼容性矩阵、同类项目对照及已知限制见 [verification.md](docs/verification.md)，组件权利说明见 [THIRD_PARTY_NOTICES.md](THIRD_PARTY_NOTICES.md)。

package/config.schema.json

@@ -81,7 +81,7 @@
       },
       "enableNightVision": {
         "type": "boolean",
-        "title": "在家庭中显示夜视开关",
+        "title": "在家庭中显示手动／自动夜视开关",
         "default": true
       },
       "enablePtzSwitches": {

package/docs/verification.md

@@ -1,6 +1,6 @@
-# Homebridge verification preparation
+# Homebridge verification status and evidence
 
-Reviewed against the [current official criteria](https://github.com/homebridge/plugins/wiki/Verified-Plugins) on 2026-10-24. **This plugin has not been verified by the Homebridge team.** This document records preparation and remaining review points; it is not an approval or a guarantee that the request will be accepted.
+Reviewed against the [current official criteria](https://github.com/homebridge/plugins/wiki/Verified-Plugins) on 2026-10-24. Release **0.4.1** is public on [npm](https://www.npmjs.com/package/@linanw/homebridge-mijia-remote-camera), with matching [GitHub source and release](https://github.com/linanw/homebridge-mijia-remote-camera/releases/tag/v0.4.1). [Verification request #1296](https://github.com/homebridge/plugins/issues/1296) has been submitted and is open with `pending` / `request-verification` labels. **The Homebridge team has not granted verification.** The project's own checks and CI do not constitute approval, and no Verified badge is displayed.
 
 ## Compatibility and distribution
 
@@ -8,7 +8,7 @@ Reviewed against the [current official criteria](https://github.com/homebridge/p
 | --- | --- |
 | npm name | `@linanw/homebridge-mijia-remote-camera` |
 | Platform | Dynamic platform `MijiaRemoteCamera`; external native HAP camera; optional independently registered Matter camera |
-| Target release | 0.4.1; matching public npm and GitHub release required before submission |
+| Review release | Public npm and matching GitHub release 0.4.1; code commit `b0fcb441872d5fd38e6035b18a3967c9e7c49421` |
 | Node.js | `^22.13.1 || ^24.0.0` |
 | Homebridge | `^1.11.4 || ^2.0.0`; current development dependency 2.4.0 |
 | OS / CPU | Linux x64 only; pinned local runtime contains glibc and musl variants |
@@ -23,8 +23,8 @@ The current criteria specify the supported Node LTS lines, currently 22 and 24.
 | Official requirement | Implementation / review evidence |
 | --- | --- |
 | Dynamic platform and a distinct purpose | Registered platform with a single selected external camera; the comparison below explains the remote Xiaomi transport use case |
-| Public npm and GitHub source with Issues enabled | Public source, Issues, npm 0.4.0 and its GitHub release exist; the 0.4.1 alias-import patch is the final review target |
-| Supported Node LTS, clean installation and no unconfigured startup | Node 22/24 public-source CI matrix; no platform instance or camera is created without configuration; clean tarball installation still needs final release verification |
+| Public npm and GitHub source with Issues enabled | Public source and Issues are available; npm 0.4.1 and the matching GitHub release are published |
+| Supported Node LTS, clean installation and no unconfigured startup | All six public CI combinations passed; anonymous fresh nonroot installation of npm 0.4.1 and unconfigured Homebridge startup passed without creating the plugin runtime, account session or camera |
 | No system-changing postinstall or TTY setup | No plugin lifecycle install scripts; local import and account setup are in Homebridge UI; CLI tools are optional |
 | Settings GUI | Schema plus protected custom settings page |
 | No analytics or tracking | No author-operated analytics service; Xiaomi account, cloud metadata and remote-camera services are necessary network dependencies |
@@ -45,6 +45,8 @@ The comparison uses the [official verified list](https://github.com/homebridge/p
 
 A related [homebridge-xiaomi-go2rtc project](https://github.com/moguennouni/homebridge-xiaomi-go2rtc) now documents local Xiaomi camera streaming and controls, automatic go2rtc provisioning and broader server architectures. It was not present in the official verified list checked for this preparation. Its overlapping functionality must still be disclosed; acceptance of a distinct use case is the Homebridge team's decision.
 
+Another related project, [homebridge-xiaomi-camera-native](https://github.com/Kosztyk/homebridge-xiaomi-camera-native), has an open [verification request #1289](https://github.com/homebridge/plugins/issues/1289), marked `awaiting-final-review` on 2026-10-24. It was not in the official verified list checked on that date. Its [README](https://github.com/Kosztyk/homebridge-xiaomi-camera-native/blob/main/README.md) describes direct LAN MISS/CS2 video, snapshots and pan/tilt, requires LAN access to the camera, and explicitly excludes audio and two-way talk. This plugin's validated remote transport, camera audio/talkback and Mi Home/Matter metadata are relevant differences. Both the existing overlap and the pending application should be considered by the reviewers; no general feature-superset or replacement claim is made.
+
 ## Scope that must remain explicit
 
 - The npm package excludes micam, its native components, JRE and FFmpeg. The known local backend repository has no license, and the known FFmpeg build enables `nonfree`. No redistribution rights are asserted. See [third-party notices](../THIRD_PARTY_NOTICES.md).
@@ -53,21 +55,22 @@ A related [homebridge-xiaomi-go2rtc project](https://github.com/moguennouni/home
 - Apple Home's own name and room edits are not written back to Mi Home. Matter metadata uses a vendor interface and a 160-byte UTF-8 bound; controllers must explicitly support it. Neither of these features is a universal HomeKit/Matter room sync promise.
 - Matter remains an experimental development device using SDK test attestation. Homebridge verification, if granted, would not confer Matter product certification.
 
-## Validation and release checklist
+## Validation and release status
 
-The CI workflow tests public-source behavior with Node 22.13.1, the current 22.x and 24.x releases against Homebridge 1.11.4 and 2.4.0. It runs `npm test` without proprietary runtime assets; codec-dependent HomeKit media and the full-runtime UI IPC fixture explicitly report skipped tests when their required components are absent. Java/vendor protocol fixtures and real AAC-ELD/media checks require the separately held components; execute those locally and report their results separately. The workflow must actually pass on the public repository before describing CI as passed.
+The [0.4.1 public CI run](https://github.com/linanw/homebridge-mijia-remote-camera/actions/runs/40076759349), for code commit `b0fcb441872d5fd38e6035b18a3967c9e7c49421`, passed all six combinations of Node 22.13.1 / current 22.x / 24.x and Homebridge 1.11.4 / 2.4.0. It installs public dependencies and runs unfiltered `npm test` without proprietary runtime assets. Codec-dependent HomeKit media, Java/vendor protocol fixtures and the full-runtime UI IPC fixture explicitly skip when their required components are absent. Public CI therefore does not replace the separately reported full-runtime and real-device validation.
 
-The final local full suite, with the held runtime and an independent Matter controller integration, passed on **Node 22.22.1 and Node 24.19.0 / Homebridge 2.4.0: 325 tests, 324 passed, 1 root-only ownership test skipped, 0 failed on each Node version**. Real-account validation changed a Chinese camera name and restored it, moved the camera between two existing rooms of its owned home and restored the original room, and independently read back each result. The original name/room and credentials were preserved at completion. An emoji-containing target was normalized by the cloud, correctly returned `metadata_not_applied`, and was restored; the plugin does not promise arbitrary cloud name characters or automatic rollback.
+The final 0.4.1 local full suite, with the held runtime and an independent Matter controller integration, passed on **Node 22.22.1 and Node 24.19.0 / Homebridge 2.4.0: 328 tests, 327 passed, 1 root-only ownership test skipped, 0 failed on each Node version**. Real-account validation changed a Chinese camera name and restored it, moved the camera between two existing rooms of its owned home and restored the original room, and independently read back each result. The original name/room and credentials were preserved at completion. An emoji-containing target was normalized by the cloud, correctly returned `metadata_not_applied`, and was restored; the plugin does not promise arbitrary cloud name characters or automatic rollback.
 
-A local isolated source copy with no `assets/`, using Node 22.22.1 and Homebridge 2.4.0, ran the unfiltered `npm test`: **325 tests, 295 passed, 30 explicitly skipped, 0 failed**. It reused installed public dependencies, so it is not evidence of a fresh registry installation or of all six CI combinations. The four affected native-media/UI test files also ran with the held runtime: **40 passed, 0 skipped**; without assets the same subset reported **35 passed, 5 skipped**. No real account writes were performed by these tests.
+Anonymous installation of **0.4.1** from the public npm registry into a fresh nonroot environment passed with lifecycle scripts disabled. Unconfigured Homebridge loaded the plugin and started normally without creating the plugin runtime, account session or camera. The public tarball contains no vendor runtime assets, and its production dependency audit reported **0 vulnerabilities**. These installation checks do not establish working video for users without the matching local components.
 
 - [x] Publish the reviewed source to the intended public GitHub repository, enable Issues, and verify all package URLs resolve.
 - [x] Complete changed-value Chinese rename/restore and existing-room round-trip validation with independent reads, original values restored and credentials unchanged. Confirm exact readback rejects a cloud-normalized emoji result; run the final local suite on Node 22 and 24.
-- [x] Public [CI matrix](https://github.com/linanw/homebridge-mijia-remote-camera/actions/runs/40076414483) passed all six combinations for 0.4.0 plus test portability fixes. The final 0.4.1 patch must retain a passing matrix. Anonymous registry installation as a nonroot user succeeded, and unconfigured Homebridge loaded the plugin without creating its runtime.
+- [x] Public [0.4.1 CI matrix](https://github.com/linanw/homebridge-mijia-remote-camera/actions/runs/40076759349) passed all six combinations. Anonymous fresh nonroot registry installation and unconfigured Homebridge startup passed.
 - [x] Inspect the exact npm tarball and Git tree for credentials, imported assets, APK/DEX/decompiled code and third-party binaries. Only the project's own Java adapter JAR is intended for distribution.
-- [ ] Publish npm 0.4.1 and a matching GitHub release with release notes; ensure the default branch package version matches npm latest.
+- [x] Publish npm 0.4.1 and a matching GitHub release with release notes; verify the default-branch package version matches npm latest.
 - [x] Refresh the production audit and official criteria/checker findings, then provide the limitations and comparison to the reviewers.
-- [ ] Submit the official verification request and address review feedback. Add a Verified badge only after the Homebridge team grants verification.
+- [x] Submit [verification request #1296](https://github.com/homebridge/plugins/issues/1296) for 0.4.1; it is awaiting official review.
+- [ ] Address official review feedback and await the Homebridge team's decision. Add a Verified badge only if verification is granted.
 
 The [official request form](https://github.com/homebridge/plugins/issues/new?template=1_verification-request.yml) requires the npm name, public repository and six Yes/No declarations. A roughly 100×100 PNG icon is optional and must respect licensing/trademarks. Include setup restrictions and test evidence in More Information. Use the [current template](https://github.com/homebridge/plugins/blob/latest/.github/ISSUE_TEMPLATE/1_verification-request.yml); repository transfer or a package scope change is not required for this request. The project team performs the review described in the [program documentation](https://github.com/homebridge/plugins#plugin-verification).
 

package/homebridge-ui/public/index.html

@@ -45,10 +45,10 @@
   <section><div class="step">03 · 声音与夜视</div><h2>摄像头功能</h2>
     <label for="nightMode">夜视模式</label><select id="nightMode" disabled><option value="auto">自动</option><option value="on">开启</option><option value="off">关闭</option></select>
     <div class="row"><button id="nightRead" class="secondary">读取夜视状态</button><button id="nightSave" disabled>应用夜视模式</button></div><p id="nightState" class="small" aria-live="polite" style="margin-top:12px">读取摄像头实际模式后可修改。</p>
-    <p class="small">Apple“家庭”中的夜视开关表示允许夜视；自动模式显示为开。关闭后再次打开会设为始终开启；恢复自动请在这里选择。</p>
+    <p class="small">Apple“家庭”提供“手动夜视”和“自动夜视”两个互斥开关，分别设置常开和自动模式。关闭当前开启的开关会关闭夜视；两者表示模式，不代表红外灯此刻是否点亮。</p>
     <label><input id="enableAudio" type="checkbox" style="width:auto"> 收听摄像头现场声音</label>
     <label><input id="enableTalkback" type="checkbox" style="width:auto"> 允许 Apple“家庭”双向对讲</label>
-    <label><input id="enableNightVision" type="checkbox" style="width:auto"> 在 Apple“家庭”中显示夜视开关</label>
+    <label><input id="enableNightVision" type="checkbox" style="width:auto"> 在 Apple“家庭”中显示手动／自动夜视开关</label>
     <div class="row"><button id="saveFeatures" class="secondary">保存功能配置</button></div><p id="featureState" class="small" aria-live="polite" style="margin-top:12px">功能配置保存后需重启摄像头子桥。对讲时，在“家庭”直播页面使用对讲按钮。</p>
   </section>
   <section id="ptzSection"><div class="step">04 · 云台</div><h2>调整摄像头方向</h2>

package/lib/night-vision.mjs

@@ -11,11 +11,12 @@ export const supportsNightVision = model => MODELS.has(model);
 
 /** Reads real camera policy. Registration/polling never changes that policy. */
 export class NightVisionManager {
-  constructor({ getMode, setMode, cacheMs = 10000, pollIntervalMs = 60000, timeoutMs = 7200,
+  constructor({ getMode, setMode, setModeSwitch, cacheMs = 10000, pollIntervalMs = 60000, timeoutMs = 7200,
     now = Date.now, onChange, onFailure } = {}) {
     if (typeof getMode !== 'function' || typeof setMode !== 'function') throw failure();
     this.getMode = getMode;
     this.setMode = setMode;
+    this.setModeSwitch = setModeSwitch;
     this.cacheMs = cacheMs;
     this.pollIntervalMs = pollIntervalMs;
     this.timeoutMs = timeoutMs;
@@ -64,6 +65,12 @@ export class NightVisionManager {
     return this.status();
   }
 
+  observe(mode) {
+    if (this.closed || !MODES.has(mode)) return;
+    ++this.generation;
+    return this.accept(mode);
+  }
+
   async get({ force = false } = {}) {
     await this.mutations;
     if (this.closed) throw failure('runtime_closed');
@@ -118,6 +125,21 @@ export class NightVisionManager {
     });
   }
 
+  setModeEnabled(mode, enabled) {
+    if (!['on', 'auto'].includes(mode) || typeof enabled !== 'boolean')
+      return Promise.reject(failure('night_vision_rejected'));
+    if (typeof this.setModeSwitch !== 'function') return Promise.reject(failure());
+    return this.enqueue(async () => {
+      const confirmed = await this.operation(async () => {
+        const result = await this.setModeSwitch(mode, enabled);
+        if (enabled ? result?.mode !== mode : result?.mode === mode)
+          throw failure('night_vision_not_applied');
+        return result;
+      });
+      return this.accept(confirmed);
+    });
+  }
+
   start() {
     if (this.closed || this.timer) return;
     void this.get({ force: true }).catch(() => {});
@@ -133,19 +155,36 @@ export class NightVisionManager {
   }
 }
 
-/** The switch enables the night-vision policy; Auto is enabled, not a real-time IR-lamp reading. */
-export function configureNightVision({ api, accessory, runtime, model, name = '夜视', log,
+/** Separate manual and automatic policy switches; neither reports the live IR-lamp state. */
+export function configureNightVision({ api, accessory, runtime, model, name = '手动夜视', log,
   cacheMs, pollIntervalMs, timeoutMs } = {}) {
   if (!supportsNightVision(model)) return null;
-  const service = accessory.getServiceById?.(api.hap.Service.Switch, 'mijia-night-vision')
-    || accessory.addService(api.hap.Service.Switch, name, 'mijia-night-vision');
-  const on = service.getCharacteristic(api.hap.Characteristic.On);
+  const controls = [
+    { mode: 'on', name, subtype: 'mijia-night-vision' },
+    { mode: 'auto', name: '自动夜视', subtype: 'mijia-night-vision-auto' },
+  ].map(control => {
+    const service = accessory.getServiceById?.(api.hap.Service.Switch, control.subtype)
+      || accessory.addService(api.hap.Service.Switch, control.name, control.subtype);
+    service.displayName = control.name;
+    service.updateCharacteristic(api.hap.Characteristic.Name, control.name);
+    if (!service.testCharacteristic(api.hap.Characteristic.ConfiguredName))
+      service.addOptionalCharacteristic(api.hap.Characteristic.ConfiguredName);
+    const configuredName = service.getCharacteristic(api.hap.Characteristic.ConfiguredName);
+    if (typeof configuredName.value !== 'string' || !configuredName.value.trim())
+      configuredName.updateValue(control.name);
+    return { ...control, service, on: service.getCharacteristic(api.hap.Characteristic.On) };
+  });
   let lastLoggedFailure;
   const manager = new NightVisionManager({
     getMode: () => runtime.getNightVision(),
     setMode: mode => runtime.setNightVision(mode),
+    setModeSwitch: (mode, enabled) => runtime.setNightVisionSwitch(mode, enabled),
     cacheMs, pollIntervalMs, timeoutMs,
-    onChange: status => { lastLoggedFailure = null; service.updateCharacteristic(api.hap.Characteristic.On, status.enabled); },
+    onChange: status => {
+      lastLoggedFailure = null;
+      for (const control of controls)
+        control.service.updateCharacteristic(api.hap.Characteristic.On, status.mode === control.mode);
+    },
     onFailure: reason => {
       if (reason !== lastLoggedFailure) {
         lastLoggedFailure = reason;
@@ -154,9 +193,15 @@ export function configureNightVision({ api, accessory, runtime, model, name = '
     },
   });
   const hapFailure = () => new api.hap.HapStatusError(api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE);
-  on.onGet(async () => { try { return (await manager.get()).enabled; } catch { throw hapFailure(); } });
-  on.onSet(async value => { try { await manager.setEnabled(value); } catch { throw hapFailure(); } });
-  const observed = value => { if (!manager.closed && MODES.has(value?.mode)) manager.accept(value.mode); };
+  for (const control of controls) {
+    control.on.onGet(async () => {
+      try { return (await manager.get()).mode === control.mode; } catch { throw hapFailure(); }
+    });
+    control.on.onSet(async value => {
+      try { await manager.setModeEnabled(control.mode, value); } catch { throw hapFailure(); }
+    });
+  }
+  const observed = value => manager.observe(value?.mode);
   runtime.on?.('night-mode', observed);
   const shutdown = manager.shutdown.bind(manager);
   manager.shutdown = () => { runtime.off?.('night-mode', observed); shutdown(); };

package/lib/platform.mjs

@@ -107,14 +107,14 @@ export class MijiaRemoteCameraPlatform {
       ?.setCharacteristic(this.api.hap.Characteristic.Manufacturer, 'Xiaomi')
       .setCharacteristic(this.api.hap.Characteristic.Model, label(selected.model || '米家远程摄像头'))
       .setCharacteristic(this.api.hap.Characteristic.SerialNumber, `MiCam-${opaqueId}`)
-      .setCharacteristic(this.api.hap.Characteristic.FirmwareRevision, '0.4.0');
+      .setCharacteristic(this.api.hap.Characteristic.FirmwareRevision, '0.4.3');
     this.delegate = this.delegateFactory({ api: this.api, log: this.log, runtime: this.runtime,
       config: this.config, ffmpegPath: this.runtime.ffmpegPath });
     accessory.configureController(this.delegate.controller);
     if (this.delegate.audioCompatibility) this.delegate.controller.setMicrophoneMuted(this.config.enableAudio === false);
     if (this.delegate.talkbackEnabled) this.delegate.controller.setSpeakerMuted(false);
     if (this.config.enableNightVision !== false) this.nightVision = configureNightVision({ api: this.api,
-      accessory, runtime: this.runtime, model: selected.model, name: '夜视', log: this.log });
+      accessory, runtime: this.runtime, model: selected.model, name: '手动夜视', log: this.log });
     if (this.config.enablePtzSwitches === true) this.ptz = await configurePtz({ api: this.api,
       accessory, runtime: this.runtime, selection: selected, log: this.log });
     if (this.stopping) { this.ptz?.shutdown?.(); this.nightVision?.shutdown?.(); this.delegate?.shutdown(); return; }

package/lib/ptz.mjs

@@ -17,6 +17,15 @@ export async function configurePtz({ api, accessory, runtime, selection, log } =
     const subtype = `mijia-ptz-${direction}`;
     const service = accessory.getServiceById?.(api.hap.Service.Switch, subtype)
       || accessory.addService(api.hap.Service.Switch, LABELS[direction], subtype);
+    service.displayName = LABELS[direction];
+    service.updateCharacteristic(api.hap.Characteristic.Name, LABELS[direction]);
+    // Home uses ConfiguredName for switches grouped under a camera. Keep a
+    // controller's existing custom name when reusing an already configured service.
+    if (!service.testCharacteristic(api.hap.Characteristic.ConfiguredName))
+      service.addOptionalCharacteristic(api.hap.Characteristic.ConfiguredName);
+    const configuredName = service.getCharacteristic(api.hap.Characteristic.ConfiguredName);
+    if (typeof configuredName.value !== 'string' || !configuredName.value.trim())
+      configuredName.updateValue(LABELS[direction]);
     services.push(service);
     const on = service.getCharacteristic(api.hap.Characteristic.On);
     service.updateCharacteristic(api.hap.Characteristic.On, false);

package/lib/runtime.mjs

@@ -405,7 +405,11 @@ export class RuntimeManager extends EventEmitter {
     if (!['on', 'off', 'auto'].includes(mode)) return Promise.reject(new RuntimeError('invalid_request'));
     return this._nightVision(mode);
   }
-  _nightVision(mode) {
+  setNightVisionSwitch(mode, enabled) {
+    if (!['on', 'auto'].includes(mode) || typeof enabled !== 'boolean') return Promise.reject(new RuntimeError('invalid_request'));
+    return this._nightVision(mode, enabled);
+  }
+  _nightVision(mode, enabled) {
     if (this.metadataWriteBusy) return Promise.reject(new RuntimeError('metadata_busy'));
     if (this.closed) return Promise.reject(new RuntimeError('runtime_closed'));
     if (this.paused) return Promise.reject(new RuntimeError('auth_in_progress'));
@@ -414,43 +418,58 @@ export class RuntimeManager extends EventEmitter {
     if (!selected) return Promise.reject(new RuntimeError('not_selected'));
     const deadline = Date.now() + 6500, region = this.region, generation = this.generation;
     this.controlRequests.add(controller);
+    let cancelled = false, timer;
     const valid = () => {
       const current = this.selected();
       return !cancelled && !controller.signal.aborted && this.region === region && this.generation === generation && current
         && ['deviceId', 'homeId', 'homeOwner', 'region'].every(key => current[key] === selected[key]);
     };
-    let cancelled = false, timer;
-    const task = async () => {
+    const check = () => {
       if (cancelled || Date.now() >= deadline) throw new RuntimeError('query_timeout');
       if (this.closed) throw new RuntimeError('runtime_closed');
       if (this.paused) throw new RuntimeError('auth_in_progress');
-      const current = this.selected();
       if (!valid()) throw new RuntimeError('query_cancelled');
-      const args = [current.homeId, current.homeOwner, current.deviceId, ...(mode ? [mode] : [])];
+    };
+    const request = async requestedMode => {
+      check();
+      const current = this.selected();
+      const args = [current.homeId, current.homeOwner, current.deviceId, ...(requestedMode ? [requestedMode] : [])];
       let reply;
       if (this.cloudControl) {
         await this.open();
-        if (Date.now() >= deadline) throw new RuntimeError('query_timeout');
-        if (!valid() || this.paused || this.closed) throw new RuntimeError('query_cancelled');
+        check();
         try {
-          reply = mode ? await this.cloudControl.setNightVision(current, region, mode, { signal: controller.signal })
+          reply = requestedMode ? await this.cloudControl.setNightVision(current, region, requestedMode, { signal: controller.signal })
             : await this.cloudControl.getNightVision(current, region, { signal: controller.signal });
         } catch (error) {
           if (error?.reason === 'session_expired') this._renewControlSession();
           else if (error?.capabilityRequired === true && this.ready) this._refreshControlCapability(current, region);
-          throw error;
+          throw new RuntimeError(error?.reason, error?.code);
         }
-      } else reply = await this._query(mode ? 'set' : 'get', args,
-        { mainClass: 'mijia.bridge.NightVisionControl', deadline, guard: valid });
-      if (!valid()) throw new RuntimeError('query_cancelled');
+      } else reply = await this._query(requestedMode ? 'set' : 'get', args,
+        { mainClass: 'mijia.bridge.NightVisionControl', deadline, guard: valid, signal: controller.signal });
+      check();
       if (!['on', 'off', 'auto'].includes(reply?.mode)) throw new RuntimeError('invalid_backend_response');
+      if (requestedMode && reply.mode !== requestedMode) throw new RuntimeError('night_vision_not_applied');
+      return { mode: reply.mode };
+    };
+    const task = async () => {
+      let reply;
+      if (typeof enabled === 'boolean') {
+        // Keep the fresh observation and its conditional mutation in one queue
+        // task so UI/Matter writes cannot change the mode between these steps.
+        reply = await request();
+        const target = enabled ? mode : reply.mode === mode ? 'off' : reply.mode;
+        if (target !== reply.mode) reply = await request(target);
+      } else reply = await request(mode);
+      check();
       this.emit('night-mode', { mode: reply.mode });
       return { mode: reply.mode };
     };
     const result = this.queryChain.then(task, task);
     this.queryChain = result.catch(() => {});
     const timeout = new Promise((_, reject) => {
-      timer = setTimeout(() => { cancelled = true; controller.abort(); reject(new RuntimeError('query_timeout')); }, 6500);
+      timer = setTimeout(() => { cancelled = true; controller.abort(); reject(new RuntimeError('query_timeout')); }, Math.max(1, deadline - Date.now()));
     });
     return Promise.race([result, timeout]).finally(() => { clearTimeout(timer); this.controlRequests.delete(controller); });
   }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@linanw/homebridge-mijia-remote-camera",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@linanw/homebridge-mijia-remote-camera",
-      "version": "0.4.1",
+      "version": "0.4.3",
       "cpu": [
         "x64"
       ],

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@linanw/homebridge-mijia-remote-camera",
   "displayName": "米家远程摄像头",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "Xiaomi remote camera plugin with HomeKit, experimental Matter streaming and Mi Home name/room sync",
   "license": "MIT",
   "author": "linanw",