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

package/lib/ring-camera.d.ts

@@ -1,11 +1,13 @@
-import { CameraData, CameraDeviceSettingsData, CameraEventOptions, CameraEventResponse, CameraHealth, HistoryOptions, PeriodicFootageResponse, PushNotificationDingV2, VideoSearchResponse, OnvifCameraData, RingCameraKind, PushNotification } from './ring-types';
-import { RingRestClient } from './rest-client';
+import { RingCameraKind } from './ring-types.ts';
+import { type CameraData, type CameraDeviceSettingsData, type CameraEventOptions, type CameraEventResponse, type CameraHealth, type HistoryOptions, type PeriodicFootageResponse, type PushNotificationDingV2, type VideoSearchResponse, type OnvifCameraData, type PushNotification } from './ring-types.ts';
+import type { RingRestClient } from './rest-client.ts';
 import { BehaviorSubject, Subject } from 'rxjs';
-import { DeepPartial } from './util';
-import { Subscribed } from './subscribed';
-import { StreamingConnectionOptions } from './streaming/webrtc-connection';
-import { FfmpegOptions, StreamingSession } from './streaming/streaming-session';
-import { SimpleWebRtcSession } from './streaming/simple-webrtc-session';
+import { type DeepPartial } from './util.ts';
+import { Subscribed } from './subscribed.ts';
+import type { StreamingConnectionOptions } from './streaming/webrtc-connection.ts';
+import type { FfmpegOptions } from './streaming/streaming-session.ts';
+import { StreamingSession } from './streaming/streaming-session.ts';
+import { SimpleWebRtcSession } from './streaming/simple-webrtc-session.ts';
 export type AnyCameraData = CameraData | OnvifCameraData;
 export declare function getBatteryLevel(data: Pick<CameraData, 'battery_life' | 'battery_life_2'> & {
     health?: Partial<CameraData['health']>;
@@ -15,12 +17,8 @@ export declare function getSearchQueryString(options: CameraEventOptions | (Hist
 })): string;
 export declare function cleanSnapshotUuid(uuid?: string | null): string | null | undefined;
 export declare class RingCamera extends Subscribed {
-    private initialData;
-    isDoorbot: boolean;
-    private restClient;
-    private avoidSnapshotBatteryDrain;
     id: number;
-    deviceType: RingCameraKind.onvif_camera | Omit<RingCameraKind, RingCameraKind.onvif_camera>;
+    deviceType: "onvif_camera" | Omit<RingCameraKind, "onvif_camera">;
     model: string;
     onData: BehaviorSubject<AnyCameraData>;
     hasLight: boolean;
@@ -33,6 +31,10 @@ export declare class RingCamera extends Subscribed {
     onMotionStarted: import("rxjs").Observable<null>;
     onBatteryLevel: import("rxjs").Observable<number | null>;
     onInHomeDoorbellStatus: import("rxjs").Observable<boolean>;
+    private initialData;
+    isDoorbot: boolean;
+    private restClient;
+    private avoidSnapshotBatteryDrain;
     constructor(initialData: AnyCameraData, isDoorbot: boolean, restClient: RingRestClient, avoidSnapshotBatteryDrain: boolean);
     updateData(update: AnyCameraData): void;
     requestUpdate(): void;
@@ -46,6 +48,7 @@ export declare class RingCamera extends Subscribed {
     get hasLowBattery(): boolean;
     get isCharging(): boolean;
     get operatingOnBattery(): boolean;
+    get canTakeSnapshotWhileRecording(): boolean;
     get isOffline(): boolean;
     get isRingEdgeEnabled(): boolean;
     get hasInHomeDoorbell(): boolean;
@@ -54,24 +57,24 @@ export declare class RingCamera extends Subscribed {
     setLight(on: boolean): Promise<boolean>;
     setSiren(on: boolean): Promise<boolean>;
     setSettings(settings: DeepPartial<CameraData['settings']>): Promise<void>;
-    setDeviceSettings(settings: DeepPartial<CameraDeviceSettingsData>): Promise<CameraDeviceSettingsData & import("./rest-client").ExtendedResponse>;
-    getDeviceSettings(): Promise<CameraDeviceSettingsData & import("./rest-client").ExtendedResponse>;
+    setDeviceSettings(settings: DeepPartial<CameraDeviceSettingsData>): Promise<CameraDeviceSettingsData & import("./rest-client.ts").ExtendedResponse>;
+    getDeviceSettings(): Promise<CameraDeviceSettingsData & import("./rest-client.ts").ExtendedResponse>;
     setInHomeDoorbell(enable: boolean): Promise<boolean>;
     getHealth(): Promise<CameraHealth>;
     private createStreamingConnection;
     startLiveCall(options?: StreamingConnectionOptions): Promise<StreamingSession>;
     private removeDingById;
     processPushNotification(notification: PushNotification): void;
-    getEvents(options?: CameraEventOptions): Promise<CameraEventResponse & import("./rest-client").ExtendedResponse>;
+    getEvents(options?: CameraEventOptions): Promise<CameraEventResponse & import("./rest-client.ts").ExtendedResponse>;
     videoSearch({ dateFrom, dateTo, order }?: {
         dateFrom: number;
         dateTo: number;
         order?: string | undefined;
-    }): Promise<VideoSearchResponse & import("./rest-client").ExtendedResponse>;
+    }): Promise<VideoSearchResponse & import("./rest-client.ts").ExtendedResponse>;
     getPeriodicalFootage({ startAtMs, endAtMs }?: {
         startAtMs: number;
         endAtMs: number;
-    }): Promise<PeriodicFootageResponse & import("./rest-client").ExtendedResponse>;
+    }): Promise<PeriodicFootageResponse & import("./rest-client.ts").ExtendedResponse>;
     getRecordingUrl(dingIdStr: string, { transcoded }?: {
         transcoded?: boolean | undefined;
     }): Promise<string>;
@@ -94,8 +97,8 @@ export declare class RingCamera extends Subscribed {
         maxWaitMs?: number;
         force?: boolean;
         uuid?: string;
-    }): Promise<Buffer<ArrayBufferLike> & import("./rest-client").ExtendedResponse>;
-    getSnapshotByUuid(uuid: string): Promise<Buffer<ArrayBufferLike> & import("./rest-client").ExtendedResponse>;
+    }): Promise<Buffer<ArrayBufferLike> & import("./rest-client.ts").ExtendedResponse>;
+    getSnapshotByUuid(uuid: string): Promise<Buffer<ArrayBufferLike> & import("./rest-client.ts").ExtendedResponse>;
     recordToFile(outputPath: string, duration?: number): Promise<void>;
     streamVideo(ffmpegOptions: FfmpegOptions): Promise<StreamingSession>;
     /**
@@ -105,9 +108,9 @@ export declare class RingCamera extends Subscribed {
      * enabled as soon as the stream starts, which can drain the battery more quickly.
      */
     createSimpleWebRtcSession(): SimpleWebRtcSession;
-    subscribeToDingEvents(): Promise<void & import("./rest-client").ExtendedResponse>;
-    unsubscribeFromDingEvents(): Promise<void & import("./rest-client").ExtendedResponse>;
-    subscribeToMotionEvents(): Promise<void & import("./rest-client").ExtendedResponse>;
-    unsubscribeFromMotionEvents(): Promise<void & import("./rest-client").ExtendedResponse>;
+    subscribeToDingEvents(): Promise<void & import("./rest-client.ts").ExtendedResponse>;
+    unsubscribeFromDingEvents(): Promise<void & import("./rest-client.ts").ExtendedResponse>;
+    subscribeToMotionEvents(): Promise<void & import("./rest-client.ts").ExtendedResponse>;
+    unsubscribeFromMotionEvents(): Promise<void & import("./rest-client.ts").ExtendedResponse>;
     disconnect(): void;
 }

package/lib/ring-camera.js

@@ -1,18 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RingCamera = void 0;
-exports.getBatteryLevel = getBatteryLevel;
-exports.getSearchQueryString = getSearchQueryString;
-exports.cleanSnapshotUuid = cleanSnapshotUuid;
-const ring_types_1 = require("./ring-types");
-const rest_client_1 = require("./rest-client");
-const rxjs_1 = require("rxjs");
-const operators_1 = require("rxjs/operators");
-const util_1 = require("./util");
-const subscribed_1 = require("./subscribed");
-const webrtc_connection_1 = require("./streaming/webrtc-connection");
-const streaming_session_1 = require("./streaming/streaming-session");
-const simple_webrtc_session_1 = require("./streaming/simple-webrtc-session");
+import { RingCameraKind } from "./ring-types.js";
+import { DoorbellType, PushNotificationAction, RingCameraModel, } from "./ring-types.js";
+import { appApi, clientApi, deviceApi } from "./rest-client.js";
+import { BehaviorSubject, firstValueFrom, ReplaySubject, Subject } from 'rxjs';
+import { distinctUntilChanged, filter, map, share, startWith, throttleTime, } from 'rxjs/operators';
+import { buildSearchString, delay, logDebug, logError, } from "./util.js";
+import { Subscribed } from "./subscribed.js";
+import { WebrtcConnection } from "./streaming/webrtc-connection.js";
+import { StreamingSession } from "./streaming/streaming-session.js";
+import { SimpleWebRtcSession } from "./streaming/simple-webrtc-session.js";
 const maxSnapshotRefreshSeconds = 15, fullDayMs = 24 * 60 * 60 * 1000;
 function parseBatteryLife(batteryLife) {
     if (batteryLife === null || batteryLife === undefined) {
@@ -32,7 +27,7 @@ function getStartOfToday() {
 function getEndOfToday() {
     return getStartOfToday() + fullDayMs - 1;
 }
-function getBatteryLevel(data) {
+export function getBatteryLevel(data) {
     const levels = [
         parseBatteryLife(data.battery_life),
         parseBatteryLife(data.battery_life_2),
@@ -46,7 +41,7 @@ function getBatteryLevel(data) {
     }
     return Math.min(...levels);
 }
-function getSearchQueryString(options) {
+export function getSearchQueryString(options) {
     const queryString = Object.entries(options)
         .map(([key, value]) => {
         if (value === undefined) {
@@ -61,38 +56,44 @@ function getSearchQueryString(options) {
         .join('&');
     return queryString.length ? `?${queryString}` : '';
 }
-function cleanSnapshotUuid(uuid) {
+export function cleanSnapshotUuid(uuid) {
     if (!uuid) {
         return uuid;
     }
     return uuid.replace(/:.*$/, '');
 }
-class RingCamera extends subscribed_1.Subscribed {
-    initialData;
-    isDoorbot;
-    restClient;
-    avoidSnapshotBatteryDrain;
+const wiredModelsWithNoSnapshotDuringRecording = new Set([
+    RingCameraKind.doorbell_graham_cracker,
+]), enabledDoorbellTypes = new Set([
+    DoorbellType.Mechanical,
+    DoorbellType.Digital,
+]);
+export class RingCamera extends Subscribed {
     id;
     deviceType;
     model;
     onData;
     hasLight;
     hasSiren;
-    onRequestUpdate = new rxjs_1.Subject();
-    onNewNotification = new rxjs_1.Subject();
-    onActiveNotifications = new rxjs_1.BehaviorSubject([]);
-    onDoorbellPressed = this.onNewNotification.pipe((0, operators_1.filter)((notification) => notification.android_config.category === ring_types_1.PushNotificationAction.Ding), (0, operators_1.share)());
-    onMotionDetected = this.onActiveNotifications.pipe((0, operators_1.map)((notifications) => notifications.some((notification) => notification.android_config.category ===
-        ring_types_1.PushNotificationAction.Motion)), (0, operators_1.distinctUntilChanged)(), (0, operators_1.share)({
-        connector: () => new rxjs_1.ReplaySubject(1),
+    onRequestUpdate = new Subject();
+    onNewNotification = new Subject();
+    onActiveNotifications = new BehaviorSubject([]);
+    onDoorbellPressed = this.onNewNotification.pipe(filter((notification) => notification.android_config.category === PushNotificationAction.Ding), share());
+    onMotionDetected = this.onActiveNotifications.pipe(map((notifications) => notifications.some((notification) => notification.android_config.category ===
+        PushNotificationAction.Motion)), distinctUntilChanged(), share({
+        connector: () => new ReplaySubject(1),
         resetOnError: false,
         resetOnComplete: false,
         resetOnRefCountZero: false,
     }));
-    onMotionStarted = this.onMotionDetected.pipe((0, operators_1.filter)((currentlyDetected) => currentlyDetected), (0, operators_1.map)(() => null), // no value needed, event is what matters
-    (0, operators_1.share)());
+    onMotionStarted = this.onMotionDetected.pipe(filter((currentlyDetected) => currentlyDetected), map(() => null), // no value needed, event is what matters
+    share());
     onBatteryLevel;
     onInHomeDoorbellStatus;
+    initialData;
+    isDoorbot;
+    restClient;
+    avoidSnapshotBatteryDrain;
     constructor(initialData, isDoorbot, restClient, avoidSnapshotBatteryDrain) {
         super();
         this.initialData = initialData;
@@ -102,34 +103,34 @@ class RingCamera extends subscribed_1.Subscribed {
         this.id = this.initialData.id;
         this.deviceType = this.initialData.kind;
         this.model =
-            ring_types_1.RingCameraModel[this.initialData.kind] ||
+            RingCameraModel[this.initialData.kind] ||
                 'Unknown Model';
-        this.onData = new rxjs_1.BehaviorSubject(this.initialData);
+        this.onData = new BehaviorSubject(this.initialData);
         this.hasLight = this.initialData.led_status !== undefined;
         this.hasSiren = this.initialData.siren_status !== undefined;
-        this.onBatteryLevel = this.onData.pipe((0, operators_1.map)((data) => {
+        this.onBatteryLevel = this.onData.pipe(map((data) => {
             if (!('battery_life' in data)) {
                 return null;
             }
             return getBatteryLevel(data);
-        }), (0, operators_1.distinctUntilChanged)());
-        this.onInHomeDoorbellStatus = this.onData.pipe((0, operators_1.map)(({ settings: { chime_settings } }) => {
+        }), distinctUntilChanged());
+        this.onInHomeDoorbellStatus = this.onData.pipe(map(({ settings: { chime_settings } }) => {
             return Boolean(chime_settings?.enable);
-        }), (0, operators_1.distinctUntilChanged)());
+        }), distinctUntilChanged());
         this.addSubscriptions(this.restClient.onSession
-            .pipe((0, operators_1.startWith)(undefined), (0, operators_1.throttleTime)(1000)) // Force this to run immediately, but don't double run if a session is created due to these api calls
+            .pipe(startWith(undefined), throttleTime(1000)) // Force this to run immediately, but don't double run if a session is created due to these api calls
             .subscribe(() => {
             this.subscribeToDingEvents().catch((e) => {
-                (0, util_1.logError)('Failed to subscribe ' +
+                logError('Failed to subscribe ' +
                     initialData.description +
                     ' to ding events');
-                (0, util_1.logError)(e);
+                logError(e);
             });
             this.subscribeToMotionEvents().catch((e) => {
-                (0, util_1.logError)('Failed to subscribe ' +
+                logError('Failed to subscribe ' +
                     initialData.description +
                     ' to motion events');
-                (0, util_1.logError)(e);
+                logError(e);
             });
         }));
     }
@@ -177,6 +178,10 @@ class RingCamera extends subscribed_1.Subscribed {
     get operatingOnBattery() {
         return this.hasBattery && this.data.settings.power_mode !== 'wired';
     }
+    get canTakeSnapshotWhileRecording() {
+        return (!this.operatingOnBattery &&
+            !wiredModelsWithNoSnapshotDuringRecording.has(this.data.kind));
+    }
     get isOffline() {
         return this.data.alerts.connection === 'offline';
     }
@@ -186,14 +191,13 @@ class RingCamera extends subscribed_1.Subscribed {
     get hasInHomeDoorbell() {
         const { chime_settings } = this.data.settings;
         return (this.isDoorbot &&
-            Boolean(chime_settings &&
-                [ring_types_1.DoorbellType.Mechanical, ring_types_1.DoorbellType.Digital].includes(chime_settings.type)));
+            Boolean(chime_settings && enabledDoorbellTypes.has(chime_settings.type)));
     }
     doorbotUrl(path = '') {
-        return (0, rest_client_1.clientApi)(`doorbots/${this.id}/${path}`);
+        return clientApi(`doorbots/${this.id}/${path}`);
     }
     deviceUrl(path = '') {
-        return (0, rest_client_1.deviceApi)(`devices/${this.id}/${path}`);
+        return deviceApi(`devices/${this.id}/${path}`);
     }
     async setLight(on) {
         if (!this.hasLight) {
@@ -263,16 +267,16 @@ class RingCamera extends subscribed_1.Subscribed {
         const response = await this.restClient
             .request({
             method: 'POST',
-            url: (0, rest_client_1.appApi)('clap/ticket/request/signalsocket'),
+            url: appApi('clap/ticket/request/signalsocket'),
         })
             .catch((e) => {
             throw e;
         });
-        return new webrtc_connection_1.WebrtcConnection(response.ticket, this, options);
+        return new WebrtcConnection(response.ticket, this, options);
     }
     async startLiveCall(options = {}) {
         const connection = await this.createStreamingConnection(options);
-        return new streaming_session_1.StreamingSession(this, connection);
+        return new StreamingSession(this, connection);
     }
     removeDingById(idToRemove) {
         const allActiveDings = this.activeNotifications, otherDings = allActiveDings.filter(({ data }) => data.event.ding.id !== idToRemove);
@@ -296,7 +300,7 @@ class RingCamera extends subscribed_1.Subscribed {
     }
     getEvents(options = {}) {
         return this.restClient.request({
-            url: (0, rest_client_1.clientApi)(`locations/${this.data.location_id}/devices/${this.id}/events${getSearchQueryString(options)}`),
+            url: clientApi(`locations/${this.data.location_id}/devices/${this.id}/events${getSearchQueryString(options)}`),
         });
     }
     videoSearch({ dateFrom, dateTo, order = 'asc' } = {
@@ -304,7 +308,7 @@ class RingCamera extends subscribed_1.Subscribed {
         dateTo: getEndOfToday(),
     }) {
         return this.restClient.request({
-            url: (0, rest_client_1.clientApi)(`video_search/history?doorbot_id=${this.id}&date_from=${dateFrom}&date_to=${dateTo}&order=${order}&api_version=11&includes%5B%5D=pva`),
+            url: clientApi(`video_search/history?doorbot_id=${this.id}&date_from=${dateFrom}&date_to=${dateTo}&order=${order}&api_version=11&includes%5B%5D=pva`),
         });
     }
     getPeriodicalFootage({ startAtMs, endAtMs } = {
@@ -318,7 +322,7 @@ class RingCamera extends subscribed_1.Subscribed {
     }
     async getRecordingUrl(dingIdStr, { transcoded = false } = {}) {
         const path = transcoded ? 'recording' : 'share/play', response = await this.restClient.request({
-            url: (0, rest_client_1.clientApi)(`dings/${dingIdStr}/${path}?disable_redirect=true`),
+            url: clientApi(`dings/${dingIdStr}/${path}?disable_redirect=true`),
         });
         return response.url;
     }
@@ -355,7 +359,7 @@ class RingCamera extends subscribed_1.Subscribed {
             return true;
         }
         if (this.hasSnapshotWithinLifetime) {
-            (0, util_1.logDebug)(`Snapshot for ${this.name} is still within its life time (${this.currentTimestampAge / 1000}s old)`);
+            logDebug(`Snapshot for ${this.name} is still within its life time (${this.currentTimestampAge / 1000}s old)`);
             return true;
         }
         if (!this.avoidSnapshotBatteryDrain || !this.operatingOnBattery) {
@@ -377,8 +381,8 @@ class RingCamera extends subscribed_1.Subscribed {
                     afterMs: this.lastSnapshotTimestamp,
                     force: true,
                 }),
-            (0, util_1.delay)(maxSnapshotRefreshSeconds * 1000).then(() => {
-                const extraMessageForBatteryCam = this.operatingOnBattery
+            delay(maxSnapshotRefreshSeconds * 1000).then(() => {
+                const extraMessageForBatteryCam = !this.canTakeSnapshotWhileRecording
                     ? '.  This is normal behavior since this camera is unable to capture snapshots while streaming'
                     : '';
                 throw new Error(`Snapshot for ${this.name} (${this.deviceType} - ${this.model}) failed to refresh after ${maxSnapshotRefreshSeconds} seconds${extraMessageForBatteryCam}`);
@@ -397,7 +401,7 @@ class RingCamera extends subscribed_1.Subscribed {
     }
     async getNextSnapshot({ afterMs, maxWaitMs, force, uuid, }) {
         const response = await this.restClient.request({
-            url: `https://app-snaps.ring.com/snapshots/next/${this.id}${(0, util_1.buildSearchString)({
+            url: `https://app-snaps.ring.com/snapshots/next/${this.id}${buildSearchString({
                 'after-ms': afterMs,
                 'max-wait-ms': maxWaitMs,
                 extras: force ? 'force' : undefined,
@@ -415,7 +419,7 @@ class RingCamera extends subscribed_1.Subscribed {
     }
     getSnapshotByUuid(uuid) {
         return this.restClient.request({
-            url: (0, rest_client_1.clientApi)('snapshots/uuid?uuid=' + cleanSnapshotUuid(uuid)),
+            url: clientApi('snapshots/uuid?uuid=' + cleanSnapshotUuid(uuid)),
             responseType: 'buffer',
             headers: {
                 accept: 'image/jpeg',
@@ -426,7 +430,7 @@ class RingCamera extends subscribed_1.Subscribed {
         const liveCall = await this.streamVideo({
             output: ['-t', duration.toString(), outputPath],
         });
-        await (0, rxjs_1.firstValueFrom)(liveCall.onCallEnded);
+        await firstValueFrom(liveCall.onCallEnded);
     }
     async streamVideo(ffmpegOptions) {
         const liveCall = await this.startLiveCall();
@@ -440,7 +444,7 @@ class RingCamera extends subscribed_1.Subscribed {
      * enabled as soon as the stream starts, which can drain the battery more quickly.
      */
     createSimpleWebRtcSession() {
-        return new simple_webrtc_session_1.SimpleWebRtcSession(this, this.restClient);
+        return new SimpleWebRtcSession(this, this.restClient);
     }
     subscribeToDingEvents() {
         return this.restClient.request({
@@ -470,4 +474,3 @@ class RingCamera extends subscribed_1.Subscribed {
         this.unsubscribe();
     }
 }
-exports.RingCamera = RingCamera;

package/lib/ring-chime.d.ts

@@ -1,14 +1,14 @@
-import { ChimeData, ChimeUpdate, ChimeSoundKind, RingtoneOptions, ChimeHealth } from './ring-types';
-import { RingRestClient } from './rest-client';
+import type { ChimeData, ChimeUpdate, ChimeSoundKind, RingtoneOptions, ChimeHealth } from './ring-types.ts';
+import type { RingRestClient } from './rest-client.ts';
 import { BehaviorSubject, Subject } from 'rxjs';
 export declare class RingChime {
-    private initialData;
-    private restClient;
     id: number;
-    deviceType: import("./ring-types").ChimeKind;
+    deviceType: import("./ring-types.ts").ChimeKind;
     model: string;
     onData: BehaviorSubject<ChimeData>;
     onRequestUpdate: Subject<unknown>;
+    private initialData;
+    private restClient;
     constructor(initialData: ChimeData, restClient: RingRestClient);
     updateData(update: ChimeData): void;
     requestUpdate(): void;
@@ -16,7 +16,7 @@ export declare class RingChime {
     get name(): string;
     get description(): string;
     get volume(): number;
-    getRingtones(): Promise<RingtoneOptions & import("./rest-client").ExtendedResponse>;
+    getRingtones(): Promise<RingtoneOptions & import("./rest-client.ts").ExtendedResponse>;
     getRingtoneByDescription(description: string, kind: ChimeSoundKind): Promise<{
         user_id: string;
         id: string;
@@ -27,7 +27,7 @@ export declare class RingChime {
         available: string;
     }>;
     chimeUrl(path?: string): string;
-    playSound(kind: ChimeSoundKind): Promise<void & import("./rest-client").ExtendedResponse>;
+    playSound(kind: ChimeSoundKind): Promise<void & import("./rest-client.ts").ExtendedResponse>;
     snooze(time: number): Promise<void>;
     clearSnooze(): Promise<void>;
     updateChime(update: ChimeUpdate): Promise<boolean>;

package/lib/ring-chime.js

@@ -1,30 +1,27 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RingChime = void 0;
-const ring_types_1 = require("./ring-types");
-const rest_client_1 = require("./rest-client");
-const rxjs_1 = require("rxjs");
+import { ChimeModel } from "./ring-types.js";
+import { clientApi } from "./rest-client.js";
+import { BehaviorSubject, Subject } from 'rxjs';
 const settingsWhichRequireReboot = [
     'ding_audio_id',
     'ding_audio_user_id',
     'motion_audio_id',
     'motion_audio_user_id',
 ];
-class RingChime {
-    initialData;
-    restClient;
+export class RingChime {
     id;
     deviceType;
     model;
     onData;
-    onRequestUpdate = new rxjs_1.Subject();
+    onRequestUpdate = new Subject();
+    initialData;
+    restClient;
     constructor(initialData, restClient) {
         this.initialData = initialData;
         this.restClient = restClient;
-        this.id = this.initialData.id;
-        this.deviceType = this.initialData.kind;
-        this.model = ring_types_1.ChimeModel[this.deviceType] || 'Chime';
-        this.onData = new rxjs_1.BehaviorSubject(this.initialData);
+        this.id = initialData.id;
+        this.deviceType = initialData.kind;
+        this.model = ChimeModel[this.deviceType] || 'Chime';
+        this.onData = new BehaviorSubject(this.initialData);
     }
     updateData(update) {
         this.onData.next(update);
@@ -46,7 +43,7 @@ class RingChime {
     }
     getRingtones() {
         return this.restClient.request({
-            url: (0, rest_client_1.clientApi)('ringtones'),
+            url: clientApi('ringtones'),
         });
     }
     async getRingtoneByDescription(description, kind) {
@@ -59,7 +56,7 @@ class RingChime {
         return requestedRingtone;
     }
     chimeUrl(path = '') {
-        return (0, rest_client_1.clientApi)(`chimes/${this.id}/${path}`);
+        return clientApi(`chimes/${this.id}/${path}`);
     }
     playSound(kind) {
         return this.restClient.request({
@@ -106,9 +103,8 @@ class RingChime {
     }
     async getHealth() {
         const response = await this.restClient.request({
-            url: (0, rest_client_1.clientApi)(`chimes/${this.id}/health`),
+            url: clientApi(`chimes/${this.id}/health`),
         });
         return response.device_health;
     }
 }
-exports.RingChime = RingChime;

package/lib/ring-device-data-cli.js

@@ -1,8 +1,6 @@
 #!/usr/bin/env node
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const device_data_1 = require("./device-data");
-(0, device_data_1.logDeviceData)().catch((e) => {
+import { logDeviceData } from "./device-data.js";
+logDeviceData().catch((e) => {
     // eslint-disable-next-line no-console
     console.error(e);
     process.exit(1);

package/lib/ring-device.d.ts

@@ -1,17 +1,17 @@
 import { BehaviorSubject } from 'rxjs';
-import { RingDeviceData } from './ring-types';
-import { Location } from './location';
-import { Subscribed } from './subscribed';
+import type { RingDeviceData } from './ring-types.ts';
+import type { Location } from './location.ts';
+import { Subscribed } from './subscribed.ts';
 export declare class RingDevice extends Subscribed {
-    private initialData;
-    location: Location;
-    assetId: string;
     onData: BehaviorSubject<RingDeviceData>;
     zid: string;
     id: string;
-    deviceType: import("./ring-types").RingDeviceType;
+    deviceType: import("./ring-types.ts").RingDeviceType;
     categoryId: number;
     onComponentDevices: import("rxjs").Observable<RingDevice[]>;
+    private initialData;
+    location: Location;
+    assetId: string;
     constructor(initialData: RingDeviceData, location: Location, assetId: string);
     updateData(update: Partial<RingDeviceData>): void;
     get data(): RingDeviceData;

package/lib/ring-device.js

@@ -1,34 +1,31 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RingDevice = void 0;
-const rxjs_1 = require("rxjs");
-const ring_types_1 = require("./ring-types");
-const operators_1 = require("rxjs/operators");
-const subscribed_1 = require("./subscribed");
-const util_1 = require("./util");
-class RingDevice extends subscribed_1.Subscribed {
-    initialData;
-    location;
-    assetId;
+import { BehaviorSubject } from 'rxjs';
+import { deviceTypesWithVolume } from "./ring-types.js";
+import { filter, map } from 'rxjs/operators';
+import { Subscribed } from "./subscribed.js";
+import { logError } from "./util.js";
+export class RingDevice extends Subscribed {
     onData;
     zid;
     id;
     deviceType;
     categoryId;
     onComponentDevices;
+    initialData;
+    location;
+    assetId;
     constructor(initialData, location, assetId) {
         super();
         this.initialData = initialData;
         this.location = location;
         this.assetId = assetId;
-        this.onData = new rxjs_1.BehaviorSubject(this.initialData);
-        this.zid = this.initialData.zid;
+        this.onData = new BehaviorSubject(initialData);
+        this.zid = initialData.zid;
         this.id = this.zid;
         this.deviceType = this.initialData.deviceType;
         this.categoryId = this.initialData.categoryId;
-        this.onComponentDevices = this.location.onDevices.pipe((0, operators_1.map)((devices) => devices.filter(({ data }) => data.parentZid === this.id)));
+        this.onComponentDevices = this.location.onDevices.pipe(map((devices) => devices.filter(({ data }) => data.parentZid === this.id)));
         this.addSubscriptions(location.onDeviceDataUpdate
-            .pipe((0, operators_1.filter)((update) => update.zid === this.zid))
+            .pipe(filter((update) => update.zid === this.zid))
             .subscribe((update) => this.updateData(update)));
     }
     updateData(update) {
@@ -41,7 +38,7 @@ class RingDevice extends subscribed_1.Subscribed {
         return this.data.name;
     }
     get supportsVolume() {
-        return (ring_types_1.deviceTypesWithVolume.includes(this.data.deviceType) &&
+        return (deviceTypesWithVolume.includes(this.data.deviceType) &&
             this.data.volume !== undefined);
     }
     setVolume(volume) {
@@ -49,7 +46,7 @@ class RingDevice extends subscribed_1.Subscribed {
             throw new Error('Volume must be between 0 and 1');
         }
         if (!this.supportsVolume) {
-            throw new Error(`Volume can only be set on ${ring_types_1.deviceTypesWithVolume.join(', ')}`);
+            throw new Error(`Volume can only be set on ${deviceTypesWithVolume.join(', ')}`);
         }
         return this.setInfo({ device: { v1: { volume } } });
     }
@@ -76,7 +73,7 @@ class RingDevice extends subscribed_1.Subscribed {
                     },
                 ],
             },
-        }).catch(util_1.logError);
+        }).catch(logError);
     }
     toString() {
         return this.toJSON();
@@ -90,4 +87,3 @@ class RingDevice extends subscribed_1.Subscribed {
         this.unsubscribe();
     }
 }
-exports.RingDevice = RingDevice;