homebridge-eufy-security 2.2.4 → 2.2.6

package/dist/accessories/BaseAccessory.d.ts

@@ -0,0 +1,32 @@
+/// <reference types="node" />
+import { PlatformAccessory, Characteristic, Service, WithUUID } from 'homebridge';
+import { EufySecurityPlatform } from '../platform';
+import { PropertyValue } 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);
+    protected handleRawPropertyChange(device: any, type: number, value: string): void;
+    protected handlePropertyChange(device: any, name: string, value: PropertyValue): void;
+    registerCharacteristic({ characteristicType, serviceType, getValue, setValue, onValue, onSimpleValue, name, serviceSubType, }: {
+        characteristicType: CharacteristicType;
+        serviceType: ServiceType;
+        serviceSubType?: string;
+        name?: string;
+        getValue: (data: any) => any;
+        setValue?: (value: any) => any;
+        onValue?: (service: Service, characteristic: Characteristic) => any;
+        onSimpleValue?: string;
+    }): void;
+    protected getService(serviceType: ServiceType, name?: string, subType?: string): Service;
+    pruneUnusedServices(): 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,EAEd,OAAO,EACP,QAAQ,EACT,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAc,aAAa,EAAmB,MAAM,sBAAsB,CAAC;AAClF,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;IAuDvB,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,sBAAsB,CAAC,EACrB,kBAAkB,EAClB,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,OAAO,EACP,aAAa,EACb,IAAI,EACJ,cAAc,GACf,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,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,GAAG,CAAC;QAE7B,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC;QAE/B,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,cAAc,KAAK,GAAG,CAAC;QACpE,aAAa,CAAC,EAAE,MAAM,CAAC;KACxB;IAiCD,SAAS,CAAC,UAAU,CAClB,WAAW,EAAE,WAAW,EACxB,IAAI,SAA6B,EACjC,OAAO,CAAC,EAAE,MAAM,GACf,OAAO;IA4BV,mBAAmB;CAgBpB"}

package/dist/accessories/BaseAccessory.js

@@ -0,0 +1,128 @@
+"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));
+        }
+    }
+    // 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, name, serviceSubType, }) {
+        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 SERVICE '${serviceType.name} / ${characteristic.displayName}': ${characteristic.UUID}`);
+        characteristic.onGet(async (data) => {
+            const value = getValue(data);
+            this.platform.log.debug(`${this.accessory.displayName} GET '${serviceType.name} / ${characteristicType.name}': ${value}`);
+            return value;
+        });
+        if (setValue) {
+            characteristic.onSet(async (value) => {
+                this.platform.log.debug(`${this.accessory.displayName} SET '${serviceType.name} / ${characteristicType.name}': ${value}`);
+                Promise.resolve(setValue(value));
+            });
+        }
+        if (onSimpleValue) {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            this.device.on(onSimpleValue, (device, state) => {
+                // eslint-disable-next-line max-len
+                this.platform.log.info(`${this.accessory.displayName} ON '${serviceType.name} / ${characteristicType.name} / ${onSimpleValue}': ${state}`);
+                characteristic.updateValue(state);
+            });
+        }
+        else if (onValue) {
+            onValue(service, characteristic);
+        }
+    }
+    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);
+            }
+        });
+    }
+}
+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,7 +1,7 @@
-import { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
+import { PlatformAccessory, CharacteristicValue } from 'homebridge';
 import { EufySecurityPlatform } from '../platform';
 import { DeviceAccessory } from './Device';
-import { Camera, Device, PropertyValue } from 'eufy-security-client';
+import { Camera, PropertyName } from 'eufy-security-client';
 import { StreamingDelegate } from '../controller/streamingDelegate';
 import { CameraConfig } from '../utils/configTypes';
 /**
@@ -10,16 +10,15 @@ 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 ring_triggered;
     readonly cameraConfig: CameraConfig;
     protected streamingDelegate: StreamingDelegate | null;
     private motionTimeout?;
-    constructor(platform: EufySecurityPlatform, accessory: PlatformAccessory, eufyDevice: Camera);
+    constructor(platform: EufySecurityPlatform, accessory: PlatformAccessory, device: Camera);
     private setupButtonService;
     private setupEnableButton;
     private setupMotionButton;
@@ -29,10 +28,10 @@ export declare class CameraAccessory extends DeviceAccessory {
     private setupMotionFunction;
     private onDeviceEventDetectedPushNotification;
     private setupSwitchService;
-    private getPropertyValue;
-    private setPropertyValue;
-    protected handlePropertyChange(device: Device, name: string, value: PropertyValue): void;
+    protected getCameraPropertyValue(characteristic: string, propertyName: PropertyName): CharacteristicValue;
+    protected setCameraPropertyValue(characteristic: string, propertyName: PropertyName, value: CharacteristicValue): Promise<void>;
     handleDummyEventGet(serviceName: string): Promise<CharacteristicValue>;
     handleDummyEventSet(serviceName: string, value: CharacteristicValue): 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,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"}
+{"version":3,"file":"CameraAccessory.d.ts","sourceRoot":"","sources":["../../src/plugin/accessories/CameraAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,iBAAiB,EAAkB,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAE7F,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAM3C,OAAO,EAAE,MAAM,EAAwB,YAAY,EAA8B,MAAM,sBAAsB,CAAC;AAC9G,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAEpE,OAAO,EAAE,YAAY,EAAe,MAAM,sBAAsB,CAAC;AAGjE;;;;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,cAAc,CAAkB;IAExC,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,MAAM,EAAE,MAAM;IAkChB,OAAO,CAAC,kBAAkB;YAsBZ,iBAAiB;YAIjB,iBAAiB;YAIjB,gBAAgB;IAI9B,OAAO,CAAC,eAAe;IAqCvB,OAAO,CAAC,cAAc;IA8EtB,OAAO,CAAC,mBAAmB;IA0C3B,OAAO,CAAC,qCAAqC;IA0B7C,OAAO,CAAC,kBAAkB;IAuB1B,SAAS,CAAC,sBAAsB,CAAC,cAAc,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,GAAG,mBAAmB;cAmCzF,sBAAsB,CAAC,cAAc,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,KAAK,EAAE,mBAAmB;IAgErH,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAgBtE,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,mBAAmB;IAMnE,OAAO,CAAC,6BAA6B;CAatC"}

package/dist/accessories/CameraAccessory.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CameraAccessory = void 0;
 const Device_1 = require("./Device");
-// import { HttpService, LocalLookupService, DeviceClientService, CommandType } from 'eufy-node-client';
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore  
 const eufy_security_client_1 = require("eufy-security-client");
@@ -13,22 +12,20 @@ const streamingDelegate_1 = require("../controller/streamingDelegate");
  * Each accessory may expose multiple services of different service types.
  */
 class CameraAccessory extends Device_1.DeviceAccessory {
-    constructor(platform, accessory, eufyDevice) {
-        super(platform, accessory, eufyDevice);
+    constructor(platform, accessory, device) {
+        super(platform, accessory, device);
+        this.ring_triggered = false;
         this.streamingDelegate = null;
-        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, 'config is:', this.cameraConfig);
+        if (this.cameraConfig.enableCamera || (typeof this.device.isDoorbell === 'function' && this.device.isDoorbell())) {
             this.platform.log.debug(this.accessory.displayName, 'has a camera');
             try {
-                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.cameraFunction();
+                const delegate = new streamingDelegate_1.StreamingDelegate(this.platform, device, this.cameraConfig, this.platform.api, this.platform.api.hap);
                 this.streamingDelegate = delegate;
                 accessory.configureController(delegate.controller);
             }
@@ -39,19 +36,17 @@ class CameraAccessory extends Device_1.DeviceAccessory {
         else {
             this.platform.log.debug(this.accessory.displayName, 'has a motion sensor.');
         }
-        this.service = this.setupMotionFunction(accessory);
-        this.setupEnableButton();
+        this.setupMotionFunction(accessory);
         this.setupMotionButton();
         this.setupLightButton();
     }
     setupButtonService(serviceName, configValue, PropertyName, serviceType) {
         try {
             this.platform.log.debug(`${this.accessory.displayName} ${serviceName} config:`, configValue);
-            if (configValue && this.eufyDevice.hasProperty(PropertyName)) {
+            if (configValue && this.device.hasProperty(PropertyName)) {
                 // eslint-disable-next-line max-len
                 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);
+                this.setupSwitchService(serviceName, serviceType, PropertyName);
             }
             else {
                 // eslint-disable-next-line max-len
@@ -77,7 +72,7 @@ class CameraAccessory extends Device_1.DeviceAccessory {
         let config = {};
         if (typeof this.platform.config.cameras !== 'undefined') {
             // eslint-disable-next-line prefer-arrow-callback, brace-style
-            const pos = this.platform.config.cameras.map(function (e) { return e.serialNumber; }).indexOf(this.eufyDevice.getSerial());
+            const pos = this.platform.config.cameras.map(function (e) { return e.serialNumber; }).indexOf(this.device.getSerial());
             config = { ...this.platform.config.cameras[pos] };
         }
         config.name = this.accessory.displayName;
@@ -93,7 +88,7 @@ class CameraAccessory extends Device_1.DeviceAccessory {
             config.snapshotHandlingMethod = (config.forcerefreshsnap) ? 1 : 3;
         }
         config.talkback = (_j = config.talkback) !== null && _j !== void 0 ? _j : (config.talkback = false);
-        if (config.talkback && !this.eufyDevice.hasCommand(eufy_security_client_1.CommandName.DeviceStartTalkback)) {
+        if (config.talkback && !this.device.hasCommand(eufy_security_client_1.CommandName.DeviceStartTalkback)) {
             this.platform.log.warn(this.accessory.displayName, 'Talkback for this device is not supported!');
             config.talkback = false;
         }
@@ -104,44 +99,78 @@ class CameraAccessory extends Device_1.DeviceAccessory {
         return config;
     }
     cameraFunction() {
-        const service = this.accessory.getService(this.platform.Service.CameraOperatingMode) ||
-            this.accessory.addService(this.platform.Service.CameraOperatingMode);
-        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.getPropertyValue.bind(this, 'this.characteristic.ManuallyDisabled', eufy_security_client_1.PropertyName.DeviceEnabled));
+        this.registerCharacteristic({
+            serviceType: this.platform.Service.CameraOperatingMode,
+            characteristicType: this.platform.Characteristic.EventSnapshotsActive,
+            getValue: (data) => this.handleDummyEventGet('EventSnapshotsActive'),
+            setValue: (value) => this.handleDummyEventSet('EventSnapshotsActive', value),
+        });
+        this.registerCharacteristic({
+            serviceType: this.platform.Service.CameraOperatingMode,
+            characteristicType: this.platform.Characteristic.HomeKitCameraActive,
+            // eslint-disable-next-line max-len
+            getValue: (data) => this.getCameraPropertyValue('this.platform.Characteristic.HomeKitCameraActive', eufy_security_client_1.PropertyName.DeviceEnabled),
+            // eslint-disable-next-line max-len
+            setValue: (value) => this.setCameraPropertyValue('this.platform.Characteristic.HomeKitCameraActive', eufy_security_client_1.PropertyName.DeviceEnabled, value),
+        });
+        if (this.device.hasProperty('enabled')) {
+            this.setupEnableButton();
+            this.registerCharacteristic({
+                serviceType: this.platform.Service.CameraOperatingMode,
+                characteristicType: this.platform.Characteristic.ManuallyDisabled,
+                // eslint-disable-next-line max-len
+                getValue: (data) => this.getCameraPropertyValue('this.platform.Characteristic.ManuallyDisabled', eufy_security_client_1.PropertyName.DeviceEnabled),
+            });
         }
-        if (this.eufyDevice.hasProperty('statusLed')) {
-            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.device.hasProperty('statusLed')) {
+            this.registerCharacteristic({
+                serviceType: this.platform.Service.CameraOperatingMode,
+                characteristicType: this.platform.Characteristic.CameraOperatingModeIndicator,
+                // eslint-disable-next-line max-len
+                getValue: (data) => this.getCameraPropertyValue('this.platform.Characteristic.CameraOperatingModeIndicator', eufy_security_client_1.PropertyName.DeviceStatusLed),
+                // eslint-disable-next-line max-len
+                setValue: (value) => this.setCameraPropertyValue('this.platform.Characteristic.CameraOperatingModeIndicator', eufy_security_client_1.PropertyName.DeviceStatusLed, value),
+            });
         }
-        if (this.eufyDevice.hasProperty('nightvision')) {
-            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));
+        if (this.device.hasProperty('nightvision')) {
+            this.registerCharacteristic({
+                serviceType: this.platform.Service.CameraOperatingMode,
+                characteristicType: this.platform.Characteristic.NightVision,
+                // eslint-disable-next-line max-len
+                getValue: (data) => this.getCameraPropertyValue('this.platform.Characteristic.NightVision', eufy_security_client_1.PropertyName.DeviceNightvision),
+                // eslint-disable-next-line max-len
+                setValue: (value) => this.setCameraPropertyValue('this.platform.Characteristic.NightVision', eufy_security_client_1.PropertyName.DeviceNightvision, value),
+            });
         }
-        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));
+        if (this.device.hasProperty('autoNightvision')) {
+            this.registerCharacteristic({
+                serviceType: this.platform.Service.CameraOperatingMode,
+                characteristicType: this.platform.Characteristic.NightVision,
+                // eslint-disable-next-line max-len
+                getValue: (data) => this.getCameraPropertyValue('this.platform.Characteristic.NightVision', eufy_security_client_1.PropertyName.DeviceAutoNightvision),
+                // eslint-disable-next-line max-len
+                setValue: (value) => this.setCameraPropertyValue('this.platform.Characteristic.NightVision', eufy_security_client_1.PropertyName.DeviceAutoNightvision, value),
+            });
         }
-        this.eufyDevice.on('property changed', (device, name, value) => this.handlePropertyChange(device, name, value));
-        return service;
+        if (this.device.isDoorbell()) {
+            this.registerCharacteristic({
+                serviceType: this.platform.Service.Doorbell,
+                characteristicType: this.platform.Characteristic.ProgrammableSwitchEvent,
+                getValue: (data) => this.handleDummyEventGet('EventSnapshotsActive'),
+                onValue: (service, characteristic) => {
+                    this.device.on('rings', (device, state) => this.onDeviceRingsPushNotification(characteristic));
+                },
+            });
+        }
+        this.getService(this.platform.Service.CameraOperatingMode).setPrimaryService(true);
     }
     setupMotionFunction(accessory) {
         try {
             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));
+            service.setCharacteristic(this.platform.Characteristic.Name, this.accessory.displayName);
+            service.getCharacteristic(this.platform.Characteristic.MotionDetected)
+                .onGet(this.getCameraPropertyValue.bind(this, 'this.platform.Characteristic.MotionDetected', eufy_security_client_1.PropertyName.DeviceMotionDetected));
             // List of event types
             const eventTypesToHandle = [
                 'motion detected',
@@ -156,7 +185,7 @@ class CameraAccessory extends Device_1.DeviceAccessory {
             // 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.device.on(eventType, (device, motion) => this.onDeviceEventDetectedPushNotification(device, motion, eventType));
             });
             return service;
         }
@@ -170,9 +199,9 @@ class CameraAccessory extends Device_1.DeviceAccessory {
         if (motion) {
             this.motionTimeout = setTimeout(() => {
                 this.platform.log.debug(this.accessory.displayName, 'Reseting motion through timout.');
-                this.service
-                    .getCharacteristic(this.characteristic.MotionDetected)
-                    .updateValue(false);
+                // this.service
+                //   .getCharacteristic(this.platform.Characteristic.MotionDetected)
+                //   .updateValue(false);
             }, 15000);
         }
         else {
@@ -183,9 +212,9 @@ class CameraAccessory extends Device_1.DeviceAccessory {
         if (this.cameraConfig.useCachedLocalLivestream && this.streamingDelegate && motion) {
             this.streamingDelegate.prepareCachedStream();
         }
-        this.service
-            .getCharacteristic(this.characteristic.MotionDetected)
-            .updateValue(motion);
+        // this.service
+        //   .getCharacteristic(this.platform.Characteristic.MotionDetected)
+        //   .updateValue(motion);
     }
     setupSwitchService(serviceName, serviceType, propertyName) {
         const platformServiceMapping = {
@@ -194,17 +223,18 @@ class CameraAccessory extends Device_1.DeviceAccessory {
             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;
+        this.registerCharacteristic({
+            serviceType: platformService,
+            characteristicType: this.platform.Characteristic.On,
+            name: this.accessory.displayName + '_' + serviceName,
+            serviceSubType: serviceName,
+            getValue: (data) => this.getCameraPropertyValue('this.platform.Characteristic.On', propertyName),
+            setValue: (value) => this.setCameraPropertyValue('this.platform.Characteristic.On', propertyName, value),
+        });
     }
-    async getPropertyValue(characteristic, propertyName) {
+    getCameraPropertyValue(characteristic, propertyName) {
         try {
-            let value = await this.eufyDevice.getPropertyValue(propertyName);
+            let value = this.device.getPropertyValue(propertyName);
             this.platform.log.debug(`${this.accessory.displayName} GET '${characteristic}' ${propertyName}: ${value}`);
             if (propertyName === eufy_security_client_1.PropertyName.DeviceNightvision) {
                 return value === 1;
@@ -216,7 +246,7 @@ class CameraAccessory extends Device_1.DeviceAccessory {
                 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') {
+            if (characteristic === 'this.platform.Characteristic.ManuallyDisabled') {
                 this.platform.log.debug(`${this.accessory.displayName} INVERSED '${characteristic}' ${propertyName}: ${!value}`);
                 value = !value;
             }
@@ -230,44 +260,45 @@ class CameraAccessory extends Device_1.DeviceAccessory {
             return false;
         }
     }
-    async setPropertyValue(characteristic, propertyName, value) {
+    async setCameraPropertyValue(characteristic, propertyName, value) {
         try {
             // 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());
+            const station = await this.platform.getStationById(this.device.getStationSerial());
+            const cameraService = this.getService(this.platform.Service.CameraOperatingMode);
             switch (propertyName) {
                 case eufy_security_client_1.PropertyName.DeviceEnabled: {
-                    if (characteristic === 'this.characteristic.On') {
+                    if (characteristic === 'this.platform.Characteristic.On') {
                         this.cameraStatus = { isEnabled: value, timestamp: Date.now() };
-                        await station.enableDevice(this.eufyDevice, value);
-                        this.CameraService.updateCharacteristic(this.characteristic.ManuallyDisabled, !value);
+                        await station.enableDevice(this.device, value);
+                        cameraService.updateCharacteristic(this.platform.Characteristic.ManuallyDisabled, !value);
                     }
                     break;
                 }
                 case eufy_security_client_1.PropertyName.DeviceMotionDetection: {
-                    await station.setMotionDetection(this.eufyDevice, value);
-                    this.CameraService.updateCharacteristic(this.characteristic.CameraOperatingModeIndicator, value);
+                    await station.setMotionDetection(this.device, value);
+                    cameraService.updateCharacteristic(this.platform.Characteristic.CameraOperatingModeIndicator, value);
                     break;
                 }
                 case eufy_security_client_1.PropertyName.DeviceStatusLed: {
-                    await station.setStatusLed(this.eufyDevice, value);
-                    this.CameraService.updateCharacteristic(this.characteristic.CameraOperatingModeIndicator, value);
+                    await station.setStatusLed(this.device, value);
+                    cameraService.updateCharacteristic(this.platform.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);
+                    await station.setNightVision(this.device, Number(value));
+                    cameraService.updateCharacteristic(this.platform.Characteristic.NightVision, value);
                     break;
                 }
                 case eufy_security_client_1.PropertyName.DeviceAutoNightvision: {
-                    await station.setAutoNightVision(this.eufyDevice, value);
-                    this.CameraService.updateCharacteristic(this.characteristic.NightVision, value);
+                    await station.setAutoNightVision(this.device, value);
+                    cameraService.updateCharacteristic(this.platform.Characteristic.NightVision, value);
                     break;
                 }
                 case eufy_security_client_1.PropertyName.DeviceLight: {
-                    await station.switchLight(this.eufyDevice, value);
-                    this.service.updateCharacteristic(this.characteristic.On, value);
+                    await station.switchLight(this.device, value);
+                    // this.service.updateCharacteristic(this.platform.Characteristic.On, value as boolean);
                     break;
                 }
                 default: {
@@ -282,23 +313,10 @@ class CameraAccessory extends Device_1.DeviceAccessory {
             this.platform.log.debug(`${this.accessory.displayName} Error setting '${characteristic}' ${propertyName}: ${error}`);
         }
     }
-    handlePropertyChange(device, name, value) {
-        switch (name) {
-            case 'enabled': {
-                break;
-            }
-            case 'statusLed': {
-                break;
-            }
-            default: {
-                break;
-            }
-        }
-    }
     handleDummyEventGet(serviceName) {
         const characteristicValues = {
-            'EventSnapshotsActive': this.characteristic.EventSnapshotsActive.DISABLE,
-            'HomeKitCameraActive': this.characteristic.HomeKitCameraActive.OFF,
+            'EventSnapshotsActive': this.platform.Characteristic.EventSnapshotsActive.DISABLE,
+            'HomeKitCameraActive': this.platform.Characteristic.HomeKitCameraActive.OFF,
         };
         const currentValue = characteristicValues[serviceName];
         if (currentValue === undefined) {
@@ -310,6 +328,21 @@ class CameraAccessory extends Device_1.DeviceAccessory {
     handleDummyEventSet(serviceName, value) {
         this.platform.log.debug(`${this.accessory.displayName} SET ${serviceName}: ${value}`);
     }
+    // We receive 2 push when Doorbell ring, mute the second by checking if we already send
+    // the event to HK then reset the marker when 2nd times occurs
+    onDeviceRingsPushNotification(characteristic) {
+        if (!this.ring_triggered) {
+            this.ring_triggered = true;
+            this.platform.log.debug(this.accessory.displayName, 'DoorBell ringing');
+            if (this.cameraConfig.useCachedLocalLivestream && this.streamingDelegate) {
+                this.streamingDelegate.prepareCachedStream();
+            }
+            characteristic.updateValue(this.platform.Characteristic.ProgrammableSwitchEvent.SINGLE_PRESS);
+        }
+        else {
+            this.ring_triggered = false;
+        }
+    }
 }
 exports.CameraAccessory = CameraAccessory;
 //# sourceMappingURL=CameraAccessory.js.map