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

package/lib/location.js

@@ -1,20 +1,17 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Location = void 0;
-const socket_io_client_1 = require("socket.io-client");
-const rxjs_1 = require("rxjs");
-const operators_1 = require("rxjs/operators");
-const util_1 = require("./util");
-const ring_types_1 = require("./ring-types");
-const rest_client_1 = require("./rest-client");
-const ring_camera_1 = require("./ring-camera");
-const ring_device_1 = require("./ring-device");
-const subscribed_1 = require("./subscribed");
+import { connect as connectSocketIo } from 'socket.io-client';
+import { BehaviorSubject, firstValueFrom, merge, ReplaySubject, Subject, } from 'rxjs';
+import { concatMap, debounceTime, distinctUntilChanged, filter, map, scan, shareReplay, skip, } from 'rxjs/operators';
+import { delay, generateUuid, logDebug, logError, logInfo } from "./util.js";
+import { DispatchSignalType, RingDeviceType, disabledLocationModes, isWebSocketSupportedAsset, } from "./ring-types.js";
+import { appApi, clientApi } from "./rest-client.js";
+import { getSearchQueryString } from "./ring-camera.js";
+import { RingDevice } from "./ring-device.js";
+import { Subscribed } from "./subscribed.js";
 const deviceListMessageType = 'DeviceInfoDocGetList';
 function flattenDeviceData(data) {
     return Object.assign({}, data.general && data.general.v2, data.device && data.device.v1);
 }
-class Location extends subscribed_1.Subscribed {
+export class Location extends Subscribed {
     locationDetails;
     cameras;
     chimes;
@@ -22,13 +19,13 @@ class Location extends subscribed_1.Subscribed {
     options;
     restClient;
     seq = 1;
-    onMessage = new rxjs_1.Subject();
-    onDataUpdate = new rxjs_1.Subject();
-    onDeviceDataUpdate = this.onDataUpdate.pipe((0, operators_1.filter)((message) => {
+    onMessage = new Subject();
+    onDataUpdate = new Subject();
+    onDeviceDataUpdate = this.onDataUpdate.pipe(filter((message) => {
         return message.datatype === 'DeviceInfoDocType' && Boolean(message.body);
-    }), (0, operators_1.concatMap)((message) => message.body), (0, operators_1.map)(flattenDeviceData));
-    onDeviceList = this.onMessage.pipe((0, operators_1.filter)((m) => m.msg === deviceListMessageType));
-    onDevices = this.onDeviceList.pipe((0, operators_1.scan)((devices, { body: deviceList, src }) => {
+    }), concatMap((message) => message.body), map(flattenDeviceData));
+    onDeviceList = this.onMessage.pipe(filter((m) => m.msg === deviceListMessageType));
+    onDevices = this.onDeviceList.pipe(scan((devices, { body: deviceList, src }) => {
         if (!deviceList) {
             return devices;
         }
@@ -41,16 +38,16 @@ class Location extends subscribed_1.Subscribed {
                 existingDevice.updateData(flatData);
                 return updatedDevices;
             }
-            return [...updatedDevices, new ring_device_1.RingDevice(flatData, this, src)];
+            return [...updatedDevices, new RingDevice(flatData, this, src)];
         }, devices);
-    }, []), (0, operators_1.distinctUntilChanged)((a, b) => a.length === b.length), (0, operators_1.filter)(() => {
+    }, []), distinctUntilChanged((a, b) => a.length === b.length), filter(() => {
         return Boolean(this.assets &&
             this.assets.every((asset) => this.receivedAssetDeviceLists.includes(asset.uuid)));
-    }), (0, operators_1.shareReplay)(1));
-    onSessionInfo = this.onDataUpdate.pipe((0, operators_1.filter)((m) => m.msg === 'SessionInfo'), (0, operators_1.map)((m) => m.body));
-    onConnected = new rxjs_1.BehaviorSubject(false);
-    onLocationMode = new rxjs_1.ReplaySubject(1);
-    onLocationModeRequested = new rxjs_1.Subject();
+    }), shareReplay(1));
+    onSessionInfo = this.onDataUpdate.pipe(filter((m) => m.msg === 'SessionInfo'), map((m) => m.body));
+    onConnected = new BehaviorSubject(false);
+    onLocationMode = new ReplaySubject(1);
+    onLocationModeRequested = new Subject();
     reconnecting = false;
     disconnected = false;
     connectionPromise;
@@ -86,20 +83,20 @@ class Location extends subscribed_1.Subscribed {
                         // eslint-disable-next-line @typescript-eslint/no-empty-function
                         this.requestList(deviceListMessageType, assetUuid).catch(() => { });
                         this.offlineAssets = this.offlineAssets.filter((id) => id !== assetUuid);
-                        (0, util_1.logInfo)(`Ring ${asset.kind} ${assetUuid} has come back online`);
+                        logInfo(`Ring ${asset.kind} ${assetUuid} has come back online`);
                     }
                 }
                 else if (!assetWasOffline) {
-                    (0, util_1.logError)(`Ring ${asset.kind} ${assetUuid} is offline or on cellular backup.  Waiting for status to change`);
+                    logError(`Ring ${asset.kind} ${assetUuid} is offline or on cellular backup.  Waiting for status to change`);
                     this.offlineAssets.push(assetUuid);
                 }
             });
         }));
         if (!options.hasAlarmBaseStation && options.locationModePollingSeconds) {
-            this.addSubscriptions((0, rxjs_1.merge)(this.onLocationModeRequested, this.onLocationMode)
-                .pipe((0, operators_1.debounceTime)(options.locationModePollingSeconds * 1000))
+            this.addSubscriptions(merge(this.onLocationModeRequested, this.onLocationMode)
+                .pipe(debounceTime(options.locationModePollingSeconds * 1000))
                 .subscribe(() => this.getLocationMode()));
-            this.getLocationMode().catch(util_1.logError);
+            this.getLocationMode().catch(logError);
         }
     }
     get id() {
@@ -115,39 +112,39 @@ class Location extends subscribed_1.Subscribed {
         if (this.disconnected) {
             return Promise.resolve({ disconnected: true });
         }
-        (0, util_1.logInfo)('Creating location socket.io connection - ' + this.name);
+        logInfo('Creating location socket.io connection - ' + this.name);
         if (process.version.startsWith('v15.')) {
-            (0, util_1.logError)('Node 15 is not currently supported by the Ring client. Please install the latest Node 14 instead. May not be able to fetch devices from Ring Alarm and Smart Lighting Hubs on this version of node.');
+            logError('Node 15 is not currently supported by the Ring client. Please install the latest Node 14 instead. May not be able to fetch devices from Ring Alarm and Smart Lighting Hubs on this version of node.');
         }
         const { assets, ticket, host } = await this.restClient.request({
-            url: (0, rest_client_1.appApi)('clap/tickets?locationID=' + this.id),
-        }), supportedAssets = assets.filter(ring_types_1.isWebSocketSupportedAsset);
+            url: appApi('clap/tickets?locationID=' + this.id),
+        }), supportedAssets = assets.filter(isWebSocketSupportedAsset);
         this.assets = supportedAssets;
         this.receivedAssetDeviceLists.length = 0;
         this.offlineAssets.length = 0;
         if (!supportedAssets.length) {
             const errorMessage = `No assets (alarm hubs or beam bridges) found for location ${this.name} - ${this.id}`;
-            (0, util_1.logError)(errorMessage);
+            logError(errorMessage);
             throw new Error(errorMessage);
         }
-        const connection = (0, socket_io_client_1.connect)(`wss://${host}/?authcode=${ticket}&ack=false&EIO=3`, { transports: ['websocket'] }), reconnect = () => {
+        const connection = connectSocketIo(`wss://${host}/?authcode=${ticket}&ack=false&EIO=3`, { transports: ['websocket'] }), reconnect = () => {
             if (this.reconnecting && this.connectionPromise) {
                 return this.connectionPromise;
             }
             this.onConnected.next(false);
             if (!this.disconnected) {
-                (0, util_1.logInfo)('Reconnecting location socket.io connection');
+                logInfo('Reconnecting location socket.io connection');
             }
             this.reconnecting = true;
             connection.close();
-            return (this.connectionPromise = (0, util_1.delay)(1000).then(() => {
+            return (this.connectionPromise = delay(1000).then(() => {
                 return this.createConnection();
             }));
         };
         this.reconnecting = false;
         connection.on('DataUpdate', (message) => {
             if (message.datatype === 'HubDisconnectionEventType') {
-                (0, util_1.logInfo)('Location connection told to reconnect');
+                logInfo('Location connection told to reconnect');
                 return reconnect();
             }
             this.onDataUpdate.next(message);
@@ -159,7 +156,7 @@ class Location extends subscribed_1.Subscribed {
             connection.once('connect', () => {
                 resolve(connection);
                 this.onConnected.next(true);
-                (0, util_1.logInfo)('Ring connected to socket.io server');
+                logInfo('Ring connected to socket.io server');
                 assets.forEach((asset) => this.requestList(deviceListMessageType, asset.uuid));
             });
             connection.once('error', reject);
@@ -184,7 +181,7 @@ class Location extends subscribed_1.Subscribed {
         securityPanel.sendCommand(commandType, data);
     }
     async setAlarmMode(alarmMode, bypassSensorZids) {
-        const securityPanel = await this.getSecurityPanel(), updatedDataPromise = (0, rxjs_1.firstValueFrom)(securityPanel.onData.pipe((0, operators_1.skip)(1)));
+        const securityPanel = await this.getSecurityPanel(), updatedDataPromise = firstValueFrom(securityPanel.onData.pipe(skip(1)));
         await this.sendCommandToSecurityPanel('security-panel.switch-mode', {
             mode: alarmMode,
             bypass: bypassSensorZids,
@@ -217,7 +214,7 @@ class Location extends subscribed_1.Subscribed {
         });
     }
     getNextMessageOfType(type, src) {
-        return (0, rxjs_1.firstValueFrom)(this.onMessage.pipe((0, operators_1.filter)((m) => m.msg === type && m.src === src), (0, operators_1.map)((m) => m.body)));
+        return firstValueFrom(this.onMessage.pipe(filter((m) => m.msg === type && m.src === src), map((m) => m.body)));
     }
     requestList(listType, assetId) {
         return this.sendMessage({ msg: listType, dst: assetId });
@@ -233,7 +230,7 @@ class Location extends subscribed_1.Subscribed {
         if (!this.connectionPromise) {
             await this.getConnection();
         }
-        return (0, rxjs_1.firstValueFrom)(this.onDevices);
+        return firstValueFrom(this.onDevices);
     }
     getRoomList(assetId) {
         return this.getList('RoomGetList', assetId);
@@ -243,7 +240,7 @@ class Location extends subscribed_1.Subscribed {
             return this.securityPanel;
         }
         const devices = await this.getDevices(), securityPanel = devices.find((device) => {
-            return device.data.deviceType === ring_types_1.RingDeviceType.SecurityPanel;
+            return device.data.deviceType === RingDeviceType.SecurityPanel;
         });
         if (!securityPanel) {
             throw new Error(`Could not find a security panel for location ${this.name} - ${this.id}`);
@@ -262,7 +259,7 @@ class Location extends subscribed_1.Subscribed {
     getHistory(options = {}) {
         options.maxLevel = options.maxLevel || 50;
         return this.restClient.request({
-            url: (0, rest_client_1.appApi)(`rs/history${(0, ring_camera_1.getSearchQueryString)({
+            url: appApi(`rs/history${getSearchQueryString({
                 accountId: this.id,
                 ...options,
             })}`),
@@ -270,22 +267,22 @@ class Location extends subscribed_1.Subscribed {
     }
     getCameraEvents(options = {}) {
         return this.restClient.request({
-            url: (0, rest_client_1.clientApi)(`locations/${this.id}/events${(0, ring_camera_1.getSearchQueryString)(options)}`),
+            url: clientApi(`locations/${this.id}/events${getSearchQueryString(options)}`),
         });
     }
     getAccountMonitoringStatus() {
         return this.restClient.request({
-            url: (0, rest_client_1.appApi)('rs/monitoring/accounts/' + this.id),
+            url: appApi('rs/monitoring/accounts/' + this.id),
         });
     }
     triggerAlarm(signalType) {
-        const now = Date.now(), alarmSessionUuid = (0, util_1.generateUuid)(), baseStationAsset = this.assets && this.assets.find((x) => x.kind === 'base_station_v1');
+        const now = Date.now(), alarmSessionUuid = generateUuid(), baseStationAsset = this.assets && this.assets.find((x) => x.kind === 'base_station_v1');
         if (!baseStationAsset) {
             throw new Error('Cannot dispatch panic events without an alarm base station');
         }
         return this.restClient.request({
             method: 'POST',
-            url: (0, rest_client_1.appApi)(`rs/monitoring/accounts/${this.id}/assets/${baseStationAsset.uuid}/userAlarm`),
+            url: appApi(`rs/monitoring/accounts/${this.id}/assets/${baseStationAsset.uuid}/userAlarm`),
             json: {
                 alarmSessionUuid,
                 currentTsMs: now,
@@ -295,16 +292,16 @@ class Location extends subscribed_1.Subscribed {
         });
     }
     triggerBurglarAlarm() {
-        return this.triggerAlarm(ring_types_1.DispatchSignalType.Burglar);
+        return this.triggerAlarm(DispatchSignalType.Burglar);
     }
     triggerFireAlarm() {
-        return this.triggerAlarm(ring_types_1.DispatchSignalType.Fire);
+        return this.triggerAlarm(DispatchSignalType.Fire);
     }
     async getLocationMode() {
         this.onLocationModeRequested.next(null);
         const response = await this.restClient.request({
             method: 'GET',
-            url: (0, rest_client_1.appApi)(`mode/location/${this.id}`),
+            url: appApi(`mode/location/${this.id}`),
         });
         this.onLocationMode.next(response.mode);
         return response;
@@ -312,7 +309,7 @@ class Location extends subscribed_1.Subscribed {
     async setLocationMode(mode) {
         const response = await this.restClient.request({
             method: 'POST',
-            url: (0, rest_client_1.appApi)(`mode/location/${this.id}`),
+            url: appApi(`mode/location/${this.id}`),
             json: { mode },
         });
         this.onLocationMode.next(response.mode);
@@ -321,14 +318,14 @@ class Location extends subscribed_1.Subscribed {
     async disableLocationModes() {
         await this.restClient.request({
             method: 'DELETE',
-            url: (0, rest_client_1.appApi)(`mode/location/${this.id}/settings`),
+            url: appApi(`mode/location/${this.id}/settings`),
         });
         this.onLocationMode.next('disabled');
     }
     async enableLocationModes() {
         const response = await this.restClient.request({
             method: 'POST',
-            url: (0, rest_client_1.appApi)(`mode/location/${this.id}/settings/setup`),
+            url: appApi(`mode/location/${this.id}/settings/setup`),
         });
         await this.getLocationMode();
         return response;
@@ -336,26 +333,26 @@ class Location extends subscribed_1.Subscribed {
     getLocationModeSettings() {
         return this.restClient.request({
             method: 'GET',
-            url: (0, rest_client_1.appApi)(`mode/location/${this.id}/settings`),
+            url: appApi(`mode/location/${this.id}/settings`),
         });
     }
     setLocationModeSettings(settings) {
         return this.restClient.request({
             method: 'POST',
-            url: (0, rest_client_1.appApi)(`mode/location/${this.id}/settings`),
+            url: appApi(`mode/location/${this.id}/settings`),
             json: settings,
         });
     }
     getLocationModeSharing() {
         return this.restClient.request({
             method: 'GET',
-            url: (0, rest_client_1.appApi)(`mode/location/${this.id}/sharing`),
+            url: appApi(`mode/location/${this.id}/sharing`),
         });
     }
     setLocationModeSharing(sharedUsersEnabled) {
         return this.restClient.request({
             method: 'POST',
-            url: (0, rest_client_1.appApi)(`mode/location/${this.id}/sharing`),
+            url: appApi(`mode/location/${this.id}/sharing`),
             json: { sharedUsersEnabled },
         });
     }
@@ -364,8 +361,8 @@ class Location extends subscribed_1.Subscribed {
             return false;
         }
         const modeResponse = await this.getLocationMode(), { mode, readOnly } = modeResponse;
-        (0, util_1.logDebug)('Location Mode: ' + JSON.stringify(modeResponse));
-        return !readOnly && !ring_types_1.disabledLocationModes.includes(mode);
+        logDebug('Location Mode: ' + JSON.stringify(modeResponse));
+        return !readOnly && !disabledLocationModes.includes(mode);
     }
     disconnect() {
         this.disconnected = true;
@@ -375,12 +372,11 @@ class Location extends subscribed_1.Subscribed {
             .then((devices) => {
             devices.forEach((device) => device.disconnect());
         })
-            .catch(util_1.logError);
+            .catch(logError);
         if (this.connectionPromise) {
             this.connectionPromise
                 .then((connection) => connection.close())
-                .catch(util_1.logError);
+                .catch(logError);
         }
     }
 }
-exports.Location = Location;

package/lib/refresh-token.js

@@ -1,13 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.acquireRefreshToken = acquireRefreshToken;
-exports.logRefreshToken = logRefreshToken;
 /* eslint-disable no-console */
-const rest_client_1 = require("./rest-client");
-const util_1 = require("./util");
-async function acquireRefreshToken() {
-    const email = await (0, util_1.requestInput)('Email: '), password = await (0, util_1.requestInput)('Password: '), restClient = new rest_client_1.RingRestClient({ email, password }), getAuthWith2fa = async () => {
-        const code = await (0, util_1.requestInput)('2fa Code: ');
+import { RingRestClient } from "./rest-client.js";
+import { requestInput } from "./util.js";
+export async function acquireRefreshToken() {
+    const email = await requestInput('Email: '), password = await requestInput('Password: '), restClient = new RingRestClient({ email, password }), getAuthWith2fa = async () => {
+        const code = await requestInput('2fa Code: ');
         try {
             return await restClient.getAuth(code);
         }
@@ -25,7 +21,7 @@ async function acquireRefreshToken() {
     });
     return auth.refresh_token;
 }
-async function logRefreshToken() {
+export async function logRefreshToken() {
     console.log('This CLI will provide you with a refresh token which you can use to configure ring-client-api and homebridge-ring.');
     const refreshToken = await acquireRefreshToken();
     console.log('\nSuccessfully logged in to Ring. Please add the following to your config:\n');

package/lib/rest-client.d.ts

@@ -1,6 +1,6 @@
-import { AuthTokenResponse, SessionResponse } from './ring-types';
+import type { AuthTokenResponse, SessionResponse } from './ring-types.ts';
 import { ReplaySubject } from 'rxjs';
-import type { Credentials } from '@eneris/push-receiver/dist/types';
+import type { Credentials } from '@eneris/push-receiver/dist/types.d.js';
 import { Agent } from 'undici';
 interface RequestOptions extends RequestInit {
     responseType?: 'json' | 'buffer';
@@ -44,7 +44,7 @@ export declare class RingRestClient {
         oldRefreshToken?: string;
         newRefreshToken: string;
     }>;
-    onSession: ReplaySubject<import("./ring-types").ProfileResponse>;
+    onSession: ReplaySubject<import("./ring-types.ts").ProfileResponse>;
     readonly baseSessionMetadata: {
         api_version: number;
         device_model: string;

package/lib/rest-client.js

@@ -1,18 +1,8 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RingRestClient = void 0;
-exports.clientApi = clientApi;
-exports.deviceApi = deviceApi;
-exports.commandsApi = commandsApi;
-exports.appApi = appApi;
-const util_1 = require("./util");
-const rxjs_1 = require("rxjs");
-const assert_1 = __importDefault(require("assert"));
-const undici_1 = require("undici");
-const fetchAgent = new undici_1.Agent({
+import { delay, fromBase64, getHardwareId, logDebug, logError, logInfo, stringify, toBase64, } from "./util.js";
+import { ReplaySubject } from 'rxjs';
+import assert from 'assert';
+import { Agent } from 'undici';
+const fetchAgent = new Agent({
     connections: 6,
     pipelining: 1,
     keepAliveTimeout: 115000,
@@ -27,16 +17,16 @@ const fetchAgent = new undici_1.Agent({
     7062: 'UPDATING',
     7063: 'MAINTENANCE',
 }, clientApiBaseUrl = 'https://api.ring.com/clients_api/', deviceApiBaseUrl = 'https://api.ring.com/devices/v1/', commandsApiBaseUrl = 'https://api.ring.com/commands/v1/', appApiBaseUrl = 'https://prd-api-us.prd.rings.solutions/api/v1/', apiVersion = 11;
-function clientApi(path) {
+export function clientApi(path) {
     return clientApiBaseUrl + path;
 }
-function deviceApi(path) {
+export function deviceApi(path) {
     return deviceApiBaseUrl + path;
 }
-function commandsApi(path) {
+export function commandsApi(path) {
     return commandsApiBaseUrl + path;
 }
-function appApi(path) {
+export function appApi(path) {
     return appApiBaseUrl + path;
 }
 async function responseToError(response) {
@@ -123,13 +113,13 @@ async function requestWithRetry(requestOptions, retryCount = 0) {
                 let detailedError = `Error: ${e.message}`;
                 detailedError += e.cause?.message ? `, Cause: ${e.cause.message}` : '';
                 detailedError += e.cause?.code ? `, Code: ${e.cause.code}` : '';
-                (0, util_1.logError)(`Retry #${retryCount} failed to reach Ring server at ${requestOptions.url}.  ${detailedError}.  Trying again in 5 seconds...`);
+                logError(`Retry #${retryCount} failed to reach Ring server at ${requestOptions.url}.  ${detailedError}.  Trying again in 5 seconds...`);
                 if (e.message.includes('NGHTTP2_ENHANCE_YOUR_CALM')) {
-                    (0, util_1.logError)(`There is a known issue with your current NodeJS version (${process.version}).  Please see https://github.com/dgreif/ring/wiki/NGHTTP2_ENHANCE_YOUR_CALM-Error for details`);
+                    logError(`There is a known issue with your current NodeJS version (${process.version}).  Please see https://github.com/dgreif/ring/wiki/NGHTTP2_ENHANCE_YOUR_CALM-Error for details`);
                 }
-                (0, util_1.logDebug)(e);
+                logDebug(e);
             }
-            await (0, util_1.delay)(5000);
+            await delay(5000);
             return requestWithRetry(requestOptions, retryCount + 1);
         }
         throw e;
@@ -140,9 +130,9 @@ function parseAuthConfig(rawRefreshToken) {
         return;
     }
     try {
-        const config = JSON.parse((0, util_1.fromBase64)(rawRefreshToken));
-        (0, assert_1.default)(config);
-        (0, assert_1.default)(config.rt);
+        const config = JSON.parse(fromBase64(rawRefreshToken));
+        assert(config);
+        assert(config.rt);
         return config;
     }
     catch {
@@ -151,7 +141,7 @@ function parseAuthConfig(rawRefreshToken) {
         };
     }
 }
-class RingRestClient {
+export class RingRestClient {
     authOptions;
     refreshToken;
     authConfig;
@@ -184,8 +174,8 @@ class RingRestClient {
     sessionPromise = undefined;
     using2fa = false;
     promptFor2fa;
-    onRefreshTokenUpdated = new rxjs_1.ReplaySubject(1);
-    onSession = new rxjs_1.ReplaySubject(1);
+    onRefreshTokenUpdated = new ReplaySubject(1);
+    onSession = new ReplaySubject(1);
     baseSessionMetadata;
     constructor(authOptions) {
         this.authOptions = authOptions;
@@ -193,7 +183,7 @@ class RingRestClient {
             'refreshToken' in authOptions ? authOptions.refreshToken : undefined;
         this.authConfig = parseAuthConfig(this.refreshToken);
         this.hardwareIdPromise =
-            this.authConfig?.hid || (0, util_1.getHardwareId)(authOptions.systemId);
+            this.authConfig?.hid || getHardwareId(authOptions.systemId);
         this.baseSessionMetadata = {
             api_version: apiVersion,
             device_model: authOptions.controlCenterDisplayName ?? 'ring-client-api',
@@ -240,7 +230,7 @@ class RingRestClient {
                 rt: response.refresh_token,
                 hid: hardwareId,
             };
-            this.refreshToken = (0, util_1.toBase64)(JSON.stringify(this.authConfig));
+            this.refreshToken = toBase64(JSON.stringify(this.authConfig));
             // Emit an event with the new token
             this.onRefreshTokenUpdated.next({
                 oldRefreshToken,
@@ -257,7 +247,7 @@ class RingRestClient {
                 // failed request with refresh token
                 this.refreshToken = undefined;
                 this.authConfig = undefined;
-                (0, util_1.logError)(requestError);
+                logError(requestError);
                 return this.getAuth();
             }
             const response = requestError.response || {}, responseData = response.body || {}, responseError = 'error' in responseData && typeof responseData.error === 'string'
@@ -292,8 +282,8 @@ class RingRestClient {
                     ? 'You have requested too many 2fa codes.  Ring limits 2fa to 10 codes within 10 minutes.  Please try again in 10 minutes.'
                     : `Verify that your ${authTypeMessage} correct.`) +
                 ` (error: ${responseError})`;
-            (0, util_1.logError)(requestError.response || requestError);
-            (0, util_1.logError)(errorMessage);
+            logError(requestError.response || requestError);
+            logError(errorMessage);
             throw new Error(errorMessage);
         }
     }
@@ -330,9 +320,9 @@ class RingRestClient {
                     const retryAfter = e.response.headers.get('retry-after'), waitSeconds = isNaN(retryAfter)
                         ? 200
                         : Number.parseInt(retryAfter, 10);
-                    (0, util_1.logError)(`Session response rate limited. Waiting to retry after ${waitSeconds} seconds`);
-                    await (0, util_1.delay)((waitSeconds + 1) * 1000);
-                    (0, util_1.logInfo)('Retrying session request');
+                    logError(`Session response rate limited. Waiting to retry after ${waitSeconds} seconds`);
+                    await delay((waitSeconds + 1) * 1000);
+                    logInfo('Retrying session request');
                     return this.getSession();
                 }
                 throw e;
@@ -355,7 +345,7 @@ class RingRestClient {
             }, 12 * 60 * 60 * 1000); // 12 hours
             this.timeouts.push(timeout);
         })
-            .catch((e) => (0, util_1.logError)(e));
+            .catch((e) => logError(e));
     }
     async request(options) {
         const hardwareId = await this.hardwareIdPromise, url = options.url, initialSessionPromise = this.sessionPromise;
@@ -380,7 +370,7 @@ class RingRestClient {
             }
             if (response.status === 504) {
                 // Gateway Timeout.  These should be recoverable, but wait a few seconds just to be on the safe side
-                await (0, util_1.delay)(5000);
+                await delay(5000);
                 return this.request(options);
             }
             if (response.status === 404 &&
@@ -391,29 +381,29 @@ class RingRestClient {
                     .filter((x) => x)
                     .join(', ');
                 if (errorText) {
-                    (0, util_1.logError)(`http request failed.  ${url} returned errors: (${errorText}).  Trying again in 20 seconds`);
-                    await (0, util_1.delay)(20000);
+                    logError(`http request failed.  ${url} returned errors: (${errorText}).  Trying again in 20 seconds`);
+                    await delay(20000);
                     return this.request(options);
                 }
-                (0, util_1.logError)(`http request failed.  ${url} returned unknown errors: (${(0, util_1.stringify)(errors)}).`);
+                logError(`http request failed.  ${url} returned unknown errors: (${stringify(errors)}).`);
             }
             if (response.status === 404 && url.startsWith(clientApiBaseUrl)) {
-                (0, util_1.logError)('404 from endpoint ' + url);
+                logError('404 from endpoint ' + url);
                 if (response.body?.error?.includes(hardwareId)) {
-                    (0, util_1.logError)('Session hardware_id not found.  Creating a new session and trying again.');
+                    logError('Session hardware_id not found.  Creating a new session and trying again.');
                     if (this.sessionPromise === initialSessionPromise) {
                         this.refreshSession();
                     }
                     return this.request(options);
                 }
-                throw new Error('Not found with response: ' + (0, util_1.stringify)(response.body));
+                throw new Error('Not found with response: ' + stringify(response.body));
             }
             if (response.status) {
-                (0, util_1.logError)(`Request to ${url} failed with status ${response.status}. Response body: ${(0, util_1.stringify)(response.body)}`);
+                logError(`Request to ${url} failed with status ${response.status}. Response body: ${stringify(response.body)}`);
             }
             else if (!options.allowNoResponse) {
-                (0, util_1.logError)(`Request to ${url} failed:`);
-                (0, util_1.logError)(e);
+                logError(`Request to ${url} failed:`);
+                logError(e);
             }
             throw e;
         }
@@ -437,7 +427,7 @@ class RingRestClient {
             pnc: credentials,
         };
         // SOMEDAY: refactor the conversion from auth config to refresh token - DRY from above
-        const newRefreshToken = (0, util_1.toBase64)(JSON.stringify(this.authConfig));
+        const newRefreshToken = toBase64(JSON.stringify(this.authConfig));
         if (newRefreshToken === oldRefreshToken) {
             // No change, so we don't need to emit an updated refresh token
             return;
@@ -450,4 +440,3 @@ class RingRestClient {
         });
     }
 }
-exports.RingRestClient = RingRestClient;

package/lib/ring-auth-cli.js

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