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

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # 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 云台向右.

package/README.md

@@ -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）
 

package/config.schema.json

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

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.2');
+      .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/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.2",
+  "version": "0.4.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@linanw/homebridge-mijia-remote-camera",
-      "version": "0.4.2",
+      "version": "0.4.3",
       "cpu": [
         "x64"
       ],

package/package.json

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