ring-client-api 13.0.1 → 13.2.0-beta.0

package/lib/api.js

@@ -18,6 +18,9 @@ const push_receiver_1 = __importDefault(require("@eneris/push-receiver"));
 const ring_intercom_1 = require("./ring-intercom");
 const json_bigint_1 = __importDefault(require("json-bigint"));
 class RingApi extends subscribed_1.Subscribed {
+    options;
+    restClient;
+    onRefreshTokenUpdated;
     constructor(options) {
         super();
         this.options = options;
@@ -273,6 +276,7 @@ class RingApi extends subscribed_1.Subscribed {
         });
         return locations;
     }
+    locationsPromise;
     getLocations() {
         if (!this.locationsPromise) {
             this.locationsPromise = this.fetchAndBuildLocations();

package/lib/location.js

@@ -15,6 +15,51 @@ function flattenDeviceData(data) {
     return Object.assign({}, data.general && data.general.v2, data.device && data.device.v1);
 }
 class Location extends subscribed_1.Subscribed {
+    locationDetails;
+    cameras;
+    chimes;
+    intercoms;
+    options;
+    restClient;
+    seq = 1;
+    onMessage = new rxjs_1.Subject();
+    onDataUpdate = new rxjs_1.Subject();
+    onDeviceDataUpdate = this.onDataUpdate.pipe((0, operators_1.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 }) => {
+        if (!deviceList) {
+            return devices;
+        }
+        if (!this.receivedAssetDeviceLists.includes(src)) {
+            this.receivedAssetDeviceLists.push(src);
+        }
+        return deviceList.reduce((updatedDevices, data) => {
+            const flatData = flattenDeviceData(data), existingDevice = updatedDevices.find((x) => x.zid === flatData.zid);
+            if (existingDevice) {
+                existingDevice.updateData(flatData);
+                return updatedDevices;
+            }
+            return [...updatedDevices, new ring_device_1.RingDevice(flatData, this, src)];
+        }, devices);
+    }, []), (0, operators_1.distinctUntilChanged)((a, b) => a.length === b.length), (0, operators_1.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();
+    reconnecting = false;
+    disconnected = false;
+    connectionPromise;
+    securityPanel;
+    assets;
+    receivedAssetDeviceLists = [];
+    offlineAssets = [];
+    hasHubs;
+    hasAlarmBaseStation;
     constructor(locationDetails, cameras, chimes, intercoms, options, restClient) {
         super();
         this.locationDetails = locationDetails;
@@ -23,40 +68,6 @@ class Location extends subscribed_1.Subscribed {
         this.intercoms = intercoms;
         this.options = options;
         this.restClient = restClient;
-        this.seq = 1;
-        this.onMessage = new rxjs_1.Subject();
-        this.onDataUpdate = new rxjs_1.Subject();
-        this.onDeviceDataUpdate = this.onDataUpdate.pipe((0, operators_1.filter)((message) => {
-            return message.datatype === 'DeviceInfoDocType' && Boolean(message.body);
-        }), (0, operators_1.concatMap)((message) => message.body), (0, operators_1.map)(flattenDeviceData));
-        this.onDeviceList = this.onMessage.pipe((0, operators_1.filter)((m) => m.msg === deviceListMessageType));
-        this.onDevices = this.onDeviceList.pipe((0, operators_1.scan)((devices, { body: deviceList, src }) => {
-            if (!deviceList) {
-                return devices;
-            }
-            if (!this.receivedAssetDeviceLists.includes(src)) {
-                this.receivedAssetDeviceLists.push(src);
-            }
-            return deviceList.reduce((updatedDevices, data) => {
-                const flatData = flattenDeviceData(data), existingDevice = updatedDevices.find((x) => x.zid === flatData.zid);
-                if (existingDevice) {
-                    existingDevice.updateData(flatData);
-                    return updatedDevices;
-                }
-                return [...updatedDevices, new ring_device_1.RingDevice(flatData, this, src)];
-            }, devices);
-        }, []), (0, operators_1.distinctUntilChanged)((a, b) => a.length === b.length), (0, operators_1.filter)(() => {
-            return Boolean(this.assets &&
-                this.assets.every((asset) => this.receivedAssetDeviceLists.includes(asset.uuid)));
-        }), (0, operators_1.shareReplay)(1));
-        this.onSessionInfo = this.onDataUpdate.pipe((0, operators_1.filter)((m) => m.msg === 'SessionInfo'), (0, operators_1.map)((m) => m.body));
-        this.onConnected = new rxjs_1.BehaviorSubject(false);
-        this.onLocationMode = new rxjs_1.ReplaySubject(1);
-        this.onLocationModeRequested = new rxjs_1.Subject();
-        this.reconnecting = false;
-        this.disconnected = false;
-        this.receivedAssetDeviceLists = [];
-        this.offlineAssets = [];
         this.hasHubs = this.options.hasHubs;
         this.hasAlarmBaseStation = this.options.hasAlarmBaseStation;
         this.addSubscriptions(

package/lib/rest-client.js

@@ -138,6 +138,12 @@ function parseAuthConfig(rawRefreshToken) {
     }
 }
 class RingRestClient {
+    authOptions;
+    refreshToken;
+    authConfig;
+    hardwareIdPromise;
+    _authPromise;
+    timeouts = [];
     clearPreviousAuth() {
         this._authPromise = undefined;
     }
@@ -161,21 +167,22 @@ class RingRestClient {
         }
         return this._authPromise;
     }
+    sessionPromise = undefined;
+    using2fa = false;
+    promptFor2fa;
+    onRefreshTokenUpdated = new rxjs_1.ReplaySubject(1);
+    onSession = new rxjs_1.ReplaySubject(1);
+    baseSessionMetadata;
     constructor(authOptions) {
         this.authOptions = authOptions;
-        this.refreshToken = 'refreshToken' in this.authOptions
-            ? this.authOptions.refreshToken
-            : undefined;
+        this.refreshToken =
+            'refreshToken' in authOptions ? authOptions.refreshToken : undefined;
         this.authConfig = parseAuthConfig(this.refreshToken);
-        this.hardwareIdPromise = this.authConfig?.hid || (0, util_1.getHardwareId)(this.authOptions.systemId);
-        this.timeouts = [];
-        this.sessionPromise = undefined;
-        this.using2fa = false;
-        this.onRefreshTokenUpdated = new rxjs_1.ReplaySubject(1);
-        this.onSession = new rxjs_1.ReplaySubject(1);
+        this.hardwareIdPromise =
+            this.authConfig?.hid || (0, util_1.getHardwareId)(authOptions.systemId);
         this.baseSessionMetadata = {
             api_version: apiVersion,
-            device_model: this.authOptions.controlCenterDisplayName ?? 'ring-client-api',
+            device_model: authOptions.controlCenterDisplayName ?? 'ring-client-api',
         };
     }
     getGrantData(twoFactorAuthCode) {

package/lib/ring-camera.js

@@ -68,28 +68,37 @@ function cleanSnapshotUuid(uuid) {
     return uuid.replace(/:.*$/, '');
 }
 class RingCamera extends subscribed_1.Subscribed {
+    initialData;
+    isDoorbot;
+    restClient;
+    avoidSnapshotBatteryDrain;
+    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),
+        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)());
+    onBatteryLevel;
+    onInHomeDoorbellStatus;
     constructor(initialData, isDoorbot, restClient, avoidSnapshotBatteryDrain) {
         super();
         this.initialData = initialData;
         this.isDoorbot = isDoorbot;
         this.restClient = restClient;
         this.avoidSnapshotBatteryDrain = avoidSnapshotBatteryDrain;
-        this.onRequestUpdate = new rxjs_1.Subject();
-        this.onNewNotification = new rxjs_1.Subject();
-        this.onActiveNotifications = new rxjs_1.BehaviorSubject([]);
-        this.onDoorbellPressed = this.onNewNotification.pipe((0, operators_1.filter)((notification) => notification.android_config.category === ring_types_1.PushNotificationAction.Ding), (0, operators_1.share)());
-        this.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),
-            resetOnError: false,
-            resetOnComplete: false,
-            resetOnRefCountZero: false,
-        }));
-        this.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)());
-        this.lastSnapshotTimestamp = 0;
-        this.lastSnapshotTimestampLocal = 0;
-        this.fetchingSnapshot = false;
         this.id = this.initialData.id;
         this.deviceType = this.initialData.kind;
         this.model =
@@ -324,6 +333,9 @@ class RingCamera extends subscribed_1.Subscribed {
             ? 600 * 1000 // battery cams only refresh timestamp every 10 minutes
             : 10 * 1000; // snapshot updates will be forced.  Limit to 10s lifetime
     }
+    lastSnapshotTimestamp = 0;
+    lastSnapshotTimestampLocal = 0;
+    lastSnapshotPromise;
     get currentTimestampAge() {
         return Date.now() - this.lastSnapshotTimestampLocal;
     }
@@ -352,6 +364,7 @@ class RingCamera extends subscribed_1.Subscribed {
             return false;
         }
     }
+    fetchingSnapshot = false;
     async getSnapshot({ uuid } = {}) {
         if (this.lastSnapshotPromise && this.shouldUseExistingSnapshotPromise()) {
             return this.lastSnapshotPromise;

package/lib/ring-chime.js

@@ -11,10 +11,16 @@ const settingsWhichRequireReboot = [
     'motion_audio_user_id',
 ];
 class RingChime {
+    initialData;
+    restClient;
+    id;
+    deviceType;
+    model;
+    onData;
+    onRequestUpdate = new rxjs_1.Subject();
     constructor(initialData, restClient) {
         this.initialData = initialData;
         this.restClient = restClient;
-        this.onRequestUpdate = new rxjs_1.Subject();
         this.id = this.initialData.id;
         this.deviceType = this.initialData.kind;
         this.model = ring_types_1.ChimeModel[this.deviceType] || 'Chime';

package/lib/ring-device.js

@@ -7,6 +7,15 @@ 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;
+    onData;
+    zid;
+    id;
+    deviceType;
+    categoryId;
+    onComponentDevices;
     constructor(initialData, location, assetId) {
         super();
         this.initialData = initialData;

package/lib/ring-intercom.js

@@ -8,12 +8,18 @@ const operators_1 = require("rxjs/operators");
 const ring_camera_1 = require("./ring-camera");
 const util_1 = require("./util");
 class RingIntercom {
+    initialData;
+    restClient;
+    id;
+    deviceType;
+    onData;
+    onRequestUpdate = new rxjs_1.Subject();
+    onBatteryLevel;
+    onDing = new rxjs_1.Subject();
+    onUnlocked = new rxjs_1.Subject();
     constructor(initialData, restClient) {
         this.initialData = initialData;
         this.restClient = restClient;
-        this.onRequestUpdate = new rxjs_1.Subject();
-        this.onDing = new rxjs_1.Subject();
-        this.onUnlocked = new rxjs_1.Subject();
         this.id = this.initialData.id;
         this.deviceType = this.initialData.kind;
         this.onData = new rxjs_1.BehaviorSubject(this.initialData);

package/lib/ring-types.d.ts

@@ -42,7 +42,8 @@ export declare enum RingDeviceType {
     UnknownZWave = "unknown.zwave",
     OnvifCamera = "onvif_camera",
     ThirdPartyGarageDoorOpener = "third_party_gdo",
-    IntercomHandsetAudio = "intercom_handset_audio"
+    IntercomHandsetAudio = "intercom_handset_audio",
+    WaterValve = "valve.water"
 }
 export declare enum RingDeviceCategory {
     Outlets = 1,
@@ -61,7 +62,8 @@ export declare enum RingDeviceCategory {
     RangeExtenders = 32,
     Keypads = 33,
     Sirens = 34,
-    PanicButtons = 35
+    PanicButtons = 35,
+    WaterValves = 37
 }
 export declare enum RingCameraKind {
     doorbot = "doorbot",
@@ -187,6 +189,7 @@ export interface RingDeviceData {
     }[];
     motionSensorEnabled?: boolean;
     brightness?: number;
+    valveState?: 'open' | 'closed';
 }
 export declare const deviceTypesWithVolume: RingDeviceType[];
 export interface BaseStation {

package/lib/ring-types.js

@@ -52,6 +52,7 @@ var RingDeviceType;
     RingDeviceType["OnvifCamera"] = "onvif_camera";
     RingDeviceType["ThirdPartyGarageDoorOpener"] = "third_party_gdo";
     RingDeviceType["IntercomHandsetAudio"] = "intercom_handset_audio";
+    RingDeviceType["WaterValve"] = "valve.water";
 })(RingDeviceType || (exports.RingDeviceType = RingDeviceType = {}));
 // eslint-disable-next-line no-shadow
 var RingDeviceCategory;
@@ -73,6 +74,7 @@ var RingDeviceCategory;
     RingDeviceCategory[RingDeviceCategory["Keypads"] = 33] = "Keypads";
     RingDeviceCategory[RingDeviceCategory["Sirens"] = 34] = "Sirens";
     RingDeviceCategory[RingDeviceCategory["PanicButtons"] = 35] = "PanicButtons";
+    RingDeviceCategory[RingDeviceCategory["WaterValves"] = 37] = "WaterValves";
 })(RingDeviceCategory || (exports.RingDeviceCategory = RingDeviceCategory = {}));
 // eslint-disable-next-line no-shadow
 var RingCameraKind;
@@ -110,6 +112,7 @@ var RingCameraKind;
     RingCameraKind["stickup_cam_mini"] = "stickup_cam_mini";
     RingCameraKind["onvif_camera"] = "onvif_camera";
 })(RingCameraKind || (exports.RingCameraKind = RingCameraKind = {}));
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 exports.RingCameraModel = {
     doorbot: 'Doorbell',
     doorbell: 'Doorbell',
@@ -159,6 +162,7 @@ exports.deviceTypesWithVolume = [
     RingDeviceType.BaseStation,
     RingDeviceType.Keypad,
 ];
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 exports.ChimeModel = {
     chime: 'Chime',
     chime_pro: 'Chime Pro',

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

@@ -22,7 +22,7 @@ export declare class WeriftPeerConnection extends Subscribed implements BasicPee
     onVideoRtp: Subject<RtpPacket>;
     onVideoRtcp: Subject<RtcpPacket>;
     onIceCandidate: Subject<RTCIceCandidate>;
-    onConnectionState: ReplaySubject<"connected" | "closed" | "failed" | "disconnected" | "new" | "connecting">;
+    onConnectionState: ReplaySubject<"closed" | "connected" | "failed" | "disconnected" | "new" | "connecting">;
     returnAudioTrack: MediaStreamTrack;
     private onRequestKeyFrame;
     constructor();

package/lib/streaming/peer-connection.js

@@ -17,16 +17,17 @@ const ringIceServers = [
     'stun:stun4.l.google.com:19302',
 ];
 class WeriftPeerConnection extends subscribed_1.Subscribed {
+    pc;
+    onAudioRtp = new rxjs_1.Subject();
+    onAudioRtcp = new rxjs_1.Subject();
+    onVideoRtp = new rxjs_1.Subject();
+    onVideoRtcp = new rxjs_1.Subject();
+    onIceCandidate = new rxjs_1.Subject();
+    onConnectionState = new rxjs_1.ReplaySubject(1);
+    returnAudioTrack = new werift_1.MediaStreamTrack({ kind: 'audio' });
+    onRequestKeyFrame = new rxjs_1.Subject();
     constructor() {
         super();
-        this.onAudioRtp = new rxjs_1.Subject();
-        this.onAudioRtcp = new rxjs_1.Subject();
-        this.onVideoRtp = new rxjs_1.Subject();
-        this.onVideoRtcp = new rxjs_1.Subject();
-        this.onIceCandidate = new rxjs_1.Subject();
-        this.onConnectionState = new rxjs_1.ReplaySubject(1);
-        this.returnAudioTrack = new werift_1.MediaStreamTrack({ kind: 'audio' });
-        this.onRequestKeyFrame = new rxjs_1.Subject();
         const pc = (this.pc = new werift_1.RTCPeerConnection({
             codecs: {
                 audio: [

package/lib/streaming/simple-webrtc-session.js

@@ -6,10 +6,12 @@ function liveViewUrl(path) {
     return `https://api.ring.com/integrations/v1/liveview/${path}`;
 }
 class SimpleWebRtcSession {
+    camera;
+    restClient;
+    sessionId = (0, util_1.generateUuid)();
     constructor(camera, restClient) {
         this.camera = camera;
         this.restClient = restClient;
-        this.sessionId = (0, util_1.generateUuid)();
     }
     async start(sdp) {
         const response = await this.restClient.request({

package/lib/streaming/streaming-session.js

@@ -17,19 +17,19 @@ function getCleanSdp(sdp, includeVideo) {
         .join('\n');
 }
 class StreamingSession extends subscribed_1.Subscribed {
+    camera;
+    connection;
+    onCallEnded = new rxjs_1.ReplaySubject(1);
+    onUsingOpus = new rxjs_1.ReplaySubject(1);
+    onVideoRtp = new rxjs_1.Subject();
+    onAudioRtp = new rxjs_1.Subject();
+    audioSplitter = new camera_utils_1.RtpSplitter();
+    videoSplitter = new camera_utils_1.RtpSplitter();
+    returnAudioSplitter = new camera_utils_1.RtpSplitter();
     constructor(camera, connection) {
         super();
         this.camera = camera;
         this.connection = connection;
-        this.onCallEnded = new rxjs_1.ReplaySubject(1);
-        this.onUsingOpus = new rxjs_1.ReplaySubject(1);
-        this.onVideoRtp = new rxjs_1.Subject();
-        this.onAudioRtp = new rxjs_1.Subject();
-        this.audioSplitter = new camera_utils_1.RtpSplitter();
-        this.videoSplitter = new camera_utils_1.RtpSplitter();
-        this.returnAudioSplitter = new camera_utils_1.RtpSplitter();
-        this.cameraSpeakerActivated = false;
-        this.hasEnded = false;
         this.bindToConnection(connection);
     }
     bindToConnection(connection) {
@@ -44,6 +44,7 @@ class StreamingSession extends subscribed_1.Subscribed {
     activate() {
         this.requestKeyFrame();
     }
+    cameraSpeakerActivated = false;
     activateCameraSpeaker() {
         if (this.cameraSpeakerActivated || this.hasEnded) {
             return;
@@ -155,6 +156,7 @@ class StreamingSession extends subscribed_1.Subscribed {
         });
         this.onCallEnded.pipe((0, operators_1.take)(1)).subscribe(() => ff.stop());
     }
+    hasEnded = false;
     callEnded() {
         if (this.hasEnded) {
             return;

package/lib/streaming/webrtc-connection.js

@@ -8,19 +8,23 @@ const util_1 = require("../util");
 const peer_connection_1 = require("./peer-connection");
 const subscribed_1 = require("../subscribed");
 class WebrtcConnection extends subscribed_1.Subscribed {
+    camera;
+    onSessionId = new rxjs_1.ReplaySubject(1);
+    onOfferSent = new rxjs_1.ReplaySubject(1);
+    dialogId = (0, util_1.generateUuid)();
+    onCameraConnected = new rxjs_1.ReplaySubject(1);
+    onCallAnswered = new rxjs_1.ReplaySubject(1);
+    onCallEnded = new rxjs_1.ReplaySubject(1);
+    onError = new rxjs_1.ReplaySubject(1);
+    onMessage = new rxjs_1.ReplaySubject();
+    onWsOpen;
+    onAudioRtp;
+    onVideoRtp;
+    pc;
+    ws;
     constructor(ticket, camera, options) {
         super();
         this.camera = camera;
-        this.onSessionId = new rxjs_1.ReplaySubject(1);
-        this.onOfferSent = new rxjs_1.ReplaySubject(1);
-        this.dialogId = (0, util_1.generateUuid)();
-        this.onCameraConnected = new rxjs_1.ReplaySubject(1);
-        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.sessionId = null;
-        this.hasEnded = false;
         this.ws = new ws_1.WebSocket(`wss://api.prod.signalling.ring.devices.a2z.com:443/ws?api_version=4.0&auth_type=ring_solutions&client_id=ring_site-${(0, util_1.generateUuid)()}&token=${ticket}`, {
             headers: {
                 // This must exist or the socket will close immediately but content does not seem to matter
@@ -110,6 +114,7 @@ class WebrtcConnection extends subscribed_1.Subscribed {
         });
         this.onOfferSent.next();
     }
+    sessionId = null;
     async handleMessage(message) {
         if (message.body.doorbot_id !== this.camera.id) {
             // ignore messages for other cameras
@@ -220,6 +225,7 @@ class WebrtcConnection extends subscribed_1.Subscribed {
             });
         }));
     }
+    hasEnded = false;
     callEnded() {
         if (this.hasEnded) {
             return;

package/lib/subscribed.js

@@ -2,9 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Subscribed = void 0;
 class Subscribed {
-    constructor() {
-        this.subscriptions = [];
-    }
+    subscriptions = [];
     addSubscriptions(...subscriptions) {
         this.subscriptions.push(...subscriptions);
     }

package/lib/test/rest-client.spec.js

@@ -6,105 +6,104 @@ const rest_client_1 = require("../rest-client");
 const util_1 = require("../util");
 const rxjs_1 = require("rxjs");
 let sessionCreatedCount = 0, client;
-const email = 'some@one.com', password = 'abc123!', phone = '+1xxxxxxxx89', twoFactorAuthCode = '123456', hardwareIdPromise = (0, util_1.getHardwareId)(), accessToken = 'ey__accees_token', secondAccessToken = 'ey__second_accees_token', refreshToken = 'ey__refresh_token', secondRefreshToken = 'ey__second_refresh_token', thirdRefreshToken = 'ey__third_refresh_token', server = (0, node_1.setupServer)(msw_1.rest.post('https://oauth.ring.com/oauth/token', async (req, res, ctx) => {
+const email = 'some@one.com', password = 'abc123!', phone = '+1xxxxxxxx89', twoFactorAuthCode = '123456', hardwareIdPromise = (0, util_1.getHardwareId)(), accessToken = 'ey__accees_token', secondAccessToken = 'ey__second_accees_token', refreshToken = 'ey__refresh_token', secondRefreshToken = 'ey__second_refresh_token', thirdRefreshToken = 'ey__third_refresh_token', server = (0, node_1.setupServer)(msw_1.http.post('https://oauth.ring.com/oauth/token', async ({ request: req }) => {
     const body = await req.json();
     if (req.headers.get('2fa-support') !== 'true' ||
         req.headers.get('User-Agent') !== 'android:com.ringapp' ||
         req.headers.get('hardware_id') !== (await hardwareIdPromise)) {
-        return res(ctx.status(400), ctx.json({
+        return msw_1.HttpResponse.json({
             code: 1,
-            error: 'Invalid auth headers: ' +
-                JSON.stringify(req.headers.raw(), null, 2),
-        }));
+            error: 'Invalid auth headers: ' + JSON.stringify(req.headers, null, 2),
+        }, { status: 400 });
     }
     if (body.grant_type === 'refresh_token') {
         if (body.refresh_token === refreshToken) {
             // Valid refresh token
-            return res(ctx.status(200), ctx.json({
+            return msw_1.HttpResponse.json({
                 access_token: accessToken,
                 expires_in: 3600,
                 refresh_token: secondRefreshToken,
                 scope: 'client',
                 token_type: 'Bearer',
-            }));
+            }, { status: 200 });
         }
         if (body.refresh_token === secondRefreshToken) {
             // Valid refresh token
-            return res(ctx.status(200), ctx.json({
+            return msw_1.HttpResponse.json({
                 access_token: secondAccessToken,
                 expires_in: 3600,
                 refresh_token: thirdRefreshToken,
                 scope: 'client',
                 token_type: 'Bearer',
-            }));
+            }, { status: 200 });
         }
         // Invalid refresh token
-        return res(ctx.status(401), ctx.json({
+        return msw_1.HttpResponse.json({
             error: 'invalid_grant',
             error_description: 'token is invalid or does not exists',
-        }));
+        }, { status: 401 });
     }
     if (body.grant_type !== 'password' ||
         body.client_id !== 'ring_official_android' ||
         body.scope !== 'client') {
-        return res(ctx.status(400), ctx.json({
+        return msw_1.HttpResponse.json({
             code: 1,
             error: 'Invalid auth request: ' + JSON.stringify(body),
-        }));
+        }, { status: 400 });
     }
     if (body.username !== email || body.password !== password) {
         // Wrong username or password
-        return res(ctx.status(401), ctx.json({
+        return msw_1.HttpResponse.json({
             error: 'access_denied',
             error_description: 'invalid user credentials',
-        }));
+        }, { status: 401 });
     }
     if (req.headers.get('2fa-code') &&
         req.headers.get('2fa-code') !== twoFactorAuthCode) {
         // Wrong 2fa code
-        return res(ctx.status(400), ctx.json({
+        return msw_1.HttpResponse.json({
             err_msg: 'bad request response from dependency service',
             error: 'Verification Code is invalid or expired',
-        }));
+        }, { status: 400 });
     }
     if (req.headers.get('2fa-code') === twoFactorAuthCode) {
         // Successfull login with correct 2fa code
-        return res(ctx.json({
+        return msw_1.HttpResponse.json({
             access_token: accessToken,
             expires_in: 3600,
             refresh_token: refreshToken,
             scope: 'client',
             token_type: 'Bearer',
             responseTimestamp: Date.now(),
-        }));
+        });
     }
     // 2fa code not provided, so return the 2fa prompt
-    return res(ctx.status(412), ctx.json({
+    return msw_1.HttpResponse.json({
         next_time_in_secs: 60,
         phone,
         tsv_state: 'sms',
-    }));
-}), msw_1.rest.post('https://api.ring.com/clients_api/session', async (req, res, ctx) => {
+    }, { status: 412 });
+}), msw_1.http.post('https://api.ring.com/clients_api/session', async ({ request: req }) => {
     const authHeader = req.headers.get('Authorization');
     if (authHeader !== `Bearer ${accessToken}` &&
         authHeader !== `Bearer ${secondAccessToken}`) {
         // Invalid access token used
-        return res(ctx.status(401));
+        return msw_1.HttpResponse.json({}, { status: 401 });
     }
     const body = await req.json();
     if (body.device.hardware_id !== (await (0, util_1.getHardwareId)()) ||
         body.device.metadata.api_version !== 11 ||
         body.device.metadata.device_model !== 'ring-client-api' ||
         body.device.os !== 'android') {
-        return res(ctx.status(400), ctx.body('Bad session request: ' + JSON.stringify(body, null, 2)));
+        return msw_1.HttpResponse.text('Bad session request: ' + JSON.stringify(body, null, 2), { status: 400 });
     }
     // Fake a response from the session endpoint, incrementing the sessionCreatedCount
     sessionCreatedCount++;
-    return res(ctx.json({
+    return msw_1.HttpResponse.json({
         profile: {
             id: 1234,
         },
-    }));
+    });
 }));
 async function wrapRefreshToken(rt) {
     return (0, util_1.toBase64)(JSON.stringify({
@@ -200,25 +199,25 @@ describe('fetch', () => {
     let invalidateFirstAccessToken = false;
     beforeEach(() => {
         invalidateFirstAccessToken = false;
-        server.use(msw_1.rest.get('https://api.ring.com/clients_api/some_endpoint', (req, res, ctx) => {
+        server.use(msw_1.http.get('https://api.ring.com/clients_api/some_endpoint', ({ request: req }) => {
             const authHeader = req.headers.get('Authorization');
             if (invalidateFirstAccessToken &&
                 authHeader === `Bearer ${accessToken}`) {
                 // Original access token used, but no longer valid
-                return res(ctx.status(401));
+                return msw_1.HttpResponse.json({}, { status: 401 });
             }
             if (authHeader !== `Bearer ${accessToken}` &&
                 authHeader !== `Bearer ${secondAccessToken}`) {
                 // Invalid access token used
-                return res(ctx.status(401));
+                return msw_1.HttpResponse.json({}, { status: 401 });
             }
             if (sessionCreatedCount === 0) {
                 // Session not created yet
-                return res(ctx.status(404), ctx.json({
+                return msw_1.HttpResponse.json({
                     error: 'Session not found for ' + req.headers.get('hardware_id'),
-                }));
+                }, { status: 404 });
             }
-            return res(ctx.json([]));
+            return msw_1.HttpResponse.json([]);
         }));
     });
     it('should include the auth token as a header', async () => {

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "ring-client-api",
-  "version": "13.0.1",
+  "version": "13.2.0-beta.0",
   "description": "Unofficial API for Ring doorbells, cameras, security alarm system and smart lighting",
   "main": "lib/index.js",
   "exports": {
     ".": "./lib/index.js",
     "./ffmpeg": "./lib/ffmpeg.js",
     "./util": "./lib/util.js",
-    "./rest-client": "./lib/rest-client.js"
+    "./rest-client": "./lib/rest-client.js",
+    "./streaming/streaming-session": "./lib/streaming/streaming-session.js"
   },
   "scripts": {
     "build": "rm -rf lib && tsc --declaration && chmod +x ./lib/ring-*-cli.js",
@@ -17,35 +18,35 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@eneris/push-receiver": "4.1.6",
+    "@eneris/push-receiver": "4.2.0",
     "@homebridge/camera-utils": "^2.2.6",
-    "@types/socket.io-client": "1.4.36",
     "colors": "1.4.0",
-    "debug": "^4.3.5",
+    "debug": "^4.3.7",
     "json-bigint": "^1.0.0",
     "rxjs": "^7.8.1",
     "socket.io-client": "^2.5.0",
-    "systeminformation": "^5.22.11",
+    "systeminformation": "^5.23.5",
     "uuid": "^10.0.0",
     "werift": "0.19.4",
     "ws": "^8.18.0"
   },
   "devDependencies": {
     "@types/debug": "4.1.12",
-    "@types/jest": "29.5.12",
+    "@types/jest": "29.5.13",
     "@types/json-bigint": "^1.0.4",
-    "@types/node": "20.14.11",
+    "@types/node": "22.7.5",
+    "@types/socket.io-client": "1.4.36",
     "@types/uuid": "10.0.0",
-    "@types/ws": "^8.5.11",
+    "@types/ws": "^8.5.12",
     "eslint-config-shared": "*",
     "jest": "29.7.0",
-    "msw": "^1.3.3",
-    "ts-jest": "29.2.3",
+    "msw": "^2.4.10",
+    "ts-jest": "29.2.5",
     "tsconfig": "*",
-    "typescript": "5.5.3"
+    "typescript": "5.6.3"
   },
   "engines": {
-    "node": "^18 || ^20"
+    "node": "^18 || ^20 || ^22"
   },
   "repository": {
     "type": "git",