Fix interacting with latest revanced-cli

Signed-off-by: Lev Rusanov <30170278+JDM170@users.noreply.github.com>

.github/workflows/Build.yml

@@ -48,18 +48,17 @@ jobs:
           $JavaPath = (Resolve-Path -Path "Temp\jdk_windows-x64_bin\zulu*win_x64\bin\java.exe").Path
 
           & $JavaPath `
-          -jar "Temp\revanced-cli.jar" `
-          --apk "Temp\youtube.apk" `
-          --bundle "Temp\revanced-patches.jar" `
+          -jar "Temp\revanced-cli.jar" patch `
+          --patch-bundle "Temp\revanced-patches.jar" `
           --merge "Temp\revanced-integrations.apk" `
-          --exclude hide-time-and-seekbar `
-          --exclude always-autorepeat `
-          --exclude hide-captions-button `
-          --exclude disable-fullscreen-panels `
-          --exclude old-quality-layout `
-          --clean `
-          --temp-dir "Temp\Temp" `
-          --out "Temp\revanced.apk"
+          --exclude "always-autorepeat" `
+          --exclude "hide-captions-button" `
+          --exclude "hide-timestamp" `
+          --exclude "hide-seekbar" `
+          --purge `
+          --resource-cache "Temp\Temp" `
+          --out "Temp\revanced.apk" `
+          "Temp\youtube.apk"
 
       - name: Creating archive
         run: |

Build.ps1

@@ -18,6 +18,10 @@
 # Requires -Version 5.1
 # Doesn't work on PowerShell 7.2 due it doesn't contains IE parser engine. You have to use a 3rd party module to make it work like it's presented in CI/CD config: AngleSharp
 
+# Invoke-Webrequest speedup workaround. Improved downloads speeds significantly. 
+# Ref: https://www.codewrecks.com/post/azdo/pills/powershell-download/
+$ProgressPreference = 'SilentlyContinue'
+
 # Download all files to "Script location folder\ReVanced"
 $WorkingFolder = Split-Path $MyInvocation.MyCommand.Path -Parent
 if (-not (Test-Path -Path "$WorkingFolder\ReVanced"))
@@ -37,10 +41,28 @@ $versions = ($JSON | Where-Object -FilterScript {$_.compatiblePackages.name -eq
 $LatestSupported = $versions | Sort-Object -Descending -Unique | Select-Object -First 1
 $LatestSupported = $LatestSupported.replace(".", "-")
 
-# Get unique key to generate direct link
+# Trying to find correct APK link (not BUNDLE)
 # https://www.apkmirror.com/apk/google-inc/youtube/
-# $apkMirrorLink = "https://www.apkmirror.com/apk/google-inc/youtube/youtube-$($LatestSupported)-release/youtube-$($LatestSupported)-2-android-apk-download/"
-$apkMirrorLink = "https://www.apkmirror.com/apk/google-inc/youtube/youtube-$($LatestSupported)-release/youtube-$($LatestSupported)-android-apk-download/"
+$apkMirrorLink = "https://www.apkmirror.com/apk/google-inc/youtube/youtube-$($LatestSupported)-release/"
+$Parameters = @{
+    Uri             = $apkMirrorLink
+    UseBasicParsing = $false # Disabled
+    Verbose         = $true
+}
+$Request = Invoke-Webrequest @Parameters
+$Request.ParsedHtml.getElementsByClassName("table-row headerFont") | ForEach-Object -Process {
+    foreach ($child in $_.children)
+    {
+        if ($child.innerText -eq "nodpi")
+        {
+            $apkPackageLink = ($_.getElementsByTagName("a") | Select-Object -First 1).nameProp
+            break
+        }
+    }
+}
+$apkMirrorLink += $apkPackageLink # actual APK link (not BUNDLE)
+
+# Get unique key to generate direct link
 $Parameters = @{
     Uri             = $apkMirrorLink
     UseBasicParsing = $false # Disabled
@@ -50,7 +72,7 @@ $Request = Invoke-Webrequest @Parameters
 $nameProp = $Request.ParsedHtml.getElementsByClassName("accent_bg btn btn-flat downloadButton") | ForEach-Object -Process {$_.nameProp}
 
 $Parameters = @{
-    Uri = $apkMirrorLink + "download/$($nameProp)"
+    Uri = $apkMirrorLink + "/download/$($nameProp)"
     UseBasicParsing = $false # Disabled
     Verbose         = $true
 }
@@ -127,6 +149,11 @@ $Parameters = @{
 }
 Invoke-RestMethod @Parameters
 
+# Sometimes older version of zulu-jdk causes conflict, so remove older version before proceeding.
+if (Test-Path -Path "$WorkingFolder\ReVanced\jdk") {
+    Remove-Item -Path "$WorkingFolder\ReVanced\jdk" -Recurse -Force
+}
+
 # https://github.com/ScoopInstaller/Java/blob/master/bucket/zulu-jdk.json
 $Parameters = @{
     Uri             = "https://raw.githubusercontent.com/ScoopInstaller/Java/master/bucket/zulu-jdk.json"
@@ -153,20 +180,19 @@ Expand-Archive @Parameters
 
 Remove-Item -Path "$WorkingFolder\ReVanced\jdk_windows-x64_bin.zip" -Force
 
-# https://github.com/revanced/revanced-patches
+# Let's create patched APK
 & "$WorkingFolder\ReVanced\jdk\zulu*win_x64\bin\java.exe" `
--jar "$WorkingFolder\ReVanced\revanced-cli.jar" `
---apk "$WorkingFolder\ReVanced\youtube.apk" `
---bundle "$WorkingFolder\ReVanced\revanced-patches.jar" `
+-jar "$WorkingFolder\ReVanced\revanced-cli.jar" patch `
+--patch-bundle "$WorkingFolder\ReVanced\revanced-patches.jar" `
 --merge "$WorkingFolder\ReVanced\revanced-integrations.apk" `
---exclude hide-time-and-seekbar `
---exclude always-autorepeat `
---exclude hide-captions-button `
---exclude disable-fullscreen-panels `
---exclude old-quality-layout `
---clean `
---temp-dir "$WorkingFolder\ReVanced\Temp" `
---out "$WorkingFolder\ReVanced\revanced.apk"
+--exclude "always-autorepeat" `
+--exclude "hide-captions-button" `
+--exclude "hide-timestamp" `
+--exclude "hide-seekbar" `
+--purge `
+--resource-cache "$WorkingFolder\ReVanced\Temp" `
+--out "$WorkingFolder\ReVanced\revanced.apk" `
+"$WorkingFolder\ReVanced\youtube.apk"
 
 # Open working directory with builded files
 # Invoke-Item -Path "$WorkingFolder\ReVanced"

Scripts/ReVanced_Patches.ps1

@@ -4,13 +4,10 @@ $Parameters = @{
     UseBasicParsing = $true
     Verbose         = $true
 }
-# $Patchesvtag = (Invoke-RestMethod @Parameters).tag_name
-# $Patchestag = $Patchesvtag.replace("v", "")
 $apiResult = Invoke-RestMethod @Parameters
 $URL = ($apiResult.assets | Where-Object -FilterScript {$_.content_type -eq "application/java-archive"}).browser_download_url
 $TAG = $apiResult.tag_name
 $Parameters = @{
-    # Uri             = "https://github.com/revanced/revanced-patches/releases/download/$Patchesvtag/revanced-patches-$Patchestag.jar"
     Uri             = $URL
     Outfile         = "Temp\revanced-patches.jar"
     UseBasicParsing = $true

Scripts/YouTube.ps1

@@ -13,17 +13,39 @@ $LatestSupportedYT = $LatestSupported.replace(".", "-")
 $AngleSharpAssemblyPath = (Get-ChildItem -Path (Split-Path -Path (Get-Package -Name AngleSharp).Source) -Filter "*.dll" -Recurse | Where-Object -FilterScript {$_ -match "standard"} | Select-Object -Last 1).FullName
 Add-Type -Path $AngleSharpAssemblyPath
 
-# Get unique key to generate direct link
+# Create parser object
+$angleparser = New-Object -TypeName AngleSharp.Html.Parser.HtmlParser
+
+# Trying to find correct APK link (not BUNDLE)
 # https://www.apkmirror.com/apk/google-inc/youtube/
-# $apkMirrorLink = "https://www.apkmirror.com/apk/google-inc/youtube/youtube-$($LatestSupported)-release/youtube-$($LatestSupported)-2-android-apk-download/"
-$apkMirrorLink = "https://www.apkmirror.com/apk/google-inc/youtube/youtube-$($LatestSupported)-release/youtube-$($LatestSupported)-android-apk-download/"
+$apkMirrorLink = "https://www.apkmirror.com/apk/google-inc/youtube/youtube-$($LatestSupported)-release/"
 $Parameters = @{
     Uri             = $apkMirrorLink
     UseBasicParsing = $false # Disabled
     Verbose         = $true
 }
 $Request = Invoke-Webrequest @Parameters
-$Parsed = (New-Object -TypeName AngleSharp.Html.Parser.HtmlParser).ParseDocument($Request.Content)
+$Parsed = $angleparser.ParseDocument($Request.Content)
+$Parsed.All | Where-Object -FilterScript {$_.ClassName -match "table-row headerFont"} | ForEach-Object -Process {
+    foreach($child in $_.children)
+    {
+        if ($child.InnerHtml -eq "nodpi")
+        {
+            $apkPackageLink = (($_.getElementsByTagName("a") | Select-Object -First 1).Href).Substring(57)
+            break
+        }
+    }
+}
+$apkMirrorLink += $apkPackageLink # actual APK link (not BUNDLE)
+
+# Get unique key to generate direct link
+$Parameters = @{
+    Uri             = $apkMirrorLink
+    UseBasicParsing = $false # Disabled
+    Verbose         = $true
+}
+$Request = Invoke-Webrequest @Parameters
+$Parsed = $angleparser.ParseDocument($Request.Content)
 $Key = $Parsed.All | Where-Object -FilterScript {$_.ClassName -match "accent_bg btn btn-flat downloadButton"} | ForEach-Object -Process {$_.Search}
 
 $Parameters = @{
@@ -32,7 +54,7 @@ $Parameters = @{
     Verbose         = $true
 }
 $Request = Invoke-Webrequest @Parameters
-$Parsed = (New-Object -TypeName AngleSharp.Html.Parser.HtmlParser).ParseDocument($Request.Content)
+$Parsed = $angleparser.ParseDocument($Request.Content)
 $Key = ($Parsed.All | Where-Object -FilterScript { $_.InnerHtml -eq "here" }).Search
 
 # Finally, get the real link
@@ -44,4 +66,4 @@ $Parameters = @{
 }
 Invoke-Webrequest @Parameters
 
-echo "LatestSupportedYT=$LatestSupportedYT" >> $env:GITHUB_ENV
+echo "LatestSupportedYT=$LatestSupportedYT" >> $env:GITHUB_ENV