prev commit patch

pkg/hls/server_handler.go

@@ -90,13 +90,20 @@ func (s *ServerHandler) ServeHTTPWithUrlCtx(resp http.ResponseWriter, req *http.
 				// noop
 			}
 		} else if filetype == "m3u8" {
+			neededRedirect := false
+
 			if sessionIdHash != "" {
 				err = s.keepSessionAlive(sessionIdHash)
 				if err != nil {
 					Log.Warnf("keepSessionAlive failed. session=%s, err=%+v", sessionIdHash, err)
+					neededRedirect = true
 				}
 			} else {
-				// m3u8请求时，session_id不存在，创建session对象，并让m3u8跳转到携带session_id的url请求
+				neededRedirect = true
+			}
+
+			if neededRedirect {
+				// 创建session对象，并让m3u8跳转到携带session_id的url请求
 
 				session, err := s.createSubSession(req, urlCtx)
 				if err != nil {
@@ -201,6 +208,27 @@ func (s *ServerHandler) clearExpireSession() {
 	}
 }
 
+func (s *ServerHandler) CloseSubSessionIfExist(req *http.Request) {
+	s.mutex.Lock()
+	defer s.mutex.Unlock()
+
+	urlCtx, err := base.ParseUrl(base.ParseHttpRequest(req), 80)
+	if err != nil {
+		Log.Errorf("parse url. err=%+v", err)
+		return
+	}
+
+	urlObj, _ := url.Parse(urlCtx.Url)
+	sessionIdHash := urlObj.Query().Get("session_id")
+
+	session := s.sessionMap[sessionIdHash]
+	if session == nil {
+		return
+	}
+	delete(s.sessionMap, sessionIdHash)
+	s.observer.OnDelHlsSubSession(session)
+}
+
 func (s *ServerHandler) isSubSessionModeEnable() bool {
 	return s.subSessionHashKey != ""
 }