homebridge-eufy-security 2.2.2 → 2.2.4

package/dist/accessories/CameraAccessory.d.ts

@@ -1,7 +1,7 @@
 import { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
 import { EufySecurityPlatform } from '../platform';
 import { DeviceAccessory } from './Device';
-import { Camera } from 'eufy-security-client';
+import { Camera, Device, PropertyValue } from 'eufy-security-client';
 import { StreamingDelegate } from '../controller/streamingDelegate';
 import { CameraConfig } from '../utils/configTypes';
 /**
@@ -12,50 +12,27 @@ import { CameraConfig } from '../utils/configTypes';
 export declare class CameraAccessory extends DeviceAccessory {
     protected service: Service;
     protected CameraService: Service;
+    protected cameraStatus: {
+        isEnabled: boolean;
+        timestamp: number;
+    };
     readonly cameraConfig: CameraConfig;
     protected streamingDelegate: StreamingDelegate | null;
     private motionTimeout?;
     constructor(platform: EufySecurityPlatform, accessory: PlatformAccessory, eufyDevice: Camera);
+    private setupButtonService;
+    private setupEnableButton;
+    private setupMotionButton;
+    private setupLightButton;
     private getCameraConfig;
     private cameraFunction;
-    handleEventSnapshotsActiveGet(): Promise<CharacteristicValue>;
-    /**
-     * Handle requests to set the "Event Snapshots Active" characteristic
-     */
-    handleEventSnapshotsActiveSet(value: any): void;
-    /**
-     * Handle requests to get the current value of the "HomeKit Camera Active" characteristic
-     */
-    handleHomeKitCameraActiveGet(): Promise<CharacteristicValue>;
-    /**
-     * Handle requests to set the "HomeKit Camera Active" characteristic
-     */
-    handleHomeKitCameraActiveSet(value: any): void;
-    /**
-     * Handle requests to get the current value of the "HomeKit Camera Active" characteristic
-     */
-    handleHomeKitCameraOperatingModeIndicatorGet(): Promise<CharacteristicValue>;
-    /**
-     * Handle requests to set the "HomeKit Camera Active" characteristic
-     */
-    handleHomeKitCameraOperatingModeIndicatorSet(value: any): Promise<void>;
-    /**
-     * Handle requests to get the current value of the "HomeKit Camera Active" characteristic
-     */
-    handleHomeKitNightVisionGet(): Promise<CharacteristicValue>;
-    /**
-     * Handle requests to set the "HomeKit Camera Active" characteristic
-     */
-    handleHomeKitNightVisionSet(value: any): Promise<void>;
-    private motionFunction;
-    handleMotionDetectedGet(): Promise<CharacteristicValue>;
+    private setupMotionFunction;
     private onDeviceEventDetectedPushNotification;
-    handleEnableGet(): Promise<CharacteristicValue>;
-    handleManuallyDisabledGet(): Promise<CharacteristicValue>;
-    handleEnableSet(value: CharacteristicValue): Promise<void>;
-    handleMotionOnGet(): Promise<CharacteristicValue>;
-    handleMotionOnSet(value: CharacteristicValue): Promise<void>;
-    handleLightOnGet(): Promise<CharacteristicValue>;
-    handleLightOnSet(value: CharacteristicValue): Promise<void>;
+    private setupSwitchService;
+    private getPropertyValue;
+    private setPropertyValue;
+    protected handlePropertyChange(device: Device, name: string, value: PropertyValue): void;
+    handleDummyEventGet(serviceName: string): Promise<CharacteristicValue>;
+    handleDummyEventSet(serviceName: string, value: CharacteristicValue): void;
 }
 //# sourceMappingURL=CameraAccessory.d.ts.map

package/dist/accessories/CameraAccessory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CameraAccessory.d.ts","sourceRoot":"","sources":["../../src/plugin/accessories/CameraAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAE7E,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAM3C,OAAO,EAAE,MAAM,EAA+D,MAAM,sBAAsB,CAAC;AAC3G,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAEpE,OAAO,EAAE,YAAY,EAAe,MAAM,sBAAsB,CAAC;AAEjE;;;;GAIG;AACH,qBAAa,eAAgB,SAAQ,eAAe;IAElD,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC;IAC3B,SAAS,CAAC,aAAa,EAAE,OAAO,CAAC;IAEjC,SAAgB,YAAY,EAAE,YAAY,CAAC;IAE3C,SAAS,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,IAAI,CAAQ;IAE7D,OAAO,CAAC,aAAa,CAAC,CAAiB;gBAGrC,QAAQ,EAAE,oBAAoB,EAC9B,SAAS,EAAE,iBAAiB,EAC5B,UAAU,EAAE,MAAM;IAmHpB,OAAO,CAAC,eAAe;IAqCvB,OAAO,CAAC,cAAc;IAiDtB,6BAA6B,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAM7D;;OAEG;IACH,6BAA6B,CAAC,KAAK,KAAA;IAInC;;OAEG;IACH,4BAA4B,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAM5D;;OAEG;IACH,4BAA4B,CAAC,KAAK,KAAA;IAIlC;;OAEG;IACG,4CAA4C,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAWlF;;OAEG;IACG,4CAA4C,CAAC,KAAK,KAAA;IAOxD;;OAEG;IACG,2BAA2B,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAWjE;;OAEG;IACG,2BAA2B,CAAC,KAAK,KAAA;IAOvC,OAAO,CAAC,cAAc;IAsChB,uBAAuB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAW7D,OAAO,CAAC,qCAAqC;IA0BvC,eAAe,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAW/C,yBAAyB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAWzD,eAAe,CAAC,KAAK,EAAE,mBAAmB;IAS1C,iBAAiB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAWjD,iBAAiB,CAAC,KAAK,EAAE,mBAAmB;IAM5C,gBAAgB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAWhD,gBAAgB,CAAC,KAAK,EAAE,mBAAmB;CAKlD"}
+{"version":3,"file":"CameraAccessory.d.ts","sourceRoot":"","sources":["../../src/plugin/accessories/CameraAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAE7E,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAM3C,OAAO,EAAE,MAAM,EAAE,MAAM,EAA2C,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC9G,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAEpE,OAAO,EAAE,YAAY,EAAe,MAAM,sBAAsB,CAAC;AAEjE;;;;GAIG;AACH,qBAAa,eAAgB,SAAQ,eAAe;IAElD,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC;IAC3B,SAAS,CAAC,aAAa,EAAE,OAAO,CAAC;IAGjC,SAAS,CAAC,YAAY,EAAE;QAAE,SAAS,EAAE,OAAO,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAElE,SAAgB,YAAY,EAAE,YAAY,CAAC;IAE3C,SAAS,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,IAAI,CAAQ;IAE7D,OAAO,CAAC,aAAa,CAAC,CAAiB;gBAGrC,QAAQ,EAAE,oBAAoB,EAC9B,SAAS,EAAE,iBAAiB,EAC5B,UAAU,EAAE,MAAM;IAuCpB,OAAO,CAAC,kBAAkB;YAuBZ,iBAAiB;YAIjB,iBAAiB;YAIjB,gBAAgB;IAI9B,OAAO,CAAC,eAAe;IAqCvB,OAAO,CAAC,cAAc;IAiDtB,OAAO,CAAC,mBAAmB;IA0C3B,OAAO,CAAC,qCAAqC;IA0B7C,OAAO,CAAC,kBAAkB;YA6BZ,gBAAgB;YAmChB,gBAAgB;cA8DX,oBAAoB,CACrC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,aAAa,GACnB,IAAI;IAgBP,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAgBtE,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,mBAAmB;CAGpE"}

package/dist/accessories/CameraAccessory.js

@@ -19,89 +19,59 @@ class CameraAccessory extends Device_1.DeviceAccessory {
         this.service = {};
         this.CameraService = {};
         this.cameraConfig = {};
+        this.cameraStatus = { isEnabled: false, timestamp: 0 }; // Initialize the cameraStatus object
         this.platform.log.debug(this.accessory.displayName, 'Constructed Camera');
         this.cameraConfig = this.getCameraConfig();
         this.platform.log.debug(this.accessory.displayName, 'config is:', this.cameraConfig);
         if (this.cameraConfig.enableCamera || (typeof this.eufyDevice.isDoorbell === 'function' && this.eufyDevice.isDoorbell())) {
             this.platform.log.debug(this.accessory.displayName, 'has a camera');
             try {
-                this.CameraService = this.cameraFunction(accessory);
+                this.CameraService = this.cameraFunction();
                 this.CameraService.setPrimaryService(true);
                 const delegate = new streamingDelegate_1.StreamingDelegate(this.platform, eufyDevice, this.cameraConfig, this.platform.api, this.platform.api.hap);
                 this.streamingDelegate = delegate;
                 accessory.configureController(delegate.controller);
             }
-            catch (Error) {
-                this.platform.log.error(this.accessory.displayName, 'raise error to check and attach livestream function.', Error);
+            catch (error) {
+                this.platform.log.error(this.accessory.displayName, 'raise error to check and attach livestream function.', error);
             }
         }
         else {
             this.platform.log.debug(this.accessory.displayName, 'has a motion sensor.');
         }
+        this.service = this.setupMotionFunction(accessory);
+        this.setupEnableButton();
+        this.setupMotionButton();
+        this.setupLightButton();
+    }
+    setupButtonService(serviceName, configValue, PropertyName, serviceType) {
         try {
-            this.service = this.motionFunction(accessory);
-        }
-        catch (Error) {
-            this.platform.log.error(this.accessory.displayName, 'raise error to check and attach motion function.', Error);
-        }
-        try {
-            this.platform.log.debug(this.accessory.displayName, 'enableButton config:', this.cameraConfig.enableButton);
-            if (this.cameraConfig.enableButton
-                && this.eufyDevice.hasProperty('enabled')) {
-                this.platform.log.debug(this.accessory.displayName, 'has a isEnabled, so append switchEnabledService characteristic to him.');
-                const switchEnabledService = this.accessory.getService('Enabled') ||
-                    this.accessory.addService(this.platform.Service.Switch, 'Enabled', 'enabled');
-                switchEnabledService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName + ' Enabled');
-                switchEnabledService.getCharacteristic(this.characteristic.On)
-                    .onGet(this.handleEnableGet.bind(this))
-                    .onSet(this.handleEnableSet.bind(this));
-            }
-            else {
-                // eslint-disable-next-line max-len
-                this.platform.log.debug(this.accessory.displayName, 'Looks like not compatible with isEnabled or this has been disabled within configuration');
-            }
-        }
-        catch (Error) {
-            this.platform.log.error(this.accessory.displayName, 'raise error to check and attach switchEnabledService.', Error);
-        }
-        try {
-            this.platform.log.debug(this.accessory.displayName, 'motionButton config:', this.cameraConfig.motionButton);
-            if (this.cameraConfig.motionButton && this.eufyDevice.hasProperty('motionDetection')) {
+            this.platform.log.debug(`${this.accessory.displayName} ${serviceName} config:`, configValue);
+            if (configValue && this.eufyDevice.hasProperty(PropertyName)) {
                 // eslint-disable-next-line max-len
-                this.platform.log.debug(this.accessory.displayName, 'has a isMotionDetectionEnabled, so append switchMotionService characteristic to him.');
-                const switchMotionService = this.accessory.getService('Motion') ||
-                    this.accessory.addService(this.platform.Service.Switch, 'Motion', 'motion');
-                switchMotionService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName + ' Motion');
-                switchMotionService.getCharacteristic(this.characteristic.On)
-                    .onGet(this.handleMotionOnGet.bind(this))
-                    .onSet(this.handleMotionOnSet.bind(this));
+                this.platform.log.debug(`${this.accessory.displayName} has a ${PropertyName}, so append ${serviceType}${serviceName} characteristic to it.`);
+                const newService = this.setupSwitchService(serviceName, serviceType, PropertyName);
+                this.service.addLinkedService(newService);
             }
             else {
                 // eslint-disable-next-line max-len
-                this.platform.log.debug(this.accessory.displayName, 'Looks like not compatible with isMotionDetectionEnabled or this has been disabled within configuration');
+                this.platform.log.debug(`${this.accessory.displayName} Looks like not compatible with ${PropertyName} or this has been disabled within configuration`);
             }
         }
-        catch (Error) {
-            this.platform.log.error(this.accessory.displayName, 'raise error to check and attach switchMotionService.', Error);
-        }
-        try {
-            if (this.eufyDevice.hasProperty('light') && (typeof this.eufyDevice.isFloodLight === 'function' && this.eufyDevice.isFloodLight())) {
-                this.platform.log.debug(this.accessory.displayName, 'has a DeviceLight, so append switchLightService characteristic to him.');
-                const switchLightService = this.accessory.getService('Light') ||
-                    this.accessory.addService(this.platform.Service.Switch, 'Light', 'light');
-                switchLightService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName + ' Light');
-                switchLightService.getCharacteristic(this.characteristic.On)
-                    .onGet(this.handleLightOnGet.bind(this))
-                    .onSet(this.handleLightOnSet.bind(this));
-            }
-            else {
-                this.platform.log.debug(this.accessory.displayName, 'Looks like not compatible with DeviceLight');
-            }
-        }
-        catch (Error) {
-            this.platform.log.error(this.accessory.displayName, 'raise error to check and attach switchLightService.', Error);
+        catch (error) {
+            this.platform.log.error(`${this.accessory.displayName} raise error to check and attach ${serviceType}${serviceName}.`, error);
+            throw Error;
         }
     }
+    async setupEnableButton() {
+        this.setupButtonService('Enabled', this.cameraConfig.enableButton, eufy_security_client_1.PropertyName.DeviceEnabled, 'switch');
+    }
+    async setupMotionButton() {
+        this.setupButtonService('Motion', this.cameraConfig.motionButton, eufy_security_client_1.PropertyName.DeviceMotionDetection, 'switch');
+    }
+    async setupLightButton() {
+        this.setupButtonService('Light', true, eufy_security_client_1.PropertyName.DeviceLight, 'lightbulb');
+    }
     getCameraConfig() {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         let config = {};
@@ -133,150 +103,70 @@ class CameraAccessory extends Device_1.DeviceAccessory {
         }
         return config;
     }
-    cameraFunction(accessory) {
+    cameraFunction() {
         const service = this.accessory.getService(this.platform.Service.CameraOperatingMode) ||
             this.accessory.addService(this.platform.Service.CameraOperatingMode);
-        service.setCharacteristic(this.characteristic.Name, accessory.displayName);
-        service
-            .getCharacteristic(this.characteristic.EventSnapshotsActive)
-            .onGet(this.handleEventSnapshotsActiveGet.bind(this));
-        service
-            .getCharacteristic(this.characteristic.EventSnapshotsActive)
-            .onSet(this.handleEventSnapshotsActiveSet.bind(this));
-        service
-            .getCharacteristic(this.characteristic.HomeKitCameraActive)
-            .onGet(this.handleHomeKitCameraActiveGet.bind(this));
-        service
-            .getCharacteristic(this.characteristic.HomeKitCameraActive)
-            .onSet(this.handleHomeKitCameraActiveSet.bind(this));
+        service.setCharacteristic(this.characteristic.Name, this.accessory.displayName);
+        service.getCharacteristic(this.characteristic.EventSnapshotsActive)
+            .onGet(this.handleDummyEventGet.bind(this, 'EventSnapshotsActive'))
+            .onSet(this.handleDummyEventSet.bind(this, 'EventSnapshotsActive'));
+        service.getCharacteristic(this.characteristic.HomeKitCameraActive)
+            .onGet(this.getPropertyValue.bind(this, 'this.characteristic.HomeKitCameraActive', eufy_security_client_1.PropertyName.DeviceEnabled))
+            .onSet(this.getPropertyValue.bind(this, 'this.characteristic.HomeKitCameraActive', eufy_security_client_1.PropertyName.DeviceEnabled));
         if (this.eufyDevice.hasProperty('enabled')) {
-            service
-                .getCharacteristic(this.characteristic.ManuallyDisabled)
-                .onGet(this.handleManuallyDisabledGet.bind(this));
+            service.getCharacteristic(this.characteristic.ManuallyDisabled)
+                .onGet(this.getPropertyValue.bind(this, 'this.characteristic.ManuallyDisabled', eufy_security_client_1.PropertyName.DeviceEnabled));
         }
         if (this.eufyDevice.hasProperty('statusLed')) {
-            service
-                .getCharacteristic(this.characteristic.CameraOperatingModeIndicator)
-                .onGet(this.handleHomeKitCameraOperatingModeIndicatorGet.bind(this))
-                .onSet(this.handleHomeKitCameraOperatingModeIndicatorSet.bind(this));
+            service.getCharacteristic(this.characteristic.CameraOperatingModeIndicator)
+                .onGet(this.getPropertyValue.bind(this, 'this.characteristic.CameraOperatingModeIndicator', eufy_security_client_1.PropertyName.DeviceStatusLed))
+                .onSet(this.setPropertyValue.bind(this, 'this.characteristic.CameraOperatingModeIndicator', eufy_security_client_1.PropertyName.DeviceStatusLed));
         }
         if (this.eufyDevice.hasProperty('nightvision')) {
-            service
-                .getCharacteristic(this.characteristic.NightVision)
-                .onGet(this.handleHomeKitNightVisionGet.bind(this))
-                .onSet(this.handleHomeKitNightVisionSet.bind(this));
-        }
-        return service;
-    }
-    handleEventSnapshotsActiveGet() {
-        const currentValue = this.characteristic.EventSnapshotsActive.DISABLE;
-        this.platform.log.debug(this.accessory.displayName, 'GET EventSnapshotsActive:', currentValue);
-        return currentValue;
-    }
-    /**
-     * Handle requests to set the "Event Snapshots Active" characteristic
-     */
-    handleEventSnapshotsActiveSet(value) {
-        this.platform.log.debug(this.accessory.displayName, 'SET EventSnapshotsActive:', value);
-    }
-    /**
-     * Handle requests to get the current value of the "HomeKit Camera Active" characteristic
-     */
-    handleHomeKitCameraActiveGet() {
-        const currentValue = this.characteristic.HomeKitCameraActive.OFF;
-        this.platform.log.debug(this.accessory.displayName, 'GET HomeKitCameraActive:', currentValue);
-        return currentValue;
-    }
-    /**
-     * Handle requests to set the "HomeKit Camera Active" characteristic
-     */
-    handleHomeKitCameraActiveSet(value) {
-        this.platform.log.debug(this.accessory.displayName, 'SET HomeKitCameraActive:', value);
-    }
-    /**
-     * Handle requests to get the current value of the "HomeKit Camera Active" characteristic
-     */
-    async handleHomeKitCameraOperatingModeIndicatorGet() {
-        try {
-            const currentValue = this.eufyDevice.getPropertyValue(eufy_security_client_1.PropertyName.DeviceStatusLed);
-            this.platform.log.debug(this.accessory.displayName, 'GET DeviceStatusLed:', currentValue);
-            return currentValue;
-        }
-        catch (_a) {
-            this.platform.log.debug(this.accessory.displayName, 'handleHomeKitCameraOperatingModeIndicatorGet', 'Wrong return value');
-            return false;
-        }
-    }
-    /**
-     * Handle requests to set the "HomeKit Camera Active" characteristic
-     */
-    async handleHomeKitCameraOperatingModeIndicatorSet(value) {
-        this.platform.log.debug(this.accessory.displayName, 'SET HomeKitCameraOperatingModeIndicator:', value);
-        const station = await this.platform.getStationById(this.eufyDevice.getStationSerial());
-        station.setStatusLed(this.eufyDevice, value);
-        this.CameraService.getCharacteristic(this.characteristic.CameraOperatingModeIndicator).updateValue(value);
-    }
-    /**
-     * Handle requests to get the current value of the "HomeKit Camera Active" characteristic
-     */
-    async handleHomeKitNightVisionGet() {
-        try {
-            const currentValue = this.eufyDevice.getPropertyValue(eufy_security_client_1.PropertyName.DeviceNightvision);
-            this.platform.log.debug(this.accessory.displayName, 'GET DeviceNightvision:', currentValue);
-            return currentValue;
+            service.getCharacteristic(this.characteristic.NightVision)
+                .onGet(this.getPropertyValue.bind(this, 'this.characteristic.NightVision', eufy_security_client_1.PropertyName.DeviceNightvision))
+                .onSet(this.setPropertyValue.bind(this, 'this.characteristic.NightVision', eufy_security_client_1.PropertyName.DeviceNightvision));
         }
-        catch (_a) {
-            this.platform.log.debug(this.accessory.displayName, 'handleHomeKitNightVisionGet', 'Wrong return value');
-            return false;
+        if (this.eufyDevice.hasProperty('autoNightvision')) {
+            service.getCharacteristic(this.characteristic.NightVision)
+                .onGet(this.getPropertyValue.bind(this, 'this.characteristic.NightVision', eufy_security_client_1.PropertyName.DeviceAutoNightvision))
+                .onSet(this.setPropertyValue.bind(this, 'this.characteristic.NightVision', eufy_security_client_1.PropertyName.DeviceAutoNightvision));
         }
-    }
-    /**
-     * Handle requests to set the "HomeKit Camera Active" characteristic
-     */
-    async handleHomeKitNightVisionSet(value) {
-        this.platform.log.debug(this.accessory.displayName, 'SET handleHomeKitNightVisionSet:', value);
-        const station = await this.platform.getStationById(this.eufyDevice.getStationSerial());
-        station.setNightVision(this.eufyDevice, value);
-        this.CameraService.getCharacteristic(this.characteristic.NightVision).updateValue(value);
-    }
-    motionFunction(accessory) {
-        const service = this.accessory.getService(this.platform.Service.MotionSensor) ||
-            this.accessory.addService(this.platform.Service.MotionSensor);
-        service.setCharacteristic(this.characteristic.Name, accessory.displayName);
-        service
-            .getCharacteristic(this.characteristic.MotionDetected)
-            .onGet(this.handleMotionDetectedGet.bind(this));
-        // List of event types
-        const eventTypesToHandle = [
-            'motion detected',
-            'person detected',
-            'pet detected',
-            'vehicle detected',
-            'sound detected',
-            'crying detected',
-            'dog detected',
-            'stranger person detected',
-        ];
-        // Attach the common event handler to each event type
-        eventTypesToHandle.forEach(eventType => {
-            this.platform.log.debug(this.accessory.displayName, 'SETON Firing on:', eventType);
-            this.eufyDevice.on(eventType, (device, motion) => this.onDeviceEventDetectedPushNotification(device, motion, eventType));
-        });
+        this.eufyDevice.on('property changed', (device, name, value) => this.handlePropertyChange(device, name, value));
         return service;
     }
-    async handleMotionDetectedGet() {
+    setupMotionFunction(accessory) {
         try {
-            const currentValue = this.eufyDevice.getPropertyValue(eufy_security_client_1.PropertyName.DeviceMotionDetected);
-            this.platform.log.debug(this.accessory.displayName, 'GET DeviceMotionDetected:', currentValue);
-            return currentValue;
-        }
-        catch (_a) {
-            this.platform.log.debug(this.accessory.displayName, 'handleMotionDetectedGet', 'Wrong return value');
-            return false;
+            const service = this.accessory.getService(this.platform.Service.MotionSensor) ||
+                this.accessory.addService(this.platform.Service.MotionSensor);
+            service.setCharacteristic(this.characteristic.Name, this.accessory.displayName);
+            service.getCharacteristic(this.characteristic.MotionDetected)
+                .onGet(this.getPropertyValue.bind(this, 'this.characteristic.MotionDetected', eufy_security_client_1.PropertyName.DeviceMotionDetected));
+            // List of event types
+            const eventTypesToHandle = [
+                'motion detected',
+                'person detected',
+                'pet detected',
+                'vehicle detected',
+                'sound detected',
+                'crying detected',
+                'dog detected',
+                'stranger person detected',
+            ];
+            // Attach the common event handler to each event type
+            eventTypesToHandle.forEach(eventType => {
+                this.platform.log.debug(this.accessory.displayName, 'SETON Firing on:', eventType);
+                this.eufyDevice.on(eventType, (device, motion) => this.onDeviceEventDetectedPushNotification(device, motion, eventType));
+            });
+            return service;
+        }
+        catch (error) {
+            this.platform.log.error(this.accessory.displayName, 'raise error to check and attach motion function.', error);
+            throw Error;
         }
     }
     onDeviceEventDetectedPushNotification(device, motion, eventType) {
-        this.platform.log.info(this.accessory.displayName, `ON Event Detected (${eventType}): ${motion}`);
+        this.platform.log.info(`${this.accessory.displayName} ON Event Detected (${eventType}): ${motion}`);
         if (motion) {
             this.motionTimeout = setTimeout(() => {
                 this.platform.log.debug(this.accessory.displayName, 'Reseting motion through timout.');
@@ -297,67 +187,128 @@ class CameraAccessory extends Device_1.DeviceAccessory {
             .getCharacteristic(this.characteristic.MotionDetected)
             .updateValue(motion);
     }
-    async handleEnableGet() {
-        try {
-            const currentValue = this.eufyDevice.getPropertyValue(eufy_security_client_1.PropertyName.DeviceEnabled);
-            this.platform.log.debug(this.accessory.displayName, 'GET DeviceEnabled:', currentValue);
-            return currentValue;
-        }
-        catch (_a) {
-            this.platform.log.debug(this.accessory.displayName, 'handleEnableGet', 'Wrong return value');
-            return false;
-        }
+    setupSwitchService(serviceName, serviceType, propertyName) {
+        const platformServiceMapping = {
+            switch: this.platform.Service.Switch,
+            lightbulb: this.platform.Service.Lightbulb,
+            outlet: this.platform.Service.Outlet,
+        };
+        const platformService = platformServiceMapping[serviceType] || this.platform.Service.Switch;
+        const service = this.accessory.getService(serviceName) ||
+            this.accessory.addService(platformService, serviceName, serviceName);
+        service.setCharacteristic(this.characteristic.Name, this.accessory.displayName + ' ' + serviceName);
+        service.getCharacteristic(this.characteristic.On)
+            .onGet(this.getPropertyValue.bind(this, 'this.characteristic.On', propertyName))
+            .onSet(this.setPropertyValue.bind(this, 'this.characteristic.On', propertyName));
+        return service;
     }
-    async handleManuallyDisabledGet() {
+    async getPropertyValue(characteristic, propertyName) {
         try {
-            const currentValue = this.eufyDevice.getPropertyValue(eufy_security_client_1.PropertyName.DeviceEnabled);
-            this.platform.log.debug(this.accessory.displayName, 'GET DeviceEnabled:', currentValue);
-            return !currentValue;
+            let value = await this.eufyDevice.getPropertyValue(propertyName);
+            this.platform.log.debug(`${this.accessory.displayName} GET '${characteristic}' ${propertyName}: ${value}`);
+            if (propertyName === eufy_security_client_1.PropertyName.DeviceNightvision) {
+                return value === 1;
+            }
+            // Override for PropertyName.DeviceEnabled when enabled button is fired and 
+            if (propertyName === eufy_security_client_1.PropertyName.DeviceEnabled &&
+                Date.now() - this.cameraStatus.timestamp <= 60000) {
+                // eslint-disable-next-line max-len
+                this.platform.log.debug(`${this.accessory.displayName} CACHED for (1 min) '${characteristic}' ${propertyName}: ${this.cameraStatus.isEnabled}`);
+                value = this.cameraStatus.isEnabled;
+            }
+            if (characteristic === 'this.characteristic.ManuallyDisabled') {
+                this.platform.log.debug(`${this.accessory.displayName} INVERSED '${characteristic}' ${propertyName}: ${!value}`);
+                value = !value;
+            }
+            if (value === undefined) {
+                return false;
+            }
+            return value;
         }
-        catch (_a) {
-            this.platform.log.debug(this.accessory.displayName, 'handleManuallyDisabledGet', 'Wrong return value');
+        catch (error) {
+            this.platform.log.debug(`${this.accessory.displayName} Error getting '${characteristic}' ${propertyName}: ${error}`);
             return false;
         }
     }
-    async handleEnableSet(value) {
-        this.platform.log.debug(this.accessory.displayName, 'SET DeviceEnabled:', value);
-        const station = await this.platform.getStationById(this.eufyDevice.getStationSerial());
-        station.enableDevice(this.eufyDevice, value);
-        if (this.cameraConfig.enableCamera) {
-            this.CameraService.getCharacteristic(this.characteristic.ManuallyDisabled).updateValue(!value);
-        }
-    }
-    async handleMotionOnGet() {
+    async setPropertyValue(characteristic, propertyName, value) {
         try {
-            const currentValue = await this.eufyDevice.getPropertyValue(eufy_security_client_1.PropertyName.DeviceMotionDetection);
-            this.platform.log.debug(this.accessory.displayName, 'GET DeviceMotionDetection:', currentValue);
-            return currentValue;
+            // eslint-disable-next-line max-len
+            this.platform.log.debug(`${this.accessory.displayName} SET '${typeof characteristic} / ${characteristic}' ${propertyName}: ${value}`);
+            const station = await this.platform.getStationById(this.eufyDevice.getStationSerial());
+            switch (propertyName) {
+                case eufy_security_client_1.PropertyName.DeviceEnabled: {
+                    if (characteristic === 'this.characteristic.On') {
+                        this.cameraStatus = { isEnabled: value, timestamp: Date.now() };
+                        await station.enableDevice(this.eufyDevice, value);
+                        this.CameraService.updateCharacteristic(this.characteristic.ManuallyDisabled, !value);
+                    }
+                    break;
+                }
+                case eufy_security_client_1.PropertyName.DeviceMotionDetection: {
+                    await station.setMotionDetection(this.eufyDevice, value);
+                    this.CameraService.updateCharacteristic(this.characteristic.CameraOperatingModeIndicator, value);
+                    break;
+                }
+                case eufy_security_client_1.PropertyName.DeviceStatusLed: {
+                    await station.setStatusLed(this.eufyDevice, value);
+                    this.CameraService.updateCharacteristic(this.characteristic.CameraOperatingModeIndicator, value);
+                    break;
+                }
+                case eufy_security_client_1.PropertyName.DeviceNightvision: {
+                    // Convert true to 1 (B&W Night Vision) and false to 0 (off)
+                    await station.setNightVision(this.eufyDevice, Number(value));
+                    this.CameraService.updateCharacteristic(this.characteristic.NightVision, value);
+                    break;
+                }
+                case eufy_security_client_1.PropertyName.DeviceAutoNightvision: {
+                    await station.setAutoNightVision(this.eufyDevice, value);
+                    this.CameraService.updateCharacteristic(this.characteristic.NightVision, value);
+                    break;
+                }
+                case eufy_security_client_1.PropertyName.DeviceLight: {
+                    await station.switchLight(this.eufyDevice, value);
+                    this.service.updateCharacteristic(this.characteristic.On, value);
+                    break;
+                }
+                default: {
+                    // eslint-disable-next-line max-len
+                    this.platform.log.error(`${this.accessory.displayName} Shouldn't Match '${characteristic}' ${propertyName}: ${value}`);
+                    throw Error;
+                    break;
+                }
+            }
         }
-        catch (_a) {
-            this.platform.log.debug(this.accessory.displayName, 'handleMotionOnGet', 'Wrong return value');
-            return false;
+        catch (error) {
+            this.platform.log.debug(`${this.accessory.displayName} Error setting '${characteristic}' ${propertyName}: ${error}`);
         }
     }
-    async handleMotionOnSet(value) {
-        this.platform.log.debug(this.accessory.displayName, 'SET DeviceMotionDetection:', value);
-        const station = await this.platform.getStationById(this.eufyDevice.getStationSerial());
-        station.setMotionDetection(this.eufyDevice, value);
-    }
-    async handleLightOnGet() {
-        try {
-            const currentValue = await this.eufyDevice.getPropertyValue(eufy_security_client_1.PropertyName.DeviceLight);
-            this.platform.log.debug(this.accessory.displayName, 'GET DeviceLight:', currentValue);
-            return currentValue;
-        }
-        catch (_a) {
-            this.platform.log.debug(this.accessory.displayName, 'handleLightOnGet', 'Wrong return value');
-            return false;
+    handlePropertyChange(device, name, value) {
+        switch (name) {
+            case 'enabled': {
+                break;
+            }
+            case 'statusLed': {
+                break;
+            }
+            default: {
+                break;
+            }
         }
     }
-    async handleLightOnSet(value) {
-        this.platform.log.debug(this.accessory.displayName, 'SET DeviceLight:', value);
-        const station = await this.platform.getStationById(this.eufyDevice.getStationSerial());
-        station.switchLight(this.eufyDevice, value);
+    handleDummyEventGet(serviceName) {
+        const characteristicValues = {
+            'EventSnapshotsActive': this.characteristic.EventSnapshotsActive.DISABLE,
+            'HomeKitCameraActive': this.characteristic.HomeKitCameraActive.OFF,
+        };
+        const currentValue = characteristicValues[serviceName];
+        if (currentValue === undefined) {
+            throw new Error(`Invalid serviceName: ${serviceName}`);
+        }
+        this.platform.log.debug(`${this.accessory.displayName} GET ${serviceName}: ${currentValue}`);
+        return Promise.resolve(currentValue);
+    }
+    handleDummyEventSet(serviceName, value) {
+        this.platform.log.debug(`${this.accessory.displayName} SET ${serviceName}: ${value}`);
     }
 }
 exports.CameraAccessory = CameraAccessory;