mirror of
https://github.com/iv-org/invidious.git
synced 2024-10-01 01:25:56 -04:00
Chunk video files to bypass throttling
This commit is contained in:
parent
f7dbf2bdd4
commit
e5fa5df7be
@ -54,6 +54,7 @@ MAX_ITEMS_PER_PAGE = 1500
|
|||||||
|
|
||||||
REQUEST_HEADERS_WHITELIST = {"Accept", "Accept-Encoding", "Cache-Control", "Connection", "Content-Length", "If-None-Match", "Range"}
|
REQUEST_HEADERS_WHITELIST = {"Accept", "Accept-Encoding", "Cache-Control", "Connection", "Content-Length", "If-None-Match", "Range"}
|
||||||
RESPONSE_HEADERS_BLACKLIST = {"Access-Control-Allow-Origin", "Alt-Svc", "Server"}
|
RESPONSE_HEADERS_BLACKLIST = {"Access-Control-Allow-Origin", "Alt-Svc", "Server"}
|
||||||
|
HTTP_CHUNK_SIZE = 10485760 # ~10MB
|
||||||
|
|
||||||
CURRENT_BRANCH = {{ "#{`git branch | sed -n '/\* /s///p'`.strip}" }}
|
CURRENT_BRANCH = {{ "#{`git branch | sed -n '/\* /s///p'`.strip}" }}
|
||||||
CURRENT_COMMIT = {{ "#{`git rev-list HEAD --max-count=1 --abbrev-commit`.strip}" }}
|
CURRENT_COMMIT = {{ "#{`git rev-list HEAD --max-count=1 --abbrev-commit`.strip}" }}
|
||||||
@ -4640,31 +4641,58 @@ get "/videoplayback" do |env|
|
|||||||
next
|
next
|
||||||
end
|
end
|
||||||
|
|
||||||
|
content_length = nil
|
||||||
|
first_chunk = true
|
||||||
|
range_start, range_end = parse_range(env.request.headers["Range"]?)
|
||||||
|
chunk_start = range_start
|
||||||
|
chunk_end = range_end
|
||||||
|
|
||||||
|
if !chunk_end || chunk_end - chunk_start > HTTP_CHUNK_SIZE
|
||||||
|
chunk_end = chunk_start + HTTP_CHUNK_SIZE - 1
|
||||||
|
end
|
||||||
|
|
||||||
|
while true
|
||||||
|
if !range_end && content_length
|
||||||
|
range_end = content_length
|
||||||
|
end
|
||||||
|
|
||||||
|
if range_end && chunk_start > range_end
|
||||||
|
break
|
||||||
|
end
|
||||||
|
|
||||||
|
if range_end && chunk_end > range_end
|
||||||
|
chunk_end = range_end
|
||||||
|
end
|
||||||
|
|
||||||
|
headers["Range"] = "bytes=#{chunk_start}-#{chunk_end}"
|
||||||
client = make_client(URI.parse(host), region)
|
client = make_client(URI.parse(host), region)
|
||||||
begin
|
begin
|
||||||
client.get(url, headers) do |response|
|
client.get(url, headers) do |response|
|
||||||
|
if first_chunk
|
||||||
|
if !env.request.headers["Range"]? && response.status_code == 206
|
||||||
|
env.response.status_code = 200
|
||||||
|
else
|
||||||
env.response.status_code = response.status_code
|
env.response.status_code = response.status_code
|
||||||
|
end
|
||||||
|
|
||||||
response.headers.each do |key, value|
|
response.headers.each do |key, value|
|
||||||
if !RESPONSE_HEADERS_BLACKLIST.includes? key
|
if !RESPONSE_HEADERS_BLACKLIST.includes?(key) && key != "Content-Range"
|
||||||
env.response.headers[key] = value
|
env.response.headers[key] = value
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
env.response.headers["Access-Control-Allow-Origin"] = "*"
|
env.response.headers["Access-Control-Allow-Origin"] = "*"
|
||||||
|
|
||||||
if response.headers["Location"]?
|
if location = response.headers["Location"]?
|
||||||
url = URI.parse(response.headers["Location"])
|
location = URI.parse(location)
|
||||||
host = url.host
|
location = "#{location.full_path}&host=#{location.host}"
|
||||||
|
|
||||||
url = url.full_path
|
|
||||||
url += "&host=#{host}"
|
|
||||||
|
|
||||||
if region
|
if region
|
||||||
url += "®ion=#{region}"
|
location += "®ion=#{region}"
|
||||||
end
|
end
|
||||||
|
|
||||||
next env.redirect url
|
env.redirect location
|
||||||
|
break
|
||||||
end
|
end
|
||||||
|
|
||||||
if title = query_params["title"]?
|
if title = query_params["title"]?
|
||||||
@ -4672,9 +4700,26 @@ 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
|
||||||
|
|
||||||
|
content_length = response.headers["Content-Range"].split("/")[-1].to_i64
|
||||||
|
if env.request.headers["Range"]?
|
||||||
|
env.response.headers["Content-Range"] = "bytes #{range_start}-#{range_end || (content_length - 1)}/#{content_length}"
|
||||||
|
env.response.content_length = ((range_end.try &.+ 1) || content_length) - range_start
|
||||||
|
else
|
||||||
|
env.response.content_length = content_length
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
proxy_file(response, env)
|
proxy_file(response, env)
|
||||||
end
|
end
|
||||||
rescue ex
|
rescue ex
|
||||||
|
if ex.message != "Error reading socket: Connection reset by peer"
|
||||||
|
break
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
chunk_start = chunk_end + 1
|
||||||
|
chunk_end += HTTP_CHUNK_SIZE
|
||||||
|
first_chunk = false
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -347,3 +347,21 @@ def subscribe_pubsub(topic, key, config)
|
|||||||
|
|
||||||
return client.post("/subscribe", form: body)
|
return client.post("/subscribe", form: body)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def parse_range(range)
|
||||||
|
if !range
|
||||||
|
return 0_i64, nil
|
||||||
|
end
|
||||||
|
|
||||||
|
ranges = range.lchop("bytes=").split(',')
|
||||||
|
ranges.each do |range|
|
||||||
|
start_range, end_range = range.split('-')
|
||||||
|
|
||||||
|
start_range = start_range.to_i64? || 0_i64
|
||||||
|
end_range = end_range.to_i64?
|
||||||
|
|
||||||
|
return start_range, end_range
|
||||||
|
end
|
||||||
|
|
||||||
|
return 0_i64, nil
|
||||||
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user