Fix inactive timeout.

Author: Sunoo

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## v3.0.1 (2020-08-25)
+
+### Bug Fixes
+
+- Fixed an issue with inactive camera timeouts that could cause zombie FFmpeg processes.
+
 ## v3.0.0 (2020-08-24)
 
 ### Changes

package-lock.json

@@ -1,7 +1,7 @@
 {
   "displayName": "Homebridge Camera FFmpeg",
   "name": "homebridge-camera-ffmpeg",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "Homebridge Plugin Providing FFmpeg-based Camera Support",
   "main": "dist/index.js",
   "license": "ISC",

package.json

@@ -367,7 +367,6 @@ export class StreamingDelegate implements CameraStreamingDelegate {
         clearTimeout(activeSession.timeout);
       }
       activeSession.timeout = setTimeout(() => {
-        activeSession.socket?.close();
         this.log.info('Device appears to be inactive. Stopping stream.', this.cameraName);
         this.controller.forceStopStreamingSession(request.sessionID);
         this.stopStream(request.sessionID);
@@ -434,20 +433,28 @@ export class StreamingDelegate implements CameraStreamingDelegate {
   }
 
   public stopStream(sessionId: string): void {
-    try {
-      const session = this.ongoingSessions[sessionId];
-      if (session) {
-        if (session.timeout) {
-          clearTimeout(session.timeout);
-        }
+    const session = this.ongoingSessions[sessionId];
+    if (session) {
+      if (session.timeout) {
+        clearTimeout(session.timeout);
+      }
+      try {
         session.socket?.close();
+      } catch (err) {
+        this.log.error('Error occurred closing socket: ' + err, this.cameraName);
+      }
+      try {
         session.mainProcess?.stop();
+      } catch (err) {
+        this.log.error('Error occurred terminating main FFmpeg process: ' + err, this.cameraName);
+      }
+      try {
         session.returnProcess?.stop();
+      } catch (err) {
+        this.log.error('Error occurred terminating two-way FFmpeg process: ' + err, this.cameraName);
       }
-      delete this.ongoingSessions[sessionId];
-      this.log.info('Stopped video stream.', this.cameraName);
-    } catch (err) {
-      this.log.error('Error occurred terminating FFmpeg process: ' + err, this.cameraName);
     }
+    delete this.ongoingSessions[sessionId];
+    this.log.info('Stopped video stream.', this.cameraName);
   }
 }