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

package/lib/ring-intercom.js

@@ -1,33 +1,30 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RingIntercom = void 0;
-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 ring_camera_1 = require("./ring-camera");
-const util_1 = require("./util");
-class RingIntercom {
+import { PushNotificationAction } from "./ring-types.js";
+import { clientApi, commandsApi } from "./rest-client.js";
+import { BehaviorSubject, Subject } from 'rxjs';
+import { distinctUntilChanged, map } from 'rxjs/operators';
+import { getBatteryLevel } from "./ring-camera.js";
+import { logError } from "./util.js";
+export class RingIntercom {
     initialData;
     restClient;
     id;
     deviceType;
     onData;
-    onRequestUpdate = new rxjs_1.Subject();
+    onRequestUpdate = new Subject();
     onBatteryLevel;
-    onDing = new rxjs_1.Subject();
-    onUnlocked = new rxjs_1.Subject();
+    onDing = new Subject();
+    onUnlocked = new Subject();
     constructor(initialData, restClient) {
         this.initialData = initialData;
         this.restClient = restClient;
         this.id = this.initialData.id;
         this.deviceType = this.initialData.kind;
-        this.onData = new rxjs_1.BehaviorSubject(this.initialData);
-        this.onBatteryLevel = this.onData.pipe((0, operators_1.map)((data) => (0, ring_camera_1.getBatteryLevel)(data)), (0, operators_1.distinctUntilChanged)());
+        this.onData = new BehaviorSubject(this.initialData);
+        this.onBatteryLevel = this.onData.pipe(map((data) => getBatteryLevel(data)), distinctUntilChanged());
         if (!initialData.subscribed) {
             this.subscribeToDingEvents().catch((e) => {
-                (0, util_1.logError)('Failed to subscribe ' + initialData.description + ' to ding events');
-                (0, util_1.logError)(e);
+                logError('Failed to subscribe ' + initialData.description + ' to ding events');
+                logError(e);
             });
         }
     }
@@ -47,12 +44,12 @@ class RingIntercom {
         return this.data.alerts.connection === 'offline';
     }
     get batteryLevel() {
-        return (0, ring_camera_1.getBatteryLevel)(this.data);
+        return getBatteryLevel(this.data);
     }
     unlock() {
         return this.restClient.request({
             method: 'PUT',
-            url: (0, rest_client_1.commandsApi)(`devices/${this.id}/device_rpc`),
+            url: commandsApi(`devices/${this.id}/device_rpc`),
             json: {
                 command_name: 'device_rpc',
                 request: {
@@ -67,7 +64,7 @@ class RingIntercom {
         });
     }
     doorbotUrl(path = '') {
-        return (0, rest_client_1.clientApi)(`doorbots/${this.id}/${path}`);
+        return clientApi(`doorbots/${this.id}/${path}`);
     }
     subscribeToDingEvents() {
         return this.restClient.request({
@@ -84,13 +81,12 @@ class RingIntercom {
     processPushNotification(notification) {
         if ('android_config' in notification &&
             notification.android_config.category ===
-                ring_types_1.PushNotificationAction.IntercomDing) {
+                PushNotificationAction.IntercomDing) {
             this.onDing.next();
         }
         else if ('gcmData' in notification.data &&
-            notification.data.gcmData.action === ring_types_1.PushNotificationAction.IntercomUnlock) {
+            notification.data.gcmData.action === PushNotificationAction.IntercomUnlock) {
             this.onUnlocked.next();
         }
     }
 }
-exports.RingIntercom = RingIntercom;

package/lib/ring-types.d.ts

@@ -94,6 +94,8 @@ export declare enum RingCameraKind {
     floodlight_pro = "floodlight_pro",
     cocoa_camera = "cocoa_camera",// appears to be used for all next gen stickup cams (wired/battery/solar)
     cocoa_doorbell = "cocoa_doorbell",
+    cocoa_doorbell_v2 = "cocoa_doorbell_v2",
+    cocoa_doorbell_v3 = "cocoa_doorbell_v3",
     cocoa_floodlight = "cocoa_floodlight",
     cocoa_spotlight = "cocoa_spotlight",// used for the Spotlight Cam Plus (potentially other Spotlight models)
     stickup_cam_mini = "stickup_cam_mini",

package/lib/ring-types.js

@@ -1,9 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.disabledLocationModes = exports.DispatchSignalType = exports.PushNotificationAction = exports.NotificationDetectionType = exports.DoorbellType = exports.ChimeModel = exports.deviceTypesWithVolume = exports.allAlarmStates = exports.RingCameraModel = exports.RingCameraKind = exports.RingDeviceCategory = exports.RingDeviceType = void 0;
-exports.isWebSocketSupportedAsset = isWebSocketSupportedAsset;
 // eslint-disable-next-line no-shadow
-var RingDeviceType;
+export var RingDeviceType;
 (function (RingDeviceType) {
     RingDeviceType["BaseStation"] = "hub.redsky";
     RingDeviceType["BaseStationPro"] = "hub.kili";
@@ -49,9 +45,9 @@ var RingDeviceType;
     RingDeviceType["ThirdPartyGarageDoorOpener"] = "third_party_gdo";
     RingDeviceType["IntercomHandsetAudio"] = "intercom_handset_audio";
     RingDeviceType["WaterValve"] = "valve.water";
-})(RingDeviceType || (exports.RingDeviceType = RingDeviceType = {}));
+})(RingDeviceType || (RingDeviceType = {}));
 // eslint-disable-next-line no-shadow
-var RingDeviceCategory;
+export var RingDeviceCategory;
 (function (RingDeviceCategory) {
     RingDeviceCategory[RingDeviceCategory["Outlets"] = 1] = "Outlets";
     RingDeviceCategory[RingDeviceCategory["Lights"] = 2] = "Lights";
@@ -71,9 +67,9 @@ var RingDeviceCategory;
     RingDeviceCategory[RingDeviceCategory["Sirens"] = 34] = "Sirens";
     RingDeviceCategory[RingDeviceCategory["PanicButtons"] = 35] = "PanicButtons";
     RingDeviceCategory[RingDeviceCategory["WaterValves"] = 37] = "WaterValves";
-})(RingDeviceCategory || (exports.RingDeviceCategory = RingDeviceCategory = {}));
+})(RingDeviceCategory || (RingDeviceCategory = {}));
 // eslint-disable-next-line no-shadow
-var RingCameraKind;
+export var RingCameraKind;
 (function (RingCameraKind) {
     RingCameraKind["doorbot"] = "doorbot";
     RingCameraKind["doorbell"] = "doorbell";
@@ -103,13 +99,15 @@ var RingCameraKind;
     RingCameraKind["floodlight_pro"] = "floodlight_pro";
     RingCameraKind["cocoa_camera"] = "cocoa_camera";
     RingCameraKind["cocoa_doorbell"] = "cocoa_doorbell";
+    RingCameraKind["cocoa_doorbell_v2"] = "cocoa_doorbell_v2";
+    RingCameraKind["cocoa_doorbell_v3"] = "cocoa_doorbell_v3";
     RingCameraKind["cocoa_floodlight"] = "cocoa_floodlight";
     RingCameraKind["cocoa_spotlight"] = "cocoa_spotlight";
     RingCameraKind["stickup_cam_mini"] = "stickup_cam_mini";
     RingCameraKind["onvif_camera"] = "onvif_camera";
-})(RingCameraKind || (exports.RingCameraKind = RingCameraKind = {}));
+})(RingCameraKind || (RingCameraKind = {}));
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-exports.RingCameraModel = {
+export const RingCameraModel = {
     doorbot: 'Doorbell',
     doorbell: 'Doorbell',
     doorbell_v3: 'Doorbell',
@@ -138,12 +136,14 @@ exports.RingCameraModel = {
     floodlight_pro: 'Floodlight Pro',
     cocoa_camera: 'Stick Up Cam',
     cocoa_doorbell: 'Doorbell Gen 2',
+    cocoa_doorbell_v2: 'Battery Doorbell Plus',
+    cocoa_doorbell_v3: 'Battery Doorbell Pro',
     cocoa_floodlight: 'Floodlight Cam Plus',
     cocoa_spotlight: 'Spotlight Cam Plus',
     stickup_cam_mini: 'Indoor Cam',
     onvif_camera: 'ONVIF Camera',
 };
-exports.allAlarmStates = [
+export const allAlarmStates = [
     'burglar-alarm',
     'entry-delay',
     'fire-alarm',
@@ -154,26 +154,26 @@ exports.allAlarmStates = [
     'burglar-accelerated-alarm',
     'fire-accelerated-alarm',
 ];
-exports.deviceTypesWithVolume = [
+export const deviceTypesWithVolume = [
     RingDeviceType.BaseStation,
     RingDeviceType.Keypad,
 ];
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-exports.ChimeModel = {
+export const ChimeModel = {
     chime: 'Chime',
     chime_pro: 'Chime Pro',
     chime_v2: 'Chime v2',
     chime_pro_v2: 'Chime Pro v2',
 };
 // eslint-disable-next-line no-shadow
-var DoorbellType;
+export var DoorbellType;
 (function (DoorbellType) {
     DoorbellType[DoorbellType["Mechanical"] = 0] = "Mechanical";
     DoorbellType[DoorbellType["Digital"] = 1] = "Digital";
     DoorbellType[DoorbellType["None"] = 2] = "None";
-})(DoorbellType || (exports.DoorbellType = DoorbellType = {}));
+})(DoorbellType || (DoorbellType = {}));
 // eslint-disable-next-line no-shadow
-var NotificationDetectionType;
+export var NotificationDetectionType;
 (function (NotificationDetectionType) {
     // Note, this list may not be complete
     NotificationDetectionType["Human"] = "human";
@@ -182,9 +182,9 @@ var NotificationDetectionType;
     NotificationDetectionType["OtherMotion"] = "other_motion";
     NotificationDetectionType["NotAvailable"] = "null";
     NotificationDetectionType["StreamBroken"] = "stream_broken";
-})(NotificationDetectionType || (exports.NotificationDetectionType = NotificationDetectionType = {}));
+})(NotificationDetectionType || (NotificationDetectionType = {}));
 // eslint-disable-next-line no-shadow
-var PushNotificationAction;
+export var PushNotificationAction;
 (function (PushNotificationAction) {
     PushNotificationAction["Ding"] = "com.ring.pn.live-event.ding";
     PushNotificationAction["Motion"] = "com.ring.pn.live-event.motion";
@@ -194,14 +194,14 @@ var PushNotificationAction;
     PushNotificationAction["AlarmModeSome"] = "com.ring.push.HANDLE_NEW_SECURITY_PANEL_MODE_SOME_NOTICE";
     PushNotificationAction["AlarmSoundSiren"] = "com.ring.push.HANDLE_NEW_USER_SOUND_SIREN";
     PushNotificationAction["AlarmSilenceSiren"] = "com.ring.push.HANDLE_NEW_NON_ALARM_SIREN_SILENCED";
-})(PushNotificationAction || (exports.PushNotificationAction = PushNotificationAction = {}));
+})(PushNotificationAction || (PushNotificationAction = {}));
 // eslint-disable-next-line no-shadow
-var DispatchSignalType;
+export var DispatchSignalType;
 (function (DispatchSignalType) {
     DispatchSignalType["Burglar"] = "user-verified-burglar-xa";
     DispatchSignalType["Fire"] = "user-verified-fire-xa";
-})(DispatchSignalType || (exports.DispatchSignalType = DispatchSignalType = {}));
-exports.disabledLocationModes = ['disabled', 'unset'];
-function isWebSocketSupportedAsset({ kind }) {
+})(DispatchSignalType || (DispatchSignalType = {}));
+export const disabledLocationModes = ['disabled', 'unset'];
+export function isWebSocketSupportedAsset({ kind }) {
     return kind.startsWith('base_station') || kind.startsWith('beams_bridge');
 }

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

@@ -1,6 +1,8 @@
-import { ConnectionState, MediaStreamTrack, RTCIceCandidate, RtcpPacket, RtpPacket } from 'werift';
-import { Observable, ReplaySubject, Subject } from 'rxjs';
-import { Subscribed } from '../subscribed';
+import type { RTCIceCandidate, RtpPacket } from 'werift';
+import { type ConnectionState, MediaStreamTrack, type RtcpPacket } from 'werift';
+import type { Observable } from 'rxjs';
+import { ReplaySubject, Subject } from 'rxjs';
+import { Subscribed } from '../subscribed.ts';
 export interface BasicPeerConnection {
     createOffer(): Promise<{
         sdp: string;

package/lib/streaming/peer-connection.js

@@ -1,11 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WeriftPeerConnection = void 0;
-/* eslint-disable brace-style */
-const werift_1 = require("werift");
-const rxjs_1 = require("rxjs");
-const util_1 = require("../util");
-const subscribed_1 = require("../subscribed");
+import { MediaStreamTrack, RTCPeerConnection, RTCRtpCodecParameters, } from 'werift';
+import { interval, merge, ReplaySubject, Subject } from 'rxjs';
+import { logDebug, logError, logInfo } from "../util.js";
+import { Subscribed } from "../subscribed.js";
 const ringIceServers = [
     'stun:stun.kinesisvideo.us-east-1.amazonaws.com:443',
     'stun:stun.kinesisvideo.us-east-2.amazonaws.com:443',
@@ -16,27 +12,27 @@ const ringIceServers = [
     'stun:stun3.l.google.com:19302',
     'stun:stun4.l.google.com:19302',
 ];
-class WeriftPeerConnection extends subscribed_1.Subscribed {
+export class WeriftPeerConnection extends 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();
+    onAudioRtp = new Subject();
+    onAudioRtcp = new Subject();
+    onVideoRtp = new Subject();
+    onVideoRtcp = new Subject();
+    onIceCandidate = new Subject();
+    onConnectionState = new ReplaySubject(1);
+    returnAudioTrack = new MediaStreamTrack({ kind: 'audio' });
+    onRequestKeyFrame = new Subject();
     constructor() {
         super();
-        const pc = (this.pc = new werift_1.RTCPeerConnection({
+        const pc = (this.pc = new RTCPeerConnection({
             codecs: {
                 audio: [
-                    new werift_1.RTCRtpCodecParameters({
+                    new RTCRtpCodecParameters({
                         mimeType: 'audio/opus',
                         clockRate: 48000,
                         channels: 2,
                     }),
-                    new werift_1.RTCRtpCodecParameters({
+                    new RTCRtpCodecParameters({
                         mimeType: 'audio/PCMU',
                         clockRate: 8000,
                         channels: 1,
@@ -44,7 +40,7 @@ class WeriftPeerConnection extends subscribed_1.Subscribed {
                     }),
                 ],
                 video: [
-                    new werift_1.RTCRtpCodecParameters({
+                    new RTCRtpCodecParameters({
                         mimeType: 'video/H264',
                         clockRate: 90000,
                         rtcpFeedback: [
@@ -56,7 +52,7 @@ class WeriftPeerConnection extends subscribed_1.Subscribed {
                         ],
                         parameters: 'packetization-mode=1;profile-level-id=640029;level-asymmetry-allowed=1',
                     }),
-                    new werift_1.RTCRtpCodecParameters({
+                    new RTCRtpCodecParameters({
                         mimeType: 'video/rtx',
                         clockRate: 90000,
                     }),
@@ -78,7 +74,7 @@ class WeriftPeerConnection extends subscribed_1.Subscribed {
                 this.onAudioRtcp.next(rtcp);
             });
             track.onReceiveRtp.once(() => {
-                (0, util_1.logDebug)('received first audio packet');
+                logDebug('received first audio packet');
             });
         });
         videoTransceiver.onTrack.subscribe((track) => {
@@ -89,11 +85,11 @@ class WeriftPeerConnection extends subscribed_1.Subscribed {
                 this.onVideoRtcp.next(rtcp);
             });
             track.onReceiveRtp.once(() => {
-                (0, util_1.logDebug)('received first video packet');
-                this.addSubscriptions((0, rxjs_1.merge)(this.onRequestKeyFrame, (0, rxjs_1.interval)(4000)).subscribe(() => {
+                logDebug('received first video packet');
+                this.addSubscriptions(merge(this.onRequestKeyFrame, interval(4000)).subscribe(() => {
                     videoTransceiver.receiver
                         .sendRtcpPLI(track.ssrc)
-                        .catch((e) => (0, util_1.logError)(e));
+                        .catch((e) => logError(e));
                 }));
                 this.requestKeyFrame();
             });
@@ -104,13 +100,13 @@ class WeriftPeerConnection extends subscribed_1.Subscribed {
             }
         });
         pc.iceConnectionStateChange.subscribe(() => {
-            (0, util_1.logInfo)(`iceConnectionStateChange: ${pc.iceConnectionState}`);
+            logInfo(`iceConnectionStateChange: ${pc.iceConnectionState}`);
             if (pc.iceConnectionState === 'closed') {
                 this.onConnectionState.next('closed');
             }
         });
         pc.connectionStateChange.subscribe(() => {
-            (0, util_1.logInfo)(`connectionStateChange: ${pc.connectionState}`);
+            logInfo(`connectionStateChange: ${pc.connectionState}`);
             this.onConnectionState.next(pc.connectionState);
         });
     }
@@ -129,8 +125,7 @@ class WeriftPeerConnection extends subscribed_1.Subscribed {
         this.onRequestKeyFrame.next();
     }
     close() {
-        this.pc.close().catch(util_1.logError);
+        this.pc.close().catch(logError);
         this.unsubscribe();
     }
 }
-exports.WeriftPeerConnection = WeriftPeerConnection;

package/lib/streaming/simple-webrtc-session.d.ts

@@ -1,5 +1,5 @@
-import { RingCamera } from '../ring-camera';
-import { RingRestClient } from '../rest-client';
+import type { RingCamera } from '../ring-camera.ts';
+import type { RingRestClient } from '../rest-client.ts';
 export declare class SimpleWebRtcSession {
     private readonly camera;
     private restClient;

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

@@ -1,14 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SimpleWebRtcSession = void 0;
-const util_1 = require("../util");
+import { generateUuid } from "../util.js";
 function liveViewUrl(path) {
     return `https://api.ring.com/integrations/v1/liveview/${path}`;
 }
-class SimpleWebRtcSession {
+export class SimpleWebRtcSession {
     camera;
     restClient;
-    sessionId = (0, util_1.generateUuid)();
+    sessionId = generateUuid();
     constructor(camera, restClient) {
         this.camera = camera;
         this.restClient = restClient;
@@ -47,4 +44,3 @@ class SimpleWebRtcSession {
         });
     }
 }
-exports.SimpleWebRtcSession = SimpleWebRtcSession;

package/lib/streaming/streaming-messages.js

@@ -1,5 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 // eslint-disable-next-line no-shadow
 var CloseReasonCode;
 (function (CloseReasonCode) {
@@ -11,3 +9,4 @@ var CloseReasonCode;
     // reason: { code: 6, text: 'Timeout waiting for ping' }
     CloseReasonCode[CloseReasonCode["Timeout"] = 6] = "Timeout";
 })(CloseReasonCode || (CloseReasonCode = {}));
+export {};

package/lib/streaming/streaming-session.d.ts

@@ -1,8 +1,8 @@
 import { RtpPacket } from 'werift';
 import { ReplaySubject, Subject } from 'rxjs';
-import { WebrtcConnection } from './webrtc-connection';
-import { RingCamera } from '../ring-camera';
-import { Subscribed } from '../subscribed';
+import type { WebrtcConnection } from './webrtc-connection.ts';
+import type { RingCamera } from '../ring-camera.ts';
+import { Subscribed } from '../subscribed.ts';
 type SpawnInput = string | number;
 export interface FfmpegOptions {
     input?: SpawnInput[];

package/lib/streaming/streaming-session.js

@@ -1,13 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.StreamingSession = void 0;
-const werift_1 = require("werift");
-const camera_utils_1 = require("@homebridge/camera-utils");
-const rxjs_1 = require("rxjs");
-const ffmpeg_1 = require("../ffmpeg");
-const util_1 = require("../util");
-const operators_1 = require("rxjs/operators");
-const subscribed_1 = require("../subscribed");
+import { RtpPacket } from 'werift';
+import { FfmpegProcess, reservePorts, RtpSplitter, } from '@homebridge/camera-utils';
+import { firstValueFrom, ReplaySubject, Subject } from 'rxjs';
+import { getFfmpegPath } from "../ffmpeg.js";
+import { logDebug, logError } from "../util.js";
+import { concatMap, map, mergeWith, take } from 'rxjs/operators';
+import { Subscribed } from "../subscribed.js";
 function getCleanSdp(sdp, includeVideo) {
     return sdp
         .split('\nm=')
@@ -16,16 +13,16 @@ function getCleanSdp(sdp, includeVideo) {
         .filter((section) => includeVideo || !section.startsWith('m=video'))
         .join('\n');
 }
-class StreamingSession extends subscribed_1.Subscribed {
+export class StreamingSession extends 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();
+    onCallEnded = new ReplaySubject(1);
+    onUsingOpus = new ReplaySubject(1);
+    onVideoRtp = new Subject();
+    onAudioRtp = new Subject();
+    audioSplitter = new RtpSplitter();
+    videoSplitter = new RtpSplitter();
+    returnAudioSplitter = new RtpSplitter();
     constructor(camera, connection) {
         super();
         this.camera = camera;
@@ -53,11 +50,11 @@ class StreamingSession extends subscribed_1.Subscribed {
         this.connection.activateCameraSpeaker();
     }
     async reservePort(bufferPorts = 0) {
-        const ports = await (0, camera_utils_1.reservePorts)({ count: bufferPorts + 1 });
+        const ports = await reservePorts({ count: bufferPorts + 1 });
         return ports[0];
     }
     get isUsingOpus() {
-        return (0, rxjs_1.firstValueFrom)(this.onUsingOpus.pipe((0, operators_1.mergeWith)(this.connection.onError.pipe((0, operators_1.map)((e) => {
+        return firstValueFrom(this.onUsingOpus.pipe(mergeWith(this.connection.onError.pipe(map((e) => {
             throw e;
         })))));
     }
@@ -66,11 +63,11 @@ class StreamingSession extends subscribed_1.Subscribed {
             return;
         }
         const videoPort = await this.reservePort(1), audioPort = await this.reservePort(1), transcodeVideoStream = ffmpegOptions.video !== false, ringSdp = await Promise.race([
-            (0, rxjs_1.firstValueFrom)(this.connection.onCallAnswered),
-            (0, rxjs_1.firstValueFrom)(this.onCallEnded),
+            firstValueFrom(this.connection.onCallAnswered),
+            firstValueFrom(this.onCallEnded),
         ]);
         if (!ringSdp) {
-            (0, util_1.logDebug)('Call ended before answered');
+            logDebug('Call ended before answered');
             return;
         }
         const usingOpus = await this.isUsingOpus, ffmpegInputArguments = [
@@ -86,21 +83,21 @@ class StreamingSession extends subscribed_1.Subscribed {
             'pipe:',
         ], inputSdp = getCleanSdp(ringSdp, transcodeVideoStream)
             .replace(/m=audio \d+/, `m=audio ${audioPort}`)
-            .replace(/m=video \d+/, `m=video ${videoPort}`), ff = new camera_utils_1.FfmpegProcess({
+            .replace(/m=video \d+/, `m=video ${videoPort}`), ff = new FfmpegProcess({
             ffmpegArgs: ffmpegInputArguments.concat(...(ffmpegOptions.audio || ['-acodec', 'aac']), ...(transcodeVideoStream
                 ? ffmpegOptions.video || ['-vcodec', 'copy']
                 : []), ...(ffmpegOptions.output || [])),
-            ffmpegPath: (0, ffmpeg_1.getFfmpegPath)(),
+            ffmpegPath: getFfmpegPath(),
             stdoutCallback: ffmpegOptions.stdoutCallback,
             exitCallback: () => this.callEnded(),
             logLabel: `From Ring (${this.camera.name})`,
             logger: {
-                error: util_1.logError,
-                info: util_1.logDebug,
+                error: logError,
+                info: logDebug,
             },
         });
         this.addSubscriptions(this.onAudioRtp
-            .pipe((0, operators_1.concatMap)((rtp) => {
+            .pipe(concatMap((rtp) => {
             return this.audioSplitter.send(rtp.serialize(), {
                 port: audioPort,
             });
@@ -108,14 +105,14 @@ class StreamingSession extends subscribed_1.Subscribed {
             .subscribe());
         if (transcodeVideoStream) {
             this.addSubscriptions(this.onVideoRtp
-                .pipe((0, operators_1.concatMap)((rtp) => {
+                .pipe(concatMap((rtp) => {
                 return this.videoSplitter.send(rtp.serialize(), {
                     port: videoPort,
                 });
             }))
                 .subscribe());
         }
-        this.onCallEnded.pipe((0, operators_1.take)(1)).subscribe(() => ff.stop());
+        this.onCallEnded.pipe(take(1)).subscribe(() => ff.stop());
         ff.writeStdin(inputSdp);
         // Request a key frame now that ffmpeg is ready to receive
         this.requestKeyFrame();
@@ -124,11 +121,11 @@ class StreamingSession extends subscribed_1.Subscribed {
         if (this.hasEnded) {
             return;
         }
-        const audioOutForwarder = new camera_utils_1.RtpSplitter(({ message }) => {
-            const rtp = werift_1.RtpPacket.deSerialize(message);
+        const audioOutForwarder = new RtpSplitter(({ message }) => {
+            const rtp = RtpPacket.deSerialize(message);
             this.connection.sendAudioPacket(rtp);
             return null;
-        }), usingOpus = await this.isUsingOpus, ff = new camera_utils_1.FfmpegProcess({
+        }), usingOpus = await this.isUsingOpus, ff = new FfmpegProcess({
             ffmpegArgs: [
                 '-hide_banner',
                 '-protocol_whitelist',
@@ -146,15 +143,15 @@ class StreamingSession extends subscribed_1.Subscribed {
                 'rtp',
                 `rtp://127.0.0.1:${await audioOutForwarder.portPromise}`,
             ],
-            ffmpegPath: (0, ffmpeg_1.getFfmpegPath)(),
+            ffmpegPath: getFfmpegPath(),
             exitCallback: () => this.callEnded(),
             logLabel: `Return Audio (${this.camera.name})`,
             logger: {
-                error: util_1.logError,
-                info: util_1.logDebug,
+                error: logError,
+                info: logDebug,
             },
         });
-        this.onCallEnded.pipe((0, operators_1.take)(1)).subscribe(() => ff.stop());
+        this.onCallEnded.pipe(take(1)).subscribe(() => ff.stop());
     }
     hasEnded = false;
     callEnded() {
@@ -182,4 +179,3 @@ class StreamingSession extends subscribed_1.Subscribed {
         this.connection.requestKeyFrame();
     }
 }
-exports.StreamingSession = StreamingSession;

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

@@ -1,8 +1,8 @@
 import { ReplaySubject, Subject } from 'rxjs';
-import { RingCamera } from '../ring-camera';
-import { BasicPeerConnection } from './peer-connection';
-import { Subscribed } from '../subscribed';
-import { RtpPacket } from 'werift';
+import type { RingCamera } from '../ring-camera.ts';
+import { type BasicPeerConnection } from './peer-connection.ts';
+import { Subscribed } from '../subscribed.ts';
+import type { RtpPacket } from 'werift';
 export interface StreamingConnectionOptions {
     createPeerConnection?: () => BasicPeerConnection;
 }