homebridge-ring 11.4.0-beta.1 → 11.4.0-beta.3

package/lib/base-accessory.js

@@ -1,243 +1,82 @@
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
-    try {
-        var info = gen[key](arg);
-        var value = info.value;
-    } catch (error) {
-        reject(error);
-        return;
-    }
-    if (info.done) {
-        resolve(value);
-    } else {
-        Promise.resolve(value).then(_next, _throw);
-    }
-}
-function _asyncToGenerator(fn) {
-    return function() {
-        var self = this, args = arguments;
-        return new Promise(function(resolve, reject) {
-            var gen = fn.apply(self, args);
-            function _next(value) {
-                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
-            }
-            function _throw(err) {
-                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
-            }
-            _next(undefined);
-        });
-    };
-}
-function _classCallCheck(instance, Constructor) {
-    if (!(instance instanceof Constructor)) {
-        throw new TypeError("Cannot call a class as a function");
-    }
-}
-var __generator = this && this.__generator || function(thisArg, body) {
-    var f, y, t, g, _ = {
-        label: 0,
-        sent: function() {
-            if (t[0] & 1) throw t[1];
-            return t[1];
-        },
-        trys: [],
-        ops: []
-    };
-    return(g = {
-        next: verb(0),
-        "throw": verb(1),
-        "return": verb(2)
-    }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
-        return this;
-    }), g);
-    function verb(n) {
-        return function(v) {
-            return step([
-                n,
-                v
-            ]);
-        };
-    }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while(_)try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [
-                op[0] & 2,
-                t.value
-            ];
-            switch(op[0]){
-                case 0:
-                case 1:
-                    t = op;
-                    break;
-                case 4:
-                    _.label++;
-                    return {
-                        value: op[1],
-                        done: false
-                    };
-                case 5:
-                    _.label++;
-                    y = op[1];
-                    op = [
-                        0
-                    ];
-                    continue;
-                case 7:
-                    op = _.ops.pop();
-                    _.trys.pop();
-                    continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
-                        _ = 0;
-                        continue;
-                    }
-                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
-                        _.label = op[1];
-                        break;
-                    }
-                    if (op[0] === 6 && _.label < t[1]) {
-                        _.label = t[1];
-                        t = op;
-                        break;
-                    }
-                    if (t && _.label < t[2]) {
-                        _.label = t[2];
-                        _.ops.push(op);
-                        break;
-                    }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop();
-                    continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) {
-            op = [
-                6,
-                e
-            ];
-            y = 0;
-        } finally{
-            f = t = 0;
-        }
-        if (op[0] & 5) throw op[1];
-        return {
-            value: op[0] ? op[1] : void 0,
-            done: true
-        };
-    }
-};
-import { hap } from "./hap";
-import { shareReplay, take } from "rxjs/operators";
-import { firstValueFrom } from "rxjs";
-import { debug } from "./config";
-import { CharacteristicEventTypes } from "homebridge";
-import { logError, logInfo } from "ring-client-api/util";
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "BaseAccessory", {
+    enumerable: true,
+    get: ()=>BaseAccessory
+});
+const _hap = require("./hap");
+const _operators = require("rxjs/operators");
+const _rxjs = require("rxjs");
+const _config = require("./config");
+const _homebridge = require("homebridge");
+const _util = require("ring-client-api/util");
 function isServiceInstance(serviceType) {
-    return typeof serviceType === "object";
+    return typeof serviceType === 'object';
 }
-export var BaseAccessory = /*#__PURE__*/ function() {
-    "use strict";
-    function BaseAccessory() {
-        _classCallCheck(this, BaseAccessory);
-        this.servicesInUse = [];
-    }
-    var _proto = BaseAccessory.prototype;
-    _proto.initBase = function initBase() {
+class BaseAccessory {
+    initBase() {
         this.pruneUnusedServices();
-    };
-    _proto.getService = function getService(serviceType) {
-        var name = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : this.device.name, subType = arguments.length > 2 ? arguments[2] : void 0;
+    }
+    getService(serviceType, name = this.device.name, subType) {
         if (isServiceInstance(serviceType)) {
             return serviceType;
         }
-        if (debug) {
-            name = "TEST " + name;
+        if (_config.debug) {
+            name = 'TEST ' + name;
         }
-        var existingService = subType ? this.accessory.getServiceById(serviceType, subType) : this.accessory.getService(serviceType), service = existingService || this.accessory.addService(serviceType, name, subType);
-        if (debug && existingService && existingService.displayName && name !== existingService.displayName) {
-            throw new Error("Overlapping services for device ".concat(this.device.name, " - ").concat(name, " != ").concat(existingService.displayName, " - ").concat(serviceType));
+        const existingService = subType ? this.accessory.getServiceById(serviceType, subType) : this.accessory.getService(serviceType), service = existingService || this.accessory.addService(serviceType, name, subType);
+        if (_config.debug && existingService && existingService.displayName && name !== existingService.displayName) {
+            throw new Error(`Overlapping services for device ${this.device.name} - ${name} != ${existingService.displayName} - ${serviceType}`);
         }
         if (!this.servicesInUse.includes(service)) {
             this.servicesInUse.push(service);
         }
         return service;
-    };
-    _proto.registerObservableCharacteristic = function registerObservableCharacteristic(param) {
-        var characteristicType = param.characteristicType, serviceType = param.serviceType, serviceSubType = param.serviceSubType, onValue = param.onValue, setValue = param.setValue, name = param.name, requestUpdate = param.requestUpdate;
-        var service = this.getService(serviceType, name, serviceSubType), characteristic = service.getCharacteristic(characteristicType), onCachedValue = onValue.pipe(shareReplay(1));
-        onCachedValue.subscribe(function(value) {
+    }
+    registerObservableCharacteristic({ characteristicType , serviceType , serviceSubType , onValue , setValue , name , requestUpdate  }) {
+        const service = this.getService(serviceType, name, serviceSubType), characteristic = service.getCharacteristic(characteristicType), onCachedValue = onValue.pipe((0, _operators.shareReplay)(1));
+        onCachedValue.subscribe((value)=>{
             characteristic.updateValue(value);
         });
         if (requestUpdate) {
             // Only register for GET if an async request should be made to get an updated value
-            onCachedValue.pipe(take(1)).subscribe(function() {
+            onCachedValue.pipe((0, _operators.take)(1)).subscribe(()=>{
                 // allow GET once a value is cached
-                characteristic.on(CharacteristicEventTypes.GET, function() {
-                    var _ref = _asyncToGenerator(function(callback) {
-                        var value, e;
-                        return __generator(this, function(_state) {
-                            switch(_state.label){
-                                case 0:
-                                    _state.trys.push([
-                                        0,
-                                        2,
-                                        ,
-                                        3
-                                    ]);
-                                    return [
-                                        4,
-                                        firstValueFrom(onCachedValue)
-                                    ];
-                                case 1:
-                                    value = _state.sent();
-                                    callback(null, value);
-                                    requestUpdate();
-                                    return [
-                                        3,
-                                        3
-                                    ];
-                                case 2:
-                                    e = _state.sent();
-                                    callback(e);
-                                    return [
-                                        3,
-                                        3
-                                    ];
-                                case 3:
-                                    return [
-                                        2
-                                    ];
-                            }
-                        });
-                    });
-                    return function(callback) {
-                        return _ref.apply(this, arguments);
-                    };
-                }());
+                characteristic.on(_homebridge.CharacteristicEventTypes.GET, async (callback)=>{
+                    try {
+                        const value = await (0, _rxjs.firstValueFrom)(onCachedValue);
+                        callback(null, value);
+                        requestUpdate();
+                    } catch (e) {
+                        callback(e);
+                    }
+                });
             });
         }
         if (setValue) {
-            characteristic.on(CharacteristicEventTypes.SET, function(newValue, callback) {
-                Promise.resolve(setValue(newValue)).catch(function(e) {
-                    logError(e);
+            characteristic.on(_homebridge.CharacteristicEventTypes.SET, (newValue, callback)=>{
+                Promise.resolve(setValue(newValue)).catch((e)=>{
+                    (0, _util.logError)(e);
                 });
                 callback();
             });
         }
-    };
-    _proto.pruneUnusedServices = function pruneUnusedServices() {
-        var _this = this;
-        var safeServiceUUIDs = [
-            hap.Service.CameraRTPStreamManagement.UUID,
-            hap.Service.CameraControl.UUID
+    }
+    pruneUnusedServices() {
+        const safeServiceUUIDs = [
+            _hap.hap.Service.CameraRTPStreamManagement.UUID,
+            _hap.hap.Service.CameraControl.UUID
         ];
-        this.accessory.services.forEach(function(service) {
-            if (!_this.servicesInUse.includes(service) && !safeServiceUUIDs.includes(service.UUID)) {
-                logInfo("Pruning unused service", service.UUID, service.displayName || service.name, "from", _this.device.name);
-                _this.accessory.removeService(service);
+        this.accessory.services.forEach((service)=>{
+            if (!this.servicesInUse.includes(service) && !safeServiceUUIDs.includes(service.UUID)) {
+                (0, _util.logInfo)('Pruning unused service', service.UUID, service.displayName || service.name, 'from', this.device.name);
+                this.accessory.removeService(service);
             }
         });
-    };
-    return BaseAccessory;
-}();
+    }
+    constructor(){
+        this.servicesInUse = [];
+    }
+}

package/lib/base-data-accessory.js

@@ -1,96 +1,24 @@
-function _assertThisInitialized(self) {
-    if (self === void 0) {
-        throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
-    }
-    return self;
-}
-function _classCallCheck(instance, Constructor) {
-    if (!(instance instanceof Constructor)) {
-        throw new TypeError("Cannot call a class as a function");
-    }
-}
-function _getPrototypeOf(o) {
-    _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) {
-        return o.__proto__ || Object.getPrototypeOf(o);
-    };
-    return _getPrototypeOf(o);
-}
-function _inherits(subClass, superClass) {
-    if (typeof superClass !== "function" && superClass !== null) {
-        throw new TypeError("Super expression must either be null or a function");
-    }
-    subClass.prototype = Object.create(superClass && superClass.prototype, {
-        constructor: {
-            value: subClass,
-            writable: true,
-            configurable: true
-        }
-    });
-    if (superClass) _setPrototypeOf(subClass, superClass);
-}
-function _possibleConstructorReturn(self, call) {
-    if (call && (_typeof(call) === "object" || typeof call === "function")) {
-        return call;
-    }
-    return _assertThisInitialized(self);
-}
-function _setPrototypeOf(o, p) {
-    _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {
-        o.__proto__ = p;
-        return o;
-    };
-    return _setPrototypeOf(o, p);
-}
-var _typeof = function(obj) {
-    "@swc/helpers - typeof";
-    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
-};
-function _isNativeReflectConstruct() {
-    if (typeof Reflect === "undefined" || !Reflect.construct) return false;
-    if (Reflect.construct.sham) return false;
-    if (typeof Proxy === "function") return true;
-    try {
-        Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function() {}));
-        return true;
-    } catch (e) {
-        return false;
-    }
-}
-function _createSuper(Derived) {
-    var hasNativeReflectConstruct = _isNativeReflectConstruct();
-    return function _createSuperInternal() {
-        var Super = _getPrototypeOf(Derived), result;
-        if (hasNativeReflectConstruct) {
-            var NewTarget = _getPrototypeOf(this).constructor;
-            result = Reflect.construct(Super, arguments, NewTarget);
-        } else {
-            result = Super.apply(this, arguments);
-        }
-        return _possibleConstructorReturn(this, result);
-    };
-}
-import { BaseAccessory } from "./base-accessory";
-import { Subject } from "rxjs";
-import { debounceTime, distinctUntilChanged, map } from "rxjs/operators";
-import { CharacteristicEventTypes } from "homebridge";
-import { logError } from "ring-client-api/util";
-export var BaseDataAccessory = /*#__PURE__*/ function(BaseAccessory) {
-    "use strict";
-    _inherits(BaseDataAccessory, BaseAccessory);
-    var _super = _createSuper(BaseDataAccessory);
-    function BaseDataAccessory() {
-        _classCallCheck(this, BaseDataAccessory);
-        return _super.apply(this, arguments);
-    }
-    var _proto = BaseDataAccessory.prototype;
-    _proto.registerCharacteristic = function registerCharacteristic(param) {
-        var characteristicType = param.characteristicType, serviceType = param.serviceType, getValue = param.getValue, setValue = param.setValue, _param_setValueDebounceTime = param.setValueDebounceTime, setValueDebounceTime = _param_setValueDebounceTime === void 0 ? 0 : _param_setValueDebounceTime, name = param.name, requestUpdate = param.requestUpdate, serviceSubType = param.serviceSubType;
-        var service = this.getService(serviceType, name, serviceSubType), characteristic = service.getCharacteristic(characteristicType), device = this.device;
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "BaseDataAccessory", {
+    enumerable: true,
+    get: ()=>BaseDataAccessory
+});
+const _baseAccessory = require("./base-accessory");
+const _rxjs = require("rxjs");
+const _operators = require("rxjs/operators");
+const _homebridge = require("homebridge");
+const _util = require("ring-client-api/util");
+class BaseDataAccessory extends _baseAccessory.BaseAccessory {
+    registerCharacteristic({ characteristicType , serviceType , getValue , setValue , setValueDebounceTime =0 , name , requestUpdate , serviceSubType  }) {
+        const service = this.getService(serviceType, name, serviceSubType), characteristic = service.getCharacteristic(characteristicType), { device  } = this;
         if (requestUpdate) {
             // Only register for GET if an async request should be made to get an updated value
-            characteristic.on(CharacteristicEventTypes.GET, function(callback) {
+            characteristic.on(_homebridge.CharacteristicEventTypes.GET, (callback)=>{
                 try {
-                    var value = getValue(device.data);
+                    const value = getValue(device.data);
                     callback(null, value);
                     requestUpdate();
                 } catch (e) {
@@ -99,42 +27,38 @@ export var BaseDataAccessory = /*#__PURE__*/ function(BaseAccessory) {
             });
         }
         if (setValue && setValueDebounceTime) {
-            var onValueToSet = new Subject();
-            characteristic.on(CharacteristicEventTypes.SET, function(newValue, callback) {
+            const onValueToSet = new _rxjs.Subject();
+            characteristic.on(_homebridge.CharacteristicEventTypes.SET, (newValue, callback)=>{
                 onValueToSet.next(newValue);
                 callback();
             });
-            onValueToSet.pipe(debounceTime(setValueDebounceTime)).subscribe(setValue);
+            onValueToSet.pipe((0, _operators.debounceTime)(setValueDebounceTime)).subscribe(setValue);
         } else if (setValue) {
-            characteristic.on(CharacteristicEventTypes.SET, function(newValue, callback) {
-                Promise.resolve(setValue(newValue)).catch(logError);
+            characteristic.on(_homebridge.CharacteristicEventTypes.SET, (newValue, callback)=>{
+                Promise.resolve(setValue(newValue)).catch(_util.logError);
                 callback();
             });
         }
-        this.device.onData.pipe(map(getValue), distinctUntilChanged()).subscribe(function(value) {
-            return characteristic.updateValue(value);
-        });
-    };
-    _proto.registerLevelCharacteristic = function registerLevelCharacteristic(param) {
-        var characteristicType = param.characteristicType, serviceType = param.serviceType, getValue = param.getValue, setValue = param.setValue, requestUpdate = param.requestUpdate;
-        var targetLevel;
+        this.device.onData.pipe((0, _operators.map)(getValue), (0, _operators.distinctUntilChanged)()).subscribe((value)=>characteristic.updateValue(value));
+    }
+    registerLevelCharacteristic({ characteristicType , serviceType , getValue , setValue , requestUpdate  }) {
+        let targetLevel;
         this.registerCharacteristic({
-            characteristicType: characteristicType,
-            serviceType: serviceType,
-            getValue: function(data) {
-                var newLevel = getValue(data);
+            characteristicType,
+            serviceType,
+            getValue: (data)=>{
+                const newLevel = getValue(data);
                 if (newLevel === targetLevel) {
                     targetLevel = undefined;
                 }
                 return targetLevel === undefined ? newLevel : targetLevel;
             },
-            setValue: function(level) {
+            setValue: (level)=>{
                 targetLevel = level;
                 setValue(level);
             },
             setValueDebounceTime: 500,
-            requestUpdate: requestUpdate
+            requestUpdate
         });
-    };
-    return BaseDataAccessory;
-}(BaseAccessory);
+    }
+}