matter-all-in-one-addon 2.3.13 → 2.3.18
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 +18 -12
- package/dist/camera/browser-preview.js +12 -10
- package/dist/camera/browser-preview.js.map +1 -1
- package/dist/camera/homekit/homekit-camera-recording.delegate.d.ts +5 -0
- package/dist/camera/homekit/homekit-camera-recording.delegate.js +14 -0
- package/dist/camera/homekit/homekit-camera-recording.delegate.js.map +1 -1
- package/dist/camera/homekit/homekit-camera-stream.delegate.d.ts +8 -2
- package/dist/camera/homekit/homekit-camera-stream.delegate.js +113 -49
- package/dist/camera/homekit/homekit-camera-stream.delegate.js.map +1 -1
- package/dist/camera/homekit/homekit-camera.accessory.js +17 -3
- package/dist/camera/homekit/homekit-camera.accessory.js.map +1 -1
- package/dist/camera/homekit/tuya-hap-talkback.d.ts +1 -0
- package/dist/camera/homekit/tuya-hap-talkback.js +11 -8
- package/dist/camera/homekit/tuya-hap-talkback.js.map +1 -1
- package/dist/camera/matter/camera-endpoint.builder.js +31 -18
- package/dist/camera/matter/camera-endpoint.builder.js.map +1 -1
- package/dist/converters/binary_sensor.converter.d.ts +1 -1
- package/dist/converters/binary_sensor.converter.js +2 -2
- package/dist/converters/climate.converter.d.ts +14 -1
- package/dist/converters/climate.converter.js +44 -2
- package/dist/converters/climate.converter.js.map +1 -1
- package/dist/converters/sensor.converter.js +6 -6
- package/dist/converters/sensor.converter.js.map +1 -1
- package/dist/device-profiles.js +33 -2
- package/dist/device-profiles.js.map +1 -1
- package/dist/device-registry.js +12 -0
- package/dist/device-registry.js.map +1 -1
- package/dist/entities/air_quality.entity.js +24 -1
- package/dist/entities/air_quality.entity.js.map +1 -1
- package/dist/entities/base.entity.js +25 -5
- package/dist/entities/base.entity.js.map +1 -1
- package/dist/entities/climate.entity.d.ts +23 -0
- package/dist/entities/climate.entity.js +174 -0
- package/dist/entities/climate.entity.js.map +1 -0
- package/dist/entities/closure.entity.js +24 -1
- package/dist/entities/closure.entity.js.map +1 -1
- package/dist/entities/composite-device.entity.js +23 -7
- package/dist/entities/composite-device.entity.js.map +1 -1
- package/dist/entities/cooktop.entity.d.ts +1 -0
- package/dist/entities/cooktop.entity.js +18 -3
- package/dist/entities/cooktop.entity.js.map +1 -1
- package/dist/entities/energy_tariff.entity.js +16 -4
- package/dist/entities/energy_tariff.entity.js.map +1 -1
- package/dist/entities/humidifier.entity.d.ts +3 -0
- package/dist/entities/humidifier.entity.js +61 -45
- package/dist/entities/humidifier.entity.js.map +1 -1
- package/dist/entities/lock.entity.js +9 -5
- package/dist/entities/lock.entity.js.map +1 -1
- package/dist/entities/oven.entity.d.ts +2 -0
- package/dist/entities/oven.entity.js +50 -8
- package/dist/entities/oven.entity.js.map +1 -1
- package/dist/entities/soil_sensor.entity.js +2 -1
- package/dist/entities/soil_sensor.entity.js.map +1 -1
- package/dist/entities/vacuum.entity.js +4 -4
- package/dist/entities/vacuum.entity.js.map +1 -1
- package/dist/entities/valve.entity.js +29 -5
- package/dist/entities/valve.entity.js.map +1 -1
- package/dist/frontend/assets/CameraConfigModal-DnDZbkpj.js +6 -0
- package/dist/frontend/assets/CameraUiModal-DVCgRtyT.js +1 -0
- package/dist/frontend/assets/DeviceModal-DFgXDEzB.js +5 -0
- package/dist/frontend/assets/QRCodeDisplay-B3RFLtWz.js +8 -0
- package/dist/frontend/assets/ScryptedModal-DZ4B2NLt.js +1 -0
- package/dist/frontend/assets/SettingsModal-BBflJWuJ.js +2 -0
- package/dist/frontend/assets/clipboard-CnKYMNaq.js +1 -0
- package/dist/frontend/assets/index-CONl6ATp.js +10 -0
- package/dist/frontend/index.html +1 -1
- package/dist/hap/hap-generic-accessory.d.ts +6 -0
- package/dist/hap/hap-generic-accessory.js +641 -26
- package/dist/hap/hap-generic-accessory.js.map +1 -1
- package/dist/homeAssistant.d.ts +1 -0
- package/dist/homeAssistant.js +40 -1
- package/dist/homeAssistant.js.map +1 -1
- package/dist/mqtt/mqtt-client.d.ts +2 -0
- package/dist/mqtt/mqtt-client.js +44 -2
- package/dist/mqtt/mqtt-client.js.map +1 -1
- package/dist/mqtt/mqtt.entity.d.ts +12 -0
- package/dist/mqtt/mqtt.entity.js +231 -82
- package/dist/mqtt/mqtt.entity.js.map +1 -1
- package/dist/platform.d.ts +2 -0
- package/dist/platform.js +111 -37
- package/dist/platform.js.map +1 -1
- package/dist/proxy.js +13 -1
- package/dist/proxy.js.map +1 -1
- package/dist/utils/hap-firmware.js +1 -1
- package/dist/utils/hap-firmware.js.map +1 -1
- package/dist/utils/matter-command-response.js +64 -44
- package/dist/utils/matter-command-response.js.map +1 -1
- package/dist/utils/matter-reset-storage.d.ts +2 -0
- package/dist/utils/matter-reset-storage.js +74 -0
- package/dist/utils/matter-reset-storage.js.map +1 -0
- package/dist/utils/measurements.d.ts +8 -0
- package/dist/utils/measurements.js +42 -0
- package/dist/utils/measurements.js.map +1 -0
- package/package.json +17 -17
- package/dist/frontend/assets/index-1k-iTL-m.js +0 -26
|
@@ -149,6 +149,7 @@ export class HomeKitCameraStreamingDelegate extends EventEmitter {
|
|
|
149
149
|
capabilities;
|
|
150
150
|
streamSource;
|
|
151
151
|
record;
|
|
152
|
+
recordingSnapshotMedia;
|
|
152
153
|
activeSessions = new Map();
|
|
153
154
|
/**
|
|
154
155
|
* Watchdog timers for orphaned prepareStream sessions.
|
|
@@ -174,15 +175,16 @@ export class HomeKitCameraStreamingDelegate extends EventEmitter {
|
|
|
174
175
|
return this.activeSessions.size;
|
|
175
176
|
}
|
|
176
177
|
twoWayAudioSupported;
|
|
177
|
-
|
|
178
|
+
snapshotWaiters;
|
|
178
179
|
lastSnapshotTime = 0;
|
|
179
|
-
constructor(platform, entityId, capabilities, streamSource, record) {
|
|
180
|
+
constructor(platform, entityId, capabilities, streamSource, record, recordingSnapshotMedia) {
|
|
180
181
|
super();
|
|
181
182
|
this.platform = platform;
|
|
182
183
|
this.entityId = entityId;
|
|
183
184
|
this.capabilities = capabilities;
|
|
184
185
|
this.streamSource = streamSource;
|
|
185
186
|
this.record = record;
|
|
187
|
+
this.recordingSnapshotMedia = recordingSnapshotMedia;
|
|
186
188
|
const cameraIdentity = `${this.entityId} ${String(this.streamSource.metadata?.name || "")} ${String(this.streamSource.metadata?.model || "")}`;
|
|
187
189
|
const isTuyaOrFeeder = this.streamSource.metadata?.isOmniTuyaDirect === true ||
|
|
188
190
|
/(?:\bomni\b|\btuya\b|comedero|feeder|acf100)/i.test(cameraIdentity);
|
|
@@ -311,10 +313,16 @@ export class HomeKitCameraStreamingDelegate extends EventEmitter {
|
|
|
311
313
|
recordFfmpegProgress(session, line) {
|
|
312
314
|
if (!session.telemetry)
|
|
313
315
|
return;
|
|
314
|
-
|
|
315
|
-
|
|
316
|
+
const outputHeader = /^Output #(\d+)/i.exec(line.trim());
|
|
317
|
+
if (outputHeader) {
|
|
318
|
+
session.ffmpegOutputHeaderSeen = outputHeader[1] === "0";
|
|
316
319
|
return;
|
|
317
320
|
}
|
|
321
|
+
const frame = /^frame=\s*(\d+)/.exec(line.trim());
|
|
322
|
+
if (frame && Number(frame[1]) > 0 && !session.firstFfmpegFrameReported) {
|
|
323
|
+
session.firstFfmpegFrameReported = true;
|
|
324
|
+
this.platform?.log?.notice?.(`[HomeKitCamera][${this.entityId}] FFmpeg first output frame after ${Date.now() - (session.startRequestedAt ?? Date.parse(session.telemetry.startedAt))}ms`);
|
|
325
|
+
}
|
|
318
326
|
const progress = mergeFfmpegProgress(session.telemetry.output, line);
|
|
319
327
|
const output = session.ffmpegOutputHeaderSeen
|
|
320
328
|
? mergeFfmpegStreamHeader(progress, line)
|
|
@@ -327,7 +335,7 @@ export class HomeKitCameraStreamingDelegate extends EventEmitter {
|
|
|
327
335
|
const snapPath = `/data/snapshots/${this.entityId.replaceAll(".", "_")}.jpg`;
|
|
328
336
|
if (fsSync.existsSync(snapPath)) {
|
|
329
337
|
const buf = fsSync.readFileSync(snapPath);
|
|
330
|
-
if (isJpeg(buf)
|
|
338
|
+
if (isJpeg(buf)) {
|
|
331
339
|
this.lastSnapshotBuffer = buf;
|
|
332
340
|
// A persisted snapshot can survive an add-on restart. Preserve its
|
|
333
341
|
// actual age instead of treating load time as capture time.
|
|
@@ -350,20 +358,22 @@ export class HomeKitCameraStreamingDelegate extends EventEmitter {
|
|
|
350
358
|
}
|
|
351
359
|
async handleSnapshotRequest(request, callback) {
|
|
352
360
|
const started = Date.now();
|
|
361
|
+
let ownsCapture = false;
|
|
353
362
|
let completed = false;
|
|
354
363
|
let safetyTimer = undefined;
|
|
355
|
-
const finish = (source, buffer) => {
|
|
364
|
+
const finish = (source, buffer, receivedAt = Date.now()) => {
|
|
356
365
|
if (safetyTimer) {
|
|
357
366
|
clearTimeout(safetyTimer);
|
|
358
367
|
safetyTimer = undefined;
|
|
359
368
|
}
|
|
360
|
-
this.isTakingSnapshot = false;
|
|
361
369
|
if (completed)
|
|
362
370
|
return;
|
|
363
371
|
completed = true;
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
372
|
+
if (ownsCapture && this.lastSnapshotTime > started) {
|
|
373
|
+
source = "cached-active-stream";
|
|
374
|
+
buffer = this.lastSnapshotBuffer;
|
|
375
|
+
}
|
|
376
|
+
const selected = isJpeg(buffer) ? buffer : this.lastSnapshotBuffer;
|
|
367
377
|
if (isJpeg(selected) && selected !== FALLBACK_JPEG_BUFFER) {
|
|
368
378
|
this.lastSnapshotBuffer = selected;
|
|
369
379
|
// Cached/error fallbacks keep HomeKit responsive, but must not make
|
|
@@ -372,46 +382,54 @@ export class HomeKitCameraStreamingDelegate extends EventEmitter {
|
|
|
372
382
|
source === "ha-fetch-png-converted" ||
|
|
373
383
|
source === "http-snapshot" ||
|
|
374
384
|
source === "http-png-converted" ||
|
|
385
|
+
source === "recording-prebuffer" ||
|
|
375
386
|
source === "ffmpeg") {
|
|
376
|
-
this.lastSnapshotTime =
|
|
387
|
+
this.lastSnapshotTime = receivedAt;
|
|
377
388
|
void this.persistSnapshotToDisk(selected);
|
|
378
389
|
}
|
|
379
390
|
}
|
|
380
|
-
this.platform?.log?.notice?.(`[HomeKitCamera][${this.entityId}] Snapshot source=${source} bytes=${selected.length} duration=${Date.now() - started}ms validJpeg=${isJpeg(selected)}`);
|
|
391
|
+
this.platform?.log?.notice?.(`[HomeKitCamera][${this.entityId}] Snapshot source=${source} bytes=${selected.length} duration=${Date.now() - started}ms cacheAgeMs=${this.lastSnapshotTime ? Date.now() - this.lastSnapshotTime : "unknown"} validJpeg=${isJpeg(selected)}`);
|
|
392
|
+
const waiters = ownsCapture ? this.snapshotWaiters : undefined;
|
|
393
|
+
if (ownsCapture)
|
|
394
|
+
this.snapshotWaiters = undefined;
|
|
381
395
|
callback(undefined, selected);
|
|
396
|
+
waiters?.forEach((waiter) => waiter(undefined, selected));
|
|
382
397
|
};
|
|
383
|
-
|
|
384
|
-
// Cameras like Tapo allow max 2 RTSP connections; opening a 3rd connection kills the live stream.
|
|
398
|
+
const cacheAge = Date.now() - this.lastSnapshotTime;
|
|
385
399
|
if (this.activeSessions.size > 0) {
|
|
386
|
-
finish("active-session-protect", this.lastSnapshotBuffer);
|
|
400
|
+
finish(cacheAge < 10000 ? "cached-active-stream" : "active-session-protect", this.lastSnapshotBuffer);
|
|
387
401
|
return;
|
|
388
402
|
}
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
this.lastSnapshotBuffer &&
|
|
392
|
-
this.lastSnapshotBuffer !== FALLBACK_JPEG_BUFFER) {
|
|
393
|
-
finish("cached-active-stream", this.lastSnapshotBuffer);
|
|
403
|
+
if (this.lastSnapshotBuffer !== FALLBACK_JPEG_BUFFER && cacheAge < 8000) {
|
|
404
|
+
finish("cached-recent", this.lastSnapshotBuffer);
|
|
394
405
|
return;
|
|
395
406
|
}
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
this.lastSnapshotBuffer !== FALLBACK_JPEG_BUFFER &&
|
|
399
|
-
(this.isTakingSnapshot || now - this.lastSnapshotTime < 8000)) {
|
|
400
|
-
finish("cached-session-guard", this.lastSnapshotBuffer);
|
|
407
|
+
if (this.snapshotWaiters) {
|
|
408
|
+
this.snapshotWaiters.push(callback);
|
|
401
409
|
return;
|
|
402
410
|
}
|
|
403
|
-
|
|
411
|
+
ownsCapture = true;
|
|
412
|
+
this.snapshotWaiters = [];
|
|
404
413
|
safetyTimer = setTimeout(() => {
|
|
405
|
-
|
|
406
|
-
this.lastSnapshotBuffer &&
|
|
407
|
-
this.lastSnapshotBuffer !== FALLBACK_JPEG_BUFFER) {
|
|
408
|
-
finish("safety-cached-fallback", this.lastSnapshotBuffer);
|
|
409
|
-
}
|
|
410
|
-
// Let the bounded HA snapshot, direct HTTP snapshot, and final FFmpeg
|
|
411
|
-
// capture complete before returning an older cached image. These paths
|
|
412
|
-
// have explicit upper bounds of 1.2s + 1.5s + 2s respectively.
|
|
414
|
+
finish("safety-cached-fallback", this.lastSnapshotBuffer);
|
|
413
415
|
}, 5200);
|
|
414
416
|
try {
|
|
417
|
+
const media = this.streamSource.metadata?.isOmniTuyaDirect
|
|
418
|
+
? this.recordingSnapshotMedia?.()
|
|
419
|
+
: undefined;
|
|
420
|
+
if (media) {
|
|
421
|
+
const jpeg = await convertImageToJpeg(media.data, request.width, request.height);
|
|
422
|
+
if (completed)
|
|
423
|
+
return;
|
|
424
|
+
if (jpeg) {
|
|
425
|
+
finish("recording-prebuffer", jpeg, media.receivedAt);
|
|
426
|
+
return;
|
|
427
|
+
}
|
|
428
|
+
if (this.activeSessions.size > 0) {
|
|
429
|
+
finish("active-session-protect", this.lastSnapshotBuffer);
|
|
430
|
+
return;
|
|
431
|
+
}
|
|
432
|
+
}
|
|
415
433
|
let haEntityToQuery = this.entityId.startsWith("camera.")
|
|
416
434
|
? this.entityId
|
|
417
435
|
: undefined;
|
|
@@ -437,7 +455,7 @@ export class HomeKitCameraStreamingDelegate extends EventEmitter {
|
|
|
437
455
|
typeof this.platform.ha.fetchSnapshot === "function") {
|
|
438
456
|
try {
|
|
439
457
|
const buffer = await this.platform.ha.fetchSnapshot(haEntityToQuery);
|
|
440
|
-
if (buffer && isJpeg(buffer)
|
|
458
|
+
if (buffer && isJpeg(buffer)) {
|
|
441
459
|
finish("ha-fetch-snapshot", buffer);
|
|
442
460
|
return;
|
|
443
461
|
}
|
|
@@ -467,7 +485,7 @@ export class HomeKitCameraStreamingDelegate extends EventEmitter {
|
|
|
467
485
|
});
|
|
468
486
|
if (response.ok) {
|
|
469
487
|
const buffer = Buffer.from(await response.arrayBuffer());
|
|
470
|
-
if (isJpeg(buffer)
|
|
488
|
+
if (isJpeg(buffer)) {
|
|
471
489
|
finish("http-snapshot", buffer);
|
|
472
490
|
return;
|
|
473
491
|
}
|
|
@@ -484,6 +502,15 @@ export class HomeKitCameraStreamingDelegate extends EventEmitter {
|
|
|
484
502
|
this.platform?.log?.debug?.(`[HomeKitCamera][${this.entityId}] Snapshot HTTP failed: ${String(error)}`);
|
|
485
503
|
}
|
|
486
504
|
}
|
|
505
|
+
// A live request may have arrived while awaiting the HA image.
|
|
506
|
+
// Omni's saved source URL is signed and already used by the prebuffer.
|
|
507
|
+
if (completed)
|
|
508
|
+
return;
|
|
509
|
+
if (this.activeSessions.size ||
|
|
510
|
+
this.streamSource.metadata?.isOmniTuyaDirect) {
|
|
511
|
+
finish("shared-reader-cache", this.lastSnapshotBuffer);
|
|
512
|
+
return;
|
|
513
|
+
}
|
|
487
514
|
const ffmpegPath = resolveFfmpegPath();
|
|
488
515
|
const sourceUrl = this.getCleanSourceUrl();
|
|
489
516
|
if (!ffmpegPath || !sourceUrl) {
|
|
@@ -491,7 +518,7 @@ export class HomeKitCameraStreamingDelegate extends EventEmitter {
|
|
|
491
518
|
return;
|
|
492
519
|
}
|
|
493
520
|
const args = ["-hide_banner", "-loglevel", "error"];
|
|
494
|
-
if (
|
|
521
|
+
if (/^rtsps?:\/\//i.test(sourceUrl)) {
|
|
495
522
|
const isDemandingCam = this.isTapoC402() || this.isWyze() || this.isEzviz();
|
|
496
523
|
args.push("-probesize", isDemandingCam ? "1048576" : this.isTapoC120() ? "131072" : "65536", "-analyzeduration", isDemandingCam ? "1000000" : "0", "-rtsp_transport", "tcp", "-timeout", "3000000", "-fflags", "+nobuffer+flush_packets", "-flags", "low_delay");
|
|
497
524
|
}
|
|
@@ -524,9 +551,7 @@ export class HomeKitCameraStreamingDelegate extends EventEmitter {
|
|
|
524
551
|
process.once("close", () => {
|
|
525
552
|
clearTimeout(timer);
|
|
526
553
|
const buffer = Buffer.concat(chunks);
|
|
527
|
-
finish(isJpeg(buffer)
|
|
528
|
-
? "ffmpeg"
|
|
529
|
-
: "fallback-invalid-jpeg", buffer);
|
|
554
|
+
finish(isJpeg(buffer) ? "ffmpeg" : "fallback-invalid-jpeg", buffer);
|
|
530
555
|
});
|
|
531
556
|
}
|
|
532
557
|
catch (error) {
|
|
@@ -686,7 +711,19 @@ export class HomeKitCameraStreamingDelegate extends EventEmitter {
|
|
|
686
711
|
callback(new Error(`Session ${request.sessionID} was not prepared`));
|
|
687
712
|
return;
|
|
688
713
|
}
|
|
689
|
-
|
|
714
|
+
if (session.startRequestedAt !== undefined) {
|
|
715
|
+
callback(new Error("Stream already starting or active"));
|
|
716
|
+
return;
|
|
717
|
+
}
|
|
718
|
+
session.startRequestedAt = Date.now();
|
|
719
|
+
const timer = this.prepareTimeouts.get(session.sessionId);
|
|
720
|
+
if (timer !== undefined)
|
|
721
|
+
clearTimeout(timer);
|
|
722
|
+
this.prepareTimeouts.delete(session.sessionId);
|
|
723
|
+
void this.startStream(session, request, callback).catch(() => {
|
|
724
|
+
this.stopStream(session.sessionId);
|
|
725
|
+
callback(new Error("Could not start HomeKit stream"));
|
|
726
|
+
});
|
|
690
727
|
return;
|
|
691
728
|
}
|
|
692
729
|
if (request.type === "reconfigure" /* StreamRequestTypes.RECONFIGURE */) {
|
|
@@ -880,7 +917,7 @@ export class HomeKitCameraStreamingDelegate extends EventEmitter {
|
|
|
880
917
|
if (!ffmpegPath || !sourceUrl) {
|
|
881
918
|
this.platform?.log?.warn?.(`[HomeKitCamera][${this.entityId}] HAP START rejected: ${!ffmpegPath ? "FFmpeg unavailable" : "stream source unavailable"}`);
|
|
882
919
|
callback(new Error("FFmpeg or RTSP source is unavailable"));
|
|
883
|
-
this.
|
|
920
|
+
this.stopStream(session.sessionId);
|
|
884
921
|
return;
|
|
885
922
|
}
|
|
886
923
|
// Omni issues a new single-session RTSP URL for each HomeKit open. The
|
|
@@ -916,10 +953,14 @@ export class HomeKitCameraStreamingDelegate extends EventEmitter {
|
|
|
916
953
|
// Metadata probing is a separate RTSP reader. Allocate another signed
|
|
917
954
|
// URL for the actual live process instead of reopening the probe URL.
|
|
918
955
|
if (!audioFormatKnown) {
|
|
956
|
+
if (this.activeSessions.get(session.sessionId) !== session) {
|
|
957
|
+
callback(new Error("HomeKit stream stopped during setup"));
|
|
958
|
+
return;
|
|
959
|
+
}
|
|
919
960
|
const freshUrl = await this.platform?.ha?.requestOmniTuyaCameraStream?.(this.streamSource.metadata?.sourceCameraEntityId || this.entityId);
|
|
920
961
|
if (!freshUrl) {
|
|
921
962
|
callback(new Error("Omni could not renew the live stream after probing"));
|
|
922
|
-
this.
|
|
963
|
+
this.stopStream(session.sessionId);
|
|
923
964
|
return;
|
|
924
965
|
}
|
|
925
966
|
this.streamSource.url = freshUrl;
|
|
@@ -943,12 +984,6 @@ export class HomeKitCameraStreamingDelegate extends EventEmitter {
|
|
|
943
984
|
? 4000
|
|
944
985
|
: 2500;
|
|
945
986
|
const bitrate = Math.max(qualityFloor, Math.min(video.max_bit_rate || 2500, maxBitrateCap));
|
|
946
|
-
// Cancel the prepare watchdog timer because stream has legitimately started
|
|
947
|
-
const timer = this.prepareTimeouts.get(session.sessionId);
|
|
948
|
-
if (timer !== undefined) {
|
|
949
|
-
clearTimeout(timer);
|
|
950
|
-
this.prepareTimeouts.delete(session.sessionId);
|
|
951
|
-
}
|
|
952
987
|
this.platform?.log?.notice?.(`[HomeKitCamera][${this.entityId}] [Session][${session.sessionId}] session-start ${video.width}x${video.height} | FPS[declarado=${declaredFps}, solicitado=${requestedFps ?? "omitted"}, medido=${measuredFps ?? "unmeasured"}, efectivo=${effectiveFps ?? "auto"}]`);
|
|
953
988
|
// Yield event loop without artificial delay so background listeners handle pause immediately
|
|
954
989
|
await new Promise((resolve) => setImmediate(resolve));
|
|
@@ -959,6 +994,10 @@ export class HomeKitCameraStreamingDelegate extends EventEmitter {
|
|
|
959
994
|
callbackSettled = true;
|
|
960
995
|
callback(error);
|
|
961
996
|
};
|
|
997
|
+
if (this.activeSessions.get(session.sessionId) !== session) {
|
|
998
|
+
settle(new Error("HomeKit stream stopped during setup"));
|
|
999
|
+
return;
|
|
1000
|
+
}
|
|
962
1001
|
this.spawnFfmpegProcess(session, request, settle, false);
|
|
963
1002
|
}
|
|
964
1003
|
spawnFfmpegProcess(session, request, settle, forceTranscode = false) {
|
|
@@ -1001,6 +1040,10 @@ export class HomeKitCameraStreamingDelegate extends EventEmitter {
|
|
|
1001
1040
|
/^rtsps?:\/\//i.test(sourceUrl || "")
|
|
1002
1041
|
? "pipe"
|
|
1003
1042
|
: "ignore",
|
|
1043
|
+
this.streamSource.metadata?.isOmniTuyaDirect === true &&
|
|
1044
|
+
/^rtsps?:\/\//i.test(sourceUrl || "")
|
|
1045
|
+
? "pipe"
|
|
1046
|
+
: "ignore",
|
|
1004
1047
|
],
|
|
1005
1048
|
});
|
|
1006
1049
|
session.process = process;
|
|
@@ -1010,6 +1053,26 @@ export class HomeKitCameraStreamingDelegate extends EventEmitter {
|
|
|
1010
1053
|
this.emit("recording-analysis-data", chunk);
|
|
1011
1054
|
});
|
|
1012
1055
|
}
|
|
1056
|
+
const snapshotPipe = process.stdio[4];
|
|
1057
|
+
if (snapshotPipe && typeof snapshotPipe !== "string") {
|
|
1058
|
+
let pending = Buffer.alloc(0);
|
|
1059
|
+
snapshotPipe.on("data", (chunk) => {
|
|
1060
|
+
if (this.activeSessions.get(request.sessionID)?.process !== process)
|
|
1061
|
+
return;
|
|
1062
|
+
pending = Buffer.concat([pending, chunk]);
|
|
1063
|
+
let end;
|
|
1064
|
+
while ((end = pending.indexOf(Buffer.from([0xff, 0xd9]), 2)) >= 0) {
|
|
1065
|
+
const jpeg = pending.subarray(0, end + 2);
|
|
1066
|
+
pending = pending.subarray(end + 2);
|
|
1067
|
+
if (isJpeg(jpeg)) {
|
|
1068
|
+
this.lastSnapshotBuffer = jpeg;
|
|
1069
|
+
this.lastSnapshotTime = Date.now();
|
|
1070
|
+
}
|
|
1071
|
+
}
|
|
1072
|
+
if (pending.length > 2 * 1024 * 1024)
|
|
1073
|
+
pending = Buffer.alloc(0);
|
|
1074
|
+
});
|
|
1075
|
+
}
|
|
1013
1076
|
if (isHaProxyStream && sourceUrl) {
|
|
1014
1077
|
this.startHaCameraProxyPipe(session, process, sourceUrl);
|
|
1015
1078
|
}
|
|
@@ -1465,6 +1528,7 @@ export class HomeKitCameraStreamingDelegate extends EventEmitter {
|
|
|
1465
1528
|
// receiving timestamped fMP4 media during the same RTSP session.
|
|
1466
1529
|
"-frag_duration", String(Math.max(1000, Math.min(10000, Number(this.record?.hksvRecordingConfiguration
|
|
1467
1530
|
?.mediaContainerConfiguration?.fragmentLength) || 4000)) * 1000), "-f", "mp4", "-movflags", "frag_keyframe+empty_moov+default_base_moof+skip_sidx+skip_trailer", "pipe:3");
|
|
1531
|
+
args.push("-map", "0:v:0", "-vf", "select='isnan(prev_selected_t)+gte(t-prev_selected_t,5)',scale=w='min(1280,iw)':h=-2", "-an", "-c:v", "mjpeg", "-q:v", "4", "-fps_mode", "vfr", "-f", "image2pipe", "pipe:4");
|
|
1468
1532
|
}
|
|
1469
1533
|
return args;
|
|
1470
1534
|
}
|