homebridge-ring 11.0.2-beta.1 → 11.0.2

package/CHANGELOG.md

@@ -2,20 +2,16 @@
 
 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)
+### [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/lib/api/streaming/streaming-connection-base.d.ts

@@ -21,10 +21,11 @@ export declare abstract class StreamingConnectionBase extends Subscribed {
     }): Promise<void>;
     protected abstract sendSessionMessage(method: string, body?: Record<any, any>): void;
     private activated;
-    activate(): Promise<void>;
-    activateCameraSpeaker(): Promise<void>;
+    activate(): void;
+    activateCameraSpeaker(): void;
     protected sendMessage(message: Record<any, any>): void;
     sendAudioPacket(rtp: RtpPacket): void;
+    private hasEnded;
     protected callEnded(): void;
     stop(): void;
 }

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

@@ -14,6 +14,7 @@ class StreamingConnectionBase extends subscribed_1.Subscribed {
         this.onCallAnswered = new rxjs_1.ReplaySubject(1);
         this.onCallEnded = new rxjs_1.ReplaySubject(1);
         this.activated = false;
+        this.hasEnded = false;
         if (options.createPeerConnection) {
             // we were passed a custom peer connection factory
             this.pc = options.createPeerConnection();
@@ -50,25 +51,43 @@ class StreamingConnectionBase extends subscribed_1.Subscribed {
             }
         }));
     }
-    async activate() {
+    activate() {
         if (this.activated) {
             return;
         }
         this.activated = true;
-        await (0, rxjs_1.firstValueFrom)(this.pc.onConnectionState.pipe((0, operators_1.filter)((state) => state === 'connected')));
-        (0, util_1.logInfo)('Activating Session');
-        this.sendSessionMessage('activate_session');
+        // Fire and forget this call so that callers don't get hung up waiting for connection (which might not happen)
+        (0, rxjs_1.firstValueFrom)(this.pc.onConnectionState.pipe((0, operators_1.filter)((state) => state === 'connected')))
+            .then(() => {
+            (0, util_1.logInfo)('Activating Session');
+            this.sendSessionMessage('activate_session');
+        })
+            .catch((e) => {
+            (0, util_1.logError)(e);
+        });
     }
-    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 +96,9 @@ class StreamingConnectionBase extends subscribed_1.Subscribed {
         }
     }
     callEnded() {
+        if (this.hasEnded) {
+            return;
+        }
         try {
             this.sendMessage({
                 reason: { code: 0, text: '' },
@@ -87,6 +109,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();

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

@@ -24,9 +24,9 @@ export declare class StreamingSession extends Subscribed {
     constructor(camera: RingCamera, connection: RingEdgeConnection | WebrtcConnection);
     private bindToConnection;
     activated: boolean;
-    activate(): Promise<void>;
+    activate(): void;
     cameraSpeakerActivated: boolean;
-    activateCameraSpeaker(): Promise<void>;
+    activateCameraSpeaker(): void;
     reservePort(bufferPorts?: number): Promise<number>;
     get isUsingOpus(): Promise<boolean>;
     startTranscoding(ffmpegOptions: FfmpegOptions): Promise<void>;

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

@@ -38,19 +38,19 @@ class StreamingSession extends subscribed_1.Subscribed {
             this.onUsingOpus.next(sdp.toLocaleLowerCase().includes(' opus/'));
         }));
     }
-    async activate() {
+    activate() {
         if (this.activated || this.hasEnded) {
             return;
         }
         this.activated = true;
-        await this.connection.activate();
+        this.connection.activate();
     }
-    async activateCameraSpeaker() {
+    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 });
@@ -107,7 +107,7 @@ 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();
+        this.activate();
     }
     async transcodeReturnAudio(ffmpegOptions) {
         if (this.hasEnded) {

package/lib/homebridge/camera-source.js

@@ -167,7 +167,7 @@ class StreamingSessionWrapper {
         }, audioSrtpSession = new werift_1.SrtpSession(getSessionConfig(remoteAudioSrtpOptions)), returnAudioTranscodedSplitter = new camera_utils_1.RtpSplitter(({ message }) => {
             if (!cameraSpeakerActive) {
                 cameraSpeakerActive = true;
-                this.streamingSession.activateCameraSpeaker().catch(util_1.logError);
+                this.streamingSession.activateCameraSpeaker();
             }
             // decrypt the message
             try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-ring",
-  "version": "11.0.2-beta.1",
+  "version": "11.0.2",
   "description": "Homebridge plugin for Ring doorbells, cameras, security alarm system and smart lighting",
   "main": "lib/homebridge/index.js",
   "bin": {
@@ -81,8 +81,8 @@
     "typescript": "4.6.4"
   },
   "engines": {
-    "node": ">=8.3.0",
-    "homebridge": ">=0.4.0"
+    "node": "^16",
+    "homebridge": ">=1.4.0"
   },
   "bugs": {
     "url": "https://github.com/dgreif/ring/issues"