ring-client-api 13.2.1 → 14.0.0-beta.1

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

@@ -1,37 +1,36 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const index_1 = require("../index");
+import { getBatteryLevel, cleanSnapshotUuid } from "../ring-camera.js";
+import { describe, expect, it } from 'vitest';
 describe('Ring Camera', () => {
     describe('battery level', () => {
         it('should handle string battery life', () => {
-            expect((0, index_1.getBatteryLevel)({
+            expect(getBatteryLevel({
                 battery_life: '49',
             })).toEqual(49);
         });
         it('should handle null battery life', () => {
-            expect((0, index_1.getBatteryLevel)({ battery_life: null })).toEqual(null);
+            expect(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);
+            expect(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);
+            expect(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);
+            expect(getBatteryLevel({ battery_life: '92', battery_life_2: 84 })).toEqual(84);
+            expect(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');
+            expect(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');
+            expect(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);
+            expect(cleanSnapshotUuid(undefined)).toBe(undefined);
+            expect(cleanSnapshotUuid(null)).toBe(null);
         });
     });
 });

package/lib/util.js

@@ -1,47 +1,25 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearTimeouts = clearTimeouts;
-exports.delay = delay;
-exports.logDebug = logDebug;
-exports.logInfo = logInfo;
-exports.logError = logError;
-exports.useLogger = useLogger;
-exports.enableDebug = enableDebug;
-exports.generateUuid = generateUuid;
-exports.getHardwareId = getHardwareId;
-exports.requestInput = requestInput;
-exports.stringify = stringify;
-exports.mapAsync = mapAsync;
-exports.randomInteger = randomInteger;
-exports.randomString = randomString;
-exports.fromBase64 = fromBase64;
-exports.toBase64 = toBase64;
-exports.buildSearchString = buildSearchString;
-const debug_1 = __importDefault(require("debug"));
-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';
+import debug from 'debug';
+import colors from 'colors';
+import { createInterface } from 'readline';
+import { v4 as generateRandomUuid, v5 as generateUuidFromNamespace } from 'uuid';
+import { uuid as getSystemUuid } from 'systeminformation';
+import pushReceiverLogger from '@eneris/push-receiver/dist/utils/logger.js';
+const debugLogger = debug('ring'), uuidNamespace = 'e53ffdc0-e91d-4ce1-bec2-df939d94739d';
 let logger = {
     logInfo(message) {
         debugLogger(message);
     },
     logError(message) {
-        debugLogger((0, colors_1.red)(message));
+        debugLogger(colors.red(message));
     },
 }, debugEnabled = false;
 const timeouts = new Set();
-function clearTimeouts() {
+export function clearTimeouts() {
     timeouts.forEach((timeout) => {
         clearTimeout(timeout);
     });
 }
-function delay(milliseconds) {
+export function delay(milliseconds) {
     return new Promise((resolve) => {
         const timeout = setTimeout(() => {
             timeouts.delete(timeout);
@@ -50,50 +28,50 @@ function delay(milliseconds) {
         timeouts.add(timeout);
     });
 }
-function logDebug(message) {
+export function logDebug(message) {
     if (debugEnabled) {
         logger.logInfo(message);
     }
 }
-function logInfo(...message) {
+export function logInfo(...message) {
     logger.logInfo(...message);
 }
-function logError(message) {
+export function logError(message) {
     logger.logError(message);
 }
-function useLogger(newLogger) {
+export function useLogger(newLogger) {
     logger = newLogger;
 }
-function enableDebug() {
+export function enableDebug() {
     debugEnabled = true;
 }
-function generateUuid(seed) {
+export function generateUuid(seed) {
     if (seed) {
-        return (0, uuid_1.v5)(seed, uuidNamespace);
+        return generateUuidFromNamespace(seed, uuidNamespace);
     }
-    return (0, uuid_1.v4)();
+    return generateRandomUuid();
 }
-async function getHardwareId(systemId) {
+export async function getHardwareId(systemId) {
     if (systemId) {
         return generateUuid(systemId);
     }
     const timeoutValue = '-1', { os: id } = await Promise.race([
-        (0, systeminformation_1.uuid)(),
+        getSystemUuid(),
         delay(5000).then(() => ({ os: timeoutValue })),
     ]);
     if (id === timeoutValue) {
         logError('Request for system uuid timed out.  Falling back to random session id');
-        return (0, uuid_1.v4)();
+        return generateRandomUuid();
     }
     if (id === '-') {
         // default value set by systeminformation if it can't find a real value
         logError('Unable to get system uuid.  Falling back to random session id');
-        return (0, uuid_1.v4)();
+        return generateRandomUuid();
     }
     return generateUuid(id);
 }
-async function requestInput(question) {
-    const lineReader = (0, readline_1.createInterface)({
+export async function requestInput(question) {
+    const lineReader = createInterface({
         input: process.stdin,
         output: process.stdout,
     }), answer = await new Promise((resolve) => {
@@ -102,7 +80,7 @@ async function requestInput(question) {
     lineReader.close();
     return answer.trim();
 }
-function stringify(data) {
+export function stringify(data) {
     if (typeof data === 'string') {
         return data;
     }
@@ -111,13 +89,13 @@ function stringify(data) {
     }
     return JSON.stringify(data) + '';
 }
-function mapAsync(records, asyncMapper) {
+export function mapAsync(records, asyncMapper) {
     return Promise.all(records.map((record) => asyncMapper(record)));
 }
-function randomInteger() {
+export function randomInteger() {
     return Math.floor(Math.random() * 99999999) + 100000;
 }
-function randomString(length) {
+export function randomString(length) {
     const uuid = generateUuid();
     return uuid.replace(/-/g, '').substring(0, length).toLowerCase();
 }
@@ -135,16 +113,17 @@ function logPushReceiver(...args) {
     logDebug('[Push Receiver]');
     logDebug(args[0]);
 }
-logger_1.default.error = logPushReceiver;
-function fromBase64(encodedInput) {
+const pushReceiverLoggerDefault = pushReceiverLogger.default || pushReceiverLogger; // fix for vitest
+pushReceiverLoggerDefault.error = logPushReceiver;
+export function fromBase64(encodedInput) {
     const buff = Buffer.from(encodedInput, 'base64');
     return buff.toString('ascii');
 }
-function toBase64(input) {
+export function toBase64(input) {
     const buff = Buffer.from(input);
     return buff.toString('base64');
 }
-function buildSearchString(search) {
+export function buildSearchString(search) {
     return ('?' +
         Object.entries(search)
             .filter(([, value]) => value !== undefined && value !== null)

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "ring-client-api",
-  "version": "13.2.1",
+  "version": "14.0.0-beta.1",
   "description": "Unofficial API for Ring doorbells, cameras, security alarm system and smart lighting",
   "main": "lib/index.js",
+  "type": "module",
   "exports": {
     ".": "./lib/index.js",
     "./ffmpeg": "./lib/ffmpeg.js",
@@ -11,40 +12,37 @@
     "./streaming/streaming-session": "./lib/streaming/streaming-session.js"
   },
   "scripts": {
-    "build": "rm -rf lib && tsc --declaration && chmod +x ./lib/ring-*-cli.js",
+    "build": "rm -rf lib && tsc --declaration && chmod +x ./lib/ring-*-cli.js && rm -rf ./lib/test",
     "dev": "tsc --declaration --watch --preserveWatchOutput",
     "lint": "eslint .",
-    "test": "jest",
-    "test:watch": "jest --watch"
+    "test": "vitest run"
   },
   "dependencies": {
     "@eneris/push-receiver": "4.3.0",
-    "@homebridge/camera-utils": "^2.2.7",
+    "@homebridge/camera-utils": "^3.0.0",
     "colors": "1.4.0",
-    "debug": "^4.3.7",
+    "debug": "^4.4.0",
     "json-bigint": "^1.0.0",
-    "rxjs": "^7.8.1",
+    "rxjs": "^7.8.2",
     "socket.io-client": "^2.5.0",
-    "systeminformation": "^5.23.5",
-    "undici": "^6.21.0",
-    "uuid": "^11.0.3",
-    "werift": "0.20.1",
-    "ws": "^8.18.0"
+    "systeminformation": "^5.25.11",
+    "undici": "^7.8.0",
+    "uuid": "^11.1.0",
+    "werift": "0.22.1",
+    "ws": "^8.18.1"
   },
   "devDependencies": {
     "@types/debug": "4.1.12",
-    "@types/jest": "29.5.14",
     "@types/json-bigint": "^1.0.4",
-    "@types/node": "22.9.3",
+    "@types/node": "22.14.1",
     "@types/socket.io-client": "1.4.36",
     "@types/uuid": "10.0.0",
-    "@types/ws": "^8.5.13",
+    "@types/ws": "^8.18.1",
     "eslint-config-shared": "*",
-    "jest": "29.7.0",
-    "msw": "^2.6.4",
-    "ts-jest": "29.2.5",
+    "msw": "^2.7.5",
     "tsconfig": "*",
-    "typescript": "5.7.2"
+    "typescript": "5.8.3",
+    "vitest": "^3.1.1"
   },
   "engines": {
     "node": "^18 || ^20 || ^22"