Added PR deepch#485 (to upstream)

Author: joshjowen

apiHTTPWebRTC.go

@@ -41,7 +41,15 @@ func HTTPAPIServerStreamWebRTC(c *gin.Context) {
 		}).Errorln(err.Error())
 		return
 	}
-	muxerWebRTC := webrtc.NewMuxer(webrtc.Options{ICEServers: Storage.ServerICEServers(), ICEUsername: Storage.ServerICEUsername(), ICECredential: Storage.ServerICECredential(), PortMin: Storage.ServerWebRTCPortMin(), PortMax: Storage.ServerWebRTCPortMax()})
+
+	muxerWebRTC := webrtc.NewMuxer(webrtc.Options{
+		ICEServers:   Storage.ServerICEServers(),
+		ICEUsername:  Storage.ServerICEUsername(),
+		ICECredential: Storage.ServerICECredential(),
+		PortMin:      Storage.ServerWebRTCPortMin(),
+		PortMax:      Storage.ServerWebRTCPortMax(),
+	})
+
 	answer, err := muxerWebRTC.WriteHeader(codecs, c.PostForm("data"))
 	if err != nil {
 		c.IndentedJSON(400, Message{Status: 0, Payload: err.Error()})
@@ -68,17 +76,27 @@ func HTTPAPIServerStreamWebRTC(c *gin.Context) {
 			return
 		}
 		defer Storage.ClientDelete(c.Param("uuid"), cid, c.Param("channel"))
+		defer muxerWebRTC.Close() // Close the WebRTC session when done
 		var videoStart bool
 		noVideo := time.NewTimer(10 * time.Second)
 		for {
 			select {
 			case <-noVideo.C:
-				//				c.IndentedJSON(500, Message{Status: 0, Payload: ErrorStreamNoVideo.Error()})
+				c.IndentedJSON(500, Message{Status: 0, Payload: ErrorStreamNoVideo.Error()})
 				requestLogger.WithFields(logrus.Fields{
 					"call": "ErrorStreamNoVideo",
 				}).Errorln(ErrorStreamNoVideo.Error())
 				return
-			case pck := <-ch:
+			case pck, ok := <-ch:
+				if !ok {
+					// Channel closed, likely due to camera disconnection
+					c.IndentedJSON(500, Message{Status: 0, Payload: "Camera disconnected"})
+					requestLogger.WithFields(logrus.Fields{
+						"call": "CameraDisconnected",
+					}).Errorln("Camera disconnected")
+					return
+				}
+
 				if pck.IsKeyFrame {
 					noVideo.Reset(10 * time.Second)
 					videoStart = true