Mantiene la copertina YouTube se il telefono cade e avvia ffmpeg sul nodo, non via SSH.
Il relay HLS→RTMPS resta sul worker/agent del nodo assegnato, così tre dirette contemporanee restano in onda sul sito e sul canale della società senza schermo nero. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -20,7 +20,8 @@ class HlsProxyController < ActionController::Base
|
||||
def proxy_mediamtx_path(upstream_path)
|
||||
return head :not_found if upstream_path.blank?
|
||||
|
||||
upstream = "#{MatchLiveTv.mediamtx_hls_url}/#{upstream_path}"
|
||||
origin = hls_origin_for(upstream_path)
|
||||
upstream = "#{origin}/#{upstream_path}"
|
||||
upstream = "#{upstream}?#{request.query_string}" if request.query_string.present?
|
||||
cookie = request.headers["Cookie"].presence || "cookieCheck=1"
|
||||
|
||||
@@ -30,7 +31,7 @@ class HlsProxyController < ActionController::Base
|
||||
if response.status.in?([301, 302, 307, 308])
|
||||
location = response.headers["location"].to_s
|
||||
cookie = cookie_from_set_header(response.headers["set-cookie"]).presence || cookie
|
||||
upstream = resolve_upstream_url(location)
|
||||
upstream = resolve_upstream_url(location, origin)
|
||||
next
|
||||
end
|
||||
|
||||
@@ -43,10 +44,21 @@ class HlsProxyController < ActionController::Base
|
||||
head :bad_gateway
|
||||
end
|
||||
|
||||
def resolve_upstream_url(location)
|
||||
def hls_origin_for(upstream_path)
|
||||
session_id = upstream_path[/\Alive\/match_([0-9a-f-]{36})/i, 1]
|
||||
if session_id
|
||||
session = StreamSession.find_by(id: session_id)
|
||||
node_hls = session&.stream_node&.internal_hls_url.presence
|
||||
return node_hls.sub(%r{/$}, "") if node_hls.present?
|
||||
end
|
||||
|
||||
MatchLiveTv.mediamtx_hls_url.sub(%r{/$}, "")
|
||||
end
|
||||
|
||||
def resolve_upstream_url(location, origin)
|
||||
return location if location.start_with?("http://", "https://")
|
||||
|
||||
base = MatchLiveTv.mediamtx_hls_url.sub(%r{/$}, "")
|
||||
base = origin.to_s.sub(%r{/$}, "")
|
||||
location.start_with?("/") ? "#{base}#{location}" : "#{base}/#{location}"
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user