homebridge-ring 11.1.0 → 11.2.0

package/lib/homebridge/multi-level-switch.d.ts

@@ -1,13 +1,12 @@
 import { BaseDeviceAccessory } from './base-device-accessory';
 import { RingDevice } from '../api';
 import { RingPlatformConfig } from './config';
-import { Logging, PlatformAccessory } from 'homebridge';
+import { PlatformAccessory } from 'homebridge';
 export declare class MultiLevelSwitch extends BaseDeviceAccessory {
     readonly device: RingDevice;
     readonly accessory: PlatformAccessory;
-    readonly logger: Logging;
     readonly config: RingPlatformConfig;
-    constructor(device: RingDevice, accessory: PlatformAccessory, logger: Logging, config: RingPlatformConfig);
+    constructor(device: RingDevice, accessory: PlatformAccessory, config: RingPlatformConfig);
     setOnState(on: boolean): Promise<void>;
     setLevelState(level: number): Promise<void>;
 }

package/lib/homebridge/multi-level-switch.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MultiLevelSwitch = void 0;
 const base_device_accessory_1 = require("./base-device-accessory");
 const hap_1 = require("./hap");
+const util_1 = require("../api/util");
 class MultiLevelSwitch extends base_device_accessory_1.BaseDeviceAccessory {
-    constructor(device, accessory, logger, config) {
+    constructor(device, accessory, config) {
         super();
         this.device = device;
         this.accessory = accessory;
-        this.logger = logger;
         this.config = config;
         const { Characteristic, Service } = hap_1.hap, { data: initialData } = this.device;
         this.registerCharacteristic({
@@ -30,11 +30,11 @@ class MultiLevelSwitch extends base_device_accessory_1.BaseDeviceAccessory {
         // SOMEDAY: Hue/Sat/Color Temp
     }
     setOnState(on) {
-        this.logger.info(`Turning ${this.device.name} ${on ? 'On' : 'Off'}`);
+        (0, util_1.logInfo)(`Turning ${this.device.name} ${on ? 'On' : 'Off'}`);
         return this.device.setInfo({ device: { v1: { on } } });
     }
     setLevelState(level) {
-        this.logger.info(`Setting brightness of ${this.device.name} to ${level}%`);
+        (0, util_1.logInfo)(`Setting brightness of ${this.device.name} to ${level}%`);
         return this.device.setInfo({
             device: { v1: { level: level / 100 } },
         });

package/lib/homebridge/outlet.d.ts

@@ -1,12 +1,11 @@
 import { BaseDeviceAccessory } from './base-device-accessory';
 import { RingDevice } from '../api';
 import { RingPlatformConfig } from './config';
-import { Logging, PlatformAccessory } from 'homebridge';
+import { PlatformAccessory } from 'homebridge';
 export declare class Outlet extends BaseDeviceAccessory {
     readonly device: RingDevice;
     readonly accessory: PlatformAccessory;
-    readonly logger: Logging;
     readonly config: RingPlatformConfig;
-    constructor(device: RingDevice, accessory: PlatformAccessory, logger: Logging, config: RingPlatformConfig);
+    constructor(device: RingDevice, accessory: PlatformAccessory, config: RingPlatformConfig);
     setOnState(on: boolean): Promise<void>;
 }

package/lib/homebridge/outlet.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Outlet = void 0;
 const base_device_accessory_1 = require("./base-device-accessory");
 const hap_1 = require("./hap");
+const util_1 = require("../api/util");
 class Outlet extends base_device_accessory_1.BaseDeviceAccessory {
-    constructor(device, accessory, logger, config) {
+    constructor(device, accessory, config) {
         super();
         this.device = device;
         this.accessory = accessory;
-        this.logger = logger;
         this.config = config;
         const { Characteristic, Service } = hap_1.hap;
         this.registerCharacteristic({
@@ -24,7 +24,7 @@ class Outlet extends base_device_accessory_1.BaseDeviceAccessory {
         });
     }
     setOnState(on) {
-        this.logger.info(`Turning ${this.device.name} ${on ? 'On' : 'Off'}`);
+        (0, util_1.logInfo)(`Turning ${this.device.name} ${on ? 'On' : 'Off'}`);
         return this.device.setInfo({ device: { v1: { on } } });
     }
 }

package/lib/homebridge/panic-buttons.d.ts

@@ -1,12 +1,11 @@
 import { RingDevice } from '../api';
 import { RingPlatformConfig } from './config';
 import { BaseDataAccessory } from './base-data-accessory';
-import { Logging, PlatformAccessory } from 'homebridge';
+import { PlatformAccessory } from 'homebridge';
 export declare class PanicButtons extends BaseDataAccessory<RingDevice> {
     readonly device: RingDevice;
     readonly accessory: PlatformAccessory;
-    readonly logger: Logging;
     readonly config: RingPlatformConfig;
-    constructor(device: RingDevice, accessory: PlatformAccessory, logger: Logging, config: RingPlatformConfig);
+    constructor(device: RingDevice, accessory: PlatformAccessory, config: RingPlatformConfig);
     initBase(): void;
 }

package/lib/homebridge/panic-buttons.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PanicButtons = void 0;
 const hap_1 = require("./hap");
 const base_data_accessory_1 = require("./base-data-accessory");
+const util_1 = require("../api/util");
 const burglarStates = [
     'burglar-alarm',
     'user-verified-burglar-alarm',
@@ -16,11 +17,10 @@ function matchesAnyAlarmState({ alarmInfo }, targetStates) {
     return Boolean(alarmInfo && targetStates.includes(alarmInfo.state));
 }
 class PanicButtons extends base_data_accessory_1.BaseDataAccessory {
-    constructor(device, accessory, logger, config) {
+    constructor(device, accessory, config) {
         super();
         this.device = device;
         this.accessory = accessory;
-        this.logger = logger;
         this.config = config;
         const { Characteristic, Service } = hap_1.hap, locationName = device.location.name;
         this.registerCharacteristic({
@@ -31,10 +31,10 @@ class PanicButtons extends base_data_accessory_1.BaseDataAccessory {
             getValue: (data) => matchesAnyAlarmState(data, burglarStates),
             setValue: (on) => {
                 if (on) {
-                    this.logger.info(`Burglar Alarm activated for ${locationName}`);
+                    (0, util_1.logInfo)(`Burglar Alarm activated for ${locationName}`);
                     return this.device.location.triggerBurglarAlarm();
                 }
-                this.logger.info(`Burglar Alarm turned off for ${locationName}`);
+                (0, util_1.logInfo)(`Burglar Alarm turned off for ${locationName}`);
                 return this.device.location.setAlarmMode('none');
             },
         });
@@ -46,10 +46,10 @@ class PanicButtons extends base_data_accessory_1.BaseDataAccessory {
             getValue: (data) => matchesAnyAlarmState(data, fireStates),
             setValue: (on) => {
                 if (on) {
-                    this.logger.info(`Fire Alarm activated for ${locationName}`);
+                    (0, util_1.logInfo)(`Fire Alarm activated for ${locationName}`);
                     return this.device.location.triggerFireAlarm();
                 }
-                this.logger.info(`Fire Alarm turned off for ${locationName}`);
+                (0, util_1.logInfo)(`Fire Alarm turned off for ${locationName}`);
                 return this.device.location.setAlarmMode('none');
             },
         });

package/lib/homebridge/ring-platform.js

@@ -4,9 +4,8 @@ exports.RingPlatform = exports.pluginName = exports.platformName = void 0;
 const api_1 = require("../api");
 const hap_1 = require("./hap");
 const security_panel_1 = require("./security-panel");
-const base_station_1 = require("./base-station");
 const chime_1 = require("./chime");
-const keypad_1 = require("./keypad");
+const brightness_only_1 = require("./brightness-only");
 const contact_sensor_1 = require("./contact-sensor");
 const motion_sensor_1 = require("./motion-sensor");
 const lock_1 = require("./lock");
@@ -30,7 +29,7 @@ const location_mode_switch_1 = require("./location-mode-switch");
 const thermostat_1 = require("./thermostat");
 const unknown_zwave_switch_1 = require("./unknown-zwave-switch");
 const util_2 = require("./util");
-const debug = __filename.includes('release-homebridge'), unsupportedDeviceTypes = [api_1.RingDeviceType.BaseStation, api_1.RingDeviceType.Keypad], ignoreHiddenDeviceTypes = [
+const debug = __filename.includes('release-homebridge'), ignoreHiddenDeviceTypes = [
     api_1.RingDeviceType.RingNetAdapter,
     api_1.RingDeviceType.ZigbeeAdapter,
     api_1.RingDeviceType.CodeVault,
@@ -63,9 +62,9 @@ function getAccessoryClass(device) {
         case api_1.RingDeviceType.SecurityPanel:
             return security_panel_1.SecurityPanel;
         case api_1.RingDeviceType.BaseStation:
-            return base_station_1.BaseStation;
+        case api_1.RingDeviceType.BaseStationPro:
         case api_1.RingDeviceType.Keypad:
-            return keypad_1.Keypad;
+            return brightness_only_1.BrightnessOnly;
         case api_1.RingDeviceType.SmokeAlarm:
             return smoke_alarm_1.SmokeAlarm;
         case api_1.RingDeviceType.CoAlarm:
@@ -117,16 +116,18 @@ class RingPlatform {
         this.config = config;
         this.api = api;
         this.homebridgeAccessories = {};
-        (0, util_1.useLogger)({
-            logInfo(message) {
-                log.info(message);
-            },
-            logError(message) {
-                log.error(message);
-            },
-        });
+        if (!config.disableLogs) {
+            (0, util_1.useLogger)({
+                logInfo(message) {
+                    log.info(message);
+                },
+                logError(message) {
+                    log.error(message);
+                },
+            });
+        }
         if (!config) {
-            this.log.info('No configuration found for platform Ring');
+            (0, util_1.logInfo)('No configuration found for platform Ring');
             return;
         }
         config.cameraStatusPollingSeconds = config.cameraStatusPollingSeconds ?? 20;
@@ -146,7 +147,7 @@ class RingPlatform {
         this.homebridgeAccessories = {};
     }
     configureAccessory(accessory) {
-        this.log.info(`Configuring cached accessory ${accessory.UUID} ${accessory.displayName}`);
+        (0, util_1.logInfo)(`Configuring cached accessory ${accessory.UUID} ${accessory.displayName}`);
         this.log.debug('%j', accessory);
         this.homebridgeAccessories[accessory.UUID] = accessory;
     }
@@ -156,9 +157,9 @@ class RingPlatform {
             ...config,
             systemId,
         }), locations = await ringApi.getLocations(), cachedAccessoryIds = Object.keys(this.homebridgeAccessories), platformAccessories = [], externalAccessories = [], activeAccessoryIds = [];
-        this.log.info('Found the following locations:');
+        (0, util_1.logInfo)('Found the following locations:');
         locations.forEach((location) => {
-            this.log.info(`  locationId: ${location.id} - ${location.name}`);
+            (0, util_1.logInfo)(`  locationId: ${location.id} - ${location.name}`);
         });
         await Promise.all(locations.map(async (location) => {
             const devices = await location.getDevices(), cameras = location.cameras, chimes = location.chimes, allDevices = [...devices, ...cameras, ...chimes], securityPanel = devices.find((x) => x.deviceType === api_1.RingDeviceType.SecurityPanel), debugPrefix = debug ? 'TEST ' : '', hapDevices = allDevices.map((device) => {
@@ -200,18 +201,16 @@ class RingPlatform {
                     AccessoryClass: location_mode_switch_1.LocationModeSwitch,
                 });
             }
-            this.log.info(`Configuring ${cameras.length} cameras and ${hapDevices.length} devices for location "${location.name}" - locationId: ${location.id}`);
+            (0, util_1.logInfo)(`Configuring ${cameras.length} cameras and ${hapDevices.length} devices for location "${location.name}" - locationId: ${location.id}`);
             hapDevices.forEach(({ deviceType, device, isCamera, id, name, AccessoryClass }) => {
                 const uuid = hap_1.hap.uuid.generate(debugPrefix + id), displayName = debugPrefix + name, isExternalCamera = isCamera && this.config.unbridgeCameras;
                 if (!AccessoryClass ||
                     (config.hideLightGroups &&
                         deviceType === api_1.RingDeviceType.BeamsLightGroupSwitch) ||
-                    (config.hideUnsupportedServices &&
-                        unsupportedDeviceTypes.includes(deviceType)) ||
                     hideDeviceIds.includes(uuid) ||
                     (onlyDeviceTypes && !onlyDeviceTypes.includes(deviceType))) {
                     if (!ignoreHiddenDeviceTypes.includes(deviceType)) {
-                        this.log.info(`Hidden accessory ${uuid} ${deviceType} ${displayName}`);
+                        (0, util_1.logInfo)(`Hidden accessory ${uuid} ${deviceType} ${displayName}`);
                     }
                     return;
                 }
@@ -228,11 +227,11 @@ class RingPlatform {
                         ? 17 /* hap.Categories.CAMERA */
                         : 11 /* hap.Categories.SECURITY_SYSTEM */);
                     if (isExternalCamera) {
-                        this.log.info(`Configured camera ${uuid} ${deviceType} ${displayName}`);
+                        (0, util_1.logInfo)(`Configured camera ${uuid} ${deviceType} ${displayName}`);
                         externalAccessories.push(accessory);
                     }
                     else {
-                        this.log.info(`Adding new accessory ${uuid} ${deviceType} ${displayName}`);
+                        (0, util_1.logInfo)(`Adding new accessory ${uuid} ${deviceType} ${displayName}`);
                         platformAccessories.push(accessory);
                     }
                     if (isCamera &&
@@ -242,7 +241,7 @@ class RingPlatform {
                         hap_1.hap.Accessory.cleanupAccessoryData((0, util_2.generateMacAddress)(accessory.UUID));
                     }
                     return accessory;
-                }, homebridgeAccessory = this.homebridgeAccessories[uuid] || createHomebridgeAccessory(), accessory = new AccessoryClass(device, homebridgeAccessory, this.log, config);
+                }, homebridgeAccessory = this.homebridgeAccessories[uuid] || createHomebridgeAccessory(), accessory = new AccessoryClass(device, homebridgeAccessory, config);
                 accessory.initBase();
                 this.homebridgeAccessories[uuid] = homebridgeAccessory;
                 activeAccessoryIds.push(uuid);
@@ -258,7 +257,7 @@ class RingPlatform {
             .filter((cachedId) => !activeAccessoryIds.includes(cachedId))
             .map((id) => this.homebridgeAccessories[id]);
         staleAccessories.forEach((staleAccessory) => {
-            this.log.info(`Removing stale cached accessory ${staleAccessory.UUID} ${staleAccessory.displayName}`);
+            (0, util_1.logInfo)(`Removing stale cached accessory ${staleAccessory.UUID} ${staleAccessory.displayName}`);
         });
         if (staleAccessories.length) {
             this.api.unregisterPlatformAccessories(exports.pluginName, exports.platformName, staleAccessories);

package/lib/homebridge/security-panel.d.ts

@@ -1,17 +1,17 @@
 import { BaseDeviceAccessory } from './base-device-accessory';
 import { AlarmMode, RingDevice, RingDeviceData } from '../api';
 import { RingPlatformConfig } from './config';
-import { Logging, PlatformAccessory } from 'homebridge';
+import { PlatformAccessory } from 'homebridge';
 export declare class SecurityPanel extends BaseDeviceAccessory {
     readonly device: RingDevice;
     readonly accessory: PlatformAccessory;
-    readonly logger: Logging;
     readonly config: RingPlatformConfig;
     private alarmStates;
-    constructor(device: RingDevice, accessory: PlatformAccessory, logger: Logging, config: RingPlatformConfig);
+    constructor(device: RingDevice, accessory: PlatformAccessory, config: RingPlatformConfig);
     getTargetNightMode(): false | AlarmMode;
     getTargetState({ mode }: RingDeviceData): 1 | 0 | 2 | 3;
     getCurrentState(data: RingDeviceData): 1 | 0 | 2 | 3 | 4;
-    private targetingNightMode;
+    get targetingNightMode(): boolean;
+    set targetingNightMode(value: boolean);
     setTargetState(state: any): Promise<void>;
 }

package/lib/homebridge/security-panel.js

@@ -4,20 +4,19 @@ exports.SecurityPanel = void 0;
 const base_device_accessory_1 = require("./base-device-accessory");
 const api_1 = require("../api");
 const hap_1 = require("./hap");
+const util_1 = require("../api/util");
 function isValidNightModeBypass(mode) {
     return mode && (mode === 'all' || mode === 'some');
 }
 class SecurityPanel extends base_device_accessory_1.BaseDeviceAccessory {
-    constructor(device, accessory, logger, config) {
+    constructor(device, accessory, config) {
         super();
         this.device = device;
         this.accessory = accessory;
-        this.logger = logger;
         this.config = config;
         this.alarmStates = this.config.alarmOnEntryDelay
             ? api_1.allAlarmStates
             : api_1.allAlarmStates.filter((x) => x !== 'entry-delay');
-        this.targetingNightMode = false;
         const { Characteristic, Service } = hap_1.hap, validValues = [
             Characteristic.SecuritySystemTargetState.AWAY_ARM,
             Characteristic.SecuritySystemTargetState.STAY_ARM,
@@ -62,12 +61,10 @@ class SecurityPanel extends base_device_accessory_1.BaseDeviceAccessory {
     getTargetState({ mode }) {
         const { Characteristic: { SecuritySystemTargetState: State }, } = hap_1.hap;
         if (mode === this.getTargetNightMode()) {
-            setTimeout(() => {
-                // clear in next tick so that Target and Current state both get night mode
-                this.targetingNightMode = false;
-            });
             return State.NIGHT_ARM;
         }
+        // current mode does not match night mode target, so we are no longer targeting night mode
+        this.targetingNightMode = false;
         switch (mode) {
             case 'all':
                 return State.AWAY_ARM;
@@ -86,6 +83,12 @@ class SecurityPanel extends base_device_accessory_1.BaseDeviceAccessory {
         }
         return this.getTargetState(data);
     }
+    get targetingNightMode() {
+        return this.accessory.context.targetingNightMode;
+    }
+    set targetingNightMode(value) {
+        this.accessory.context.targetingNightMode = value;
+    }
     async setTargetState(state) {
         const { Characteristic: { SecuritySystemTargetState: State }, } = hap_1.hap, { location } = this.device, { nightModeBypassFor } = this.config;
         let bypass = false;
@@ -111,20 +114,20 @@ class SecurityPanel extends base_device_accessory_1.BaseDeviceAccessory {
             : '';
         try {
             if (state === State.AWAY_ARM) {
-                this.logger.info(`Arming (Away) ${this.device.name}${bypassLog}`);
+                (0, util_1.logInfo)(`Arming (Away) ${this.device.name}${bypassLog}`);
                 await location.armAway(bypassSensorZids);
             }
             else if (state === State.DISARM) {
-                this.logger.info(`Disarming ${this.device.name}`);
+                (0, util_1.logInfo)(`Disarming ${this.device.name}`);
                 await location.disarm();
             }
             else {
-                this.logger.info(`Arming (Home) ${this.device.name}${bypassLog}`);
+                (0, util_1.logInfo)(`Arming (Home) ${this.device.name}${bypassLog}`);
                 await location.armHome(bypassSensorZids);
             }
         }
         catch (e) {
-            this.logger.error(e);
+            (0, util_1.logError)(e);
             this.getService(hap_1.hap.Service.SecuritySystem)
                 .getCharacteristic(hap_1.hap.Characteristic.SecuritySystemTargetState)
                 .updateValue(this.getTargetState(this.device.data));

package/lib/homebridge/smoke-alarm.d.ts

@@ -1,11 +1,10 @@
 import { BaseDeviceAccessory } from './base-device-accessory';
 import { RingDevice } from '../api';
 import { RingPlatformConfig } from './config';
-import { Logging, PlatformAccessory } from 'homebridge';
+import { PlatformAccessory } from 'homebridge';
 export declare class SmokeAlarm extends BaseDeviceAccessory {
     readonly device: RingDevice;
     readonly accessory: PlatformAccessory;
-    readonly logger: Logging;
     readonly config: RingPlatformConfig;
-    constructor(device: RingDevice, accessory: PlatformAccessory, logger: Logging, config: RingPlatformConfig);
+    constructor(device: RingDevice, accessory: PlatformAccessory, config: RingPlatformConfig);
 }

package/lib/homebridge/smoke-alarm.js

@@ -4,11 +4,10 @@ exports.SmokeAlarm = void 0;
 const base_device_accessory_1 = require("./base-device-accessory");
 const hap_1 = require("./hap");
 class SmokeAlarm extends base_device_accessory_1.BaseDeviceAccessory {
-    constructor(device, accessory, logger, config) {
+    constructor(device, accessory, config) {
         super();
         this.device = device;
         this.accessory = accessory;
-        this.logger = logger;
         this.config = config;
         const { Characteristic: { SmokeDetected }, Service: { SmokeSensor }, } = hap_1.hap;
         this.registerCharacteristic({

package/lib/homebridge/smoke-co-listener.d.ts

@@ -1,11 +1,10 @@
 import { BaseDeviceAccessory } from './base-device-accessory';
 import { RingDevice } from '../api';
 import { RingPlatformConfig } from './config';
-import { Logging, PlatformAccessory } from 'homebridge';
+import { PlatformAccessory } from 'homebridge';
 export declare class SmokeCoListener extends BaseDeviceAccessory {
     readonly device: RingDevice;
     readonly accessory: PlatformAccessory;
-    readonly logger: Logging;
     readonly config: RingPlatformConfig;
-    constructor(device: RingDevice, accessory: PlatformAccessory, logger: Logging, config: RingPlatformConfig);
+    constructor(device: RingDevice, accessory: PlatformAccessory, config: RingPlatformConfig);
 }

package/lib/homebridge/smoke-co-listener.js

@@ -4,11 +4,10 @@ exports.SmokeCoListener = void 0;
 const base_device_accessory_1 = require("./base-device-accessory");
 const hap_1 = require("./hap");
 class SmokeCoListener extends base_device_accessory_1.BaseDeviceAccessory {
-    constructor(device, accessory, logger, config) {
+    constructor(device, accessory, config) {
         super();
         this.device = device;
         this.accessory = accessory;
-        this.logger = logger;
         this.config = config;
         const { Characteristic: { SmokeDetected, CarbonMonoxideDetected }, Service: { SmokeSensor, CarbonMonoxideSensor }, } = hap_1.hap;
         this.registerCharacteristic({

package/lib/homebridge/switch.d.ts

@@ -1,12 +1,11 @@
 import { BaseDeviceAccessory } from './base-device-accessory';
 import { RingDevice } from '../api';
 import { RingPlatformConfig } from './config';
-import { Logging, PlatformAccessory } from 'homebridge';
+import { PlatformAccessory } from 'homebridge';
 export declare class Switch extends BaseDeviceAccessory {
     readonly device: RingDevice;
     readonly accessory: PlatformAccessory;
-    readonly logger: Logging;
     readonly config: RingPlatformConfig;
-    constructor(device: RingDevice, accessory: PlatformAccessory, logger: Logging, config: RingPlatformConfig);
+    constructor(device: RingDevice, accessory: PlatformAccessory, config: RingPlatformConfig);
     setOnState(on: boolean): Promise<void>;
 }

package/lib/homebridge/switch.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Switch = void 0;
 const base_device_accessory_1 = require("./base-device-accessory");
 const hap_1 = require("./hap");
+const util_1 = require("../api/util");
 class Switch extends base_device_accessory_1.BaseDeviceAccessory {
-    constructor(device, accessory, logger, config) {
+    constructor(device, accessory, config) {
         super();
         this.device = device;
         this.accessory = accessory;
-        this.logger = logger;
         this.config = config;
         const { Characteristic, Service } = hap_1.hap;
         this.registerCharacteristic({
@@ -19,7 +19,7 @@ class Switch extends base_device_accessory_1.BaseDeviceAccessory {
         });
     }
     setOnState(on) {
-        this.logger.info(`Turning ${this.device.name} ${on ? 'On' : 'Off'}`);
+        (0, util_1.logInfo)(`Turning ${this.device.name} ${on ? 'On' : 'Off'}`);
         return this.device.setInfo({ device: { v1: { on } } });
     }
 }

package/lib/homebridge/temperature-sensor.d.ts

@@ -1,11 +1,10 @@
 import { BaseDeviceAccessory } from './base-device-accessory';
 import { RingDevice } from '../api';
 import { RingPlatformConfig } from './config';
-import { Logging, PlatformAccessory } from 'homebridge';
+import { PlatformAccessory } from 'homebridge';
 export declare class TemperatureSensor extends BaseDeviceAccessory {
     readonly device: RingDevice;
     readonly accessory: PlatformAccessory;
-    readonly logger: Logging;
     readonly config: RingPlatformConfig;
-    constructor(device: RingDevice, accessory: PlatformAccessory, logger: Logging, config: RingPlatformConfig);
+    constructor(device: RingDevice, accessory: PlatformAccessory, config: RingPlatformConfig);
 }

package/lib/homebridge/temperature-sensor.js

@@ -5,11 +5,10 @@ const base_device_accessory_1 = require("./base-device-accessory");
 const hap_1 = require("./hap");
 const operators_1 = require("rxjs/operators");
 class TemperatureSensor extends base_device_accessory_1.BaseDeviceAccessory {
-    constructor(device, accessory, logger, config) {
+    constructor(device, accessory, config) {
         super();
         this.device = device;
         this.accessory = accessory;
-        this.logger = logger;
         this.config = config;
         const { Characteristic: { CurrentTemperature }, Service: { TemperatureSensor: TempSensorService }, } = hap_1.hap;
         this.registerObservableCharacteristic({

package/lib/homebridge/thermostat.d.ts

@@ -1,12 +1,11 @@
-import { Logging, PlatformAccessory } from 'homebridge';
+import { PlatformAccessory } from 'homebridge';
 import { RingDevice } from '../api';
 import { BaseDeviceAccessory } from './base-device-accessory';
 import { RingPlatformConfig } from './config';
 export declare class Thermostat extends BaseDeviceAccessory {
     readonly device: RingDevice;
     readonly accessory: PlatformAccessory;
-    readonly logger: Logging;
     readonly config: RingPlatformConfig;
     private onTemperature;
-    constructor(device: RingDevice, accessory: PlatformAccessory, logger: Logging, config: RingPlatformConfig);
+    constructor(device: RingDevice, accessory: PlatformAccessory, config: RingPlatformConfig);
 }

package/lib/homebridge/thermostat.js

@@ -4,14 +4,14 @@ exports.Thermostat = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const ring_types_1 = require("../api/ring-types");
+const util_1 = require("../api/util");
 const base_device_accessory_1 = require("./base-device-accessory");
 const hap_1 = require("./hap");
 class Thermostat extends base_device_accessory_1.BaseDeviceAccessory {
-    constructor(device, accessory, logger, config) {
+    constructor(device, accessory, config) {
         super();
         this.device = device;
         this.accessory = accessory;
-        this.logger = logger;
         this.config = config;
         const { Characteristic, Service } = hap_1.hap;
         // Component Device (Temperature Sensor)
@@ -20,9 +20,9 @@ class Thermostat extends base_device_accessory_1.BaseDeviceAccessory {
             if (!temperatureSensor) {
                 return [];
             }
-            this.logger.debug(`Discovered a component temperature sensor for ${this.device.name}`);
+            (0, util_1.logDebug)(`Discovered a component temperature sensor for ${this.device.name}`);
             return temperatureSensor.onData.pipe((0, operators_1.map)(({ celsius: temperature }) => {
-                this.logger.debug(`Component temperature sensor for ${this.device.name} reported ${temperature} degrees`);
+                (0, util_1.logDebug)(`Component temperature sensor for ${this.device.name} reported ${temperature} degrees`);
                 return temperature;
             }), (0, operators_1.distinctUntilChanged)());
         }));
@@ -36,7 +36,7 @@ class Thermostat extends base_device_accessory_1.BaseDeviceAccessory {
                     return Characteristic.CurrentHeatingCoolingState.OFF;
                 }
                 if (!temperature || !setPoint) {
-                    this.logger.error(`Could not determine 'CurrentHeatingCoolingState' for ${this.device.name} given temperature: ${temperature}, set point: ${setPoint} and mode: ${mode}. Reporting 'off' state as a fallback.`);
+                    (0, util_1.logError)(`Could not determine 'CurrentHeatingCoolingState' for ${this.device.name} given temperature: ${temperature}, set point: ${setPoint} and mode: ${mode}. Reporting 'off' state as a fallback.`);
                     return Characteristic.CurrentHeatingCoolingState.OFF;
                 }
                 // Checking with a threshold to avoid floating point weirdness
@@ -90,10 +90,10 @@ class Thermostat extends base_device_accessory_1.BaseDeviceAccessory {
                     }
                 })();
                 if (!mode) {
-                    this.logger.error(`Couldn’t match ${targetHeatingCoolingState} to a recognized mode string.`);
+                    (0, util_1.logError)(`Couldn’t match ${targetHeatingCoolingState} to a recognized mode string.`);
                     return;
                 }
-                this.logger.info(`Setting ${this.device.name} mode to ${mode}`);
+                (0, util_1.logInfo)(`Setting ${this.device.name} mode to ${mode}`);
                 return this.device.setInfo({ device: { v1: { mode } } });
             },
         });
@@ -113,7 +113,7 @@ class Thermostat extends base_device_accessory_1.BaseDeviceAccessory {
             serviceType: Service.Thermostat,
             onValue: this.onTemperature.pipe((0, operators_1.map)((temperature) => {
                 if (!temperature) {
-                    this.logger.error(`Could not determine 'CurrentTemperature' for ${this.device.name} given temperature: ${temperature}. Returning 22 degrees celsius as a fallback.`);
+                    (0, util_1.logError)(`Could not determine 'CurrentTemperature' for ${this.device.name} given temperature: ${temperature}. Returning 22 degrees celsius as a fallback.`);
                     return 22;
                 }
                 // Documentation: https://developers.homebridge.io/#/characteristic/CurrentTemperature
@@ -128,13 +128,13 @@ class Thermostat extends base_device_accessory_1.BaseDeviceAccessory {
                 return setPoint;
             },
             setValue: (setPoint) => {
-                this.logger.info(`Setting ${this.device.name} target temperature to ${setPoint}`);
+                (0, util_1.logInfo)(`Setting ${this.device.name} target temperature to ${setPoint}`);
                 // Documentation: https://developers.homebridge.io/#/characteristic/TargetTemperature
                 // 'Characteristic.TargetTemperature' has a valid range from 10 to 38 degrees celsius,
                 // but devices may support a different range. When limits differ, accept the more strict.
                 const setPointMin = Math.max(this.device.data.setPointMin || 10, 10), setPointMax = Math.min(this.device.data.setPointMax || 38, 38);
                 if (setPoint < setPointMin || setPoint > setPointMax) {
-                    this.logger.error(`Ignoring request to set ${this.device.name} target temperature to ${setPoint}. Target temperature must be between ${setPointMin} and ${setPointMax}.`);
+                    (0, util_1.logError)(`Ignoring request to set ${this.device.name} target temperature to ${setPoint}. Target temperature must be between ${setPointMin} and ${setPointMax}.`);
                     return;
                 }
                 return this.device.setInfo({ device: { v1: { setPoint } } });
@@ -145,7 +145,7 @@ class Thermostat extends base_device_accessory_1.BaseDeviceAccessory {
             // 'Characteristic.TargetTemperature' has a valid range from 10 to 38 degrees celsius,
             // but devices may support a different range. When limits differ, accept the more strict.
             const setPointMin = Math.max(this.device.data.setPointMin || 10, 10), setPointMax = Math.min(this.device.data.setPointMax || 38, 38);
-            this.logger.debug(`Setting ${this.device.name} target temperature range to ${setPointMin}–${setPointMax}`);
+            (0, util_1.logDebug)(`Setting ${this.device.name} target temperature range to ${setPointMin}–${setPointMax}`);
             this.getService(Service.Thermostat)
                 .getCharacteristic(Characteristic.TargetTemperature)
                 .setProps({

package/lib/homebridge/unknown-zwave-switch.d.ts

@@ -1,12 +1,11 @@
 import { BaseDeviceAccessory } from './base-device-accessory';
 import { RingDevice } from '../api';
 import { RingPlatformConfig } from './config';
-import { Logging, PlatformAccessory } from 'homebridge';
+import { PlatformAccessory } from 'homebridge';
 export declare class UnknownZWaveSwitchSwitch extends BaseDeviceAccessory {
     readonly device: RingDevice;
     readonly accessory: PlatformAccessory;
-    readonly logger: Logging;
     readonly config: RingPlatformConfig;
-    constructor(device: RingDevice, accessory: PlatformAccessory, logger: Logging, config: RingPlatformConfig);
+    constructor(device: RingDevice, accessory: PlatformAccessory, config: RingPlatformConfig);
     setOnState(on: boolean): Promise<void>;
 }