move ProtoBuilder, add tests, fix incompatible rand call

Author: Theta-Dev

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java

@@ -48,6 +48,7 @@
 import org.schabi.newpipe.extractor.stream.AudioTrackType;
 import org.schabi.newpipe.extractor.utils.JsonUtils;
 import org.schabi.newpipe.extractor.utils.Parser;
+import org.schabi.newpipe.extractor.utils.ProtoBuilder;
 import org.schabi.newpipe.extractor.utils.RandomStringFromAlphabetGenerator;
 import org.schabi.newpipe.extractor.utils.Utils;
 
@@ -212,7 +213,7 @@ private YoutubeParsingHelper() {
             "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
 
     /**
-     * The device machine id for the iPhone 15, used to get 60fps with the {@code iOS} client.
+     * The device machine id for the iPhone 16, used to get 60fps with the {@code iOS} client.
      *
      * <p>
      * See <a href="https://gist.github.com/adamawolf/3048717">this GitHub Gist</a> for more
@@ -222,23 +223,23 @@ private YoutubeParsingHelper() {
     private static final String IOS_DEVICE_MODEL = "iPhone16,2";
 
     /**
-     * Spoofing an iPhone 15 Pro Max running iOS 17.5.1 with the hardcoded version of the iOS app.
+     * Spoofing an iPhone 16 Pro Max running iOS 18.1.0 with the hardcoded version of the iOS app.
      * To be used for the {@code "osVersion"} field in JSON POST requests.
      * <p>
      * The value of this field seems to use the following structure:
      * "iOS major version.minor version.patch version.build version", where
      * "patch version" is equal to 0 if it isn't set
      * The build version corresponding to the iOS version used can be found on
-     * <a href="https://theapplewiki.com/wiki/Firmware/iPhone/17.x#iPhone_15_Pro_Max">
-     *     https://theapplewiki.com/wiki/Firmware/iPhone/17.x#iPhone_15_Pro_Max</a>
+     * <a href="https://theapplewiki.com/wiki/Firmware/iPhone/18.x#iPhone_16_Pro_Max">
+     *     https://theapplewiki.com/wiki/Firmware/iPhone/18.x#iPhone_16_Pro_Max</a>
      * </p>
      *
      * @see #IOS_USER_AGENT_VERSION
      */
     private static final String IOS_OS_VERSION = "18.1.0.22B83";
 
     /**
-     * Spoofing an iPhone 15 running iOS 17.5.1 with the hardcoded version of the iOS app. To be
+     * Spoofing an iPhone 15 running iOS 18.1.0 with the hardcoded version of the iOS app. To be
      * used in the user agent for requests.
      *
      * @see #IOS_OS_VERSION
@@ -306,7 +307,7 @@ public static boolean isY2ubeURL(@Nonnull final URL url) {
     public static String randomVisitorData(final ContentCountry country) {
         final ProtoBuilder pbE2 = new ProtoBuilder();
         pbE2.string(2, "");
-        pbE2.varint(4, numberGenerator.nextInt(1, 256));
+        pbE2.varint(4, numberGenerator.nextInt(255) + 1);
 
         final ProtoBuilder pbE = new ProtoBuilder();
         pbE.string(1, country.getCountryCode());
@@ -1181,10 +1182,11 @@ public static JsonBuilder<JsonObject> prepareDesktopJsonBuilder(
     public static JsonBuilder<JsonObject> prepareDesktopJsonBuilder(
             @Nonnull final Localization localization,
             @Nonnull final ContentCountry contentCountry,
-            @Nullable String visitorData)
+            @Nullable final String visitorData)
             throws IOException, ExtractionException {
-        if (visitorData == null) {
-            visitorData = randomVisitorData(contentCountry);
+        String vData = visitorData;
+        if (vData == null) {
+            vData = randomVisitorData(contentCountry);
         }
 
         // @formatter:off
@@ -1198,7 +1200,7 @@ public static JsonBuilder<JsonObject> prepareDesktopJsonBuilder(
                         .value("originalUrl", "https://www.youtube.com")
                         .value("platform", "DESKTOP")
                         .value("utcOffsetMinutes", 0)
-                        .value("visitorData", visitorData)
+                        .value("visitorData", vData)
                     .end()
                     .object("request")
                         .array("internalExperimentFlags")

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java

@@ -829,12 +829,14 @@ public void onFetchPage(@Nonnull final Downloader downloader)
             // Fetching successfully the iOS player is mandatory to get streams
             fetchIosMobileJsonPlayer(contentCountry, localization, videoId);
 
+            /*
             try {
                 fetchAndroidMobileJsonPlayer(contentCountry, localization, videoId);
             } catch (final Exception ignored) {
                 // Ignore exceptions related to ANDROID client fetch or parsing, as it is not
                 // compulsory to play contents
             }
+             */
         }
 
         // The microformat JSON object of the content is only returned on the WEB client,

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/ProtoBuilder.java renamed to extractor/src/main/java/org/schabi/newpipe/extractor/utils/ProtoBuilder.java

@@ -1,4 +1,4 @@
-package org.schabi.newpipe.extractor.services.youtube;
+package org.schabi.newpipe.extractor.utils;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -22,22 +22,23 @@ public String toUrlencodedBase64() {
         return URLEncoder.encode(b64, StandardCharsets.UTF_8);
     }
 
-    private void writeVarint(long val) {
+    private void writeVarint(final long val) {
         try {
             if (val == 0) {
                 byteBuffer.write(new byte[]{(byte) 0});
             } else {
-                while (val != 0) {
-                    byte b = (byte) (val & 0x7f);
-                    val >>= 7;
+                long v = val;
+                while (v != 0) {
+                    byte b = (byte) (v & 0x7f);
+                    v >>= 7;
 
-                    if (val != 0) {
+                    if (v != 0) {
                         b |= (byte) 0x80;
                     }
                     byteBuffer.write(new byte[]{b});
                 }
             }
-        } catch (IOException e) {
+        } catch (final IOException e) {
             throw new RuntimeException(e);
         }
     }
@@ -64,7 +65,7 @@ public void bytes(final int field, final byte[] bytes) {
         writeVarint(bytes.length);
         try {
             byteBuffer.write(bytes);
-        } catch (IOException e) {
+        } catch (final IOException e) {
             throw new RuntimeException(e);
         }
     }

extractor/src/test/java/org/schabi/newpipe/extractor/utils/ProtoBuilderTest.java

@@ -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());
+    }
+}