homekit: undo revert for later publish

koush · Apr 15, 2024 · a5a464e · a5a464e
1 parent a3a878c
commit a5a464e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/plugins/homekit/src/main.ts b/plugins/homekit/src/main.ts
@@ -269,7 +269,7 @@ export class HomeKitPlugin extends ScryptedDeviceBase implements MixinProvider,
                     storageSettings.settings.pincode.persistedDefaultValue = randomPinCode();
                     // TODO: change this value after this current default has been persisted to existing clients.
                     // changing it now will cause existing accessories be renamed.
-                    storageSettings.settings.addIdentifyingMaterial.persistedDefaultValue = false;
+                    storageSettings.settings.addIdentifyingMaterial.persistedDefaultValue = true;
 
                     const mixinConsole = deviceManager.getMixinConsole(device.id, this.nativeId);
 

diff --git a/plugins/homekit/src/types/camera.ts b/plugins/homekit/src/types/camera.ts
@@ -103,7 +103,7 @@ addSupportedType({
         const isRecordingEnabled = device.interfaces.includes(ScryptedInterface.MotionSensor);
 
         let configuration: CameraRecordingConfiguration;
-        const openRecordingStreams = new Set<number>();
+        const openRecordingStreams = new Map<number, AsyncGenerator<RecordingPacket>>();
         if (isRecordingEnabled) {
             recordingDelegate = {
                 updateRecordingConfiguration(newConfiguration: CameraRecordingConfiguration) {
@@ -112,10 +112,12 @@ addSupportedType({
                 handleRecordingStreamRequest(streamId: number): AsyncGenerator<RecordingPacket> {
                     const ret = handleFragmentsRequests(streamId, device, configuration, console, homekitPlugin, 
                         () => openRecordingStreams.has(streamId));
-                    openRecordingStreams.add(streamId);
+                    openRecordingStreams.set(streamId, ret);
                     return ret;
                 },
                 closeRecordingStream(streamId, reason) {
+                    const r = openRecordingStreams.get(streamId);
+                    r?.throw(new Error(reason?.toString()));
                     openRecordingStreams.delete(streamId);
                 },
                 updateRecordingActive(active) {