webrtc: fix ffmpeg leaks?

koush · Mar 30, 2024 · be98083 · be98083
1 parent f4dcb8e
commit be98083
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/plugins/webrtc/package-lock.json b/plugins/webrtc/package-lock.json
diff --git a/plugins/webrtc/package.json b/plugins/webrtc/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/webrtc",
-   "version": "0.2.17",
+   "version": "0.2.18",
    "scripts": {
       "scrypted-setup-project": "scrypted-setup-project",
       "prescrypted-setup-project": "scrypted-package-json",

diff --git a/plugins/webrtc/src/ffmpeg-to-wrtc.ts b/plugins/webrtc/src/ffmpeg-to-wrtc.ts
@@ -406,6 +406,7 @@ class WebRTCTrack implements RTCOutputMediaObjectTrack, RTCInputMediaObjectTrack
 
     constructor(public connectionManagement: WebRTCConnectionManagement, public video: RTCRtpTransceiver, public audio: RTCRtpTransceiver, intercom: Intercom) {
         this.control = new ScryptedSessionControl(intercom, audio);
+        this.connectionManagement.activeTracks.add(this);
     }
 
     async onStop(): Promise<void> {
@@ -623,7 +624,7 @@ export class WebRTCConnectionManagement implements RTCConnectionManagement {
 
     async close(): Promise<void> {
         for (const track of this.activeTracks) {
-            track.cleanup(true);
+            track.cleanup(false);
         }
         this.activeTracks.clear();
         this.pc.close();
@@ -662,7 +663,7 @@ export async function createRTCPeerConnectionSink(
     });
 
     track.control.killed.promise.then(() => {
-        track.cleanup(true);
+        track.cleanup(false);
         connection.pc.close();
     });
 

diff --git a/plugins/webrtc/src/main.ts b/plugins/webrtc/src/main.ts
@@ -627,9 +627,10 @@ export async function fork() {
 
             const cleanup = new Deferred<string>();
             cleanup.promise.catch(e => this.console.log('cleaning up rtc connection:', e.message));
-            cleanup.promise.finally(() => setTimeout(() => process.exit(), 10000));
+            cleanup.promise.finally(() => setTimeout(() => process.exit(), 30000));
 
             const connection = new WebRTCConnectionManagement(console, clientSession, maximumCompatibilityMode, clientOptions, options);
+            cleanup.promise.finally(() => connection.close().catch(() => { }));
             const { pc } = connection;
             waitClosed(pc).then(() => cleanup.resolve('peer connection closed'));