Add HTTP DELETE handler for WHIP

Faster session tear down for OBS

Author: Sean-Der

internal/server/handlers/whip/whip.go

@@ -17,7 +17,7 @@ import (
 )
 
 func WhipHandler(responseWriter http.ResponseWriter, request *http.Request) {
-	if request.Method != "POST" && request.Method != "PATCH" {
+	if request.Method != "POST" && request.Method != "PATCH" && request.Method != "DELETE" {
 		return
 	}
 
@@ -35,6 +35,24 @@ func WhipHandler(responseWriter http.ResponseWriter, request *http.Request) {
 		return
 	}
 
+	if request.Method == "DELETE" {
+		sessionId := getSessionIdFromWhipPath(request.URL.Path)
+
+		if sessionId == "" {
+			log.Println("API.WHIP.Delete Error: Missing session id")
+			helpers.LogHttpError(responseWriter, "Missing session id", http.StatusBadRequest)
+			return
+		}
+
+		log.Println("API.WHIP.Delete: Removing session", sessionId)
+		if err := deleteHandler(responseWriter, sessionId); err != nil {
+			log.Println("API.WHIP.Delete Error:", err)
+			helpers.LogHttpError(responseWriter, err.Error(), http.StatusBadRequest)
+		}
+
+		return
+	}
+
 	offer, err := io.ReadAll(request.Body)
 	if err != nil || string(offer) == "" {
 		log.Println("Error reading offer")
@@ -106,9 +124,7 @@ func WhipHandler(responseWriter http.ResponseWriter, request *http.Request) {
 			return
 		}
 
-		path := strings.Replace(request.URL.Path, "/api/whip", "", 1)
-		segments := strings.Split(path, "/")
-		sessionId := strings.TrimSpace(segments[len(segments)-1])
+		sessionId := getSessionIdFromWhipPath(request.URL.Path)
 
 		if sessionId == "" {
 			log.Println("API.WHIP.Patch Error: Missing session id")
@@ -159,3 +175,19 @@ func patchHandler(res http.ResponseWriter, r *http.Request, sessionId, body stri
 
 	return nil
 }
+
+func deleteHandler(res http.ResponseWriter, sessionId string) error {
+	if err := webrtc.HandleWhipDelete(sessionId); err != nil {
+		return err
+	}
+
+	res.WriteHeader(http.StatusNoContent)
+
+	return nil
+}
+
+func getSessionIdFromWhipPath(path string) string {
+	path = strings.Replace(path, "/api/whip", "", 1)
+	segments := strings.Split(path, "/")
+	return strings.TrimSpace(segments[len(segments)-1])
+}

internal/webrtc/sessions/manager/manager.go

@@ -212,3 +212,21 @@ func (manager *SessionManager) GetHostSessionById(sessionId string) (host *whip.
 
 	return nil, false
 }
+
+func (manager *SessionManager) GetSessionByHostSessionId(sessionId string) (session *session.Session, foundSession bool) {
+	manager.sessionsLock.RLock()
+	defer manager.sessionsLock.RUnlock()
+
+	for _, session := range manager.sessions {
+		host := session.Host.Load()
+		if host == nil {
+			continue
+		}
+
+		if sessionId == host.Id {
+			return session, true
+		}
+	}
+
+	return nil, false
+}

internal/webrtc/sessions/session/session.go

@@ -174,6 +174,11 @@ func (session *Session) close() {
 	session.ActiveContextCancel()
 }
 
+func (session *Session) Close() {
+	log.Println("Session.Close", session.StreamKey)
+	session.close()
+}
+
 // Returns true is no WHIP tracks are present, and no WHEP sessions are waiting for incoming streams
 func (session *Session) isEmpty() bool {
 	if session.hasWhepSessions() {

internal/webrtc/webrtc.go

@@ -83,6 +83,17 @@ func HandleWhipPatch(sessionId, body string) error {
 	return nil
 }
 
+func HandleWhipDelete(sessionId string) error {
+	session, isFound := manager.SessionsManager.GetSessionByHostSessionId(sessionId)
+
+	if !isFound {
+		return errors.New("no session found")
+	}
+
+	session.Close()
+	return nil
+}
+
 func patchPeerConnection(peerConnection *webrtc.PeerConnection, body string) error {
 	oldUfrag := getSdpKeyValue(peerConnection.CurrentRemoteDescription().SDP, "ice-ufrag")
 	oldPwd := getSdpKeyValue(peerConnection.CurrentRemoteDescription().SDP, "ice-pwd")