homekit: clean up late generator bug

koush · Apr 3, 2024 · 207cb9d · 207cb9d
1 parent f2de58f
commit 207cb9d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/plugins/homekit/src/types/camera.ts b/plugins/homekit/src/types/camera.ts
@@ -103,24 +103,20 @@ addSupportedType({
         const isRecordingEnabled = device.interfaces.includes(ScryptedInterface.MotionSensor);
 
         let configuration: CameraRecordingConfiguration;
-        const openRecordingStreams = new Map<number, Deferred<any>>();
+        const openRecordingStreams = new Set<number>();
         if (isRecordingEnabled) {
             recordingDelegate = {
                 updateRecordingConfiguration(newConfiguration: CameraRecordingConfiguration) {
                     configuration = newConfiguration;
                 },
                 handleRecordingStreamRequest(streamId: number): AsyncGenerator<RecordingPacket> {
-                    const ret = handleFragmentsRequests(streamId, device, configuration, console, homekitPlugin);
-                    const d = new Deferred<any>();
-                    d.promise.then(reason => {
-                        ret.throw(new Error(reason.toString()));
-                        openRecordingStreams.delete(streamId);
-                    });
-                    openRecordingStreams.set(streamId, d);
+                    const ret = handleFragmentsRequests(streamId, device, configuration, console, homekitPlugin, 
+                        () => openRecordingStreams.has(streamId));
+                    openRecordingStreams.add(streamId);
                     return ret;
                 },
                 closeRecordingStream(streamId, reason) {
-                    openRecordingStreams.get(streamId)?.resolve(reason);
+                    openRecordingStreams.delete(streamId);
                 },
                 updateRecordingActive(active) {
                 },

diff --git a/plugins/homekit/src/types/camera/camera-recording.ts b/plugins/homekit/src/types/camera/camera-recording.ts
@@ -116,7 +116,7 @@ async function checkMp4StartsWithKeyFrame(console: Console, mp4: Buffer) {
 }
 
 export async function* handleFragmentsRequests(streamId: number, device: ScryptedDevice & VideoCamera & MotionSensor & AudioSensor,
-    configuration: CameraRecordingConfiguration, console: Console, homekitPlugin: HomeKitPlugin): AsyncGenerator<RecordingPacket> {
+    configuration: CameraRecordingConfiguration, console: Console, homekitPlugin: HomeKitPlugin, isOpen: () => boolean): AsyncGenerator<RecordingPacket> {
 
     // homekitPlugin.storageSettings.values.lastKnownHomeHub = connection.remoteAddress;
 
@@ -319,6 +319,7 @@ export async function* handleFragmentsRequests(streamId: number, device: Scrypte
         let needSkip = true;
         let ftyp: Buffer[];
         let moov: Buffer[];
+
         for await (const box of generator) {
             const { header, type, data } = box;
             // console.log('motion fragment box', type);
@@ -331,7 +332,7 @@ export async function* handleFragmentsRequests(streamId: number, device: Scrypte
                 checkMp4 = false;
                 // pending will contain the moof
                 try {
-                    if (!await checkMp4StartsWithKeyFrame(console, Buffer.concat([...ftyp, ...moov, ...pending, header, data]))) {
+                    if (false && !await checkMp4StartsWithKeyFrame(console, Buffer.concat([...ftyp, ...moov, ...pending, header, data]))) {
                         needSkip = false;
                         pending = [];
                         continue;
@@ -360,17 +361,19 @@ export async function* handleFragmentsRequests(streamId: number, device: Scrypte
                     data: fragment,
                     isLast,
                 }
+                if (!isOpen())
+                    return;
                 yield recordingPacket;
                 if (wasLast)
                     break;
             }
         }
-        console.log(`motion recording finished`);
     }
     catch (e) {
         console.log(`motion recording completed ${e}`);
     }
     finally {
+        console.log(`motion recording finished`);
         clearTimeout(videoTimeout);
         cleanupPipes();
         recordingFile?.end();