ring-client-api 11.7.2 → 11.7.4

package/lib/ring-camera.d.ts

@@ -14,6 +14,7 @@ export declare function getBatteryLevel(data: Pick<CameraData, 'battery_life' |
 export declare function getSearchQueryString(options: CameraEventOptions | (HistoryOptions & {
     accountId: string;
 })): string;
+export declare function cleanSnapshotUuid(uuid?: string | null): string | null | undefined;
 export declare class RingCamera extends Subscribed {
     private initialData;
     isDoorbot: boolean;
@@ -40,6 +41,7 @@ export declare class RingCamera extends Subscribed {
     get name(): string;
     get activeNotifications(): PushNotificationDing[];
     get latestNotification(): PushNotificationDing | undefined;
+    get latestNotificationSnapshotUuid(): string | undefined;
     get batteryLevel(): number | null;
     get hasBattery(): boolean;
     get hasLowBattery(): boolean;

package/lib/ring-camera.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RingCamera = exports.getSearchQueryString = exports.getBatteryLevel = void 0;
+exports.RingCamera = exports.cleanSnapshotUuid = exports.getSearchQueryString = exports.getBatteryLevel = void 0;
 const ring_types_1 = require("./ring-types");
 const rest_client_1 = require("./rest-client");
 const rxjs_1 = require("rxjs");
@@ -58,6 +58,13 @@ function getSearchQueryString(options) {
     return queryString.length ? `?${queryString}` : '';
 }
 exports.getSearchQueryString = getSearchQueryString;
+function cleanSnapshotUuid(uuid) {
+    if (!uuid) {
+        return uuid;
+    }
+    return uuid.replace(/:.*$/, '');
+}
+exports.cleanSnapshotUuid = cleanSnapshotUuid;
 class RingCamera extends subscribed_1.Subscribed {
     constructor(initialData, isDoorbot, restClient, avoidSnapshotBatteryDrain) {
         super();
@@ -124,6 +131,10 @@ class RingCamera extends subscribed_1.Subscribed {
         const notifications = this.activeNotifications;
         return notifications[notifications.length - 1];
     }
+    get latestNotificationSnapshotUuid() {
+        const notification = this.latestNotification;
+        return notification?.ding.image_uuid;
+    }
     get batteryLevel() {
         if (!('battery_life' in this.data)) {
             return null;
@@ -368,7 +379,7 @@ class RingCamera extends subscribed_1.Subscribed {
                 'after-ms': afterMs,
                 'max-wait-ms': maxWaitMs,
                 extras: force ? 'force' : undefined,
-                uuid,
+                uuid: cleanSnapshotUuid(uuid),
             },
             headers: {
                 accept: 'image/jpeg',
@@ -381,7 +392,7 @@ class RingCamera extends subscribed_1.Subscribed {
     }
     getSnapshotByUuid(uuid) {
         return this.restClient.request({
-            url: (0, rest_client_1.clientApi)('snapshots/uuid?uuid=' + uuid),
+            url: (0, rest_client_1.clientApi)('snapshots/uuid?uuid=' + cleanSnapshotUuid(uuid)),
             responseType: 'buffer',
             headers: {
                 accept: 'image/jpeg',

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

@@ -22,4 +22,16 @@ describe('Ring Camera', () => {
             expect((0, index_1.getBatteryLevel)({ battery_life: '92', battery_life_2: 100 })).toEqual(92);
         });
     });
+    describe('cleanSnapshotUuid', () => {
+        it('should return the original uuid if it is already clean', () => {
+            expect((0, index_1.cleanSnapshotUuid)('c2a0a397-3538-422d-bb4e-51837a56b870')).toBe('c2a0a397-3538-422d-bb4e-51837a56b870');
+        });
+        it('should return remove anything after :', () => {
+            expect((0, index_1.cleanSnapshotUuid)('c2a0a397-3538-422d-bb4e-51837a56b870:122429140')).toBe('c2a0a397-3538-422d-bb4e-51837a56b870');
+        });
+        it('should handle falsy values', () => {
+            expect((0, index_1.cleanSnapshotUuid)(undefined)).toBe(undefined);
+            expect((0, index_1.cleanSnapshotUuid)(null)).toBe(null);
+        });
+    });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ring-client-api",
-  "version": "11.7.2",
+  "version": "11.7.4",
   "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.18.1",
+    "@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.17.10",
+    "systeminformation": "^5.17.12",
     "uuid": "^9.0.0",
-    "ws": "^8.12.1"
+    "webcrypto-core": "^1.7.7",
+    "werift": "0.18.2",
+    "ws": "^8.13.0"
   },
   "devDependencies": {
     "@types/debug": "4.1.7",
-    "@types/jest": "29.4.0",
-    "@types/node": "18.14.1",
+    "@types/jest": "29.5.0",
+    "@types/node": "18.15.9",
     "@types/uuid": "9.0.1",
     "@types/ws": "^8.5.4",
-    "eslint-config-shared": "0.0.0",
-    "jest": "29.4.3",
+    "eslint-config-shared": "*",
+    "jest": "29.5.0",
     "ts-jest": "29.0.5",
-    "tsconfig": "0.0.0",
-    "typescript": "4.9.5"
+    "tsconfig": "*",
+    "typescript": "5.0.2"
   },
   "engines": {
     "node": "^16 || ^18"