ring-client-api 11.0.2-beta.0 → 11.0.2-beta.1

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 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.1](https://github.com/dgreif/ring/compare/v11.0.2-beta.0...v11.0.2-beta.1) (2022-05-21)
+
+
+### Bug Fixes
+
+* **api:** prevent duplicate events from `onCallEnded` ([75696d5](https://github.com/dgreif/ring/commit/75696d510969f706248a0f83e98fb1c99fc07213)), closes [#941](https://github.com/dgreif/ring/issues/941)
+* handle pcmu return audio ([ce29fb5](https://github.com/dgreif/ring/commit/ce29fb5638bc488c515518a0fadcaca900ebe750)), closes [#930](https://github.com/dgreif/ring/issues/930)
+
 ### [11.0.2-beta.0](https://github.com/dgreif/ring/compare/v11.0.1...v11.0.2-beta.0) (2022-05-21)
 
 

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

@@ -20,6 +20,7 @@ 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;
@@ -27,7 +28,12 @@ export declare class StreamingSession extends Subscribed {
     cameraSpeakerActivated: boolean;
     activateCameraSpeaker(): Promise<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;

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,8 +27,10 @@ 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.returnAudioSplitter = new camera_utils_1.RtpSplitter();
         this.activated = false;
         this.cameraSpeakerActivated = false;
+        this.hasEnded = false;
         this.bindToConnection(connection);
     }
     bindToConnection(connection) {
@@ -36,14 +39,14 @@ class StreamingSession extends subscribed_1.Subscribed {
         }));
     }
     async activate() {
-        if (this.activated) {
+        if (this.activated || this.hasEnded) {
             return;
         }
         this.activated = true;
         await this.connection.activate();
     }
     async activateCameraSpeaker() {
-        if (this.cameraSpeakerActivated) {
+        if (this.cameraSpeakerActivated || this.hasEnded) {
             return;
         }
         this.cameraSpeakerActivated = true;
@@ -53,8 +56,14 @@ class StreamingSession extends subscribed_1.Subscribed {
         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',
@@ -100,17 +109,61 @@ class StreamingSession extends subscribed_1.Subscribed {
         // Activate the stream now that ffmpeg is ready to receive
         await this.activate();
     }
+    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);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ring-client-api",
-  "version": "11.0.2-beta.0",
+  "version": "11.0.2-beta.1",
   "description": "Unofficial API for Ring doorbells, cameras, security alarm system and smart lighting",
   "main": "lib/api/index.js",
   "bin": {