homebridge-eufy-security 2.3.1-beta.2 → 2.3.2

package/CHANGELOG.md

@@ -2,6 +2,140 @@
 
 You can find the complete detailled changelog for every beta release [here](https://github.com/homebridge-eufy-security/plugin/releases).
 
+### Changelog 2.2.21
+
+#### Added
+- Unlocked the app-guard-modes-mapping component in the UI for station configuration options.
+- Added helper functions for better configuration value selection in StationAccessory.ts.
+- Modified and improved the convertHKtoEufy and convertEufytoHK methods to throw errors on invalid mode conversion.
+
+#### Updated
+- Update libs and dep
+- Better handling push notification for Doorbell ring events
+- Refactoring the code
+
+#### Fixed
+- Pruning characteristics wasn't correctly handled
+
+### Changelog 2.2.20
+
+#### Added
+- New feature to display HomeKit switch for indoor chime on/off
+
+#### Fixed
+- Updated systeminformation from 5.21.4 to 5.21.8 to address vulnerabilities
+
+### Changelog 2.2.19
+
+#### Bug Fixes
+
+- Fixing getter and setter for camera properties
+
+#### Credits
+
+- @cixio, @julien94800 and @zhodd on issue #420 and #365
+
+### Changelog 2.2.18
+
+#### Updated
+- `BaseAccessory.ts`: 
+  - Extended `getValue` and `setValue` to also accept `characteristic` and `service` as arguments.
+  - Removed some unnecessary lines of code.
+- `CameraAccessory.ts`:
+  - Changed the method signatures for `getCameraPropertyValue` and `setCameraPropertyValue` to accommodate new characteristic arguments.
+  - Simplified and optimized logging and value updating processes.
+
+### Changelog 2.2.17
+
+#### Added
+- New approach to handling `propertyName` in `CameraAccessory.ts` for more flexibility.
+
+#### Updated
+- Improved logging formats across `BaseAccessory.ts`, `platform.ts`, and `server.ts`.
+- Fine-tuned execution delays in `BaseAccessory.ts`, `platform.ts`, and `server.ts` for better performance.
+- `BaseAccessory.ts` to make `getValue` optional, allowing for more versatile accessory handling.
+  
+#### Fixed
+- Switch-light issue in `CameraAccessory.ts`.
+
+#### Removed
+  - `LockControlPoint` getter because it is not requested by Apple HomeKit Framework.
+
+### Changelog 2.2.16
+
+#### Bug Fixes
+
+- **Found Issue #407 Conversion Error**
+  - Commit: bac87bb
+  - Author: Lenoxys
+  - Date: Sun Sep 10 20:37:01 2023 +0200
+  - Description: Fixed double conversion which led to an error.
+
+#### New Features
+
+- **Enhanced Lock Management Characteristics**
+  - Commit: 913ed54
+  - Author: Lenoxys
+  - Date: Sun Sep 10 14:17:50 2023 +0200
+  - Description: Added missing characteristics to Lock Management service.
+
+#### Code Changes
+
+- **LockAccessory.ts**
+  - Refactored Lock Management characteristics to adhere to Apple guidelines.
+  - Introduced new characteristics like `Version`, `LockManagementAutoSecurityTimeout`, `AdministratorOnlyAccess`, and `LockControlPoint`.
+  - Optimized code related to lock status updates.
+
+### Changelog 2.2.15
+
+#### New Features
+
+- **Added Debug Logs for Lock Status**
+  - Commit: 7d5d9e5
+  - Author: Lenoxys
+  - Date: Sun Sep 10 12:35:18 2023 +0200
+  - Description: Added extra debug information to understand lock status callbacks.
+
+#### Code Changes
+
+- **BaseAccessory.ts**
+  - Additional logging for `ON` state of characteristics.
+
+- **LockAccessory.ts**
+  - Enhanced error message to include more details on lock state and errors.
+  - Minor comment update for clarity on lock status.
+
+### Changelog 2.2.14
+
+#### Updates
+
+- **Update libs**
+  - Commit: 711a966
+  - Author: Lenoxys
+  - Date: Fri Sep 8 21:28:15 2023 +0200
+  - Description: Libraries updated for improved performance and stability.
+
+#### Fixes
+
+- **Issue #407: Lock Property Error**
+  - Commit: 16dbb9f
+  - Author: Lenoxys
+  - Date: Fri Sep 8 21:25:48 2023 +0200
+  - Description: Fixed incorrect property set in the lock function.
+  - Credits: @InquisitorBR, @zhodd
+
+#### Removals
+
+- **Removed Reboot Loop**
+  - Commit: 7d58590
+  - Author: Lenoxys
+  - Date: Fri Sep 8 21:21:22 2023 +0200
+  - Description: Removed 'throw' causing a reboot loop, replaced with error message.
+
+## 2.2.13 
+### Changed
+- Refactored comments to better explain the purpose of the initial delay in device setup.
+
 ## 2.1.4 (2022-12-24)
 
 ### Changed

package/README.md

@@ -25,9 +25,9 @@ Homebridge plugin to control certain Eufy Security devices
 
 ### Prerequisites
 
-- To use this plugin, you will need to already have [Homebridge](https://homebridge.io) (at least v1.4.1)  installed. Refer to the links for more information and installation instructions.
+- To use this plugin, you will need to already have [Homebridge](https://homebridge.io) (at least v1.6.1)  installed. Refer to the links for more information and installation instructions.
 - For configuration Homebridge UI is recommenend. If you have 2FA enabled it is mandatory.
-- It is recommended to use the current LTS version of Node, currently v16.
+- It is recommended to use the current LTS version of Node, currently v18.
 
 #### Setup
 * [Installation](https://github.com/homebridge-eufy-security/plugin/wiki/Installation-and-Configuration#installation)

package/dist/accessories/BaseAccessory.d.ts

@@ -0,0 +1,37 @@
+/// <reference types="node" />
+import { PlatformAccessory, Characteristic, CharacteristicValue, Service, WithUUID } from 'homebridge';
+import { EufySecurityPlatform } from '../platform';
+import { DeviceEvents, PropertyValue, StationEvents } from 'eufy-security-client';
+import { EventEmitter } from 'events';
+export type CharacteristicType = WithUUID<{
+    new (): Characteristic;
+}>;
+export type ServiceType = WithUUID<typeof Service> | Service;
+export declare abstract class BaseAccessory extends EventEmitter {
+    protected platform: EufySecurityPlatform;
+    protected accessory: PlatformAccessory;
+    protected device: any;
+    protected servicesInUse: Service[];
+    protected SN: string;
+    constructor(platform: EufySecurityPlatform, accessory: PlatformAccessory, device: any);
+    private logPropertyKeys;
+    protected handleRawPropertyChange(device: any, type: number, value: string): void;
+    protected handlePropertyChange(device: any, name: string, value: PropertyValue): void;
+    protected registerCharacteristic({ characteristicType, serviceType, getValue, setValue, onValue, onSimpleValue, onMultipleValue, name, serviceSubType, setValueDebounceTime, }: {
+        characteristicType: CharacteristicType;
+        serviceType: ServiceType;
+        serviceSubType?: string;
+        name?: string;
+        getValue?: (data: any, characteristic?: Characteristic, service?: Service) => any;
+        setValue?: (value: any, characteristic?: Characteristic, service?: Service) => any;
+        onValue?: (service: Service, characteristic: Characteristic) => any;
+        onSimpleValue?: any;
+        onMultipleValue?: (keyof DeviceEvents | StationEvents)[];
+        setValueDebounceTime?: number;
+    }): void;
+    protected getService(serviceType: ServiceType, name?: string, subType?: string): Service;
+    protected pruneUnusedServices(): void;
+    protected handleDummyEventGet(serviceName: string): Promise<CharacteristicValue>;
+    protected handleDummyEventSet(serviceName: string, value: CharacteristicValue): void;
+}
+//# sourceMappingURL=BaseAccessory.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"BaseAccessory.d.ts","sourceRoot":"","sources":["../../src/plugin/accessories/BaseAccessory.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,iBAAiB,EACjB,cAAc,EACd,mBAAmB,EACnB,OAAO,EACP,QAAQ,EACT,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAc,YAAY,EAAE,aAAa,EAAmB,aAAa,EAAgB,MAAM,sBAAsB,CAAC;AAC7H,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAStC,MAAM,MAAM,kBAAkB,GAAG,QAAQ,CAAC;IAAE,QAAO,cAAc,CAAA;CAAE,CAAC,CAAC;AACrE,MAAM,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,OAAO,CAAC,GAAG,OAAO,CAAC;AAE7D,8BAAsB,aAAc,SAAQ,YAAY;IAMpD,SAAS,CAAC,QAAQ,EAAE,oBAAoB;IACxC,SAAS,CAAC,SAAS,EAAE,iBAAiB;IAEtC,SAAS,CAAC,MAAM,EAAE,GAAG;IAPvB,SAAS,CAAC,aAAa,EAAE,OAAO,EAAE,CAAM;IACxC,SAAS,CAAC,EAAE,EAAE,MAAM,CAAC;gBAGT,QAAQ,EAAE,oBAAoB,EAC9B,SAAS,EAAE,iBAAiB,EAE5B,MAAM,EAAE,GAAG;IAwDvB,OAAO,CAAC,eAAe;IAOvB,SAAS,CAAC,uBAAuB,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAKjF,SAAS,CAAC,oBAAoB,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,IAAI;IAIrF,SAAS,CAAC,sBAAsB,CAAC,EAC/B,kBAAkB,EAClB,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,OAAO,EACP,aAAa,EACb,eAAe,EACf,IAAI,EACJ,cAAc,EACd,oBAAwB,GACzB,EAAE;QACD,kBAAkB,EAAE,kBAAkB,CAAC;QACvC,WAAW,EAAE,WAAW,CAAC;QACzB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,IAAI,CAAC,EAAE,MAAM,CAAC;QAEd,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,cAAc,CAAC,EAAE,cAAc,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,GAAG,CAAC;QAElF,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,cAAc,CAAC,EAAE,cAAc,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,GAAG,CAAC;QAEnF,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,cAAc,KAAK,GAAG,CAAC;QAEpE,aAAa,CAAC,EAAE,GAAG,CAAC;QACpB,eAAe,CAAC,EAAE,CAAC,MAAM,YAAY,GAAG,aAAa,CAAC,EAAE,CAAC;QACzD,oBAAoB,CAAC,EAAE,MAAM,CAAC;KAC/B;IAoED,SAAS,CAAC,UAAU,CAClB,WAAW,EAAE,WAAW,EACxB,IAAI,SAA6B,EACjC,OAAO,CAAC,EAAE,MAAM,GACf,OAAO;IA4BV,SAAS,CAAC,mBAAmB;IAiB7B,SAAS,CAAC,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAgBhF,SAAS,CAAC,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,mBAAmB;CAG9E"}

package/dist/accessories/BaseAccessory.js

@@ -0,0 +1,177 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BaseAccessory = void 0;
+const eufy_security_client_1 = require("eufy-security-client");
+const events_1 = require("events");
+function isServiceInstance(serviceType) {
+    // eslint-disable-next-line
+    return typeof serviceType === 'object';
+}
+class BaseAccessory extends events_1.EventEmitter {
+    constructor(platform, accessory, 
+    // eslint-disable-next-line
+    device) {
+        super();
+        this.platform = platform;
+        this.accessory = accessory;
+        this.device = device;
+        this.servicesInUse = [];
+        this.platform = platform;
+        this.accessory = accessory;
+        this.device = device;
+        this.SN = this.device.getSerial();
+        this.registerCharacteristic({
+            serviceType: this.platform.Service.AccessoryInformation,
+            characteristicType: this.platform.Characteristic.Manufacturer,
+            getValue: (data) => 'Eufy',
+        });
+        this.registerCharacteristic({
+            serviceType: this.platform.Service.AccessoryInformation,
+            characteristicType: this.platform.Characteristic.Name,
+            getValue: (data) => this.accessory.displayName || 'Unknowm',
+        });
+        this.registerCharacteristic({
+            serviceType: this.platform.Service.AccessoryInformation,
+            characteristicType: this.platform.Characteristic.Model,
+            getValue: (data) => eufy_security_client_1.DeviceType[this.device.getDeviceType()] || 'Unknowm',
+        });
+        this.registerCharacteristic({
+            serviceType: this.platform.Service.AccessoryInformation,
+            characteristicType: this.platform.Characteristic.SerialNumber,
+            getValue: (data) => this.SN || 'Unknowm',
+        });
+        this.registerCharacteristic({
+            serviceType: this.platform.Service.AccessoryInformation,
+            characteristicType: this.platform.Characteristic.FirmwareRevision,
+            getValue: (data) => this.device.getSoftwareVersion() || 'Unknowm',
+        });
+        this.registerCharacteristic({
+            serviceType: this.platform.Service.AccessoryInformation,
+            characteristicType: this.platform.Characteristic.HardwareRevision,
+            getValue: (data) => this.device.getHardwareVersion() || 'Unknowm',
+        });
+        if (this.platform.config.enableDetailedLogging) {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            this.device.on('raw property changed', (device, type, value) => this.handleRawPropertyChange(device, type, value));
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            this.device.on('property changed', (device, name, value) => this.handlePropertyChange(device, name, value));
+        }
+        this.logPropertyKeys();
+    }
+    // Function to extract and log keys
+    logPropertyKeys() {
+        const properties = this.device.getProperties();
+        const keys = Object.keys(properties).join(', ');
+        this.platform.log.debug(`${this.accessory.displayName} Property Keys: ${keys}`);
+    }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    handleRawPropertyChange(device, type, value) {
+        this.platform.log.debug(`${this.accessory.displayName} Raw Property Changes: ${type} ${value}`);
+    }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    handlePropertyChange(device, name, value) {
+        this.platform.log.debug(`${this.accessory.displayName} Property Changes: ${name} ${value}`);
+    }
+    registerCharacteristic({ characteristicType, serviceType, getValue, setValue, onValue, onSimpleValue, onMultipleValue, name, serviceSubType, setValueDebounceTime = 0, }) {
+        // eslint-disable-next-line max-len
+        this.platform.log.debug(`${this.accessory.displayName} REGISTER CHARACTERISTIC '${serviceType.name} / ${characteristicType.name}`);
+        const service = this.getService(serviceType, name, serviceSubType);
+        const characteristic = service.getCharacteristic(characteristicType);
+        // eslint-disable-next-line max-len
+        this.platform.log.debug(`${this.accessory.displayName} REGISTER CHARACTERISTIC '(${service.UUID}) / (${characteristic.UUID})`);
+        if (getValue) {
+            characteristic.onGet(async (data) => {
+                const value = getValue(data, characteristic, service);
+                this.platform.log.debug(`${this.accessory.displayName} GET '${serviceType.name} / ${characteristicType.name}': ${value}`);
+                return value;
+            });
+        }
+        if (setValue && setValueDebounceTime) {
+            let timeoutId = null;
+            characteristic.onSet(async (value) => {
+                if (timeoutId) {
+                    clearTimeout(timeoutId);
+                }
+                timeoutId = setTimeout(() => {
+                    timeoutId = null;
+                    setValue(value, characteristic, service);
+                }, setValueDebounceTime);
+            });
+        }
+        else if (setValue) {
+            characteristic.onSet(async (value) => {
+                Promise.resolve(setValue(value, characteristic, service));
+            });
+        }
+        if (onSimpleValue) {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            this.device.on(onSimpleValue, (device, value) => {
+                // eslint-disable-next-line max-len
+                this.platform.log.info(`${this.accessory.displayName} ON '${serviceType.name} / ${characteristicType.name} / ${onSimpleValue}': ${value}`);
+                characteristic.updateValue(value);
+            });
+        }
+        if (onValue) {
+            this.platform.log.debug(`${this.accessory.displayName} ON '${serviceType.name} / ${characteristicType.name}'`);
+            onValue(service, characteristic);
+        }
+        if (onMultipleValue) {
+            // Attach the common event handler to each event type
+            onMultipleValue.forEach(eventType => {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                this.device.on(eventType, (device, value) => {
+                    // eslint-disable-next-line max-len
+                    this.platform.log.info(`${this.accessory.displayName} ON '${serviceType.name} / ${characteristicType.name} / ${eventType}': ${value}`);
+                    characteristic.updateValue(value);
+                });
+            });
+        }
+    }
+    getService(serviceType, name = this.accessory.displayName, subType) {
+        if (isServiceInstance(serviceType)) {
+            return serviceType;
+        }
+        const existingService = subType ? this.accessory.getServiceById(serviceType, subType) : this.accessory.getService(serviceType);
+        const service = existingService ||
+            this.accessory.addService(serviceType, name, subType);
+        if (existingService &&
+            existingService.displayName &&
+            name !== existingService.displayName) {
+            throw new Error(`Overlapping services for device ${this.accessory.displayName} - ${name} != ${existingService.displayName} - ${serviceType}`);
+        }
+        if (!this.servicesInUse.includes(service)) {
+            this.servicesInUse.push(service);
+        }
+        return service;
+    }
+    pruneUnusedServices() {
+        const safeServiceUUIDs = [
+            this.platform.Service.CameraRTPStreamManagement.UUID,
+        ];
+        this.accessory.services.forEach((service) => {
+            if (!this.servicesInUse.includes(service) &&
+                !safeServiceUUIDs.includes(service.UUID)) {
+                // eslint-disable-next-line max-len
+                this.platform.log.debug(`${this.accessory.displayName} Pruning unused service ${service.UUID} ${service.displayName || service.name}`);
+                this.accessory.removeService(service);
+            }
+        });
+    }
+    handleDummyEventGet(serviceName) {
+        const characteristicValues = {
+            'EventSnapshotsActive': this.platform.Characteristic.EventSnapshotsActive.DISABLE,
+            'HomeKitCameraActive': this.platform.Characteristic.HomeKitCameraActive.OFF,
+        };
+        const currentValue = characteristicValues[serviceName];
+        if (currentValue === undefined) {
+            throw new Error(`Invalid serviceName: ${serviceName}`);
+        }
+        this.platform.log.debug(`${this.accessory.displayName} IGNORE GET ${serviceName}: ${currentValue}`);
+        return Promise.resolve(currentValue);
+    }
+    handleDummyEventSet(serviceName, value) {
+        this.platform.log.debug(`${this.accessory.displayName} IGNORE SET ${serviceName}: ${value}`);
+    }
+}
+exports.BaseAccessory = BaseAccessory;
+//# sourceMappingURL=BaseAccessory.js.map

package/dist/accessories/BaseAccessory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"BaseAccessory.js","sourceRoot":"","sources":["../../src/plugin/accessories/BaseAccessory.ts"],"names":[],"mappings":"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"}

package/dist/accessories/CameraAccessory.d.ts

@@ -1,8 +1,9 @@
-import { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
+import { PlatformAccessory, CharacteristicValue } from 'homebridge';
 import { EufySecurityPlatform } from '../platform';
 import { DeviceAccessory } from './Device';
-import { Camera } from 'eufy-security-client';
+import { Camera, PropertyName } from 'eufy-security-client';
 import { StreamingDelegate } from '../controller/streamingDelegate';
+import { RecordingDelegate } from '../controller/recordingDelegate';
 import { CameraConfig } from '../utils/configTypes';
 /**
  * Platform Accessory
@@ -10,52 +11,35 @@ import { CameraConfig } from '../utils/configTypes';
  * Each accessory may expose multiple services of different service types.
  */
 export declare class CameraAccessory extends DeviceAccessory {
-    protected service: Service;
-    protected CameraService: Service;
+    protected cameraStatus: {
+        isEnabled: boolean;
+        timestamp: number;
+    };
+    private notificationTimeout;
     readonly cameraConfig: CameraConfig;
     protected streamingDelegate: StreamingDelegate | null;
-    private motionTimeout?;
-    constructor(platform: EufySecurityPlatform, accessory: PlatformAccessory, eufyDevice: Camera);
+    protected recordingDelegate?: RecordingDelegate | null;
+    private eventTypesToHandle;
+    private resolutions;
+    constructor(platform: EufySecurityPlatform, accessory: PlatformAccessory, device: Camera);
+    private setupCamera;
+    private getCameraControllerOptions;
+    private setupButtonService;
+    protected setupSwitchService(serviceName: string, serviceType: 'switch' | 'lightbulb' | 'outlet', propertyName: PropertyName): void;
+    private setupEnableButton;
+    private setupMotionButton;
+    private setupLightButton;
+    private setupChimeButton;
     private getCameraConfig;
     private cameraFunction;
-    handleEventSnapshotsActiveGet(): Promise<CharacteristicValue>;
+    private setupMotionFunction;
+    protected getCameraPropertyValue(characteristic: any, propertyName: PropertyName): CharacteristicValue;
+    protected setCameraPropertyValue(characteristic: any, propertyName: PropertyName, value: CharacteristicValue): Promise<void>;
     /**
-     * Handle requests to set the "Event Snapshots Active" characteristic
+     * Handle push notifications for a doorbell device.
+     * Mute subsequent notifications within a timeout period.
+     * @param characteristic - The Characteristic to update for HomeKit.
      */
-    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 onDeviceMotionDetectedPushNotification;
-    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 onDeviceRingsPushNotification;
 }
 //# 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,EAAiD,MAAM,sBAAsB,CAAC;AAC7F,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;IA+BhB,uBAAuB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAW7D,OAAO,CAAC,sCAAsC;IAyBxC,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,EAEL,iBAAiB,EAEjB,mBAAmB,EASpB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAI3C,OAAO,EAAE,MAAM,EAAwB,YAAY,EAAe,MAAM,sBAAsB,CAAC;AAC/F,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAEpE,OAAO,EAAE,YAAY,EAAe,MAAM,sBAAsB,CAAC;AAEjE;;;;GAIG;AACH,qBAAa,eAAgB,SAAQ,eAAe;IAGlD,SAAS,CAAC,YAAY,EAAE;QAAE,SAAS,EAAE,OAAO,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAClE,OAAO,CAAC,mBAAmB,CAA+B;IAE1D,SAAgB,YAAY,EAAE,YAAY,CAAC;IAE3C,SAAS,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,IAAI,CAAQ;IAC7D,SAAS,CAAC,iBAAiB,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAAQ;IAG9D,OAAO,CAAC,kBAAkB,CASxB;IAEF,OAAO,CAAC,WAAW,CAYjB;gBAGA,QAAQ,EAAE,oBAAoB,EAC9B,SAAS,EAAE,iBAAiB,EAC5B,MAAM,EAAE,MAAM;IAgChB,OAAO,CAAC,WAAW;IA6CnB,OAAO,CAAC,0BAA0B;IAqFlC,OAAO,CAAC,kBAAkB;IAsB1B,SAAS,CAAC,kBAAkB,CAC1B,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,QAAQ,GAAG,WAAW,GAAG,QAAQ,EAC9C,YAAY,EAAE,YAAY;YAkBd,iBAAiB;YAIjB,iBAAiB;YAIjB,gBAAgB;YAIhB,gBAAgB;IAI9B,OAAO,CAAC,eAAe;IAoCvB,OAAO,CAAC,cAAc;IAqItB,OAAO,CAAC,mBAAmB;IAyB3B,SAAS,CAAC,sBAAsB,CAAC,cAAc,EAAE,GAAG,EAAE,YAAY,EAAE,YAAY,GAAG,mBAAmB;cAqCtF,sBAAsB,CAAC,cAAc,EAAE,GAAG,EAAE,YAAY,EAAE,YAAY,EAAE,KAAK,EAAE,mBAAmB;IAyBlH;;;;OAIG;IACH,OAAO,CAAC,6BAA6B;CAStC"}