homebridge-ring 11.0.2-beta.0 → 11.0.3

package/CHANGELOG.md

@@ -2,12 +2,29 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-### [11.0.2-beta.0](https://github.com/dgreif/ring/compare/v11.0.1...v11.0.2-beta.0) (2022-05-21)
+### [11.0.3](https://github.com/dgreif/ring/compare/v11.0.2...v11.0.3) (2022-05-28)
 
 
 ### Bug Fixes
 
+* automatically activate streams and allow key frame requests ([b129f29](https://github.com/dgreif/ring/commit/b129f29d0a3774d779e9c159fe381e4e09066c0d))
+* end streaming session when connection ends ([b6bf08b](https://github.com/dgreif/ring/commit/b6bf08ba01e344faf59f6b42ea0c3b5ce384e0bf))
+* **homebridge:** allow ffmpeg in config schema ([#946](https://github.com/dgreif/ring/issues/946)) ([3242bbd](https://github.com/dgreif/ring/commit/3242bbd34dd6847500839396a9e10509e8216023))
+* remove race condition for sending messages to ring edge connections ([a9438d3](https://github.com/dgreif/ring/commit/a9438d3dfc5e7ad8b96881b689534c84fab637f1))
+* start ring edge pings as soon as session is started ([04ad614](https://github.com/dgreif/ring/commit/04ad614cb25c9aa4b11459e5fecde9ff7766a32d))
+* update dependencies including ffmpeg ([f5cd553](https://github.com/dgreif/ring/commit/f5cd553506cf0ea31a309d1350eff19c48552809))
+* use random client id for every ring edge connection ([3ba78e3](https://github.com/dgreif/ring/commit/3ba78e39b9da392779005d7d76828ddd2e425e6b))
+
+### [11.0.2](https://github.com/dgreif/ring/compare/v11.0.1...v11.0.2) (2022-05-22)
+
+
+### Bug Fixes
+
+* **api:** prevent duplicate events from `onCallEnded` ([14ee6eb](https://github.com/dgreif/ring/commit/14ee6eb90bb6ae568dcfd9e8e176c3001e422f9c)), closes [#941](https://github.com/dgreif/ring/issues/941)
 * handle pcmu audio streams for incoming audio ([06f6ff1](https://github.com/dgreif/ring/commit/06f6ff10ce7c8f2b05b1a12b8f244daa200fa9ab)), closes [#930](https://github.com/dgreif/ring/issues/930)
+* handle pcmu return audio ([7b86182](https://github.com/dgreif/ring/commit/7b8618261a6ccb85b9f760ee1fcc228be00fe5a6)), closes [#930](https://github.com/dgreif/ring/issues/930)
+* **homebride:** use shared engines config to enforce node 16 requirement ([b748cb0](https://github.com/dgreif/ring/commit/b748cb027db0c43ae109e1ea77c6bc83f86e4913))
+* prevent hanging promises from streams that fail to connect ([dd7638e](https://github.com/dgreif/ring/commit/dd7638e32626499c0be501be6b19b5d874fa974f))
 
 ### [11.0.1](https://github.com/dgreif/ring/compare/v11.0.0...v11.0.1) (2022-05-17)
 

package/config.schema.json

@@ -62,6 +62,11 @@
         "type": "boolean",
         "description": "Creates a new `Panic Buttons` device in HomeKit with `Burglar Alarm` and `Fire Alarm` switches.  **Use these at your own risk.  I do not guarantee functionality in case of emergency, nor do I take responsibility for any false alarms**.  These function just like the SOS sliders in the Ring app."
       },
+      "ffmpegPath": {
+        "title": "Custom FFmpeg Path",
+        "type": "string",
+        "description": "A custom path to the ffmpeg executable. By default, the static binaries built in ffmpeg-for-homebridge will be used. If you prefer to use your own version of ffmpeg, you can pass a complete path, or simply [ ffmpeg ] to use ffmpeg from your PATH."
+      },
       "nightModeBypassFor": {
         "title": "Night Mode as Bypass For Mode",
         "type": "string",

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

@@ -1,5 +1,6 @@
 import { ConnectionState, MediaStreamTrack, RTCIceCandidate, RtcpPacket, RtpPacket } from 'werift';
 import { Observable, ReplaySubject, Subject } from 'rxjs';
+import { Subscribed } from '../subscribed';
 export interface BasicPeerConnection {
     createOffer(): Promise<{
         sdp: string;
@@ -16,8 +17,9 @@ export interface BasicPeerConnection {
     onIceCandidate: Observable<RTCIceCandidate>;
     onConnectionState: Observable<ConnectionState>;
     close(): void;
+    requestKeyFrame?: () => void;
 }
-export declare class WeriftPeerConnection implements BasicPeerConnection {
+export declare class WeriftPeerConnection extends Subscribed implements BasicPeerConnection {
     private pc;
     onAudioRtp: Subject<RtpPacket>;
     onAudioRtcp: Subject<RtcpPacket>;
@@ -26,6 +28,7 @@ export declare class WeriftPeerConnection implements BasicPeerConnection {
     onIceCandidate: Subject<RTCIceCandidate>;
     onConnectionState: ReplaySubject<"failed" | "closed" | "connected" | "connecting" | "new" | "disconnected">;
     returnAudioTrack: MediaStreamTrack;
+    private onRequestKeyFrame;
     constructor();
     createOffer(): Promise<import("werift").RTCSessionDescription>;
     createAnswer(offer: {
@@ -37,5 +40,6 @@ export declare class WeriftPeerConnection implements BasicPeerConnection {
         sdp: string;
     }): Promise<void>;
     addIceCandidate(candidate: RTCIceCandidate): Promise<void>;
+    requestKeyFrame(): void;
     close(): void;
 }

package/lib/api/streaming/peer-connection.js

@@ -1,9 +1,11 @@
 "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");
 const debug = false, ringIceServers = [
     'stun:stun.kinesisvideo.us-east-1.amazonaws.com:443',
     'stun:stun.kinesisvideo.us-east-2.amazonaws.com:443',
@@ -14,8 +16,9 @@ const debug = false, ringIceServers = [
     'stun:stun3.l.google.com:19302',
     'stun:stun4.l.google.com:19302',
 ];
-class WeriftPeerConnection {
+class WeriftPeerConnection extends subscribed_1.Subscribed {
     constructor() {
+        super();
         this.onAudioRtp = new rxjs_1.Subject();
         this.onAudioRtcp = new rxjs_1.Subject();
         this.onVideoRtp = new rxjs_1.Subject();
@@ -23,6 +26,7 @@ class WeriftPeerConnection {
         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: [
@@ -84,7 +88,12 @@ class WeriftPeerConnection {
                 if (debug) {
                     (0, util_1.logInfo)('received first video packet');
                 }
-                setInterval(() => videoTransceiver.receiver.sendRtcpPLI(track.ssrc), 2000);
+                this.addSubscriptions((0, rxjs_1.merge)(this.onRequestKeyFrame, (0, rxjs_1.interval)(4000)).subscribe(() => {
+                    videoTransceiver.receiver
+                        .sendRtcpPLI(track.ssrc)
+                        .catch((e) => (0, util_1.logError)(e));
+                }));
+                this.requestKeyFrame();
             });
         });
         this.pc.onIceCandidate.subscribe((iceCandidate) => {
@@ -118,8 +127,12 @@ class WeriftPeerConnection {
     addIceCandidate(candidate) {
         return this.pc.addIceCandidate(candidate);
     }
+    requestKeyFrame() {
+        this.onRequestKeyFrame.next();
+    }
     close() {
         this.pc.close().catch(util_1.logError);
+        this.unsubscribe();
     }
 }
 exports.WeriftPeerConnection = WeriftPeerConnection;

package/lib/api/streaming/ring-edge-connection.js

@@ -1,11 +1,14 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RingEdgeConnection = void 0;
 const ws_1 = require("ws");
 const rxjs_1 = require("rxjs");
 const util_1 = require("../util");
-const operators_1 = require("rxjs/operators");
 const streaming_connection_base_1 = require("./streaming-connection-base");
+const crypto_1 = __importDefault(require("crypto"));
 // eslint-disable-next-line no-shadow
 var CloseReasonCode;
 (function (CloseReasonCode) {
@@ -23,7 +26,9 @@ class RingEdgeConnection extends streaming_connection_base_1.StreamingConnection
             headers: {
                 Authorization: `Bearer ${authToken}`,
                 'X-Sig-API-Version': '4.0',
-                'X-Sig-Client-ID': 'ring_android-aabb123',
+                'X-Sig-Client-ID': `ring_android-${crypto_1.default
+                    .randomBytes(4)
+                    .toString('hex')}`,
                 'X-Sig-Client-Info': 'Ring/3.49.0;Platform/Android;OS/7.0;Density/2.0;Device/samsung-SM-T710;Locale/en-US;TimeZone/GMT-07:00',
                 'X-Sig-Auth-Type': 'ring_oauth',
             },
@@ -40,12 +45,7 @@ class RingEdgeConnection extends streaming_connection_base_1.StreamingConnection
             });
         }), 
         // The ring-edge session needs a ping every 5 seconds to keep the connection alive
-        this.onCallAnswered
-            .pipe((0, operators_1.switchMap)(() => (0, rxjs_1.interval)(5000)))
-            .subscribe(() => {
-            if (!this.sessionId) {
-                return;
-            }
+        (0, rxjs_1.interval)(5000).subscribe(() => {
             this.sendSessionMessage('ping');
         }), this.pc.onIceCandidate.subscribe(async (iceCandidate) => {
             await (0, rxjs_1.firstValueFrom)(this.onOfferSent);
@@ -104,6 +104,7 @@ class RingEdgeConnection extends streaming_connection_base_1.StreamingConnection
             case 'sdp':
                 await this.pc.acceptAnswer(message.body);
                 this.onCallAnswered.next(message.body.sdp);
+                this.activate();
                 return;
             case 'ice':
                 await this.pc.addIceCandidate({
@@ -123,22 +124,25 @@ class RingEdgeConnection extends streaming_connection_base_1.StreamingConnection
         (0, util_1.logError)(message);
     }
     sendSessionMessage(method, body = {}) {
-        const message = {
-            method,
-            body: {
-                ...body,
-                doorbot_id: this.camera.id,
-                session_id: this.sessionId,
-            },
+        const sendSessionMessage = () => {
+            const message = {
+                method,
+                body: {
+                    ...body,
+                    doorbot_id: this.camera.id,
+                    session_id: this.sessionId,
+                },
+            };
+            this.sendMessage(message);
         };
         if (this.sessionId) {
             // Send immediately if we already have a session id
             // This is needed to send `close` before closing the websocket
-            this.sendMessage(message);
+            sendSessionMessage();
         }
         else {
             (0, rxjs_1.firstValueFrom)(this.onSessionId)
-                .then(() => this.sendMessage(message))
+                .then(sendSessionMessage)
                 .catch((e) => (0, util_1.logError)(e));
         }
     }

package/lib/api/streaming/streaming-connection-base.d.ts

@@ -11,6 +11,9 @@ export declare abstract class StreamingConnectionBase extends Subscribed {
     protected options: StreamingConnectionOptions;
     readonly onCallAnswered: ReplaySubject<string>;
     readonly onCallEnded: ReplaySubject<void>;
+    readonly onMessage: ReplaySubject<{
+        method: string;
+    }>;
     readonly onWsOpen: import("rxjs").Observable<unknown>;
     protected readonly pc: BasicPeerConnection;
     readonly onAudioRtp: Subject<RtpPacket>;
@@ -20,11 +23,12 @@ export declare abstract class StreamingConnectionBase extends Subscribed {
         method: string;
     }): Promise<void>;
     protected abstract sendSessionMessage(method: string, body?: Record<any, any>): void;
-    private activated;
-    activate(): Promise<void>;
-    activateCameraSpeaker(): Promise<void>;
+    protected activate(): void;
+    activateCameraSpeaker(): void;
     protected sendMessage(message: Record<any, any>): void;
     sendAudioPacket(rtp: RtpPacket): void;
+    private hasEnded;
     protected callEnded(): void;
     stop(): void;
+    requestKeyFrame(): void;
 }

package/lib/api/streaming/streaming-connection-base.js

@@ -13,7 +13,8 @@ class StreamingConnectionBase extends subscribed_1.Subscribed {
         this.options = options;
         this.onCallAnswered = new rxjs_1.ReplaySubject(1);
         this.onCallEnded = new rxjs_1.ReplaySubject(1);
-        this.activated = false;
+        this.onMessage = new rxjs_1.ReplaySubject();
+        this.hasEnded = false;
         if (options.createPeerConnection) {
             // we were passed a custom peer connection factory
             this.pc = options.createPeerConnection();
@@ -31,8 +32,10 @@ class StreamingConnectionBase extends subscribed_1.Subscribed {
         this.onWsOpen = (0, rxjs_1.fromEvent)(this.ws, 'open');
         const onMessage = (0, rxjs_1.fromEvent)(this.ws, 'message'), onError = (0, rxjs_1.fromEvent)(this.ws, 'error'), onClose = (0, rxjs_1.fromEvent)(this.ws, 'close');
         this.addSubscriptions(onMessage
-            .pipe((0, operators_1.concatMap)((message) => {
-            return this.handleMessage(JSON.parse(message.data));
+            .pipe((0, operators_1.concatMap)((event) => {
+            const message = JSON.parse(event.data);
+            this.onMessage.next(message);
+            return this.handleMessage(message);
         }))
             .subscribe(), onError.subscribe((e) => {
             (0, util_1.logError)(e);
@@ -50,25 +53,37 @@ class StreamingConnectionBase extends subscribed_1.Subscribed {
             }
         }));
     }
-    async activate() {
-        if (this.activated) {
-            return;
-        }
-        this.activated = true;
-        await (0, rxjs_1.firstValueFrom)(this.pc.onConnectionState.pipe((0, operators_1.filter)((state) => state === 'connected')));
+    activate() {
         (0, util_1.logInfo)('Activating Session');
+        // the activate_session message is required to keep the stream alive longer than 70 seconds
         this.sendSessionMessage('activate_session');
+        this.sendSessionMessage('stream_options', {
+            audio_enabled: true,
+            video_enabled: true,
+        });
     }
-    async activateCameraSpeaker() {
-        await (0, rxjs_1.firstValueFrom)(this.onCallAnswered);
-        this.sendSessionMessage('camera_options', {
-            stealth_mode: false,
+    activateCameraSpeaker() {
+        // Fire and forget this call so that callers don't get hung up waiting for answer (which might not happen)
+        (0, rxjs_1.firstValueFrom)(this.onCallAnswered)
+            .then(() => {
+            this.sendSessionMessage('camera_options', {
+                stealth_mode: false,
+            });
+        })
+            .catch((e) => {
+            (0, util_1.logError)(e);
         });
     }
     sendMessage(message) {
+        if (this.hasEnded) {
+            return;
+        }
         this.ws.send(JSON.stringify(message));
     }
     sendAudioPacket(rtp) {
+        if (this.hasEnded) {
+            return;
+        }
         if (this.pc instanceof peer_connection_1.WeriftPeerConnection) {
             this.pc.returnAudioTrack.writeRtp(rtp);
         }
@@ -77,6 +92,9 @@ class StreamingConnectionBase extends subscribed_1.Subscribed {
         }
     }
     callEnded() {
+        if (this.hasEnded) {
+            return;
+        }
         try {
             this.sendMessage({
                 reason: { code: 0, text: '' },
@@ -87,6 +105,7 @@ class StreamingConnectionBase extends subscribed_1.Subscribed {
         catch (_) {
             // ignore any errors since we are stopping the call
         }
+        this.hasEnded = true;
         this.unsubscribe();
         this.onCallEnded.next();
         this.pc.close();
@@ -94,5 +113,8 @@ class StreamingConnectionBase extends subscribed_1.Subscribed {
     stop() {
         this.callEnded();
     }
+    requestKeyFrame() {
+        this.pc.requestKeyFrame?.();
+    }
 }
 exports.StreamingConnectionBase = StreamingConnectionBase;

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

@@ -20,16 +20,26 @@ export declare class StreamingSession extends Subscribed {
     readonly onAudioRtp: Subject<RtpPacket>;
     private readonly audioSplitter;
     private readonly videoSplitter;
+    private readonly returnAudioSplitter;
     constructor(camera: RingCamera, connection: RingEdgeConnection | WebrtcConnection);
     private bindToConnection;
-    activated: boolean;
-    activate(): Promise<void>;
+    /**
+     * @deprecated
+     * activate will be removed in the future. Please use requestKeyFrame if you want to explicitly request an initial key frame
+     */
+    activate(): void;
     cameraSpeakerActivated: boolean;
-    activateCameraSpeaker(): Promise<void>;
+    activateCameraSpeaker(): void;
     reservePort(bufferPorts?: number): Promise<number>;
+    get isUsingOpus(): Promise<boolean>;
     startTranscoding(ffmpegOptions: FfmpegOptions): Promise<void>;
+    transcodeReturnAudio(ffmpegOptions: {
+        input: SpawnInput[];
+    }): Promise<void>;
+    private hasEnded;
     private callEnded;
     stop(): void;
     sendAudioPacket(rtp: RtpPacket): void;
+    requestKeyFrame(): void;
 }
 export {};

package/lib/api/streaming/streaming-session.js

@@ -1,6 +1,7 @@
 "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");
@@ -26,35 +27,42 @@ class StreamingSession extends subscribed_1.Subscribed {
         this.onAudioRtp = new rxjs_1.Subject();
         this.audioSplitter = new camera_utils_1.RtpSplitter();
         this.videoSplitter = new camera_utils_1.RtpSplitter();
-        this.activated = false;
+        this.returnAudioSplitter = new camera_utils_1.RtpSplitter();
         this.cameraSpeakerActivated = false;
+        this.hasEnded = false;
         this.bindToConnection(connection);
     }
     bindToConnection(connection) {
         this.addSubscriptions(connection.onAudioRtp.subscribe(this.onAudioRtp), connection.onVideoRtp.subscribe(this.onVideoRtp), connection.onCallAnswered.subscribe((sdp) => {
             this.onUsingOpus.next(sdp.toLocaleLowerCase().includes(' opus/'));
-        }));
+        }), connection.onCallEnded.subscribe(() => this.callEnded()));
     }
-    async activate() {
-        if (this.activated) {
-            return;
-        }
-        this.activated = true;
-        await this.connection.activate();
+    /**
+     * @deprecated
+     * activate will be removed in the future. Please use requestKeyFrame if you want to explicitly request an initial key frame
+     */
+    activate() {
+        this.requestKeyFrame();
     }
-    async activateCameraSpeaker() {
-        if (this.cameraSpeakerActivated) {
+    activateCameraSpeaker() {
+        if (this.cameraSpeakerActivated || this.hasEnded) {
             return;
         }
         this.cameraSpeakerActivated = true;
-        await this.connection.activateCameraSpeaker();
+        this.connection.activateCameraSpeaker();
     }
     async reservePort(bufferPorts = 0) {
         const ports = await (0, camera_utils_1.reservePorts)({ count: bufferPorts + 1 });
         return ports[0];
     }
+    get isUsingOpus() {
+        return (0, rxjs_1.firstValueFrom)(this.onUsingOpus);
+    }
     async startTranscoding(ffmpegOptions) {
-        const videoPort = await this.reservePort(1), audioPort = await this.reservePort(1), transcodeVideoStream = ffmpegOptions.video !== false, ringSdp = await (0, rxjs_1.firstValueFrom)(this.connection.onCallAnswered), usingOpus = await (0, rxjs_1.firstValueFrom)(this.onUsingOpus), ffmpegInputArguments = [
+        if (this.hasEnded) {
+            return;
+        }
+        const videoPort = await this.reservePort(1), audioPort = await this.reservePort(1), transcodeVideoStream = ffmpegOptions.video !== false, ringSdp = await (0, rxjs_1.firstValueFrom)(this.connection.onCallAnswered), usingOpus = await this.isUsingOpus, ffmpegInputArguments = [
             '-hide_banner',
             '-protocol_whitelist',
             'pipe,udp,rtp,file,crypto',
@@ -97,21 +105,68 @@ class StreamingSession extends subscribed_1.Subscribed {
         }
         this.onCallEnded.subscribe(() => ff.stop());
         ff.writeStdin(inputSdp);
-        // Activate the stream now that ffmpeg is ready to receive
-        await this.activate();
+        // Request a key frame now that ffmpeg is ready to receive
+        this.requestKeyFrame();
+    }
+    async transcodeReturnAudio(ffmpegOptions) {
+        if (this.hasEnded) {
+            return;
+        }
+        const audioOutForwarder = new camera_utils_1.RtpSplitter(({ message }) => {
+            const rtp = werift_1.RtpPacket.deSerialize(message);
+            this.connection.sendAudioPacket(rtp);
+            return null;
+        }), usingOpus = await this.isUsingOpus, ff = new camera_utils_1.FfmpegProcess({
+            ffmpegArgs: [
+                '-hide_banner',
+                '-protocol_whitelist',
+                'pipe,udp,rtp,file,crypto',
+                '-re',
+                '-i',
+                ...ffmpegOptions.input,
+                '-acodec',
+                ...(usingOpus
+                    ? ['libopus', '-ac', 2, '-ar', '48k']
+                    : ['pcm_mulaw', '-ac', 1, '-ar', '8k']),
+                '-flags',
+                '+global_header',
+                '-f',
+                'rtp',
+                `rtp://127.0.0.1:${await audioOutForwarder.portPromise}`,
+            ],
+            ffmpegPath: (0, ffmpeg_1.getFfmpegPath)(),
+            exitCallback: () => this.callEnded(),
+            logLabel: `Return Audio (${this.camera.name})`,
+            logger: {
+                error: util_1.logError,
+                info: util_1.logDebug,
+            },
+        });
+        this.onCallEnded.subscribe(() => ff.stop());
     }
     callEnded() {
+        if (this.hasEnded) {
+            return;
+        }
+        this.hasEnded = true;
         this.unsubscribe();
         this.onCallEnded.next();
         this.connection.stop();
         this.audioSplitter.close();
         this.videoSplitter.close();
+        this.returnAudioSplitter.close();
     }
     stop() {
         this.callEnded();
     }
     sendAudioPacket(rtp) {
+        if (this.hasEnded) {
+            return;
+        }
         this.connection.sendAudioPacket(rtp);
     }
+    requestKeyFrame() {
+        this.connection.requestKeyFrame();
+    }
 }
 exports.StreamingSession = StreamingSession;

package/lib/api/streaming/webrtc-connection.js

@@ -29,10 +29,7 @@ class WebrtcConnection extends streaming_connection_base_1.StreamingConnectionBa
                 const answer = await this.pc.createAnswer(message);
                 this.sendSessionMessage('sdp', answer);
                 this.onCallAnswered.next(message.sdp);
-                this.sendSessionMessage('stream_options', {
-                    audio_enabled: true,
-                    video_enabled: true,
-                });
+                this.activate();
                 return;
             case 'ice':
                 await this.pc.addIceCandidate({

package/lib/homebridge/base-accessory.js

@@ -45,7 +45,7 @@ class BaseAccessory {
             // Only register for GET if an async request should be made to get an updated value
             onCachedValue.pipe((0, operators_1.take)(1)).subscribe(() => {
                 // allow GET once a value is cached
-                characteristic.on("get" /* GET */, async (callback) => {
+                characteristic.on("get" /* CharacteristicEventTypes.GET */, async (callback) => {
                     try {
                         const value = await (0, rxjs_1.firstValueFrom)(onCachedValue);
                         callback(null, value);
@@ -58,7 +58,7 @@ class BaseAccessory {
             });
         }
         if (setValue) {
-            characteristic.on("set" /* SET */, (newValue, callback) => {
+            characteristic.on("set" /* CharacteristicEventTypes.SET */, (newValue, callback) => {
                 Promise.resolve(setValue(newValue)).catch((e) => {
                     this.logger.error(e);
                 });

package/lib/homebridge/base-data-accessory.js

@@ -9,7 +9,7 @@ class BaseDataAccessory extends base_accessory_1.BaseAccessory {
         const service = this.getService(serviceType, name, serviceSubType), characteristic = service.getCharacteristic(characteristicType), { device } = this;
         if (requestUpdate) {
             // Only register for GET if an async request should be made to get an updated value
-            characteristic.on("get" /* GET */, (callback) => {
+            characteristic.on("get" /* CharacteristicEventTypes.GET */, (callback) => {
                 try {
                     const value = getValue(device.data);
                     callback(null, value);
@@ -22,14 +22,14 @@ class BaseDataAccessory extends base_accessory_1.BaseAccessory {
         }
         if (setValue && setValueDebounceTime) {
             const onValueToSet = new rxjs_1.Subject();
-            characteristic.on("set" /* SET */, (newValue, callback) => {
+            characteristic.on("set" /* CharacteristicEventTypes.SET */, (newValue, callback) => {
                 onValueToSet.next(newValue);
                 callback();
             });
             onValueToSet.pipe((0, operators_1.debounceTime)(setValueDebounceTime)).subscribe(setValue);
         }
         else if (setValue) {
-            characteristic.on("set" /* SET */, (newValue, callback) => {
+            characteristic.on("set" /* CharacteristicEventTypes.SET */, (newValue, callback) => {
                 Promise.resolve(setValue(newValue)).catch((e) => {
                     this.logger.error(e);
                 });

package/lib/homebridge/camera-source.js

@@ -26,8 +26,8 @@ function getSessionConfig(srtpOptions) {
     };
 }
 class StreamingSessionWrapper {
-    constructor(liveCall, prepareStreamRequest, ringCamera, start) {
-        this.liveCall = liveCall;
+    constructor(streamingSession, prepareStreamRequest, ringCamera, start) {
+        this.streamingSession = streamingSession;
         this.prepareStreamRequest = prepareStreamRequest;
         this.ringCamera = ringCamera;
         this.start = start;
@@ -63,15 +63,15 @@ class StreamingSessionWrapper {
             onReturnPacketReceived.next(null);
             return null;
         });
-        liveCall.addSubscriptions((0, rxjs_1.merge)((0, rxjs_1.of)(true).pipe((0, operators_1.delay)(15000)), onReturnPacketReceived)
+        streamingSession.addSubscriptions((0, rxjs_1.merge)((0, rxjs_1.of)(true).pipe((0, operators_1.delay)(15000)), onReturnPacketReceived)
             .pipe((0, operators_1.debounceTime)(5000))
             .subscribe(() => {
             (0, util_1.logInfo)(`Live stream for ${this.ringCamera.name} appears to be inactive. (${getDurationSeconds(start)}s)`);
-            liveCall.stop();
+            streamingSession.stop();
         }));
         // Periodically send a blank RTCP packet to the HomeKit video port
         // Without this, HomeKit assumes the stream is dead after 30 second and sends a stop request
-        liveCall.addSubscriptions((0, rxjs_1.interval)(500).subscribe(() => {
+        streamingSession.addSubscriptions((0, rxjs_1.interval)(500).subscribe(() => {
             const senderInfo = new werift_1.RtcpSenderInfo({
                 ntpTimestamp: BigInt(0),
                 packetCount: 0,
@@ -95,7 +95,7 @@ class StreamingSessionWrapper {
         // use to encrypt Ring video to HomeKit
         videoSrtpSession = new werift_1.SrtpSession(getSessionConfig(this.videoSrtp));
         // Set up packet forwarding for video stream
-        this.liveCall.addSubscriptions(this.liveCall.onVideoRtp.subscribe(({ header, payload }) => {
+        this.streamingSession.addSubscriptions(this.streamingSession.onVideoRtp.subscribe(({ header, payload }) => {
             header.ssrc = this.videoSsrc;
             header.payloadType = request.video.pt;
             const encryptedPacket = videoSrtpSession.encrypt(payload, header);
@@ -112,9 +112,9 @@ class StreamingSessionWrapper {
         }));
         const shouldTranscodeAudio = await this.libfdkAacInstalledPromise;
         if (!shouldTranscodeAudio) {
-            return this.liveCall.activate();
+            return this.streamingSession.requestKeyFrame();
         }
-        const transcodingPromise = this.liveCall.startTranscoding({
+        const transcodingPromise = this.streamingSession.startTranscoding({
             input: ['-vn'],
             audio: [
                 '-map',
@@ -167,20 +167,20 @@ class StreamingSessionWrapper {
         }, audioSrtpSession = new werift_1.SrtpSession(getSessionConfig(remoteAudioSrtpOptions)), returnAudioTranscodedSplitter = new camera_utils_1.RtpSplitter(({ message }) => {
             if (!cameraSpeakerActive) {
                 cameraSpeakerActive = true;
-                this.liveCall.activateCameraSpeaker().catch(util_1.logError);
+                this.streamingSession.activateCameraSpeaker();
             }
             // decrypt the message
             try {
                 const rtp = werift_1.RtpPacket.deSerialize(message);
                 rtp.payload = audioSrtpSession.decrypt(rtp.payload);
                 // send to Ring - werift will handle encryption and other header params
-                this.liveCall.sendAudioPacket(rtp);
+                this.streamingSession.sendAudioPacket(rtp);
             }
             catch (_) {
                 // deSerialize will sometimes fail, but the errors can be ignored
             }
             return null;
-        }), returnAudioTranscoder = new camera_utils_1.ReturnAudioTranscoder({
+        }), usingOpus = await this.streamingSession.isUsingOpus, returnAudioTranscoder = new camera_utils_1.ReturnAudioTranscoder({
             prepareStreamRequest: this.prepareStreamRequest,
             incomingAudioOptions: {
                 ssrc: this.audioSsrc,
@@ -188,13 +188,11 @@ class StreamingSessionWrapper {
             },
             outputArgs: [
                 '-acodec',
-                'libopus',
+                ...(usingOpus
+                    ? ['libopus', '-ac', 2, '-ar', '48k']
+                    : ['pcm_mulaw', '-ac', 1, '-ar', '8k']),
                 '-flags',
                 '+global_header',
-                '-ac',
-                2,
-                '-ar',
-                '48k',
                 '-f',
                 'rtp',
                 `rtp://127.0.0.1:${await returnAudioTranscodedSplitter.portPromise}`,
@@ -207,7 +205,7 @@ class StreamingSessionWrapper {
             logLabel: `Return Audio (${this.ringCamera.name})`,
             returnAudioSplitter: this.audioSplitter,
         });
-        this.liveCall.onCallEnded.pipe((0, operators_1.take)(1)).subscribe(() => {
+        this.streamingSession.onCallEnded.pipe((0, operators_1.take)(1)).subscribe(() => {
             returnAudioTranscoder.stop();
             returnAudioTranscodedSplitter.close();
         });
@@ -217,7 +215,7 @@ class StreamingSessionWrapper {
     stop() {
         this.audioSplitter.close();
         this.videoSplitter.close();
-        this.liveCall.stop();
+        this.streamingSession.stop();
     }
 }
 class CameraSource {
@@ -227,7 +225,7 @@ class CameraSource {
             cameraStreamCount: 10,
             delegate: this,
             streamingOptions: {
-                supportedCryptoSuites: [0 /* AES_CM_128_HMAC_SHA1_80 */],
+                supportedCryptoSuites: [0 /* SRTPCryptoSuites.AES_CM_128_HMAC_SHA1_80 */],
                 video: {
                     resolutions: [
                         [1280, 720, 30],
@@ -241,15 +239,15 @@ class CameraSource {
                         [320, 180, 30],
                     ],
                     codec: {
-                        profiles: [0 /* BASELINE */],
-                        levels: [0 /* LEVEL3_1 */],
+                        profiles: [0 /* H264Profile.BASELINE */],
+                        levels: [0 /* H264Level.LEVEL3_1 */],
                     },
                 },
                 audio: {
                     codecs: [
                         {
-                            type: "AAC-eld" /* AAC_ELD */,
-                            samplerate: 16 /* KHZ_16 */,
+                            type: "AAC-eld" /* AudioStreamingCodecType.AAC_ELD */,
+                            samplerate: 16 /* AudioStreamingSamplerate.KHZ_16 */,
                         },
                     ],
                 },

package/lib/homebridge/location-mode-switch.js

@@ -40,7 +40,7 @@ class LocationModeSwitch extends base_accessory_1.BaseAccessory {
             }
             currentState.updateValue(state);
         });
-        currentState.on("get" /* GET */, async (callback) => {
+        currentState.on("get" /* CharacteristicEventTypes.GET */, async (callback) => {
             location.getLocationMode().catch((e) => {
                 (0, util_1.logError)('Failed to retrieve location mode for ' + location.name);
                 (0, util_1.logError)(e);
@@ -51,12 +51,12 @@ class LocationModeSwitch extends base_accessory_1.BaseAccessory {
             }
             callback(null, state);
         });
-        targetState.on("get" /* GET */, async (callback) => {
+        targetState.on("get" /* CharacteristicEventTypes.GET */, async (callback) => {
             callback(null, this.targetState !== undefined
                 ? this.targetState
                 : await getCurrentState());
         });
-        targetState.on("set" /* SET */, async (state, callback) => {
+        targetState.on("set" /* CharacteristicEventTypes.SET */, async (state, callback) => {
             const { Characteristic: { SecuritySystemTargetState: State }, } = hap_1.hap;
             callback();
             if (state === State.NIGHT_ARM) {

package/lib/homebridge/ring-platform.js

@@ -217,8 +217,8 @@ class RingPlatform {
                 }
                 const createHomebridgeAccessory = () => {
                     const accessory = new api.platformAccessory(displayName, uuid, isCamera
-                        ? 17 /* CAMERA */
-                        : 11 /* SECURITY_SYSTEM */);
+                        ? 17 /* hap.Categories.CAMERA */
+                        : 11 /* hap.Categories.SECURITY_SYSTEM */);
                     this.log.info(`Adding new accessory ${uuid} ${deviceType} ${displayName}`);
                     platformAccessories.push(accessory);
                     if (isCamera &&

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ring",
-  "version": "11.0.2-beta.0",
+  "version": "11.0.3",
   "description": "Homebridge plugin for Ring doorbells, cameras, security alarm system and smart lighting",
   "main": "lib/homebridge/index.js",
   "bin": {
@@ -40,9 +40,9 @@
   "license": "MIT",
   "dependencies": {
     "@eneris/push-receiver": "^3.0.1",
-    "@homebridge/camera-utils": "^2.1.0",
+    "@homebridge/camera-utils": "^2.1.1",
     "@homebridge/plugin-ui-utils": "^0.0.19",
-    "werift": "^0.15.1",
+    "werift": "^0.15.3",
     "@types/socket.io-client": "1.4.36",
     "colors": "^1.4.0",
     "debug": "^4.3.4",
@@ -51,24 +51,24 @@
     "socket.io-client": "^2.4.0",
     "systeminformation": "^5.11.15",
     "uuid": "^8.3.2",
-    "ws": "^8.6.0"
+    "ws": "^8.7.0"
   },
   "devDependencies": {
     "@swc-node/register": "^1.5.1",
     "@types/debug": "4.1.7",
     "@types/jest": "27.5.1",
-    "@types/node": "17.0.34",
+    "@types/node": "17.0.36",
     "@types/uuid": "8.3.4",
     "@types/ws": "^8.5.3",
-    "@typescript-eslint/eslint-plugin": "5.25.0",
-    "@typescript-eslint/parser": "5.25.0",
-    "concurrently": "^7.2.0",
+    "@typescript-eslint/eslint-plugin": "5.26.0",
+    "@typescript-eslint/parser": "5.26.0",
+    "concurrently": "^7.2.1",
     "conventional-github-releaser": "3.1.5",
     "dotenv": "16.0.1",
-    "esbuild": "^0.14.39",
-    "eslint": "8.15.0",
+    "esbuild": "^0.14.41",
+    "eslint": "8.16.0",
     "eslint-config-prettier": "8.5.0",
-    "eslint-plugin-jest": "26.2.2",
+    "eslint-plugin-jest": "26.4.2",
     "eslint-plugin-prettier": "4.0.0",
     "express": "4.18.1",
     "homebridge": "1.4.1",
@@ -77,12 +77,12 @@
     "reflect-metadata": "0.1.13",
     "rimraf": "3.0.2",
     "standard-version": "9.5.0",
-    "ts-jest": "28.0.2",
-    "typescript": "4.6.4"
+    "ts-jest": "28.0.3",
+    "typescript": "4.7.2"
   },
   "engines": {
-    "node": ">=8.3.0",
-    "homebridge": ">=0.4.0"
+    "node": "^16",
+    "homebridge": ">=1.4.0"
   },
   "bugs": {
     "url": "https://github.com/dgreif/ring/issues"