[YouTube] Update iOS client and add visitor data to InnerTube requests #1262
+126
−16
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| package org.schabi.newpipe.extractor.utils; | ||
|
|
||
| import java.io.ByteArrayOutputStream; | ||
| import java.io.IOException; | ||
| import java.net.URLEncoder; | ||
| import java.nio.charset.StandardCharsets; | ||
| import java.util.Base64; | ||
|
|
||
| public class ProtoBuilder { | ||
|
There was a problem hiding this comment. Some documentation would be nice, e.g. what this class does |
||
| ByteArrayOutputStream byteBuffer; | ||
|
|
||
| public ProtoBuilder() { | ||
| this.byteBuffer = new ByteArrayOutputStream(); | ||
| } | ||
|
|
||
| public byte[] toBytes() { | ||
| return byteBuffer.toByteArray(); | ||
| } | ||
|
|
||
| public String toUrlencodedBase64() { | ||
| final String b64 = Base64.getUrlEncoder().encodeToString(toBytes()); | ||
| return URLEncoder.encode(b64, StandardCharsets.UTF_8); | ||
| } | ||
|
|
||
| private void writeVarint(final long val) { | ||
| try { | ||
| if (val == 0) { | ||
| byteBuffer.write(new byte[]{(byte) 0}); | ||
| } else { | ||
| long v = val; | ||
| while (v != 0) { | ||
| byte b = (byte) (v & 0x7f); | ||
| v >>= 7; | ||
|
|
||
| if (v != 0) { | ||
| b |= (byte) 0x80; | ||
| } | ||
| byteBuffer.write(new byte[]{b}); | ||
| } | ||
| } | ||
| } catch (final IOException e) { | ||
| throw new RuntimeException(e); | ||
|
There was a problem hiding this comment. Side note: It may be better to use |
||
| } | ||
| } | ||
|
|
||
| private void field(final int field, final byte wire) { | ||
| final long fbits = ((long) field) << 3; | ||
| final long wbits = ((long) wire) & 0x07; | ||
| final long val = fbits | wbits; | ||
| writeVarint(val); | ||
| } | ||
|
|
||
| public void varint(final int field, final long val) { | ||
| field(field, (byte) 0); | ||
| writeVarint(val); | ||
| } | ||
|
|
||
| public void string(final int field, final String string) { | ||
| final byte[] strBts = string.getBytes(StandardCharsets.UTF_8); | ||
| bytes(field, strBts); | ||
| } | ||
|
|
||
| public void bytes(final int field, final byte[] bytes) { | ||
| field(field, (byte) 2); | ||
| writeVarint(bytes.length); | ||
| try { | ||
| byteBuffer.write(bytes); | ||
| } catch (final IOException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| package org.schabi.newpipe.extractor.utils; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
|
|
||
| public class ProtoBuilderTest { | ||
| @Test | ||
| public void testProtoBuilder() { | ||
| final ProtoBuilder pb = new ProtoBuilder(); | ||
| pb.varint(1, 128); | ||
| pb.varint(2, 1234567890); | ||
| pb.varint(3, 1234567890123456789L); | ||
| pb.string(4, "Hello"); | ||
| pb.bytes(5, new byte[]{1, 2, 3}); | ||
| assertEquals("CIABENKF2MwEGJWCpu_HnoSRESIFSGVsbG8qAwECAw%3D%3D", pb.toUrlencodedBase64()); | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The device used here is an iPhone 15 Pro Max but the comments are incorrectly update to "iPhone 16".
Either change/revert the comments to iPhone 15 Pro Max or update the device model to "iPhone17,2" to match the iPhone 16 Pro Max.
The mapping can be found here: https://gist.github.com/adamawolf/3048717
or: https://theapplewiki.com/wiki/Firmware/iPhone/18.x#iPhone_16_Pro_Max