Merge branch 'main' of github.com:koush/scrypted

koush · Mar 21, 2023 · b4a3960 · b4a3960
2 parents 0514e62 + 3621e58
commit b4a3960
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 35 deletions.
diff --git a/plugins/homekit/package-lock.json b/plugins/homekit/package-lock.json
diff --git a/plugins/homekit/package.json b/plugins/homekit/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/homekit",
-   "version": "1.2.17",
+   "version": "1.2.18",
    "description": "HomeKit Plugin for Scrypted",
    "scripts": {
       "scrypted-setup-project": "scrypted-setup-project",
@@ -45,7 +45,7 @@
       "@scrypted/sdk": "file:../../sdk",
       "@types/debug": "^4.1.7",
       "@types/lodash": "^4.14.191",
-      "@types/node": "^18.15.0",
+      "@types/node": "^18.15.5",
       "@types/url-parse": "^1.4.8"
    }
 }
diff --git a/plugins/homekit/src/types/camera.ts b/plugins/homekit/src/types/camera.ts
@@ -1,13 +1,13 @@
+import { Deferred } from '@scrypted/common/src/deferred';
 import sdk, { AudioSensor, Camera, Intercom, MotionSensor, ObjectsDetected, OnOff, ScryptedDevice, ScryptedDeviceType, ScryptedInterface, VideoCamera, VideoCameraConfiguration } from '@scrypted/sdk';
 import { defaultObjectDetectionContactSensorTimeout } from '../camera-mixin';
-import { addSupportedType, bindCharacteristic, DummyDevice,  } from '../common';
-import { AudioRecordingCodec, AudioRecordingCodecType, AudioRecordingSamplerate, AudioStreamingCodec, AudioStreamingCodecType, AudioStreamingSamplerate, CameraController, CameraRecordingConfiguration, CameraRecordingDelegate, CameraRecordingOptions, CameraStreamingOptions, Characteristic, CharacteristicEventTypes, DataStreamConnection, H264Level, H264Profile, MediaContainerType, OccupancySensor, RecordingManagement, RecordingPacket, Service, SRTPCryptoSuites, VideoCodecType, WithUUID } from '../hap';
+import { addSupportedType, bindCharacteristic, DummyDevice } from '../common';
+import { AudioRecordingCodec, AudioRecordingCodecType, AudioRecordingSamplerate, AudioStreamingCodec, AudioStreamingCodecType, AudioStreamingSamplerate, CameraController, CameraRecordingConfiguration, CameraRecordingDelegate, CameraRecordingOptions, CameraStreamingOptions, Characteristic, CharacteristicEventTypes, H264Level, H264Profile, MediaContainerType, OccupancySensor, RecordingPacket, Service, SRTPCryptoSuites, VideoCodecType, WithUUID } from '../hap';
+import type { HomeKitPlugin } from '../main';
 import { handleFragmentsRequests, iframeIntervalSeconds } from './camera/camera-recording';
 import { createCameraStreamingDelegate } from './camera/camera-streaming';
 import { FORCE_OPUS } from './camera/camera-utils';
 import { makeAccessory } from './common';
-import type { HomeKitPlugin } from '../main';
-import { Deferred } from '@scrypted/common/src/deferred';
 
 const { deviceManager, systemManager } = sdk;
 
@@ -100,8 +100,6 @@ addSupportedType({
         const linkedMotionSensor = storage.getItem('linkedMotionSensor');
         const isRecordingEnabled = !!linkedMotionSensor || device.interfaces.includes(ScryptedInterface.MotionSensor) || needAudioMotionService
 
-        const storageKeySelectedRecordingConfiguration = 'selectedRecordingConfiguration';
-
         let configuration: CameraRecordingConfiguration;
         const openRecordingStreams = new Map<number, Deferred<any>>();
         if (isRecordingEnabled) {
@@ -235,12 +233,6 @@ addSupportedType({
                     });
             }
 
-            persistBooleanCharacteristic(recordingManagement.recordingManagementService, Characteristic.Active);
-            persistBooleanCharacteristic(recordingManagement.recordingManagementService, Characteristic.RecordingAudioActive);
-            persistBooleanCharacteristic(recordingManagement.operatingModeService, Characteristic.EventSnapshotsActive);
-            persistBooleanCharacteristic(recordingManagement.operatingModeService, Characteristic.HomeKitCameraActive);
-            persistBooleanCharacteristic(recordingManagement.operatingModeService, Characteristic.PeriodicSnapshotsActive);
-
             if (!device.interfaces.includes(ScryptedInterface.OnOff)) {
                 persistBooleanCharacteristic(recordingManagement.operatingModeService, Characteristic.CameraOperatingModeIndicator);
             }
@@ -265,18 +257,6 @@ addSupportedType({
                         device.turnOff();
                 });
             }
-
-            recordingManagement.recordingManagementService.getCharacteristic(Characteristic.SelectedCameraRecordingConfiguration)
-                .removeOnGet()
-                .on(CharacteristicEventTypes.GET, callback => {
-                    callback(null, storage.getItem(storageKeySelectedRecordingConfiguration) || '');
-                })
-                .removeOnSet()
-                .on(CharacteristicEventTypes.SET, (value, callback) => {
-                    // prepare recording here if necessary.
-                    storage.setItem(storageKeySelectedRecordingConfiguration, value.toString());
-                    callback();
-                });
         }