@linanw/homebridge-mijia-remote-camera 0.2.0 → 0.2.1

package/README.md

@@ -64,7 +64,7 @@ mijia-camera-setup --from /homebridge/homebridge-mijia-remote-camera-0.1.0.tgz -
 
 夜视目前仅支持已核对 MIOT 定义的 `chuangmi.camera.061a01`／`chuangmi.camera.061a03`。插件设置页先读取设备实际状态，再选择“自动／开启／关闭”并应用；写入后会回读确认。Apple“家庭”的“夜视”开关表示允许夜视：自动模式显示为开，重复开不会把自动改为强制开启；关掉后重新打开会设置为始终开启。需要恢复自动时，请在插件设置页选择。该开关表示夜视策略，不表示红外灯此刻是否点亮。启动和轮询只读状态，不更改策略。
 
-## Matter 摄像头（0.2.0，实验性）
+## Matter 摄像头（0.2.1，实验性）
 
 可在保留现有 HomeKit 配对的同时启用独立的 Matter Camera（设备类型 `0x0142`，端点 `1`）。它实现 Camera AV Stream Management 与 WebRTC Transport Provider，包含 H.264 视频、Opus 现场声音、双向对讲、JPEG 快照、音量／静音和支持型号的夜视模式。当前使用 matter.js 0.18.0 的 Matter 1.6.1 模型，已与 matter-server 1.5.3 控制器进行协议对接。MatterDesk Qt 客户端是当前目标客户端；客户端需要实现摄像头播放。Apple“家庭”仍使用本插件原有的 HomeKit 配件。
 
@@ -79,7 +79,7 @@ mijia-camera-setup --from /homebridge/homebridge-mijia-remote-camera-0.1.0.tgz -
 }
 ```
 
-升级默认不开启 Matter。启用后，从受保护的插件设置页点击显示 Matter 配对信息，将手动配对码或 `MT:` 内容输入控制器。它与 HomeKit Setup Code 不同。已配对后增加其他控制器时可在设置页重新打开配对窗口，操作完成后可以关闭窗口。配对码和 Matter 私钥不会写入脱敏报告。Matter fabric／设备身份保存在插件私有存储的 `matter/` 内，升级和正常重启保留身份；删除该目录会使已有配对失效。
+0.2.1 修复了仅视频／仅音频会话的资源清理，并支持浏览器早到的 ICE 候选、重复启动，以及 Chromium 多 H264 profile 的正常协商。升级默认不开启 Matter。启用后，从受保护的插件设置页点击显示 Matter 配对信息，将手动配对码或 `MT:` 内容输入控制器。它与 HomeKit Setup Code 不同。已配对后增加其他控制器时可在设置页重新打开配对窗口，操作完成后可以关闭窗口。配对码和 Matter 私钥不会写入脱敏报告。Matter fabric／设备身份保存在插件私有存储的 `matter/` 内，升级和正常重启保留身份；删除该目录会使已有配对失效。
 
 这是未认证的开发设备，使用 SDK 的测试 VID／开发证书。matter-server 默认会拒绝这种证书；只在明确信任此开发设备时，使用它的 `--enable-test-net-dcl`（或 `ENABLE_TEST_NET_DCL=true`）选项。插件不冒充通过认证的产品，客户端普通启动应保留严格验证。
 

package/homebridge-ui/public/index.html

@@ -100,6 +100,10 @@
     if(record(value.media)){
       const media={};for(const key of ['sessions','failures','videoPackets','audioPackets','talkPackets','talkBytes'])if(count(value.media[key]))media[key]=value.media[key];
       for(const key of ['active','microphoneMuted','speakerMuted'])if(typeof value.media[key]==='boolean')media[key]=value.media[key];
+      const source=value.media;
+    for (const [key, allowed] of Object.entries({"lastFailure": ["negotiation_failed", "media_not_offered", "webrtc_timeout", "webrtc_failed", "webrtc_disconnected", "media_unavailable", "udp_error", "ffmpeg_unavailable", "ffmpeg_exit", "video_timeout"], "lastFailureStage": ["remote_description", "replace_video_track", "replace_audio_track", "create_answer", "create_offer", "local_description", "remote_answer"], "lastFailureType": ["Error", "TypeError", "RangeError", "OperationError", "InvalidStateError", "InvalidModificationError", "InvalidAccessError", "NotSupportedError", "SyntaxError", "AbortError"]})) {
+      if (allowed.includes(source[key])) media[key] = source[key];
+    }
       if(Object.keys(media).length)result.media=media;
     }
     return result;

package/lib/matter-device.mjs

@@ -75,7 +75,7 @@ export class MatterCameraResources {
     const id = this.nextSession;
     this.nextSession = this.nextSession % 65534 + 1;
     const item = { id, owner: { ...owner }, peerEndpointId, video, audio, state: 'connecting', pendingCandidates: [], ready: false,
-      mediaId: `${owner.fabricIndex}:${owner.nodeId}:${id}` };
+      pendingRemoteCandidates: [], mediaCreated: false, mediaId: `${owner.fabricIndex}:${owner.nodeId}:${id}` };
     this.sessions.set(id, item);
     for (const entry of [video, audio]) if (entry) entry.stream.referenceCount++;
     return item;
@@ -85,6 +85,8 @@ export class MatterCameraResources {
     if (this.sessions.get(item.id) !== item || item.ending) return false;
     item.ending = true;
     clearTimeout(item.timer);
+    item.pendingCandidates.length = 0;
+    item.pendingRemoteCandidates.length = 0;
     this.sessions.delete(item.id);
     for (const entry of [item.video, item.audio]) if (entry) entry.stream.referenceCount = Math.max(0, entry.stream.referenceCount - 1);
     return true;
@@ -136,6 +138,42 @@ export function validateMatterTransportRequest(request) {
     reject(Status.InvalidCommand, 'Requestor endpoint is required');
 }
 
+export function describeMatterSession(item) {
+  return { id: item.id, peerNodeId: item.owner.nodeId, peerEndpointId: item.peerEndpointId,
+    fabricIndex: item.owner.fabricIndex, streamUsage: LIVE, metadataEnabled: false,
+    videoStreamId: item.video?.stream.videoStreamId ?? null, audioStreamId: item.audio?.stream.audioStreamId ?? null,
+    ...(item.video ? { videoStreams: [item.video.stream.videoStreamId] } : {}),
+    ...(item.audio ? { audioStreams: [item.audio.stream.audioStreamId] } : {}) };
+}
+
+/** Keep external encoder accounting atomic with Matter's own cluster-state transaction. */
+export function enrollMatterSession({ resources, item, transaction, publish, start, afterRollback,
+  schedule = setImmediate }) {
+  let launchScheduled = false;
+  const rollback = () => { resources.detachSession(item); };
+  try {
+    transaction.addParticipants({
+      toString: () => `camera-session-create#${item.id}`,
+      rollback,
+      conclusion(outcome) {
+        if (outcome === 'committed' && !launchScheduled) {
+          launchScheduled = true;
+          schedule(() => { if (resources.sessions.get(item.id) === item && !item.ending) start(); });
+        } else if (outcome !== 'committed') {
+          rollback();
+          if (afterRollback) schedule(afterRollback);
+        }
+      },
+    });
+    publish();
+  } catch (error) {
+    rollback();
+    // The enclosing transaction also rolls back. Restore its view immediately when synchronous validation failed.
+    try { publish(); } catch {}
+    throw error;
+  }
+}
+
 /**
  * A real Matter Camera (0x0142), using the Matter 1.6.1 model in matter.js 0.18.
  * Matter carries authenticated signaling; media is encrypted WebRTC supplied by matter-media.
@@ -206,11 +244,7 @@ export async function createMatterDevice({ storagePath, name, serialNumber, netw
   }
   function streamList(kind) { return [...allocated[kind].values()].map(item => clone(item.stream)); }
   function describeSession(item) {
-    return { id: item.id, peerNodeId: item.owner.nodeId, peerEndpointId: item.peerEndpointId,
-      fabricIndex: item.owner.fabricIndex, streamUsage: LIVE, metadataEnabled: false,
-      videoStreamId: item.video?.stream.videoStreamId ?? null, audioStreamId: item.audio?.stream.audioStreamId ?? null,
-      videoStreams: item.video ? [item.video.stream.videoStreamId] : [],
-      audioStreams: item.audio ? [item.audio.stream.audioStreamId] : [] };
+    return describeMatterSession(item);
   }
   async function syncState() {
     if (!endpoint || closed) return;
@@ -251,6 +285,7 @@ export async function createMatterDevice({ storagePath, name, serialNumber, netw
     if (notify) await invokeRequestor(item, 'end', { webRtcSessionId: item.id, reason }).catch(() => {});
   }
   function fail(item, code) {
+    if (sessions.get(item.id) !== item) return;
     lastError = code;
     void end(item, code === 'matter_session_timeout' ? 1 : 0, true);
   }
@@ -352,11 +387,13 @@ export async function createMatterDevice({ storagePath, name, serialNumber, netw
       if (isOffer && (typeof request.sdp !== 'string' || request.sdp.length > 65535)) reject(Status.ConstraintError, 'Invalid SDP');
       const item = resources.openSession({ owner, peerEndpointId: request.originatingEndpointId, video, audio }), { id } = item;
       lastError = undefined;
-      this.state.currentSessions = [...sessions.values()].map(describeSession);
-      // Commit the response before sending the camera-initiated Requestor commands.
-      setImmediate(() => { void (async () => {
+      const startMedia = () => {
+        item.timer = setTimeout(() => fail(item, 'matter_session_timeout'), 30000);
+        item.timer.unref?.();
+        void (async () => {
         if (closed || !sessions.has(id)) return;
         await syncState();
+        if (closed || sessions.get(id) !== item || item.ending) return;
         const v = video?.stream, a = audio?.stream;
         const result = await media.createSession({ id: item.mediaId, ...(isOffer ? { offer: request.sdp } : {}),
           video: v ? { id: v.videoStreamId, codec: 'h264', width: Math.min(width, v.maxResolution.width),
@@ -365,13 +402,15 @@ export async function createMatterDevice({ storagePath, name, serialNumber, netw
           audio: a ? { id: a.audioStreamId, codec: 'opus', sampleRate: 48000, channels: 1, bitRate: a.bitRate } : undefined,
           iceServers: request.iceServers, iceTransportPolicy: request.iceTransportPolicy || 'all',
           onCandidate(candidate) {
-            if (!candidate?.candidate || closed || !sessions.has(id)) return;
+            if (!candidate?.candidate || closed || sessions.get(id) !== item) return;
             const normalized = { candidate: candidate.candidate, sdpMid: candidate.sdpMid ?? null,
               sdpmLineIndex: candidate.sdpMLineIndex ?? candidate.sdpmLineIndex ?? null };
-            if (!item.ready) item.pendingCandidates.push(normalized);
-            else void invokeRequestor(item, 'iceCandidates', { webRtcSessionId: id, iceCandidates: [normalized] }).catch(() => fail(item, 'matter_signaling_failed'));
+            if (!item.ready) {
+              if (item.pendingCandidates.length < 128) item.pendingCandidates.push(normalized);
+            } else void invokeRequestor(item, 'iceCandidates', { webRtcSessionId: id, iceCandidates: [normalized] }).catch(() => fail(item, 'matter_signaling_failed'));
           },
           onState(state) {
+            if (closed || sessions.get(id) !== item || item.ending) return;
             item.state = state;
             if (state === 'connected') {
               clearTimeout(item.timer);
@@ -379,16 +418,22 @@ export async function createMatterDevice({ storagePath, name, serialNumber, netw
               item.timer.unref?.();
             } else if (state === 'failed' || state === 'closed') void end(item, state === 'failed' ? 0 : 2, true);
           } });
-        if (!sessions.has(id) || closed) { await media.closeSession(item.mediaId); return; }
+        if (sessions.get(id) !== item || closed) { await media.closeSession(item.mediaId); return; }
+        item.mediaCreated = true;
+        while (item.pendingRemoteCandidates.length) await media.addCandidates(item.mediaId, item.pendingRemoteCandidates.splice(0, 32));
         const sdp = isOffer ? result.answer : result.offer;
         if (typeof sdp !== 'string' || !sdp.length) throw new Error('matter_signaling_failed');
         await invokeRequestor(item, isOffer ? 'answer' : 'offer', { webRtcSessionId: id, sdp });
         item.ready = true;
         if (item.pendingCandidates.length) await invokeRequestor(item, 'iceCandidates', {
           webRtcSessionId: id, iceCandidates: item.pendingCandidates.splice(0) });
-      })().catch(() => fail(item, 'matter_signaling_failed')); });
-      item.timer = setTimeout(() => fail(item, 'matter_session_timeout'), 30000);
-      item.timer.unref?.();
+        })().catch(() => fail(item, 'matter_signaling_failed'));
+      };
+      enrollMatterSession({ resources, item, transaction: this.context.transaction,
+        publish: () => { this.state.currentSessions = [...sessions.values()].map(describeSession); },
+        start: startMedia, afterRollback: () => {
+          void Promise.resolve(media.closeSession(item.mediaId)).catch(() => {}).then(() => syncState()).catch(() => {});
+        } });
       const response = { webRtcSessionId: id };
       if (!isOffer) response.deferredOffer = false;
       if ('videoStreamId' in request) response.videoStreamId = video?.stream.videoStreamId ?? null;
@@ -405,8 +450,13 @@ export async function createMatterDevice({ storagePath, name, serialNumber, netw
     async provideIceCandidates({ webRtcSessionId, iceCandidates }) {
       const item = sessionFor(this, webRtcSessionId);
       if (!iceCandidates.length || iceCandidates.length > 32) reject(Status.ConstraintError, 'Invalid ICE candidates');
-      try { await media.addCandidates(item.mediaId, iceCandidates.map(candidate => ({ candidate: candidate.candidate,
-        sdpMid: candidate.sdpMid ?? undefined, sdpMLineIndex: candidate.sdpmLineIndex ?? undefined }))); }
+      const normalized = iceCandidates.map(candidate => ({ candidate: candidate.candidate,
+        sdpMid: candidate.sdpMid ?? undefined, sdpMLineIndex: candidate.sdpmLineIndex ?? undefined }));
+      if (!item.mediaCreated) {
+        if (item.pendingRemoteCandidates.length + normalized.length > 128) reject(Status.ResourceExhausted, 'Too many pending ICE candidates');
+        item.pendingRemoteCandidates.push(...normalized); return;
+      }
+      try { await media.addCandidates(item.mediaId, normalized); }
       catch { reject(Status.Failure, 'Invalid ICE candidate'); }
     }
     async endSession({ webRtcSessionId, reason }) {
@@ -425,7 +475,7 @@ export async function createMatterDevice({ storagePath, name, serialNumber, netw
         ...(config.listeningAddressIpv6 ? { listeningAddressIpv6: config.listeningAddressIpv6 } : {}) },
       basicInformation: { vendorName: 'linanw', vendorId: VendorId(0xfff1), productName: 'Mijia Remote Camera',
         productId: 0x8001, nodeLabel: text(name, 'Mijia Camera'), serialNumber: text(serialNumber, identifier),
-        hardwareVersion: 1, softwareVersion: 200, softwareVersionString: '0.2.0' },
+        hardwareVersion: 1, softwareVersion: 201, softwareVersionString: '0.2.1' },
     });
     const audioCapabilities = { maxNumberOfChannels: 1, supportedCodecs: [0], supportedSampleRates: [48000], supportedBitDepths: [16] };
     endpoint = new Endpoint(CameraDevice.with(MijiaAvServer, MijiaWebRtcServer, WebRtcTransportRequestorClient), {

package/lib/matter-diagnostics.mjs

@@ -23,6 +23,9 @@ export function safeMatterStatus(value = {}) {
       if (count(source[key])) media[key] = source[key];
     }
     for (const key of ['active', 'microphoneMuted', 'speakerMuted']) if (typeof source[key] === 'boolean') media[key] = source[key];
+    for (const [key, allowed] of Object.entries({"lastFailure": ["negotiation_failed", "media_not_offered", "webrtc_timeout", "webrtc_failed", "webrtc_disconnected", "media_unavailable", "udp_error", "ffmpeg_unavailable", "ffmpeg_exit", "video_timeout"], "lastFailureStage": ["remote_description", "replace_video_track", "replace_audio_track", "create_answer", "create_offer", "local_description", "remote_answer"], "lastFailureType": ["Error", "TypeError", "RangeError", "OperationError", "InvalidStateError", "InvalidModificationError", "InvalidAccessError", "NotSupportedError", "SyntaxError", "AbortError"]})) {
+      if (allowed.includes(source[key])) media[key] = source[key];
+    }
     if (Object.keys(media).length) result.media = media;
   }
   return result;

package/lib/matter-media.mjs

@@ -8,6 +8,7 @@ const integer = (value, fallback, min, max) => Number.isInteger(value) && value
 const clamp = (value, min, max) => Math.min(max, Math.max(min, value));
 const timer = (callback, ms) => { const value = setTimeout(callback, ms); value.unref(); return value; };
 const isRtp = bytes => Buffer.isBuffer(bytes) && bytes.length >= 12 && bytes.length <= 2048 && (bytes[0] >> 6) === 2;
+const exceptionTypes = new Set(['Error', 'TypeError', 'RangeError', 'OperationError', 'InvalidStateError', 'InvalidModificationError', 'InvalidAccessError', 'NotSupportedError', 'SyntaxError', 'AbortError']);
 function localUrl(value, paths) {
   try {
     const url = new URL(value);
@@ -113,26 +114,45 @@ export class MatterMedia {
       if (track.kind === 'audio') track.onReceiveRtp.subscribe(packet => this.receiveTalk(session, packet));
     });
     try {
-      if (offer !== undefined) await peer.setRemoteDescription({ type: 'offer', sdp: offer });
+      // Install source codec constraints before applying an offer. With no local
+      // source werift chooses the first H264 MIME match, which can be a different
+      // profile from the encoded RTP source in a browser's multi-profile offer.
       for (const [kind, enabled] of [['video', session.video], ['audio', session.audio]]) {
         if (!enabled) continue;
+        session.negotiationStage = `replace_${kind}_track`;
         const track = new MediaStreamTrack({ kind, codec: codecs[kind][0] }); session[`${kind}Track`] = track;
-        const existing = offer !== undefined ? peer.getTransceivers().find(t => t.kind === kind && !t.stopped) : undefined;
         const direction = kind === 'audio' && this.config.enableTalkback !== false ? 'sendrecv' : 'sendonly';
-        if (existing) { await existing.sender.replaceTrack(track); existing.direction = direction; session[`${kind}Sender`] = existing.sender; }
-        else if (offer === undefined) session[`${kind}Sender`] = peer.addTransceiver(track, { direction }).sender;
-        else throw fault('media_not_offered');
+        session[`${kind}Sender`] = peer.addTransceiver(track, { direction }).sender;
       }
-      await peer.setLocalDescription(offer !== undefined ? await peer.createAnswer() : await peer.createOffer());
+      if (offer !== undefined) {
+        session.negotiationStage = 'remote_description'; await peer.setRemoteDescription({ type: 'offer', sdp: offer });
+        for (const kind of ['video', 'audio']) {
+          if (session[kind] && !peer.getTransceivers().some(t => t.sender === session[`${kind}Sender`] && t.mid != null && !t.stopped && !t.rejected)) throw fault('media_not_offered');
+        }
+      }
+      session.negotiationStage = offer !== undefined ? 'create_answer' : 'create_offer';
+      const description = offer !== undefined ? await peer.createAnswer() : await peer.createOffer();
+      session.negotiationStage = 'local_description'; await peer.setLocalDescription(description);
       if (!this.alive(session)) throw fault('session_closed');
       return offer !== undefined ? { answer: peer.localDescription.sdp } : { offer: peer.localDescription.sdp };
-    } catch (error) { await this.closeSession(id); throw fault(error?.reason === 'media_not_offered' ? 'media_not_offered' : 'negotiation_failed'); }
+    } catch (error) {
+      const reason = error?.reason === 'media_not_offered' ? 'media_not_offered' : 'negotiation_failed';
+      this.negotiationFailure(session, error, reason);
+      await this.closeSession(id); throw fault(reason);
+    }
+  }
+  negotiationFailure(session, error, reason = 'negotiation_failed') {
+    this.counters.failures++; this.counters.lastFailure = reason;
+    this.counters.lastFailureStage = session.negotiationStage || 'create_offer';
+    this.counters.lastFailureType = exceptionTypes.has(error?.name) ? error.name : 'Error';
   }
   getSession(id) { const session = this.session; if (!session || session.id !== id || session.closed) throw fault('unknown_session'); return session; }
   async provideAnswer(id, value) {
     const session = this.getSession(id); sdp(value);
     if (session.peer.signalingState !== 'have-local-offer') throw fault('invalid_session_state');
-    try { await session.peer.setRemoteDescription({ type: 'answer', sdp: value }); } catch { this.fail(session, 'negotiation_failed'); throw fault('negotiation_failed'); }
+    session.negotiationStage = 'remote_answer';
+    try { await session.peer.setRemoteDescription({ type: 'answer', sdp: value }); }
+    catch (error) { this.negotiationFailure(session, error); await this.closeSession(id); throw fault('negotiation_failed'); }
   }
   async addCandidates(id, candidates) {
     const session = this.getSession(id);

package/lib/platform.mjs

@@ -95,7 +95,7 @@ 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.2.0');
+      .setCharacteristic(this.api.hap.Characteristic.FirmwareRevision, '0.2.1');
     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);

package/npm-shrinkwrap.json

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

package/package.json

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