matter-all-in-one-addon 2.3.12 → 2.3.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +16 -8
- package/dist/camera/ai/camera-ai-detector.js +2 -1
- package/dist/camera/ai/camera-ai-detector.js.map +1 -1
- package/dist/camera/camera-source-resolver.js +5 -3
- package/dist/camera/camera-source-resolver.js.map +1 -1
- package/dist/camera/cameraui/cameraui-client.js +91 -30
- package/dist/camera/cameraui/cameraui-client.js.map +1 -1
- package/dist/camera/cameraui/cameraui-homekit-bridge.js +11 -4
- package/dist/camera/cameraui/cameraui-homekit-bridge.js.map +1 -1
- package/dist/camera/cameraui/cameraui-storage.js.map +1 -1
- package/dist/camera/cameraui/ha-camera-entity.js +5 -2
- package/dist/camera/cameraui/ha-camera-entity.js.map +1 -1
- package/dist/camera/homekit/ffmpeg-helper.js.map +1 -1
- package/dist/camera/homekit/hevc/fmp4-hevc.js +3 -1
- package/dist/camera/homekit/hevc/fmp4-hevc.js.map +1 -1
- package/dist/camera/homekit/hevc/hevc-recording.js +10 -8
- package/dist/camera/homekit/hevc/hevc-recording.js.map +1 -1
- package/dist/camera/homekit/hevc/multi-tier-rtp.js +15 -8
- package/dist/camera/homekit/hevc/multi-tier-rtp.js.map +1 -1
- package/dist/camera/homekit/hevc/sframe-rtp.js +13 -4
- package/dist/camera/homekit/hevc/sframe-rtp.js.map +1 -1
- package/dist/camera/homekit/hevc/sframe.js +67 -10
- package/dist/camera/homekit/hevc/sframe.js.map +1 -1
- package/dist/camera/homekit/hevc/types.js +81 -9
- package/dist/camera/homekit/hevc/types.js.map +1 -1
- package/dist/camera/homekit/hevc/webrtc-session.js +41 -16
- package/dist/camera/homekit/hevc/webrtc-session.js.map +1 -1
- package/dist/camera/homekit/homekit-camera-recording.delegate.js +10 -4
- package/dist/camera/homekit/homekit-camera-recording.delegate.js.map +1 -1
- package/dist/camera/homekit/homekit-camera-stream.delegate.js.map +1 -1
- package/dist/camera/homekit/tuya-hap-talkback.js +1 -3
- package/dist/camera/homekit/tuya-hap-talkback.js.map +1 -1
- package/dist/camera/motion/ffmpeg-motion-detector.js +27 -13
- package/dist/camera/motion/ffmpeg-motion-detector.js.map +1 -1
- package/dist/camera/nest/nest-camera-adapter.js +9 -5
- package/dist/camera/nest/nest-camera-adapter.js.map +1 -1
- package/dist/camera/ptz/ptz-capabilities.js +3 -1
- package/dist/camera/ptz/ptz-capabilities.js.map +1 -1
- package/dist/camera/ptz/ptz-legacy-discovery.js.map +1 -1
- package/dist/camera/ptz/ptz-mqtt-publisher.js +50 -12
- package/dist/camera/ptz/ptz-mqtt-publisher.js.map +1 -1
- package/dist/camera/ptz/ptz-zones-manager.js +6 -1
- package/dist/camera/ptz/ptz-zones-manager.js.map +1 -1
- package/dist/camera/scrypted/scrypted-camera-card.js +3 -1
- package/dist/camera/scrypted/scrypted-camera-card.js.map +1 -1
- package/dist/camera/scrypted/scrypted-camera-discovery-adapter.js +7 -5
- package/dist/camera/scrypted/scrypted-camera-discovery-adapter.js.map +1 -1
- package/dist/camera/scrypted/scrypted-client-discovery-adapter.js.map +1 -1
- package/dist/camera/scrypted/scrypted-client.js +6 -5
- package/dist/camera/scrypted/scrypted-client.js.map +1 -1
- package/dist/camera/scrypted/scrypted-discovery-provider.js.map +1 -1
- package/dist/camera/scrypted/scrypted-homekit-bridge.js +6 -4
- package/dist/camera/scrypted/scrypted-homekit-bridge.js.map +1 -1
- package/dist/camera/scrypted/scrypted-reconnect-manager.js.map +1 -1
- package/dist/camera/scrypted/scrypted-runtime-facade.js +2 -2
- package/dist/camera/scrypted/scrypted-runtime-facade.js.map +1 -1
- package/dist/camera/scrypted/scrypted-runtime-ingest.js +3 -1
- package/dist/camera/scrypted/scrypted-runtime-ingest.js.map +1 -1
- package/dist/camera/scrypted/scrypted-storage.js +12 -6
- package/dist/camera/scrypted/scrypted-storage.js.map +1 -1
- package/dist/camera/scrypted/scrypted-stream-validator.js +25 -7
- package/dist/camera/scrypted/scrypted-stream-validator.js.map +1 -1
- package/dist/camera/tuya-webrtc-session.js +6 -2
- package/dist/camera/tuya-webrtc-session.js.map +1 -1
- package/dist/converters/sensor.converter.js +4 -1
- package/dist/converters/sensor.converter.js.map +1 -1
- package/dist/device-profiles.js +3 -1
- package/dist/device-profiles.js.map +1 -1
- package/dist/entities/air_quality.entity.js +3 -1
- package/dist/entities/air_quality.entity.js.map +1 -1
- package/dist/entities/base.entity.js +45 -17
- package/dist/entities/base.entity.js.map +1 -1
- package/dist/entities/camera.entity.js +6 -2
- package/dist/entities/camera.entity.js.map +1 -1
- package/dist/entities/composite-device.entity.js +37 -13
- package/dist/entities/composite-device.entity.js.map +1 -1
- package/dist/entities/energy_tariff.entity.js.map +1 -1
- package/dist/entities/vacuum.entity.js +16 -5
- package/dist/entities/vacuum.entity.js.map +1 -1
- package/dist/hap/hap-generic-accessory.js +308 -138
- package/dist/hap/hap-generic-accessory.js.map +1 -1
- package/dist/homeAssistant.js +14 -5
- package/dist/homeAssistant.js.map +1 -1
- package/dist/index.js +3 -1
- package/dist/index.js.map +1 -1
- package/dist/mqtt/mqtt-client.js.map +1 -1
- package/dist/mqtt/mqtt.entity.js +41 -17
- package/dist/mqtt/mqtt.entity.js.map +1 -1
- package/dist/platform.d.ts +4 -4
- package/dist/platform.js +237 -96
- package/dist/platform.js.map +1 -1
- package/dist/utils/atomic-json-store.js +5 -1
- package/dist/utils/atomic-json-store.js.map +1 -1
- package/dist/utils/ha-state.js +3 -1
- package/dist/utils/ha-state.js.map +1 -1
- package/dist/utils/light-color.js +3 -5
- package/dist/utils/light-color.js.map +1 -1
- package/dist/utils/matter-command-response.js.map +1 -1
- package/dist/utils/matter-firmware.js +1 -2
- package/dist/utils/matter-firmware.js.map +1 -1
- package/dist/utils/matter-protocol.d.ts +1 -0
- package/dist/utils/matter-protocol.js +30 -0
- package/dist/utils/matter-protocol.js.map +1 -0
- package/package.json +26 -17
|
@@ -6,14 +6,17 @@ const H264_NAL_FU_A = 28;
|
|
|
6
6
|
const DESCRIPTOR_START = 0x80;
|
|
7
7
|
const DESCRIPTOR_END = 0x40;
|
|
8
8
|
export function createAccessUnitAssembler(codec) {
|
|
9
|
-
return codec === "h264"
|
|
9
|
+
return codec === "h264"
|
|
10
|
+
? new H264AccessUnitAssembler()
|
|
11
|
+
: new HevcAccessUnitAssembler();
|
|
10
12
|
}
|
|
11
13
|
class NalAccessUnitAssembler {
|
|
12
14
|
nalUnits = [];
|
|
13
15
|
fragment;
|
|
14
16
|
timestamp;
|
|
15
17
|
push(packet) {
|
|
16
|
-
if (this.timestamp !== undefined &&
|
|
18
|
+
if (this.timestamp !== undefined &&
|
|
19
|
+
packet.header.timestamp !== this.timestamp) {
|
|
17
20
|
this.reset();
|
|
18
21
|
}
|
|
19
22
|
this.timestamp = packet.header.timestamp;
|
|
@@ -71,7 +74,10 @@ export class HevcAccessUnitAssembler extends NalAccessUnitAssembler {
|
|
|
71
74
|
return;
|
|
72
75
|
}
|
|
73
76
|
const fuHeader = payload[2];
|
|
74
|
-
this.fragmentUnit(fuHeader, Buffer.from([
|
|
77
|
+
this.fragmentUnit(fuHeader, Buffer.from([
|
|
78
|
+
(payload[0] & 0x81) | ((fuHeader & 0x3f) << 1),
|
|
79
|
+
payload[1],
|
|
80
|
+
]), payload.subarray(3));
|
|
75
81
|
}
|
|
76
82
|
else {
|
|
77
83
|
this.nalUnits.push(payload);
|
|
@@ -123,7 +129,10 @@ export class SFrameRtpPacketizer {
|
|
|
123
129
|
ssrc: this.options.ssrc,
|
|
124
130
|
});
|
|
125
131
|
this.sequenceNumber = (this.sequenceNumber + 1) & 0xffff;
|
|
126
|
-
packets.push(new RtpPacket(header, Buffer.concat([
|
|
132
|
+
packets.push(new RtpPacket(header, Buffer.concat([
|
|
133
|
+
Buffer.from([descriptor]),
|
|
134
|
+
ciphertext.subarray(offset, offset + chunk),
|
|
135
|
+
])));
|
|
127
136
|
}
|
|
128
137
|
return packets;
|
|
129
138
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sframe-rtp.js","sourceRoot":"","sources":["../../../../src/camera/homekit/hevc/sframe-rtp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAI9C,MAAM,WAAW,GAAG,EAAE,CAAC;AACvB,MAAM,WAAW,GAAG,EAAE,CAAC;AACvB,MAAM,eAAe,GAAG,EAAE,CAAC;AAC3B,MAAM,aAAa,GAAG,EAAE,CAAC;AAEzB,MAAM,gBAAgB,GAAG,IAAI,CAAC;AAC9B,MAAM,cAAc,GAAG,IAAI,CAAC;AAY5B,MAAM,UAAU,yBAAyB,
|
|
1
|
+
{"version":3,"file":"sframe-rtp.js","sourceRoot":"","sources":["../../../../src/camera/homekit/hevc/sframe-rtp.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { createCipheriv, createHmac, hkdfSync, randomBytes } from "node:crypto";
|
|
1
|
+
import { createCipheriv, createHmac, hkdfSync, randomBytes, } from "node:crypto";
|
|
2
2
|
// SFrame end-to-end media protection for WebRTC remote path (RFC 9605)
|
|
3
3
|
export var SFrameCipherSuite;
|
|
4
4
|
(function (SFrameCipherSuite) {
|
|
@@ -12,12 +12,60 @@ export var SFrameCipherSuite;
|
|
|
12
12
|
const VIDEO_SUITE = SFrameCipherSuite.AES_256_CTR_HMAC_SHA512_80;
|
|
13
13
|
const AUDIO_SUITE = SFrameCipherSuite.AES_256_CTR_HMAC_SHA512_32;
|
|
14
14
|
const SUITES = {
|
|
15
|
-
[SFrameCipherSuite.AES_128_CTR_HMAC_SHA256_80]: {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
15
|
+
[SFrameCipherSuite.AES_128_CTR_HMAC_SHA256_80]: {
|
|
16
|
+
nk: 48,
|
|
17
|
+
nka: 16,
|
|
18
|
+
nn: 12,
|
|
19
|
+
nt: 10,
|
|
20
|
+
aead: "ctr-hmac",
|
|
21
|
+
hash: "sha256",
|
|
22
|
+
baseKeyLength: 16,
|
|
23
|
+
},
|
|
24
|
+
[SFrameCipherSuite.AES_128_GCM_SHA256_128]: {
|
|
25
|
+
nk: 16,
|
|
26
|
+
nka: 0,
|
|
27
|
+
nn: 12,
|
|
28
|
+
nt: 16,
|
|
29
|
+
aead: "gcm",
|
|
30
|
+
hash: "sha256",
|
|
31
|
+
baseKeyLength: 16,
|
|
32
|
+
},
|
|
33
|
+
[SFrameCipherSuite.AES_256_GCM_SHA512_128]: {
|
|
34
|
+
nk: 32,
|
|
35
|
+
nka: 0,
|
|
36
|
+
nn: 12,
|
|
37
|
+
nt: 16,
|
|
38
|
+
aead: "gcm",
|
|
39
|
+
hash: "sha512",
|
|
40
|
+
baseKeyLength: 32,
|
|
41
|
+
},
|
|
42
|
+
[SFrameCipherSuite.AES_256_CTR_HMAC_SHA512_80]: {
|
|
43
|
+
nk: 96,
|
|
44
|
+
nka: 32,
|
|
45
|
+
nn: 12,
|
|
46
|
+
nt: 10,
|
|
47
|
+
aead: "ctr-hmac",
|
|
48
|
+
hash: "sha512",
|
|
49
|
+
baseKeyLength: 32,
|
|
50
|
+
},
|
|
51
|
+
[SFrameCipherSuite.AES_256_CTR_HMAC_SHA512_64]: {
|
|
52
|
+
nk: 96,
|
|
53
|
+
nka: 32,
|
|
54
|
+
nn: 12,
|
|
55
|
+
nt: 8,
|
|
56
|
+
aead: "ctr-hmac",
|
|
57
|
+
hash: "sha512",
|
|
58
|
+
baseKeyLength: 32,
|
|
59
|
+
},
|
|
60
|
+
[SFrameCipherSuite.AES_256_CTR_HMAC_SHA512_32]: {
|
|
61
|
+
nk: 96,
|
|
62
|
+
nka: 32,
|
|
63
|
+
nn: 12,
|
|
64
|
+
nt: 4,
|
|
65
|
+
aead: "ctr-hmac",
|
|
66
|
+
hash: "sha512",
|
|
67
|
+
baseKeyLength: 32,
|
|
68
|
+
},
|
|
21
69
|
};
|
|
22
70
|
function beBytes(value, length) {
|
|
23
71
|
const out = Buffer.alloc(length);
|
|
@@ -49,8 +97,14 @@ export function deriveStreamBaseKey(key, ssrc) {
|
|
|
49
97
|
export function deriveKeys(baseKey, kid, suite) {
|
|
50
98
|
const params = SUITES[suite];
|
|
51
99
|
const suffix = Buffer.concat([beBytes(kid, 8), beBytes(BigInt(suite), 2)]);
|
|
52
|
-
const keyLabel = Buffer.concat([
|
|
53
|
-
|
|
100
|
+
const keyLabel = Buffer.concat([
|
|
101
|
+
Buffer.from("SFrame 1.0 Secret key "),
|
|
102
|
+
suffix,
|
|
103
|
+
]);
|
|
104
|
+
const saltLabel = Buffer.concat([
|
|
105
|
+
Buffer.from("SFrame 1.0 Secret salt "),
|
|
106
|
+
suffix,
|
|
107
|
+
]);
|
|
54
108
|
const empty = Buffer.alloc(0);
|
|
55
109
|
return {
|
|
56
110
|
key: Buffer.from(hkdfSync(params.hash, baseKey, empty, keyLabel, params.nk)),
|
|
@@ -142,7 +196,10 @@ export class SecureVideoSFrame {
|
|
|
142
196
|
constructor(enabled) {
|
|
143
197
|
this.enabled = enabled;
|
|
144
198
|
if (enabled) {
|
|
145
|
-
this.senderKey = {
|
|
199
|
+
this.senderKey = {
|
|
200
|
+
key: randomBytes(SUITES[VIDEO_SUITE].baseKeyLength),
|
|
201
|
+
kid: 0x100n,
|
|
202
|
+
};
|
|
146
203
|
}
|
|
147
204
|
}
|
|
148
205
|
videoStream(ssrc) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sframe.js","sourceRoot":"","sources":["../../../../src/camera/homekit/hevc/sframe.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"sframe.js","sourceRoot":"","sources":["../../../../src/camera/homekit/hevc/sframe.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,15 +45,87 @@ export var CameraSensorIntent;
|
|
|
45
45
|
CameraSensorIntent[CameraSensorIntent["GENERIC"] = 255] = "GENERIC";
|
|
46
46
|
})(CameraSensorIntent || (CameraSensorIntent = {}));
|
|
47
47
|
export const DEFAULT_HEVC_VIDEO_TIERS = [
|
|
48
|
-
{
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
48
|
+
{
|
|
49
|
+
identifier: 1,
|
|
50
|
+
quality: CameraVideoQuality.HIGHEST,
|
|
51
|
+
width: 3840,
|
|
52
|
+
height: 2160,
|
|
53
|
+
frameRate: 30,
|
|
54
|
+
targetAverageBitrate: 4500,
|
|
55
|
+
peakBitrate: 5000,
|
|
56
|
+
},
|
|
57
|
+
{
|
|
58
|
+
identifier: 2,
|
|
59
|
+
quality: CameraVideoQuality.HIGHEST,
|
|
60
|
+
width: 3840,
|
|
61
|
+
height: 2160,
|
|
62
|
+
frameRate: 24,
|
|
63
|
+
targetAverageBitrate: 4500,
|
|
64
|
+
peakBitrate: 5000,
|
|
65
|
+
},
|
|
66
|
+
{
|
|
67
|
+
identifier: 3,
|
|
68
|
+
quality: CameraVideoQuality.HIGH,
|
|
69
|
+
width: 2560,
|
|
70
|
+
height: 1440,
|
|
71
|
+
frameRate: 30,
|
|
72
|
+
targetAverageBitrate: 2800,
|
|
73
|
+
peakBitrate: 3000,
|
|
74
|
+
},
|
|
75
|
+
{
|
|
76
|
+
identifier: 4,
|
|
77
|
+
quality: CameraVideoQuality.HIGH,
|
|
78
|
+
width: 1920,
|
|
79
|
+
height: 1080,
|
|
80
|
+
frameRate: 30,
|
|
81
|
+
targetAverageBitrate: 1700,
|
|
82
|
+
peakBitrate: 1800,
|
|
83
|
+
},
|
|
84
|
+
{
|
|
85
|
+
identifier: 5,
|
|
86
|
+
quality: CameraVideoQuality.MEDIUM,
|
|
87
|
+
width: 1920,
|
|
88
|
+
height: 1080,
|
|
89
|
+
frameRate: 30,
|
|
90
|
+
targetAverageBitrate: 1700,
|
|
91
|
+
peakBitrate: 1800,
|
|
92
|
+
},
|
|
93
|
+
{
|
|
94
|
+
identifier: 6,
|
|
95
|
+
quality: CameraVideoQuality.MEDIUM,
|
|
96
|
+
width: 1280,
|
|
97
|
+
height: 720,
|
|
98
|
+
frameRate: 30,
|
|
99
|
+
targetAverageBitrate: 768,
|
|
100
|
+
peakBitrate: 800,
|
|
101
|
+
},
|
|
102
|
+
{
|
|
103
|
+
identifier: 7,
|
|
104
|
+
quality: CameraVideoQuality.LOW,
|
|
105
|
+
width: 640,
|
|
106
|
+
height: 360,
|
|
107
|
+
frameRate: 30,
|
|
108
|
+
targetAverageBitrate: 180,
|
|
109
|
+
peakBitrate: 190,
|
|
110
|
+
},
|
|
111
|
+
{
|
|
112
|
+
identifier: 8,
|
|
113
|
+
quality: CameraVideoQuality.LOW,
|
|
114
|
+
width: 640,
|
|
115
|
+
height: 360,
|
|
116
|
+
frameRate: 15,
|
|
117
|
+
targetAverageBitrate: 180,
|
|
118
|
+
peakBitrate: 190,
|
|
119
|
+
},
|
|
120
|
+
{
|
|
121
|
+
identifier: 9,
|
|
122
|
+
quality: CameraVideoQuality.LOW,
|
|
123
|
+
width: 320,
|
|
124
|
+
height: 240,
|
|
125
|
+
frameRate: 30,
|
|
126
|
+
targetAverageBitrate: 180,
|
|
127
|
+
peakBitrate: 190,
|
|
128
|
+
},
|
|
57
129
|
];
|
|
58
130
|
export const DEFAULT_HEVC_AUDIO_TIER = {
|
|
59
131
|
identifier: 1,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/camera/homekit/hevc/types.ts"],"names":[],"mappings":"AAAA;;;GAGG;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/camera/homekit/hevc/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { spawn } from "node:child_process";
|
|
2
2
|
import dgram from "node:dgram";
|
|
3
|
-
import { MediaStreamTrack, RTCPeerConnection, RTCRtpCodecParameters } from "werift";
|
|
3
|
+
import { MediaStreamTrack, RTCPeerConnection, RTCRtpCodecParameters, } from "werift";
|
|
4
4
|
import { SecureVideoSFrame } from "./sframe.js";
|
|
5
5
|
import { HevcAccessUnitAssembler, SFrameRtpPacketizer } from "./sframe-rtp.js";
|
|
6
6
|
import { resolveFfmpegPath } from "../ffmpeg-helper.js";
|
|
@@ -11,7 +11,11 @@ const hevcCodec = new RTCRtpCodecParameters({
|
|
|
11
11
|
clockRate: 90000,
|
|
12
12
|
payloadType: VIDEO_PAYLOAD_TYPE,
|
|
13
13
|
parameters: "profile-id=1;tier-flag=0;level-id=153;tx-mode=SRST",
|
|
14
|
-
rtcpFeedback: [
|
|
14
|
+
rtcpFeedback: [
|
|
15
|
+
{ type: "nack" },
|
|
16
|
+
{ type: "nack", parameter: "pli" },
|
|
17
|
+
{ type: "ccm", parameter: "fir" },
|
|
18
|
+
],
|
|
15
19
|
});
|
|
16
20
|
export class WebRtcSessionManager {
|
|
17
21
|
platform;
|
|
@@ -71,7 +75,9 @@ export class WebRtcSessionManager {
|
|
|
71
75
|
void this.handleEndSession(request.sessionIdentifier);
|
|
72
76
|
});
|
|
73
77
|
}
|
|
74
|
-
else if (state === "failed" ||
|
|
78
|
+
else if (state === "failed" ||
|
|
79
|
+
state === "closed" ||
|
|
80
|
+
state === "disconnected") {
|
|
75
81
|
void this.handleEndSession(request.sessionIdentifier);
|
|
76
82
|
}
|
|
77
83
|
});
|
|
@@ -88,7 +94,10 @@ export class WebRtcSessionManager {
|
|
|
88
94
|
if (!session || session.answered) {
|
|
89
95
|
throw new Error("Unknown or already-answered WebRTC session");
|
|
90
96
|
}
|
|
91
|
-
await session.pc.setRemoteDescription({
|
|
97
|
+
await session.pc.setRemoteDescription({
|
|
98
|
+
type: "answer",
|
|
99
|
+
sdp: request.sdpAnswer,
|
|
100
|
+
});
|
|
92
101
|
session.answered = true;
|
|
93
102
|
this.platform?.log?.debug?.(`[WebRTC][${this.entityId}] Applied remote SDP answer for session ${request.sessionIdentifier.slice(0, 8)}`);
|
|
94
103
|
for (const candidate of request.candidates) {
|
|
@@ -109,10 +118,15 @@ export class WebRtcSessionManager {
|
|
|
109
118
|
if (!session) {
|
|
110
119
|
throw new Error("Unknown WebRTC session");
|
|
111
120
|
}
|
|
112
|
-
await session.pc.setRemoteDescription({
|
|
121
|
+
await session.pc.setRemoteDescription({
|
|
122
|
+
type: "offer",
|
|
123
|
+
sdp: request.sdpOffer,
|
|
124
|
+
});
|
|
113
125
|
const answer = await session.pc.createAnswer();
|
|
114
126
|
await session.pc.setLocalDescription(answer);
|
|
115
|
-
return {
|
|
127
|
+
return {
|
|
128
|
+
sdpAnswer: session.pc.localDescription?.sdp ?? answer.sdp,
|
|
129
|
+
};
|
|
116
130
|
}
|
|
117
131
|
async handleUpdateSession(request) {
|
|
118
132
|
const session = this.sessions.get(request.sessionIdentifier);
|
|
@@ -199,20 +213,31 @@ export class WebRtcSessionManager {
|
|
|
199
213
|
// FFmpeg reads RTSP and emits standard RFC 7798 HEVC RTP packets with -c:v copy
|
|
200
214
|
const args = [
|
|
201
215
|
"-hide_banner",
|
|
202
|
-
"-loglevel",
|
|
203
|
-
"
|
|
204
|
-
"-
|
|
205
|
-
"
|
|
206
|
-
"-
|
|
216
|
+
"-loglevel",
|
|
217
|
+
"warning",
|
|
218
|
+
"-rtsp_transport",
|
|
219
|
+
"tcp",
|
|
220
|
+
"-timeout",
|
|
221
|
+
"5000000",
|
|
222
|
+
"-i",
|
|
223
|
+
sourceUrl,
|
|
224
|
+
"-map",
|
|
225
|
+
"0:v:0",
|
|
207
226
|
"-an",
|
|
208
|
-
"-c:v",
|
|
209
|
-
"
|
|
210
|
-
"-
|
|
211
|
-
"
|
|
227
|
+
"-c:v",
|
|
228
|
+
"copy",
|
|
229
|
+
"-f",
|
|
230
|
+
"rtp",
|
|
231
|
+
"-payload_type",
|
|
232
|
+
String(VIDEO_PAYLOAD_TYPE),
|
|
233
|
+
"-ssrc",
|
|
234
|
+
String(videoSsrc),
|
|
212
235
|
`rtp://127.0.0.1:${localPort}`,
|
|
213
236
|
];
|
|
214
237
|
this.platform?.log?.notice?.(`[WebRTC][${this.entityId}] Spawning WebRTC HEVC Passthrough FFmpeg pipeline to 127.0.0.1:${localPort}`);
|
|
215
|
-
const proc = spawn(ffmpegPath, args, {
|
|
238
|
+
const proc = spawn(ffmpegPath, args, {
|
|
239
|
+
stdio: ["ignore", "ignore", "pipe"],
|
|
240
|
+
});
|
|
216
241
|
session.ffmpegProcess = proc;
|
|
217
242
|
proc.stderr?.on("data", (chunk) => {
|
|
218
243
|
this.platform?.log?.debug?.(`[WebRTC][${this.entityId}][stderr] ${chunk.toString().trim()}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webrtc-session.js","sourceRoot":"","sources":["../../../../src/camera/homekit/hevc/webrtc-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAqB,MAAM,oBAAoB,CAAC;AAC9D,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,
|
|
1
|
+
{"version":3,"file":"webrtc-session.js","sourceRoot":"","sources":["../../../../src/camera/homekit/hevc/webrtc-session.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
import { EventEmitter } from "events";
|
|
7
7
|
import { spawn } from "child_process";
|
|
8
8
|
import os from "node:os";
|
|
9
|
+
import { HDSProtocolSpecificErrorReason, } from "@homebridge/hap-nodejs";
|
|
9
10
|
import { Fmp4Segmenter } from "./fmp4-parser.js";
|
|
10
11
|
import { resolveFfmpegPath, sanitizeUrlCredentials } from "./ffmpeg-helper.js";
|
|
11
12
|
import { CameraSourceResolver } from "../camera-source-resolver.js";
|
|
@@ -359,7 +360,7 @@ export class HomeKitCameraRecordingDelegate extends EventEmitter {
|
|
|
359
360
|
// publisher can take longer to provide SPS/PPS after an RTSP reconnect.
|
|
360
361
|
const isTapoC402 = /(?:\bc402\b|tapo[-_ ]?c402|frente[-_ ]?de[-_ ]?calle)/i.test(`${this.entityId} ${this.record.name || ""} ${this.record.model || ""} ${this.streamSource.url || ""}`);
|
|
361
362
|
const isTapoC120 = /(?:\bc120\b|tapo[-_ ]?c120|tapo[-_ ]?spot|\bspot\b)/i.test(`${this.entityId} ${this.record.name || ""} ${this.record.model || ""} ${this.streamSource.url || ""}`);
|
|
362
|
-
await this.waitForInitialization(
|
|
363
|
+
await this.waitForInitialization(isTapoC402 || isTapoC120 ? 10000 : 5000);
|
|
363
364
|
}
|
|
364
365
|
if (this.initializationSegment) {
|
|
365
366
|
this.deliveredInitInSession = true;
|
|
@@ -417,7 +418,7 @@ export class HomeKitCameraRecordingDelegate extends EventEmitter {
|
|
|
417
418
|
* Called by HAP-NodeJS when the recording stream is closed by Home Hub or error.
|
|
418
419
|
*/
|
|
419
420
|
closeRecordingStream(streamId, reason) {
|
|
420
|
-
const isNormal = reason ===
|
|
421
|
+
const isNormal = reason === HDSProtocolSpecificErrorReason.NORMAL;
|
|
421
422
|
this.platform?.log?.notice?.(`[HKSV][${this.entityId}] Recording stream closed for streamId ${streamId} (reason: ${reason ?? "connection closed"}, normal: ${isNormal}, initSent=${this.deliveredInitInSession}, fragmentsSent=${this.deliveredFragmentsInSession})`);
|
|
422
423
|
if (reason && !isNormal) {
|
|
423
424
|
this.sessionHadProtocolError = true;
|
|
@@ -511,7 +512,11 @@ export class HomeKitCameraRecordingDelegate extends EventEmitter {
|
|
|
511
512
|
// instead of forwarding invalid timestamps to the Apple Home Hub.
|
|
512
513
|
needsAudioTimestampRepair
|
|
513
514
|
? "+genpts+discardcorrupt"
|
|
514
|
-
: "+nobuffer+flush_packets+genpts+igndts", "-flags", isTapoC120Match
|
|
515
|
+
: "+nobuffer+flush_packets+genpts+igndts", "-flags", isTapoC120Match
|
|
516
|
+
? "low_delay"
|
|
517
|
+
: needsAudioTimestampRepair
|
|
518
|
+
? "0"
|
|
519
|
+
: "low_delay");
|
|
515
520
|
// Camera.UI AAC streams can restart with discontinuous DTS. Replacing
|
|
516
521
|
// them with wall-clock timestamps makes FFmpeg drop audio packets before
|
|
517
522
|
// the aresample filter can normalize them. Keep only these repaired
|
|
@@ -620,7 +625,8 @@ export class HomeKitCameraRecordingDelegate extends EventEmitter {
|
|
|
620
625
|
// Output fragmented MP4 to stdout pipe
|
|
621
626
|
args.push("-avoid_negative_ts", "make_zero",
|
|
622
627
|
// Do not let an audio timestamp jump hold fMP4 video fragments hostage.
|
|
623
|
-
"-max_interleave_delta", "0", "-muxdelay", "0", "-muxpreload", "0", "-f", "mp4", "-movflags", "frag_keyframe+empty_moov+default_base_moof+skip_sidx+skip_trailer", "-frag_duration", String(Math.max(1000, Math.min(10000, Number(this.selectedConfiguration?.mediaContainerConfiguration
|
|
628
|
+
"-max_interleave_delta", "0", "-muxdelay", "0", "-muxpreload", "0", "-f", "mp4", "-movflags", "frag_keyframe+empty_moov+default_base_moof+skip_sidx+skip_trailer", "-frag_duration", String(Math.max(1000, Math.min(10000, Number(this.selectedConfiguration?.mediaContainerConfiguration
|
|
629
|
+
?.fragmentLength) || 4000)) * 1000), "pipe:1");
|
|
624
630
|
return args;
|
|
625
631
|
}
|
|
626
632
|
async startPrebufferPipeline() {
|