AI: Some small improvements.

Author: ossrs-ai

trunk/research/players/js/srs.sdk.js

@@ -34,6 +34,9 @@ function SrsRtcWhipWhepAsync() {
     self.displayStream = null;
     self.userStream = null;
 
+    // Store the WHIP session resource URL from Location header for cleanup.
+    self.resourceUrl = null;
+
     // See https://datatracker.ietf.org/doc/draft-ietf-wish-whip/
     // @url The WebRTC url to publish with, for example:
     //      http://localhost:1985/rtc/v1/whip/?app=live&stream=livestream
@@ -111,6 +114,14 @@ function SrsRtcWhipWhepAsync() {
                 if (xhr.status !== 200 && xhr.status !== 201) return reject(xhr);
                 const data = xhr.responseText;
                 console.log("Got answer: ", data);
+
+                // Extract Location header for WHIP session resource URL.
+                const location = xhr.getResponseHeader('Location');
+                if (location) {
+                    self.resourceUrl = new URL(location, url).href;
+                    console.log(`WHIP session resource URL: ${self.resourceUrl}`);
+                }
+
                 return data.code ? reject(xhr) : resolve(data);
             }
             xhr.open('POST', url, true);
@@ -159,6 +170,14 @@ function SrsRtcWhipWhepAsync() {
                 if (xhr.status !== 200 && xhr.status !== 201) return reject(xhr);
                 const data = xhr.responseText;
                 console.log("Got answer: ", data);
+
+                // Extract Location header for WHEP session resource URL.
+                const location = xhr.getResponseHeader('Location');
+                if (location) {
+                    self.resourceUrl = new URL(location, url).href;
+                    console.log(`WHEP session resource URL: ${self.resourceUrl}`);
+                }
+
                 return data.code ? reject(xhr) : resolve(data);
             }
             xhr.open('POST', url, true);
@@ -190,6 +209,25 @@ function SrsRtcWhipWhepAsync() {
             });
             self.userStream = null;
         }
+
+        // Send DELETE request to WHIP session resource URL to cleanup server resources.
+        if (self.resourceUrl) {
+            const xhr = new XMLHttpRequest();
+            xhr.open('DELETE', self.resourceUrl, true);
+            xhr.onload = function() {
+                if (xhr.readyState !== xhr.DONE) return;
+                if (xhr.status === 200) {
+                    console.log(`WHIP session deleted: ${self.resourceUrl}`);
+                } else {
+                    console.warn(`Failed to delete WHIP session: ${self.resourceUrl}, status: ${xhr.status}`);
+                }
+            };
+            xhr.onerror = function() {
+                console.warn(`Error deleting WHIP session: ${self.resourceUrl}`);
+            };
+            xhr.send();
+            self.resourceUrl = null;
+        }
     };
 
     // The callback when got local stream.

trunk/src/app/srs_app_rtc_api.cpp

@@ -491,16 +491,26 @@ srs_error_t SrsGoApiRtcPublish::do_serve_http(ISrsHttpResponseWriter *w, ISrsHtt
         vcodec = r->query_get("codec");
     }
     string acodec = r->query_get("acodec");
+    // For client to specifies whether encrypt by SRTP.
+    string srtp = r->query_get("encrypt");
+    string dtls = r->query_get("dtls");
 
-    srs_trace("RTC publish %s, api=%s, tid=%s, clientip=%s, app=%s, stream=%s, offer=%dB, eip=%s, vcodec=%s, acodec=%s",
+    srs_trace("RTC publish %s, api=%s, tid=%s, clientip=%s, app=%s, stream=%s, offer=%dB, eip=%s, vcodec=%s, acodec=%s, srtp=%s, dtls=%s",
               streamurl.c_str(), api.c_str(), tid.c_str(), clientip.c_str(), ruc.req_->app_.c_str(), ruc.req_->stream_.c_str(),
-              remote_sdp_str.length(), eip.c_str(), vcodec.c_str(), acodec.c_str());
+              remote_sdp_str.length(), eip.c_str(), vcodec.c_str(), acodec.c_str(), srtp.c_str(), dtls.c_str());
 
     ruc.eip_ = eip;
     ruc.vcodec_ = vcodec;
     ruc.acodec_ = acodec;
     ruc.publish_ = true;
-    ruc.dtls_ = ruc.srtp_ = true;
+
+    // For client to specifies whether encrypt by SRTP.
+    ruc.dtls_ = (dtls != "false");
+    if (srtp.empty()) {
+        ruc.srtp_ = config_->get_rtc_server_encrypt();
+    } else {
+        ruc.srtp_ = (srtp != "false");
+    }
 
     // TODO: FIXME: It seems remote_sdp doesn't represents the full SDP information.
     ruc.remote_sdp_str_ = remote_sdp_str;