homebridge-ring 10.0.0 → 11.0.0

package/lib/homebridge/location-mode-switch.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LocationModeSwitch = void 0;
 const operators_1 = require("rxjs/operators");
@@ -38,7 +29,7 @@ class LocationModeSwitch extends base_accessory_1.BaseAccessory {
         this.device = this.location; // for use in BaseAccessory
         const { Characteristic, Service: { SecuritySystem, AccessoryInformation }, } = hap_1.hap, accessoryName = location.name + ' Mode', service = this.getService(SecuritySystem, accessoryName), currentState = service.getCharacteristic(Characteristic.SecuritySystemCurrentState), targetState = service.getCharacteristic(Characteristic.SecuritySystemTargetState), getCurrentMode = () => {
             return (0, rxjs_1.firstValueFrom)(location.onLocationMode);
-        }, getCurrentState = () => __awaiter(this, void 0, void 0, function* () { return getStateFromMode(yield getCurrentMode()); });
+        }, getCurrentState = async () => getStateFromMode(await getCurrentMode());
         location.onLocationMode.pipe((0, operators_1.distinctUntilChanged)()).subscribe((mode) => {
             const state = getStateFromMode(mode);
             if (state === this.targetState) {
@@ -49,23 +40,23 @@ class LocationModeSwitch extends base_accessory_1.BaseAccessory {
             }
             currentState.updateValue(state);
         });
-        currentState.on("get" /* GET */, (callback) => __awaiter(this, void 0, void 0, function* () {
+        currentState.on("get" /* GET */, async (callback) => {
             location.getLocationMode().catch((e) => {
                 (0, util_1.logError)('Failed to retrieve location mode for ' + location.name);
                 (0, util_1.logError)(e);
             });
-            const state = yield getCurrentState();
+            const state = await getCurrentState();
             if (state === this.targetState) {
                 this.targetState = undefined;
             }
             callback(null, state);
-        }));
-        targetState.on("get" /* GET */, (callback) => __awaiter(this, void 0, void 0, function* () {
+        });
+        targetState.on("get" /* GET */, async (callback) => {
             callback(null, this.targetState !== undefined
                 ? this.targetState
-                : yield getCurrentState());
-        }));
-        targetState.on("set" /* SET */, (state, callback) => __awaiter(this, void 0, void 0, function* () {
+                : await getCurrentState());
+        });
+        targetState.on("set" /* SET */, async (state, callback) => {
             const { Characteristic: { SecuritySystemTargetState: State }, } = hap_1.hap;
             callback();
             if (state === State.NIGHT_ARM) {
@@ -73,7 +64,7 @@ class LocationModeSwitch extends base_accessory_1.BaseAccessory {
                 // Ring doesn't have night mode, so switch over to stay mode
                 setTimeout(() => targetState.updateValue(state), 100);
             }
-            if (state === (yield getCurrentState())) {
+            if (state === (await getCurrentState())) {
                 this.targetState = undefined;
                 return;
             }
@@ -88,7 +79,7 @@ class LocationModeSwitch extends base_accessory_1.BaseAccessory {
             }
             this.logger.info(`Setting ${this.location.name} Mode to home`);
             return this.location.setLocationMode('home');
-        }));
+        });
         targetState.setProps({
             validValues: [
                 Characteristic.SecuritySystemTargetState.AWAY_ARM,

package/lib/homebridge/ring-platform.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RingPlatform = exports.pluginName = exports.platformName = void 0;
 const api_1 = require("../api");
@@ -122,7 +113,6 @@ function getAccessoryClass(device) {
 }
 class RingPlatform {
     constructor(log, config, api) {
-        var _a, _b;
         this.log = log;
         this.config = config;
         this.api = api;
@@ -139,8 +129,8 @@ class RingPlatform {
             this.log.info('No configuration found for platform Ring');
             return;
         }
-        config.cameraStatusPollingSeconds = (_a = config.cameraStatusPollingSeconds) !== null && _a !== void 0 ? _a : 20;
-        config.locationModePollingSeconds = (_b = config.locationModePollingSeconds) !== null && _b !== void 0 ? _b : 20;
+        config.cameraStatusPollingSeconds = config.cameraStatusPollingSeconds ?? 20;
+        config.locationModePollingSeconds = config.locationModePollingSeconds ?? 20;
         this.api.on('didFinishLaunching', () => {
             this.log.debug('didFinishLaunching');
             if (config.refreshToken) {
@@ -160,106 +150,107 @@ class RingPlatform {
         this.log.debug('%j', accessory);
         this.homebridgeAccessories[accessory.UUID] = accessory;
     }
-    connectToApi() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { api, config } = this, systemId = (0, config_1.getSystemId)(api), ringApi = new api_1.RingApi(Object.assign(Object.assign({ controlCenterDisplayName: 'homebridge-ring' }, config), { systemId })), locations = yield ringApi.getLocations(), cachedAccessoryIds = Object.keys(this.homebridgeAccessories), platformAccessories = [], activeAccessoryIds = [];
-            this.log.info('Found the following locations:');
-            locations.forEach((location) => {
-                this.log.info(`  locationId: ${location.id} - ${location.name}`);
-            });
-            yield Promise.all(locations.map((location) => __awaiter(this, void 0, void 0, function* () {
-                var _a;
-                const devices = yield 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) => {
-                    const isCamera = device instanceof api_1.RingCamera, cameraIdDifferentiator = isCamera ? 'camera' : '', // this forces bridged cameras from old version of the plugin to be seen as "stale"
-                    AccessoryClass = (device instanceof api_1.RingCamera
-                        ? camera_1.Camera
-                        : device instanceof api_1.RingChime
-                            ? chime_1.Chime
-                            : getAccessoryClass(device));
-                    return {
-                        deviceType: device.deviceType,
-                        device: device,
-                        isCamera,
-                        id: device.id.toString() + cameraIdDifferentiator,
-                        name: device.name,
-                        AccessoryClass,
-                    };
-                }), hideDeviceIds = config.hideDeviceIds || [], onlyDeviceTypes = ((_a = config.onlyDeviceTypes) === null || _a === void 0 ? void 0 : _a.length)
-                    ? config.onlyDeviceTypes
-                    : undefined;
-                if (config.showPanicButtons && securityPanel) {
-                    hapDevices.push({
-                        deviceType: securityPanel.deviceType,
-                        device: securityPanel,
-                        isCamera: false,
-                        id: securityPanel.id.toString() + 'panic',
-                        name: 'Panic Buttons',
-                        AccessoryClass: panic_buttons_1.PanicButtons,
-                    });
-                }
-                if (config.locationModePollingSeconds &&
-                    (yield location.supportsLocationModeSwitching())) {
-                    hapDevices.push({
-                        deviceType: 'location.mode',
-                        device: location,
-                        isCamera: false,
-                        id: location.id + 'mode',
-                        name: location.name + ' Mode',
-                        AccessoryClass: location_mode_switch_1.LocationModeSwitch,
-                    });
-                }
-                this.log.info(`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;
-                    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}`);
-                        }
-                        return;
-                    }
-                    const createHomebridgeAccessory = () => {
-                        const accessory = new api.platformAccessory(displayName, uuid, isCamera
-                            ? 17 /* CAMERA */
-                            : 11 /* SECURITY_SYSTEM */);
-                        this.log.info(`Adding new accessory ${uuid} ${deviceType} ${displayName}`);
-                        platformAccessories.push(accessory);
-                        if (isCamera &&
-                            typeof hap_1.hap.Accessory.cleanupAccessoryData === 'function') {
-                            // This is a one-time cleanup that will remove persist files for old external accessories from before camera bridging in version 8
-                            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);
-                    accessory.initBase();
-                    this.homebridgeAccessories[uuid] = homebridgeAccessory;
-                    activeAccessoryIds.push(uuid);
+    async connectToApi() {
+        const { api, config } = this, systemId = (0, config_1.getSystemId)(api), ringApi = new api_1.RingApi({
+            controlCenterDisplayName: 'homebridge-ring',
+            ...config,
+            systemId,
+        }), locations = await ringApi.getLocations(), cachedAccessoryIds = Object.keys(this.homebridgeAccessories), platformAccessories = [], activeAccessoryIds = [];
+        this.log.info('Found the following locations:');
+        locations.forEach((location) => {
+            this.log.info(`  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) => {
+                const isCamera = device instanceof api_1.RingCamera, cameraIdDifferentiator = isCamera ? 'camera' : '', // this forces bridged cameras from old version of the plugin to be seen as "stale"
+                AccessoryClass = (device instanceof api_1.RingCamera
+                    ? camera_1.Camera
+                    : device instanceof api_1.RingChime
+                        ? chime_1.Chime
+                        : getAccessoryClass(device));
+                return {
+                    deviceType: device.deviceType,
+                    device: device,
+                    isCamera,
+                    id: device.id.toString() + cameraIdDifferentiator,
+                    name: device.name,
+                    AccessoryClass,
+                };
+            }), hideDeviceIds = config.hideDeviceIds || [], onlyDeviceTypes = config.onlyDeviceTypes?.length
+                ? config.onlyDeviceTypes
+                : undefined;
+            if (config.showPanicButtons && securityPanel) {
+                hapDevices.push({
+                    deviceType: securityPanel.deviceType,
+                    device: securityPanel,
+                    isCamera: false,
+                    id: securityPanel.id.toString() + 'panic',
+                    name: 'Panic Buttons',
+                    AccessoryClass: panic_buttons_1.PanicButtons,
                 });
-            })));
-            if (platformAccessories.length) {
-                api.registerPlatformAccessories(exports.pluginName, exports.platformName, platformAccessories);
             }
-            const staleAccessories = cachedAccessoryIds
-                .filter((cachedId) => !activeAccessoryIds.includes(cachedId))
-                .map((id) => this.homebridgeAccessories[id]);
-            staleAccessories.forEach((staleAccessory) => {
-                this.log.info(`Removing stale cached accessory ${staleAccessory.UUID} ${staleAccessory.displayName}`);
-            });
-            if (staleAccessories.length) {
-                this.api.unregisterPlatformAccessories(exports.pluginName, exports.platformName, staleAccessories);
+            if (config.locationModePollingSeconds &&
+                (await location.supportsLocationModeSwitching())) {
+                hapDevices.push({
+                    deviceType: 'location.mode',
+                    device: location,
+                    isCamera: false,
+                    id: location.id + 'mode',
+                    name: location.name + ' Mode',
+                    AccessoryClass: location_mode_switch_1.LocationModeSwitch,
+                });
             }
-            ringApi.onRefreshTokenUpdated.subscribe(({ oldRefreshToken, newRefreshToken }) => {
-                if (!oldRefreshToken) {
+            this.log.info(`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;
+                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}`);
+                    }
                     return;
                 }
-                (0, config_1.updateHomebridgeConfig)(this.api, (configContents) => {
-                    return configContents.replace(oldRefreshToken, newRefreshToken);
-                });
+                const createHomebridgeAccessory = () => {
+                    const accessory = new api.platformAccessory(displayName, uuid, isCamera
+                        ? 17 /* CAMERA */
+                        : 11 /* SECURITY_SYSTEM */);
+                    this.log.info(`Adding new accessory ${uuid} ${deviceType} ${displayName}`);
+                    platformAccessories.push(accessory);
+                    if (isCamera &&
+                        typeof hap_1.hap.Accessory.cleanupAccessoryData === 'function') {
+                        // This is a one-time cleanup that will remove persist files for old external accessories from before camera bridging in version 8
+                        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);
+                accessory.initBase();
+                this.homebridgeAccessories[uuid] = homebridgeAccessory;
+                activeAccessoryIds.push(uuid);
+            });
+        }));
+        if (platformAccessories.length) {
+            api.registerPlatformAccessories(exports.pluginName, exports.platformName, platformAccessories);
+        }
+        const staleAccessories = cachedAccessoryIds
+            .filter((cachedId) => !activeAccessoryIds.includes(cachedId))
+            .map((id) => this.homebridgeAccessories[id]);
+        staleAccessories.forEach((staleAccessory) => {
+            this.log.info(`Removing stale cached accessory ${staleAccessory.UUID} ${staleAccessory.displayName}`);
+        });
+        if (staleAccessories.length) {
+            this.api.unregisterPlatformAccessories(exports.pluginName, exports.platformName, staleAccessories);
+        }
+        ringApi.onRefreshTokenUpdated.subscribe(({ oldRefreshToken, newRefreshToken }) => {
+            if (!oldRefreshToken) {
+                return;
+            }
+            (0, config_1.updateHomebridgeConfig)(this.api, (configContents) => {
+                return configContents.replace(oldRefreshToken, newRefreshToken);
             });
         });
     }

package/lib/homebridge/security-panel.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SecurityPanel = void 0;
 const base_device_accessory_1 = require("./base-device-accessory");
@@ -95,51 +86,49 @@ class SecurityPanel extends base_device_accessory_1.BaseDeviceAccessory {
         }
         return this.getTargetState(data);
     }
-    setTargetState(state) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { Characteristic: { SecuritySystemTargetState: State }, } = hap_1.hap, { location } = this.device, { nightModeBypassFor } = this.config;
-            let bypass = false;
-            this.targetingNightMode = state === State.NIGHT_ARM;
-            if (state === State.NIGHT_ARM) {
-                if (nightModeBypassFor &&
-                    (nightModeBypassFor === 'all' || nightModeBypassFor === 'some')) {
-                    state = nightModeBypassFor === 'all' ? State.AWAY_ARM : State.STAY_ARM;
-                    bypass = true;
-                }
-                else {
-                    // Switch to Home since we don't know which mode the user wanted
-                    state = State.STAY_ARM;
-                }
+    async setTargetState(state) {
+        const { Characteristic: { SecuritySystemTargetState: State }, } = hap_1.hap, { location } = this.device, { nightModeBypassFor } = this.config;
+        let bypass = false;
+        this.targetingNightMode = state === State.NIGHT_ARM;
+        if (state === State.NIGHT_ARM) {
+            if (nightModeBypassFor &&
+                (nightModeBypassFor === 'all' || nightModeBypassFor === 'some')) {
+                state = nightModeBypassFor === 'all' ? State.AWAY_ARM : State.STAY_ARM;
+                bypass = true;
             }
-            const bypassContactSensors = bypass
-                ? (yield location.getDevices()).filter((device) => {
-                    return (device.deviceType === api_1.RingDeviceType.ContactSensor &&
-                        device.data.faulted);
-                })
-                : [], bypassSensorZids = bypassContactSensors.map((sensor) => sensor.id), bypassSensorNames = bypassContactSensors.map((sensor) => sensor.name), bypassLog = bypassSensorNames.length
-                ? ' - Bypassing Sensors: ' + bypassSensorNames.join(', ')
-                : '';
-            try {
-                if (state === State.AWAY_ARM) {
-                    this.logger.info(`Arming (Away) ${this.device.name}${bypassLog}`);
-                    yield location.armAway(bypassSensorZids);
-                }
-                else if (state === State.DISARM) {
-                    this.logger.info(`Disarming ${this.device.name}`);
-                    yield location.disarm();
-                }
-                else {
-                    this.logger.info(`Arming (Home) ${this.device.name}${bypassLog}`);
-                    yield location.armHome(bypassSensorZids);
-                }
+            else {
+                // Switch to Home since we don't know which mode the user wanted
+                state = State.STAY_ARM;
             }
-            catch (e) {
-                this.logger.error(e);
-                this.getService(hap_1.hap.Service.SecuritySystem)
-                    .getCharacteristic(hap_1.hap.Characteristic.SecuritySystemTargetState)
-                    .updateValue(this.getTargetState(this.device.data));
+        }
+        const bypassContactSensors = bypass
+            ? (await location.getDevices()).filter((device) => {
+                return (device.deviceType === api_1.RingDeviceType.ContactSensor &&
+                    device.data.faulted);
+            })
+            : [], bypassSensorZids = bypassContactSensors.map((sensor) => sensor.id), bypassSensorNames = bypassContactSensors.map((sensor) => sensor.name), bypassLog = bypassSensorNames.length
+            ? ' - Bypassing Sensors: ' + bypassSensorNames.join(', ')
+            : '';
+        try {
+            if (state === State.AWAY_ARM) {
+                this.logger.info(`Arming (Away) ${this.device.name}${bypassLog}`);
+                await location.armAway(bypassSensorZids);
             }
-        });
+            else if (state === State.DISARM) {
+                this.logger.info(`Disarming ${this.device.name}`);
+                await location.disarm();
+            }
+            else {
+                this.logger.info(`Arming (Home) ${this.device.name}${bypassLog}`);
+                await location.armHome(bypassSensorZids);
+            }
+        }
+        catch (e) {
+            this.logger.error(e);
+            this.getService(hap_1.hap.Service.SecuritySystem)
+                .getCharacteristic(hap_1.hap.Characteristic.SecuritySystemTargetState)
+                .updateValue(this.getTargetState(this.device.data));
+        }
     }
 }
 exports.SecurityPanel = SecurityPanel;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ring",
-  "version": "10.0.0",
+  "version": "11.0.0",
   "description": "Homebridge plugin for Ring doorbells, cameras, security alarm system and smart lighting",
   "main": "lib/homebridge/index.js",
   "bin": {