mirror of
https://git.nadeko.net/Fijxu/invidious.git
synced 2025-12-20 18:08:54 +00:00
Refactor continuation protocol buffers
This commit is contained in:
Omar Roth
@@ -441,53 +441,57 @@ def produce_channel_videos_url(ucid, page = 1, auto_generated = nil, sort_by = "
|
||||
switch = 0x00
|
||||
end
|
||||
|
||||
meta = IO::Memory.new
|
||||
meta.write(Bytes[0x12, 0x06])
|
||||
meta.print("videos")
|
||||
data = IO::Memory.new
|
||||
data.write_byte 0x12
|
||||
data.write_byte 0x06
|
||||
data.print "videos"
|
||||
|
||||
meta.write(Bytes[0x30, 0x02])
|
||||
meta.write(Bytes[0x38, 0x01])
|
||||
meta.write(Bytes[0x60, 0x01])
|
||||
meta.write(Bytes[0x6a, 0x00])
|
||||
meta.write(Bytes[0xb8, 0x01, 0x00])
|
||||
data.write Bytes[0x30, 0x02]
|
||||
data.write Bytes[0x38, 0x01]
|
||||
data.write Bytes[0x60, 0x01]
|
||||
data.write Bytes[0x6a, 0x00]
|
||||
data.write Bytes[0xb8, 0x01, 0x00]
|
||||
|
||||
meta.write(Bytes[0x20, switch])
|
||||
meta.write(Bytes[0x7a, page.size])
|
||||
meta.print(page)
|
||||
data.write Bytes[0x20, switch]
|
||||
data.write_byte 0x7a
|
||||
VarInt.to_io(data, page.bytesize)
|
||||
data.print page
|
||||
|
||||
case sort_by
|
||||
when "newest"
|
||||
# Empty tags can be omitted
|
||||
# meta.write(Bytes[0x18,0x00])
|
||||
when "popular"
|
||||
meta.write(Bytes[0x18, 0x01])
|
||||
data.write Bytes[0x18, 0x01]
|
||||
when "oldest"
|
||||
meta.write(Bytes[0x18, 0x02])
|
||||
data.write Bytes[0x18, 0x02]
|
||||
end
|
||||
|
||||
meta.rewind
|
||||
meta = Base64.urlsafe_encode(meta.to_slice)
|
||||
meta = URI.escape(meta)
|
||||
data = Base64.urlsafe_encode(data)
|
||||
cursor = URI.escape(data)
|
||||
|
||||
continuation = IO::Memory.new
|
||||
continuation.write(Bytes[0x12, ucid.size])
|
||||
continuation.print(ucid)
|
||||
data = IO::Memory.new
|
||||
|
||||
continuation.write(Bytes[0x1a, meta.size])
|
||||
continuation.print(meta)
|
||||
data.write_byte 0x12
|
||||
VarInt.to_io(data, ucid.bytesize)
|
||||
data.print ucid
|
||||
|
||||
continuation.rewind
|
||||
continuation = continuation.gets_to_end
|
||||
data.write_byte 0x1a
|
||||
VarInt.to_io(data, cursor.bytesize)
|
||||
data.print cursor
|
||||
|
||||
wrapper = IO::Memory.new
|
||||
wrapper.write(Bytes[0xe2, 0xa9, 0x85, 0xb2, 0x02, continuation.size])
|
||||
wrapper.print(continuation)
|
||||
wrapper.rewind
|
||||
data.rewind
|
||||
|
||||
wrapper = Base64.urlsafe_encode(wrapper.to_slice)
|
||||
wrapper = URI.escape(wrapper)
|
||||
buffer = IO::Memory.new
|
||||
buffer.write Bytes[0xe2, 0xa9, 0x85, 0xb2, 0x02]
|
||||
VarInt.to_io(buffer, data.bytesize)
|
||||
|
||||
url = "/browse_ajax?continuation=#{wrapper}&gl=US&hl=en"
|
||||
IO.copy data, buffer
|
||||
|
||||
continuation = Base64.urlsafe_encode(buffer)
|
||||
continuation = URI.escape(continuation)
|
||||
|
||||
url = "/browse_ajax?continuation=#{continuation}&gl=US&hl=en"
|
||||
|
||||
return url
|
||||
end
|
||||
@@ -497,117 +501,108 @@ def produce_channel_playlists_url(ucid, cursor, sort = "newest", auto_generated
|
||||
cursor = Base64.urlsafe_encode(cursor, false)
|
||||
end
|
||||
|
||||
meta = IO::Memory.new
|
||||
data = IO::Memory.new
|
||||
|
||||
if auto_generated
|
||||
meta.write(Bytes[0x08, 0x0a])
|
||||
data.write Bytes[0x08, 0x0a]
|
||||
end
|
||||
|
||||
meta.write(Bytes[0x12, 0x09])
|
||||
meta.print("playlists")
|
||||
data.write Bytes[0x12, 0x09]
|
||||
data.print "playlists"
|
||||
|
||||
if auto_generated
|
||||
meta.write(Bytes[0x20, 0x32])
|
||||
data.write Bytes[0x20, 0x32]
|
||||
else
|
||||
# TODO: Look at 0x01, 0x00
|
||||
case sort
|
||||
when "oldest", "oldest_created"
|
||||
meta.write(Bytes[0x18, 0x02])
|
||||
data.write Bytes[0x18, 0x02]
|
||||
when "newest", "newest_created"
|
||||
meta.write(Bytes[0x18, 0x03])
|
||||
data.write Bytes[0x18, 0x03]
|
||||
when "last", "last_added"
|
||||
meta.write(Bytes[0x18, 0x04])
|
||||
data.write Bytes[0x18, 0x04]
|
||||
end
|
||||
|
||||
meta.write(Bytes[0x20, 0x01])
|
||||
data.write Bytes[0x20, 0x01]
|
||||
end
|
||||
|
||||
meta.write(Bytes[0x30, 0x02])
|
||||
meta.write(Bytes[0x38, 0x01])
|
||||
meta.write(Bytes[0x60, 0x01])
|
||||
meta.write(Bytes[0x6a, 0x00])
|
||||
data.write Bytes[0x30, 0x02]
|
||||
data.write Bytes[0x38, 0x01]
|
||||
data.write Bytes[0x60, 0x01]
|
||||
data.write Bytes[0x6a, 0x00]
|
||||
|
||||
meta.write(Bytes[0x7a, cursor.size])
|
||||
meta.print(cursor)
|
||||
data.write_byte 0x7a
|
||||
VarInt.to_io(data, cursor.bytesize)
|
||||
data.print cursor
|
||||
|
||||
meta.write(Bytes[0xb8, 0x01, 0x00])
|
||||
data.write Bytes[0xb8, 0x01, 0x00]
|
||||
|
||||
meta.rewind
|
||||
meta = Base64.urlsafe_encode(meta.to_slice)
|
||||
meta = URI.escape(meta)
|
||||
data.rewind
|
||||
data = Base64.urlsafe_encode(data)
|
||||
continuation = URI.escape(data)
|
||||
|
||||
continuation = IO::Memory.new
|
||||
continuation.write(Bytes[0x12, ucid.size])
|
||||
continuation.print(ucid)
|
||||
data = IO::Memory.new
|
||||
|
||||
continuation.write(Bytes[0x1a])
|
||||
continuation.write(write_var_int(meta.size))
|
||||
continuation.print(meta)
|
||||
data.write_byte 0x12
|
||||
VarInt.to_io(data, ucid.bytesize)
|
||||
data.print ucid
|
||||
|
||||
continuation.rewind
|
||||
continuation = continuation.gets_to_end
|
||||
data.write_byte 0x1a
|
||||
VarInt.to_io(data, continuation.bytesize)
|
||||
data.print continuation
|
||||
|
||||
wrapper = IO::Memory.new
|
||||
wrapper.write(Bytes[0xe2, 0xa9, 0x85, 0xb2, 0x02])
|
||||
wrapper.write(write_var_int(continuation.size))
|
||||
wrapper.print(continuation)
|
||||
wrapper.rewind
|
||||
data.rewind
|
||||
|
||||
wrapper = Base64.urlsafe_encode(wrapper.to_slice)
|
||||
wrapper = URI.escape(wrapper)
|
||||
buffer = IO::Memory.new
|
||||
buffer.write Bytes[0xe2, 0xa9, 0x85, 0xb2, 0x02]
|
||||
VarInt.to_io(buffer, data.bytesize)
|
||||
|
||||
url = "/browse_ajax?continuation=#{wrapper}&gl=US&hl=en"
|
||||
IO.copy data, buffer
|
||||
|
||||
continuation = Base64.urlsafe_encode(buffer)
|
||||
continuation = URI.escape(continuation)
|
||||
|
||||
url = "/browse_ajax?continuation=#{continuation}&gl=US&hl=en"
|
||||
|
||||
return url
|
||||
end
|
||||
|
||||
def extract_channel_playlists_cursor(url, auto_generated)
|
||||
wrapper = HTTP::Params.parse(URI.parse(url).query.not_nil!)["continuation"]
|
||||
continuation = HTTP::Params.parse(URI.parse(url).query.not_nil!)["continuation"]
|
||||
|
||||
wrapper = URI.unescape(wrapper)
|
||||
wrapper = Base64.decode(wrapper)
|
||||
continuation = URI.unescape(continuation)
|
||||
data = IO::Memory.new(Base64.decode(continuation))
|
||||
|
||||
# 0xe2 0xa9 0x85 0xb2 0x02
|
||||
wrapper += 5
|
||||
data.pos += 5
|
||||
|
||||
continuation_size = read_var_int(wrapper[0, 4])
|
||||
wrapper += write_var_int(continuation_size).size
|
||||
continuation = wrapper[0, continuation_size]
|
||||
continuation = Bytes.new(data.read_bytes(VarInt))
|
||||
data.read continuation
|
||||
data = IO::Memory.new(continuation)
|
||||
|
||||
# 0x12
|
||||
continuation += 1
|
||||
ucid_size = continuation[0]
|
||||
continuation += 1
|
||||
ucid = continuation[0, ucid_size]
|
||||
continuation += ucid_size
|
||||
data.read_byte # => 0x12
|
||||
ucid = Bytes.new(data.read_bytes(VarInt))
|
||||
data.read ucid
|
||||
|
||||
# 0x1a
|
||||
continuation += 1
|
||||
meta_size = read_var_int(continuation[0, 4])
|
||||
continuation += write_var_int(meta_size).size
|
||||
meta = continuation[0, meta_size]
|
||||
continuation += meta_size
|
||||
data.read_byte # => 0x1a
|
||||
inner_continuation = Bytes.new(data.read_bytes(VarInt))
|
||||
data.read inner_continuation
|
||||
|
||||
meta = String.new(meta)
|
||||
meta = URI.unescape(meta)
|
||||
meta = Base64.decode(meta)
|
||||
continuation = String.new(inner_continuation)
|
||||
continuation = URI.unescape(continuation)
|
||||
data = IO::Memory.new(Base64.decode(continuation))
|
||||
|
||||
# 0x12 0x09 playlists
|
||||
meta += 11
|
||||
data.pos += 11
|
||||
|
||||
until meta[0] == 0x7a
|
||||
tag = read_var_int(meta[0, 4])
|
||||
meta += write_var_int(tag).size
|
||||
value = meta[0]
|
||||
meta += 1
|
||||
until data.peek[0] == 0x7a
|
||||
key = data.read_bytes(VarInt)
|
||||
value = data.read_bytes(VarInt)
|
||||
end
|
||||
|
||||
# 0x7a
|
||||
meta += 1
|
||||
cursor_size = meta[0]
|
||||
meta += 1
|
||||
cursor = meta[0, cursor_size]
|
||||
|
||||
data.pos += 1 # => 0x7a
|
||||
cursor = Bytes.new(data.read_bytes(VarInt))
|
||||
data.read cursor
|
||||
cursor = String.new(cursor)
|
||||
|
||||
if !auto_generated
|
||||
@@ -874,20 +869,26 @@ end
|
||||
|
||||
def produce_channel_community_continuation(ucid, cursor)
|
||||
cursor = URI.escape(cursor)
|
||||
continuation = IO::Memory.new
|
||||
|
||||
continuation.write(Bytes[0xe2, 0xa9, 0x85, 0xb2, 0x02])
|
||||
continuation.write(write_var_int(3 + ucid.size + write_var_int(cursor.size).size + cursor.size))
|
||||
data = IO::Memory.new
|
||||
|
||||
continuation.write(Bytes[0x12, ucid.size])
|
||||
continuation.print(ucid)
|
||||
data.write_byte 0x12
|
||||
VarInt.to_io(data, ucid.bytesize)
|
||||
data.print ucid
|
||||
|
||||
continuation.write(Bytes[0x1a])
|
||||
continuation.write(write_var_int(cursor.size))
|
||||
continuation.print(cursor)
|
||||
continuation.rewind
|
||||
data.write_byte 0x1a
|
||||
VarInt.to_io(data, cursor.bytesize)
|
||||
data.print cursor
|
||||
|
||||
continuation = Base64.urlsafe_encode(continuation.to_slice)
|
||||
data.rewind
|
||||
|
||||
buffer = IO::Memory.new
|
||||
buffer.write Bytes[0xe2, 0xa9, 0x85, 0xb2, 0x02]
|
||||
VarInt.to_io(buffer, data.size)
|
||||
|
||||
IO.copy data, buffer
|
||||
|
||||
continuation = Base64.urlsafe_encode(buffer)
|
||||
continuation = URI.escape(continuation)
|
||||
|
||||
return continuation
|
||||
@@ -895,28 +896,25 @@ end
|
||||
|
||||
def extract_channel_community_cursor(continuation)
|
||||
continuation = URI.unescape(continuation)
|
||||
continuation = Base64.decode(continuation)
|
||||
data = IO::Memory.new(Base64.decode(continuation))
|
||||
|
||||
# 0xe2 0xa9 0x85 0xb2 0x02
|
||||
continuation += 5
|
||||
data.pos += 5
|
||||
|
||||
total_size = read_var_int(continuation[0, 4])
|
||||
continuation += write_var_int(total_size).size
|
||||
continuation = Bytes.new(data.read_bytes(VarInt))
|
||||
data.read continuation
|
||||
data = IO::Memory.new(continuation)
|
||||
|
||||
# 0x12
|
||||
continuation += 1
|
||||
ucid_size = continuation[0]
|
||||
continuation += 1
|
||||
ucid = continuation[0, ucid_size]
|
||||
continuation += ucid_size
|
||||
data.read_byte # => 0x12
|
||||
ucid = Bytes.new(data.read_bytes(VarInt))
|
||||
data.read ucid
|
||||
|
||||
# 0x1a
|
||||
continuation += 1
|
||||
until continuation[0] == 'E'.ord
|
||||
continuation += 1
|
||||
data.read_byte # => 0x1a
|
||||
until data.peek[0] == 'E'.ord
|
||||
data.read_byte
|
||||
end
|
||||
|
||||
return String.new(continuation)
|
||||
return URI.unescape(data.gets_to_end)
|
||||
end
|
||||
|
||||
def get_about_info(ucid, locale)
|
||||
|
||||
Reference in New Issue
Block a user