ring-client-api 11.7.1 → 11.7.3

package/lib/api.js

@@ -88,7 +88,7 @@ class RingApi extends subscribed_1.Subscribed {
             byId[intercom.id] = intercom;
             return byId;
         }, {});
-        if (!cameras.length && !chimes.length) {
+        if (!cameras.length && !chimes.length && !intercoms.length) {
             return;
         }
         this.addSubscriptions((0, rxjs_1.merge)(onDeviceRequestUpdate, onPollForStatusUpdate)

package/lib/device-data.js

@@ -61,6 +61,7 @@ async function logDeviceData() {
             name: location.name,
             cameras: location.cameras.map((camera) => camera.data),
             chimes: location.chimes.map((chime) => chime.data),
+            intercoms: location.intercoms.map((intercom) => intercom.data),
             devices: devices.map((device) => device.data),
         };
     }), results = {

package/lib/streaming/peer-connection.js

@@ -55,6 +55,10 @@ class WeriftPeerConnection extends subscribed_1.Subscribed {
                         ],
                         parameters: 'packetization-mode=1;profile-level-id=640029;level-asymmetry-allowed=1',
                     }),
+                    new werift_1.RTCRtpCodecParameters({
+                        mimeType: 'video/rtx',
+                        clockRate: 90000,
+                    }),
                 ],
             },
             iceServers: ringIceServers.map((server) => ({ urls: server })),

package/lib/streaming/streaming-connection-base.d.ts

@@ -11,6 +11,7 @@ export declare abstract class StreamingConnectionBase extends Subscribed {
     protected options: StreamingConnectionOptions;
     readonly onCallAnswered: ReplaySubject<string>;
     readonly onCallEnded: ReplaySubject<void>;
+    readonly onError: ReplaySubject<void>;
     readonly onMessage: ReplaySubject<{
         method: string;
     }>;

package/lib/streaming/streaming-connection-base.js

@@ -13,6 +13,7 @@ class StreamingConnectionBase extends subscribed_1.Subscribed {
         this.options = options;
         this.onCallAnswered = new rxjs_1.ReplaySubject(1);
         this.onCallEnded = new rxjs_1.ReplaySubject(1);
+        this.onError = new rxjs_1.ReplaySubject(1);
         this.onMessage = new rxjs_1.ReplaySubject();
         this.hasEnded = false;
         if (options.createPeerConnection) {
@@ -35,7 +36,14 @@ class StreamingConnectionBase extends subscribed_1.Subscribed {
             .pipe((0, operators_1.concatMap)((event) => {
             const message = JSON.parse(event.data);
             this.onMessage.next(message);
-            return this.handleMessage(message);
+            return this.handleMessage(message).catch((e) => {
+                if (e instanceof Error &&
+                    e.message.includes('negotiate codecs failed')) {
+                    e = new Error('Failed to negotiate codecs.  This is a known issue with Ring cameras.  Please see https://github.com/dgreif/ring/wiki/Streaming-Legacy-Mode');
+                }
+                this.onError.next(e);
+                throw e;
+            });
         }))
             .subscribe(), onError.subscribe((e) => {
             (0, util_1.logError)(e);
@@ -51,6 +59,9 @@ class StreamingConnectionBase extends subscribed_1.Subscribed {
                 (0, util_1.logDebug)('Stream connection closed');
                 this.callEnded();
             }
+        }), this.onError.subscribe((e) => {
+            (0, util_1.logError)(e);
+            this.callEnded();
         }));
     }
     activate() {

package/lib/streaming/streaming-session.js

@@ -56,7 +56,9 @@ class StreamingSession extends subscribed_1.Subscribed {
         return ports[0];
     }
     get isUsingOpus() {
-        return (0, rxjs_1.firstValueFrom)(this.onUsingOpus);
+        return (0, rxjs_1.firstValueFrom)(this.onUsingOpus.pipe((0, operators_1.mergeWith)(this.connection.onError.pipe((0, operators_1.map)((e) => {
+            throw e;
+        })))));
     }
     async startTranscoding(ffmpegOptions) {
         if (this.hasEnded) {

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

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

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ring-client-api",
-  "version": "11.7.1",
+  "version": "11.7.3",
   "description": "Unofficial API for Ring doorbells, cameras, security alarm system and smart lighting",
   "main": "lib/index.js",
   "exports": {
@@ -19,28 +19,31 @@
   "dependencies": {
     "@eneris/push-receiver": "^3.1.4",
     "@homebridge/camera-utils": "^2.2.0",
-    "werift": "0.17.5",
+    "@peculiar/asn1-schema": "^2.3.6",
+    "@peculiar/webcrypto": "^1.4.3",
     "@types/socket.io-client": "1.4.36",
     "colors": "1.4.0",
     "debug": "^4.3.4",
     "got": "^11.8.5",
     "rxjs": "^7.8.0",
     "socket.io-client": "^2.5.0",
-    "systeminformation": "^5.16.9",
+    "systeminformation": "^5.17.12",
     "uuid": "^9.0.0",
-    "ws": "^8.11.0"
+    "webcrypto-core": "^1.7.7",
+    "werift": "0.18.2",
+    "ws": "^8.13.0"
   },
   "devDependencies": {
     "@types/debug": "4.1.7",
-    "@types/jest": "29.2.4",
-    "@types/node": "18.11.17",
-    "@types/uuid": "9.0.0",
-    "@types/ws": "^8.5.3",
-    "eslint-config-shared": "0.0.0",
-    "jest": "29.3.1",
-    "ts-jest": "29.0.3",
-    "tsconfig": "0.0.0",
-    "typescript": "4.9.4"
+    "@types/jest": "29.5.0",
+    "@types/node": "18.15.9",
+    "@types/uuid": "9.0.1",
+    "@types/ws": "^8.5.4",
+    "eslint-config-shared": "*",
+    "jest": "29.5.0",
+    "ts-jest": "29.0.5",
+    "tsconfig": "*",
+    "typescript": "5.0.2"
   },
   "engines": {
     "node": "^16 || ^18"