ring-client-api 10.0.0-beta.4 → 10.0.0-beta.5

package/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [10.0.0-beta.5](https://github.com/dgreif/ring/compare/v10.0.0-beta.4...v10.0.0-beta.5) (2022-04-10)
+
+
+### Bug Fixes
+
+* **cameras:** wait to activate session until connected ([9a49389](https://github.com/dgreif/ring/commit/9a49389aa434cc5df4cfb4ba039bad0f2a30f756))
+* handle push notification for unknown camera ([cc8fc2a](https://github.com/dgreif/ring/commit/cc8fc2a6377084515d3b169a85644b2a2b13235e))
+* hide ECONNRESET errors from push receiver ([1196d96](https://github.com/dgreif/ring/commit/1196d96e67e26952f18dfbe75103419a7261bd1e))
+* restore dual battery level calculations ([26fa84d](https://github.com/dgreif/ring/commit/26fa84dbd4bbcea8208fd0ade81c54c407aabf63))
+* update dependencies ([4b97fb3](https://github.com/dgreif/ring/commit/4b97fb33623248147997944bab3de4ea3c2e5ee2))
+
 ## [10.0.0-beta.4](https://github.com/dgreif/ring/compare/v10.0.0-beta.3...v10.0.0-beta.4) (2022-04-03)
 
 

package/lib/api/api.js

@@ -126,7 +126,7 @@ class RingApi extends subscribed_1.Subscribed {
                 }
             }));
             pushReceiver.onNotification(({ message }) => {
-                var _a;
+                var _a, _b;
                 const dataJson = (_a = message.data) === null || _a === void 0 ? void 0 : _a.gcmData;
                 try {
                     const notification = JSON.parse(dataJson);
@@ -134,7 +134,7 @@ class RingApi extends subscribed_1.Subscribed {
                         // We may get notification that are not for a ding/motion, which can be ignored
                         return;
                     }
-                    camerasById[notification.ding.doorbot_id].processPushNotification(notification);
+                    (_b = camerasById[notification.ding.doorbot_id]) === null || _b === void 0 ? void 0 : _b.processPushNotification(notification);
                 }
                 catch (e) {
                     (0, util_1.logError)(e);

package/lib/api/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/api/live-call-ring-edge.js

@@ -236,7 +236,7 @@ class LiveCallRingEdge extends subscribed_1.Subscribed {
                 return;
             }
             this.activated = true;
-            yield (0, rxjs_1.firstValueFrom)(this.onCallAnswered);
+            yield (0, rxjs_1.firstValueFrom)(this.pc.onConnectionState.pipe((0, operators_1.filter)((state) => state === 'connected')));
             (0, util_1.logInfo)('Activating Session');
             this.sendSessionMessage('activate_session');
         });

package/lib/api/live-call.js

@@ -145,7 +145,8 @@ class LiveCall extends subscribed_1.Subscribed {
                 return;
             }
             this.activated = true;
-            yield (0, rxjs_1.firstValueFrom)(this.onCallAnswered);
+            yield (0, rxjs_1.firstValueFrom)(this.pc.onConnectionState.pipe((0, operators_1.filter)((state) => state === 'connected')));
+            (0, util_1.logInfo)('Activating Session');
             this.sendMessage({ method: 'activate_session' });
             this.sendMessage({
                 video_enabled: true,

package/lib/api/ring-camera.d.ts

@@ -6,7 +6,9 @@ import { DeepPartial } from './util';
 import { Subscribed } from './subscribed';
 import { FfmpegOptions, LiveCall } from './live-call';
 import { LiveCallRingEdge } from './live-call-ring-edge';
-export declare function getBatteryLevel({ health }: Pick<CameraData, 'health'>): number | null;
+export declare function getBatteryLevel(data: Pick<CameraData, 'battery_life' | 'battery_life_2'> & {
+    health?: Partial<CameraData['health']>;
+}): number | null;
 export declare function getSearchQueryString(options: CameraEventOptions | (HistoryOptions & {
     accountId: string;
 })): string;

package/lib/api/ring-camera.js

@@ -19,17 +19,34 @@ const subscribed_1 = require("./subscribed");
 const live_call_1 = require("./live-call");
 const live_call_ring_edge_1 = require("./live-call-ring-edge");
 const maxSnapshotRefreshSeconds = 15, fullDayMs = 24 * 60 * 60 * 1000;
+function parseBatteryLife(batteryLife) {
+    if (batteryLife === null || batteryLife === undefined) {
+        return null;
+    }
+    const batteryLevel = typeof batteryLife === 'number'
+        ? batteryLife
+        : Number.parseFloat(batteryLife);
+    if (isNaN(batteryLevel)) {
+        return null;
+    }
+    return batteryLevel;
+}
 function getStartOfToday() {
     return new Date(new Date().toLocaleDateString()).getTime();
 }
 function getEndOfToday() {
     return getStartOfToday() + fullDayMs - 1;
 }
-function getBatteryLevel({ health }) {
-    if (!health.battery_percentage && !health.battery_present) {
+function getBatteryLevel(data) {
+    const levels = [
+        parseBatteryLife(data.battery_life),
+        parseBatteryLife(data.battery_life_2),
+    ].filter((level) => level !== null), { health } = data;
+    if (!levels.length ||
+        (health && !health.battery_percentage && !health.battery_present)) {
         return null;
     }
-    return health.battery_percentage || 0;
+    return Math.min(...levels);
 }
 exports.getBatteryLevel = getBatteryLevel;
 function getSearchQueryString(options) {
@@ -117,7 +134,7 @@ class RingCamera extends subscribed_1.Subscribed {
         return this.data.alerts.battery === 'low';
     }
     get isCharging() {
-        return Boolean(this.data.health.ac_power || this.data.health.ext_power_state);
+        return this.initialData.external_connection;
     }
     get operatingOnBattery() {
         return this.hasBattery && this.data.settings.power_mode !== 'wired';

package/lib/api/util.js

@@ -18,6 +18,7 @@ const colors_1 = require("colors");
 const readline_1 = require("readline");
 const uuid_1 = require("uuid");
 const systeminformation_1 = require("systeminformation");
+const logger_1 = __importDefault(require("@eneris/push-receiver/dist/utils/logger"));
 const debugLogger = (0, debug_1.default)('ring'), uuidNamespace = 'e53ffdc0-e91d-4ce1-bec2-df939d94739d';
 let logger = {
     logInfo(message) {
@@ -120,3 +121,9 @@ function randomString(length) {
     return uuid.replace(/-/g, '').substring(0, length).toLowerCase();
 }
 exports.randomString = randomString;
+// Override push receiver logging to avoid ECONNRESET errors leaking
+function logPushReceiver(...args) {
+    logDebug('[Push Receiver]');
+    logDebug(args[0]);
+}
+logger_1.default.error = logPushReceiver;

package/lib/test/api/ring-camera.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/test/api/ring-camera.spec.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const api_1 = require("../../api");
+describe('Ring Camera', () => {
+    describe('battery level', () => {
+        it('should handle string battery life', () => {
+            expect((0, api_1.getBatteryLevel)({
+                battery_life: '49',
+            })).toEqual(49);
+        });
+        it('should handle null battery life', () => {
+            expect((0, api_1.getBatteryLevel)({ battery_life: null })).toEqual(null);
+        });
+        it('should handle right battery only', () => {
+            expect((0, api_1.getBatteryLevel)({ battery_life: null, battery_life_2: 24 })).toEqual(24);
+        });
+        it('should handle left battery only', () => {
+            expect((0, api_1.getBatteryLevel)({ battery_life: 76, battery_life_2: null })).toEqual(76);
+        });
+        it('should handle dual batteries', () => {
+            expect((0, api_1.getBatteryLevel)({ battery_life: '92', battery_life_2: 84 })).toEqual(84);
+            expect((0, api_1.getBatteryLevel)({ battery_life: '92', battery_life_2: 100 })).toEqual(92);
+        });
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ring-client-api",
-  "version": "10.0.0-beta.4",
+  "version": "10.0.0-beta.5",
   "description": "Unofficial API for Ring doorbells, cameras, security alarm system and smart lighting",
   "main": "lib/api/index.js",
   "bin": {
@@ -10,7 +10,7 @@
   "scripts": {
     "start": "concurrently -c yellow,blue --kill-others \"npm:hb\" \"npm:watch:ui\"",
     "watch:ui": "npm start --prefix homebridge-ui",
-    "test": "eslint '**/*.ts'",
+    "test": "jest && eslint '**/*.ts'",
     "watch:tests": "jest --watch",
     "lint": "eslint '**/*.ts' --fix",
     "build": "rm -rf lib && tsc --declaration",
@@ -58,42 +58,42 @@
     "@eneris/push-receiver": "^3.0.1",
     "@homebridge/camera-utils": "2.1.0",
     "@homebridge/plugin-ui-utils": "0.0.19",
-    "@koush/werift": "0.14.5-beta7",
+    "@koush/werift": "0.14.5-beta9",
     "@types/socket.io-client": "1.4.36",
     "colors": "1.4.0",
-    "debug": "4.3.3",
+    "debug": "4.3.4",
     "got": "11.8.3",
-    "rxjs": "7.5.2",
+    "rxjs": "7.5.5",
     "socket.io-client": "2.4.0",
-    "systeminformation": "5.10.7",
+    "systeminformation": "5.11.9",
     "uuid": "8.3.2",
-    "ws": "8.4.2"
+    "ws": "8.5.0"
   },
   "devDependencies": {
     "@types/debug": "4.1.7",
-    "@types/jest": "27.4.0",
-    "@types/node": "17.0.10",
+    "@types/jest": "27.4.1",
+    "@types/node": "17.0.23",
     "@types/uuid": "8.3.4",
-    "@types/ws": "^8.2.2",
-    "@typescript-eslint/eslint-plugin": "5.10.0",
-    "@typescript-eslint/parser": "5.10.0",
-    "concurrently": "^7.0.0",
+    "@types/ws": "^8.5.3",
+    "@typescript-eslint/eslint-plugin": "5.18.0",
+    "@typescript-eslint/parser": "5.18.0",
+    "concurrently": "^7.1.0",
     "conventional-github-releaser": "3.1.5",
-    "dotenv": "14.2.0",
-    "esbuild": "^0.14.19",
-    "eslint": "8.7.0",
-    "eslint-config-prettier": "8.3.0",
-    "eslint-plugin-jest": "25.7.0",
+    "dotenv": "16.0.0",
+    "esbuild": "^0.14.34",
+    "eslint": "8.13.0",
+    "eslint-config-prettier": "8.5.0",
+    "eslint-plugin-jest": "26.1.4",
     "eslint-plugin-prettier": "4.0.0",
-    "express": "4.17.2",
+    "express": "4.17.3",
     "homebridge": "1.4.0",
-    "jest": "27.4.7",
-    "prettier": "2.5.1",
+    "jest": "27.5.1",
+    "prettier": "2.6.2",
     "reflect-metadata": "0.1.13",
     "rimraf": "3.0.2",
     "standard-version": "9.3.2",
-    "ts-jest": "27.1.3",
-    "typescript": "4.5.5"
+    "ts-jest": "27.1.4",
+    "typescript": "4.6.3"
   },
   "engines": {
     "node": "^12.20 || ^14 || ^16",