hashirama/invidious-mod-JP
1
0
Fork 0
Code Issues Pull requests Actions 2 Projects Releases Wiki Activity

Fix chunking for livestream segments

Browse source
This commit is contained in:
Omar Roth 2019-07-05 11:02:12 -05:00
parent 28df6881a7
commit 8033d1ca6d
No known key found for this signature in database
GPG key ID: B8254FB7EC3D37F2
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/invidious.cr
View file

@ -4651,6 +4651,7 @@ get "/videoplayback" do |env|
chunk_end = chunk_start + HTTP_CHUNK_SIZE - 1 chunk_end = chunk_start + HTTP_CHUNK_SIZE - 1
end end
# TODO: Record bytes written so we can restart after a chunk fails
while true while true
if !range_end && content_length if !range_end && content_length
range_end = content_length range_end = content_length
@ -4700,6 +4701,7 @@ get "/videoplayback" do |env|
env.response.headers["Content-Disposition"] = "attachment; filename=\"#{URI.escape(title)}\"; filename*=UTF-8''#{URI.escape(title)}" env.response.headers["Content-Disposition"] = "attachment; filename=\"#{URI.escape(title)}\"; filename*=UTF-8''#{URI.escape(title)}"
end end
if !response.headers.includes_word?("Transfer-Encoding", "chunked")
content_length = response.headers["Content-Range"].split("/")[-1].to_i64 content_length = response.headers["Content-Range"].split("/")[-1].to_i64
if env.request.headers["Range"]? if env.request.headers["Range"]?
env.response.headers["Content-Range"] = "bytes #{range_start}-#{range_end || (content_length - 1)}/#{content_length}" env.response.headers["Content-Range"] = "bytes #{range_start}-#{range_end || (content_length - 1)}/#{content_length}"
@ -4708,9 +4710,15 @@ get "/videoplayback" do |env|
env.response.content_length = content_length env.response.content_length = content_length
end end
end end
end
proxy_file(response, env) proxy_file(response, env)
end end
# For livestream segments, break after first chunk
if url.includes? "&file=seg.ts"
break
end
rescue ex rescue ex
if ex.message != "Error reading socket: Connection reset by peer" if ex.message != "Error reading socket: Connection reset by peer"
break break