Fix interacting with latest revanced-cli

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

.github/workflows/Build.yml

@@ -48,17 +48,21 @@ 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: |
+          Get-ChildItem Temp\Temp -Recurse -Force
           $Parameters = @{
               Path             = "Temp\revanced.apk", "Temp\microg.apk"
               DestinationPath  = "ReVanced.zip"
@@ -71,13 +75,9 @@ jobs:
         id: read_release
         run: |
           # https://en.wikipedia.org/wiki/Percent-encoding
-          $Release = (Get-Content -Path ReleaseNotesTemplate.md -Encoding utf8 -Raw).replace("`n", "%0A").replace("`r", "%0D").replace("YouTubeTag", "${{ env.LatestSupportedYT }}").replace("CLITag", "${{ env.CLIvtag }}").replace("PatchesTag", "${{ env.Patchesvtag }}").replace("IntegrationsTag", "${{ env.IntegrationsTag }}").replace("MicroGTag", "${{ env.MicroGTag }}").replace("ZuluTag", "${{ env.ZuluTag }}")
-
+          (Get-Content -Path ReleaseNotesTemplate.md -Encoding utf8 -Raw).replace("YouTubeTag", "${{ env.LatestSupportedYT }}").replace("CLITag", "${{ env.CLIvtag }}").replace("PatchesTag", "${{ env.Patchesvtag }}").replace("IntegrationsTag", "${{ env.IntegrationsTag }}").replace("MicroGTag", "${{ env.MicroGTag }}").replace("ZuluTag", "${{ env.ZuluTag }}") | Set-Content -Path ReleaseNotesTemplate.md -Encoding utf8 -Force
           # https://trstringer.com/github-actions-multiline-strings/
-          echo "::set-output name=RELEASE_BODY::$Release"
-          # echo "RELEASE_BODY=$Release" >> $GITHUB_OUTPUT
-          # echo "RELEASE_BODY=$Release" >> $env:GITHUB_ENV
-
+          Add-Content -Path $env:GITHUB_OUTPUT -Value "ReleaseBody=ReleaseNotesTemplate.md"
           $ReleaseName = Get-Date -f "yyyy.MM.dd"
           echo "RELEASE_NAME=$ReleaseName" >> $env:GITHUB_ENV
 
@@ -87,5 +87,4 @@ jobs:
           tag_name: ${{ env.RELEASE_NAME }}
           token: ${{ github.token }}
           files: ReVanced.zip
-          body: ${{ steps.read_release.outputs.RELEASE_BODY }}
-          # body: ${{ env.RELEASE_BODY }}
+          body_path: ${{ steps.read_release.outputs.ReleaseBody }}

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,30 @@ $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/"
 $Parameters = @{
-    Uri             = "https://www.apkmirror.com/apk/google-inc/youtube/youtube-$($LatestSupported)-release/youtube-$($LatestSupported)-2-android-apk-download/"
+    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
     Verbose         = $true
 }
@@ -48,7 +72,7 @@ $Request = Invoke-Webrequest @Parameters
 $nameProp = $Request.ParsedHtml.getElementsByClassName("accent_bg btn btn-flat downloadButton") | ForEach-Object -Process {$_.nameProp}
 
 $Parameters = @{
-    Uri             = "https://www.apkmirror.com/apk/google-inc/youtube/youtube-$($LatestSupported)-release/youtube-$($LatestSupported)-2-android-apk-download/download/$($nameProp)"
+    Uri = $apkMirrorLink + "/download/$($nameProp)"
     UseBasicParsing = $false # Disabled
     Verbose         = $true
 }
@@ -71,10 +95,9 @@ $Parameters = @{
     UseBasicParsing = $true
     Verbose         = $true
 }
-$Tag = (Invoke-RestMethod @Parameters).tag_name
-$Tag2 = $Tag.replace("v", "")
+$URL = (Invoke-RestMethod @Parameters).assets.browser_download_url
 $Parameters = @{
-    Uri             = "https://github.com/revanced/revanced-cli/releases/download/$Tag/revanced-cli-$Tag2-all.jar"
+    Uri             = $URL
     Outfile         = "$WorkingFolder\ReVanced\revanced-cli.jar"
     UseBasicParsing = $true
     Verbose         = $true
@@ -87,10 +110,9 @@ $Parameters = @{
     UseBasicParsing = $true
     Verbose         = $true
 }
-$Tag = (Invoke-RestMethod @Parameters).tag_name
-$Tag2 = $Tag.replace("v", "")
+$URL = ((Invoke-RestMethod @Parameters).assets | Where-Object -FilterScript {$_.content_type -eq "application/java-archive"}).browser_download_url
 $Parameters = @{
-    Uri             = "https://github.com/revanced/revanced-patches/releases/download/$Tag/revanced-patches-$Tag2.jar"
+    Uri             = $URL
     Outfile         = "$WorkingFolder\ReVanced\revanced-patches.jar"
     UseBasicParsing = $true
     Verbose         = $true
@@ -103,11 +125,8 @@ $Parameters = @{
     UseBasicParsing = $true
     Verbose         = $true
 }
-# $Tag = (Invoke-RestMethod @Parameters).tag_name
-# $Tag2 = $Tag.replace("v", "")
 $URL = (Invoke-RestMethod @Parameters).assets.browser_download_url
 $Parameters = @{
-    # Uri             = "https://github.com/revanced/revanced-integrations/releases/download/$Tag/revanced-integrations-$Tag2.apk"
     Uri             = $URL
     Outfile         = "$WorkingFolder\ReVanced\revanced-integrations.apk"
     UseBasicParsing = $true
@@ -121,15 +140,20 @@ $Parameters = @{
     UseBasicParsing = $true
     Verbose         = $true
 }
-$Tag = (Invoke-RestMethod @Parameters).tag_name
+$URL = (Invoke-RestMethod @Parameters).assets.browser_download_url
 $Parameters = @{
-    Uri             = "https://github.com/TeamVanced/VancedMicroG/releases/download/$Tag/microg.apk"
+    Uri             = $URL
     Outfile         = "$WorkingFolder\ReVanced\microg.apk"
     UseBasicParsing = $true
     Verbose         = $true
 }
 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"
@@ -156,21 +180,24 @@ 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"
 
 # Remove temp directory, because cli failed to clean up directory
-Remove-Item -Path "$WorkingFolder\ReVanced\Temp" -Recurse -Force -Confirm:$false
+# Remove-Item -Path "$WorkingFolder\ReVanced\Temp" -Recurse -Force -Confirm:$false
 
 Write-Warning -Message "Latest available revanced.apk & microg.apk are ready in `"$WorkingFolder\ReVanced`""

README.md

@@ -1,11 +1,13 @@
-<a href="https://github.com/JDM170/ReVanced_Builder/actions"><img src="https://img.shields.io/github/workflow/status/farag2/ReVanced_Builder/Build?label=GitHub%20Actions&logo=GitHub"></a>
+<a href="https://github.com/JDM170/ReVanced_Builder/actions"><img src="https://img.shields.io/github/actions/workflow/status/JDM170/ReVanced_Builder/Build.yml?label=GitHub%20Actions&logo=GitHub"></a>
 
 # ReVanced builder
 
-Build ReVanced package (.apk) easily than ever using latest ReVanced patches and dependencies
+Build ReVanced package (.apk) easily than ever using latest ReVanced patches and dependencies locally or via cloud
 
 ## Usage
 
+### Locally
+
 * To build `revanced.apk` locally you need just to run [`Build.ps1`](https://github.com/JDM170/ReVanced_Builder/blob/main/Build.ps1) via PowerShell;
 * All [patches](https://github.com/revanced/revanced-patches) except the followings applied to `revanced.apk`:
   * always-autorepeat
@@ -18,7 +20,7 @@ Build ReVanced package (.apk) easily than ever using latest ReVanced patches and
 * After compiling you get `revanced.apk` & `microg.apk` ready to be installed;
 * Release notes are generated dynamically using the [ReleaseNotesTemplate.md](https://github.com/JDM170/ReVanced_Builder/blob/main/ReleaseNotesTemplate.md) template.
 
-## By using CI/CD
+### By using CI/CD
 
 ```powershell
 git clone https://github.com/JDM170/ReVanced_Builder

Scripts/MicroG.ps1

@@ -4,13 +4,15 @@ $Parameters = @{
     UseBasicParsing = $true
     Verbose         = $true
 }
-$MicroGTag = (Invoke-RestMethod @Parameters).tag_name
+$apiResult = Invoke-RestMethod @Parameters
+$URL = $apiResult.assets.browser_download_url
+$TAG = $apiResult.tag_name
 $Parameters = @{
-     Uri             = "https://github.com/TeamVanced/VancedMicroG/releases/download/$MicroGTag/microg.apk"
-     Outfile         = "Temp\microg.apk"
-     UseBasicParsing = $true
-     Verbose         = $true
+    Uri             = $URL
+    Outfile         = "Temp\microg.apk"
+    UseBasicParsing = $true
+    Verbose         = $true
 }
 Invoke-RestMethod @Parameters
 
-echo "MicroGTag=$MicroGTag" >> $env:GITHUB_ENV
+echo "MicroGTag=$TAG" >> $env:GITHUB_ENV

Scripts/ReVanced_CLI.ps1

@@ -4,14 +4,15 @@ $Parameters = @{
     UseBasicParsing = $true
     Verbose         = $true
 }
-$CLIvtag = (Invoke-RestMethod @Parameters).tag_name
-$CLItag = $CLIvtag.replace("v", "")
+$apiResult = Invoke-RestMethod @Parameters
+$URL = $apiResult.assets.browser_download_url
+$TAG = $apiResult.tag_name
 $Parameters = @{
-    Uri   = "https://github.com/revanced/revanced-cli/releases/download/$CLIvtag/revanced-cli-$CLItag-all.jar"
+    Uri             = $URL
     Outfile         = "Temp\revanced-cli.jar"
     UseBasicParsing = $true
     Verbose         = $true
 }
 Invoke-RestMethod @Parameters
 
-echo "CLIvtag=$CLIvtag" >> $env:GITHUB_ENV
+echo "CLIvtag=$TAG" >> $env:GITHUB_ENV

Scripts/ReVanced_Intergrations.ps1

@@ -5,14 +5,14 @@ $Parameters = @{
     Verbose         = $true
 }
 $apiResult = Invoke-RestMethod @Parameters
-$IntegrationsTag = $apiResult.tag_name
+$URL = $apiResult.assets.browser_download_url
+$TAG = $apiResult.tag_name
 $Parameters = @{
-    # Uri             = "https://github.com/revanced/revanced-integrations/releases/download/$Tag/revanced-integrations-$Tag2.apk"
-    Uri             = $apiResult.assets.browser_download_url
+    Uri             = $URL
     Outfile         = "Temp\revanced-integrations.apk"
     UseBasicParsing = $true
     Verbose         = $true
 }
 Invoke-RestMethod @Parameters
 
-echo "IntegrationsTag=$IntegrationsTag" >> $env:GITHUB_ENV
+echo "IntegrationsTag=$TAG" >> $env:GITHUB_ENV

Scripts/ReVanced_Patches.ps1

@@ -4,14 +4,15 @@ $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
     Verbose         = $true
 }
 Invoke-RestMethod @Parameters
 
-echo "Patchesvtag=$Patchesvtag" >> $env:GITHUB_ENV
+echo "Patchesvtag=$TAG" >> $env:GITHUB_ENV

Scripts/YouTube.ps1

@@ -13,24 +13,48 @@ $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/"
 $Parameters = @{
-    Uri             = "https://www.apkmirror.com/apk/google-inc/youtube/youtube-$($LatestSupportedYT)-release/youtube-$($LatestSupportedYT)-2-android-apk-download/"
+    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 = @{
-    Uri             = "https://www.apkmirror.com/apk/google-inc/youtube/youtube-$($LatestSupportedYT)-release/youtube-$($LatestSupportedYT)-2-android-apk-download/download/$($Key)"
+    Uri             = $apkMirrorLink + "download/$($Key)"
     UseBasicParsing = $true
     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
@@ -42,4 +66,4 @@ $Parameters = @{
 }
 Invoke-Webrequest @Parameters
 
-echo "LatestSupportedYT=$LatestSupportedYT" >> $env:GITHUB_ENV
+echo "LatestSupportedYT=$LatestSupportedYT" >> $env:GITHUB_ENV

Scripts/Zulu_JDK.ps1

@@ -4,8 +4,9 @@ $Parameters = @{
     UseBasicParsing = $true
     Verbose         = $true
 }
-$URL = (Invoke-RestMethod @Parameters).architecture."64bit".url
-$ZuluTag = (Invoke-RestMethod @Parameters).version
+$apiResult = Invoke-RestMethod @Parameters
+$URL = $apiResult.architecture."64bit".url
+$TAG = $apiResult.version
 $Parameters = @{
     Uri             = $URL
     Outfile         = "Temp\jdk_windows-x64_bin.zip"
@@ -14,7 +15,7 @@ $Parameters = @{
 }
 Invoke-RestMethod @Parameters
 
-echo "ZuluTag=$ZuluTag" >> $env:GITHUB_ENV
+echo "ZuluTag=$TAG" >> $env:GITHUB_ENV
 
 Write-Verbose -Message "Expanding Zulu JDK" -Verbose