homebridge-ring 11.0.3 → 11.0.4

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.4](https://github.com/dgreif/ring/compare/v11.0.3...v11.0.4) (2022-05-29)
+
+
+### Bug Fixes
+
+* handle unanswered calls when transcoding ([6f9d3df](https://github.com/dgreif/ring/commit/6f9d3dfa079f046a6b5cfa140fd67eb210669429))
+* update werift and ring edge connection strategy ([7b786f3](https://github.com/dgreif/ring/commit/7b786f3ffd9ad8eb4a8f03f5eac9ca6c67517aae))
+
 ### [11.0.3](https://github.com/dgreif/ring/compare/v11.0.2...v11.0.3) (2022-05-28)
 
 

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

@@ -13,7 +13,7 @@ export interface BasicPeerConnection {
         type: 'answer';
         sdp: string;
     }): Promise<void>;
-    addIceCandidate(candidate: RTCIceCandidate): Promise<void>;
+    addIceCandidate(candidate: Partial<RTCIceCandidate>): Promise<void>;
     onIceCandidate: Observable<RTCIceCandidate>;
     onConnectionState: Observable<ConnectionState>;
     close(): void;

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

@@ -6,7 +6,7 @@ const werift_1 = require("werift");
 const rxjs_1 = require("rxjs");
 const util_1 = require("../util");
 const subscribed_1 = require("../subscribed");
-const debug = false, ringIceServers = [
+const ringIceServers = [
     'stun:stun.kinesisvideo.us-east-1.amazonaws.com:443',
     'stun:stun.kinesisvideo.us-east-2.amazonaws.com:443',
     'stun:stun.kinesisvideo.us-west-2.amazonaws.com:443',
@@ -59,6 +59,7 @@ class WeriftPeerConnection extends subscribed_1.Subscribed {
             },
             iceServers: ringIceServers.map((server) => ({ urls: server })),
             iceTransportPolicy: 'all',
+            bundlePolicy: 'disable',
         })), audioTransceiver = pc.addTransceiver(this.returnAudioTrack, {
             direction: 'sendrecv',
         }), videoTransceiver = pc.addTransceiver('video', {
@@ -71,11 +72,9 @@ class WeriftPeerConnection extends subscribed_1.Subscribed {
             track.onReceiveRtcp.subscribe((rtcp) => {
                 this.onAudioRtcp.next(rtcp);
             });
-            if (debug) {
-                track.onReceiveRtp.once(() => {
-                    (0, util_1.logInfo)('received first audio packet');
-                });
-            }
+            track.onReceiveRtp.once(() => {
+                (0, util_1.logDebug)('received first audio packet');
+            });
         });
         videoTransceiver.onTrack.subscribe((track) => {
             track.onReceiveRtp.subscribe((rtp) => {
@@ -85,9 +84,7 @@ class WeriftPeerConnection extends subscribed_1.Subscribed {
                 this.onVideoRtcp.next(rtcp);
             });
             track.onReceiveRtp.once(() => {
-                if (debug) {
-                    (0, util_1.logInfo)('received first video packet');
-                }
+                (0, util_1.logDebug)('received first video packet');
                 this.addSubscriptions((0, rxjs_1.merge)(this.onRequestKeyFrame, (0, rxjs_1.interval)(4000)).subscribe(() => {
                     videoTransceiver.receiver
                         .sendRtcpPLI(track.ssrc)

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

@@ -54,17 +54,7 @@ class RingEdgeConnection extends streaming_connection_base_1.StreamingConnection
                 body: {
                     doorbot_id: camera.id,
                     ice: iceCandidate.candidate,
-                    mlineindex: 0,
-                },
-            });
-            // HACK: send ice candidate with both mline indexes to convince ring edge to connect both audio and video
-            // Without this, only audio will connect unless you connect from the network of the Ring Edge router
-            this.sendMessage({
-                method: 'ice',
-                body: {
-                    doorbot_id: camera.id,
-                    ice: iceCandidate.candidate,
-                    mlineindex: 1,
+                    mlineindex: iceCandidate.sdpMLineIndex,
                 },
             });
         }));
@@ -76,7 +66,7 @@ class RingEdgeConnection extends streaming_connection_base_1.StreamingConnection
             body: {
                 doorbot_id: this.camera.id,
                 stream_options: { audio_enabled: true, video_enabled: true },
-                sdp: sdp.replace('\na=group:BUNDLE 0 1', ''),
+                sdp,
             },
         });
         this.onOfferSent.next();

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

@@ -62,7 +62,15 @@ class StreamingSession extends subscribed_1.Subscribed {
         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 = [
+        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),
+        ]);
+        if (!ringSdp) {
+            (0, util_1.logDebug)('Call ended before answered');
+            return;
+        }
+        const usingOpus = await this.isUsingOpus, ffmpegInputArguments = [
             '-hide_banner',
             '-protocol_whitelist',
             'pipe,udp,rtp,file,crypto',
@@ -103,7 +111,7 @@ class StreamingSession extends subscribed_1.Subscribed {
             }))
                 .subscribe());
         }
-        this.onCallEnded.subscribe(() => ff.stop());
+        this.onCallEnded.pipe((0, operators_1.take)(1)).subscribe(() => ff.stop());
         ff.writeStdin(inputSdp);
         // Request a key frame now that ffmpeg is ready to receive
         this.requestKeyFrame();
@@ -142,7 +150,7 @@ class StreamingSession extends subscribed_1.Subscribed {
                 info: util_1.logDebug,
             },
         });
-        this.onCallEnded.subscribe(() => ff.stop());
+        this.onCallEnded.pipe((0, operators_1.take)(1)).subscribe(() => ff.stop());
     }
     callEnded() {
         if (this.hasEnded) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ring",
-  "version": "11.0.3",
+  "version": "11.0.4",
   "description": "Homebridge plugin for Ring doorbells, cameras, security alarm system and smart lighting",
   "main": "lib/homebridge/index.js",
   "bin": {
@@ -42,7 +42,7 @@
     "@eneris/push-receiver": "^3.0.1",
     "@homebridge/camera-utils": "^2.1.1",
     "@homebridge/plugin-ui-utils": "^0.0.19",
-    "werift": "^0.15.3",
+    "werift": "0.15.4",
     "@types/socket.io-client": "1.4.36",
     "colors": "^1.4.0",
     "debug": "^4.3.4",
@@ -65,7 +65,7 @@
     "concurrently": "^7.2.1",
     "conventional-github-releaser": "3.1.5",
     "dotenv": "16.0.1",
-    "esbuild": "^0.14.41",
+    "esbuild": "^0.14.42",
     "eslint": "8.16.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-jest": "26.4.2",