Merge branch 'reisxd:main' into main

.github/workflows/build.yml

@@ -14,7 +14,7 @@ jobs:
           sudo apt -y update
           sudo apt -y upgrade
           sudo apt -y install nodejs
-          sudo curl -Lo /usr/bin/ldid https://github.com/ProcursusTeam/ldid/releases/download/v2.1.5-procursus2/ldid_linux_x86_64
+          sudo curl -Lo /usr/bin/ldid https://github.com/ProcursusTeam/ldid/releases/download/v2.1.5-procursus7/ldid_linux_x86_64
           sudo chmod a+rwx /usr/bin/ldid
       - name: Clone repo
         uses: actions/checkout@v3

README.md

@@ -29,7 +29,7 @@ Clone the repository and `cd` into the directory `revanced-builder`
 ### Build using `docker-compose`
 
 ```bash
-docker-compose build --no-cache
+docker-compose build --pull --no-cache
 ```
 
 This builds the Docker image (`--no-cache` is used to build the image from scratch; sometimes the cache might cause version conflicts).
@@ -53,7 +53,7 @@ To update to a newer version, stop the existing container if it is running, buil
 ### Build using only `docker`
 
 ```bash
-docker build . -t <name_of_the_image> --no-cache
+docker build . --pull -t <name_of_the_image> --no-cache
 ```
 
 Run the newly built container:

public/index.js

@@ -422,6 +422,36 @@ ws.onmessage = (msg) => {
           };
       }
       break;
+    case 'installingStockApp': {
+      if (message.status === 'DOWNLOAD_STARTED') {
+        document.getElementsByTagName('header')[0].innerHTML =
+          '<h1><i class="fa-solid fa-download"></i>Downloading APK</h1>';
+        document.getElementById('content').innerHTML =
+          '<span class="log"></span>';
+        document.getElementsByTagName('main')[0].innerHTML +=
+          '<progress value="0"></progress>';
+        isDownloading = true;
+        document.getElementById('continue').classList.add('disabled');
+      } else if (message.status === 'DOWNLOAD_COMPLETE') {
+        document.getElementById('continue').classList.add('disabled');
+        isDownloading = false;
+        document.getElementsByClassName(
+          'log'
+        )[0].innerHTML += `<span class="log-line info"><strong>[builder]</strong> Uninstalling the stock app...</span><br>`;
+      } else if (message.status === 'UNINSTALL_COMPLETE') {
+        document.getElementsByClassName(
+          'log'
+        )[0].innerHTML += `<span class="log-line info"><strong>[builder]</strong> Installing the downloaded (stock) APK...</span><br>`;
+      } else if (message.status === 'ALL_DONE') {
+        document.getElementsByClassName(
+          'log'
+        )[0].innerHTML += `<span class="log-line info"><strong>[builder]</strong> Complete.</span><br>`;
+        document.getElementById('continue').classList.remove('disabled');
+        document.getElementById('continue').onclick = () => {
+          location.href = '/patch';
+        };
+      }
+    }
     case 'patchLog':
       {
         const logLevel = message.log.includes('WARNING')
@@ -525,12 +555,21 @@ ws.onmessage = (msg) => {
     }
     case 'askRootVersion': {
       const confirmVer = confirm(
-        `**Non Recommended Version**\nYour device has an non recommended version, do you want to patch it?`
+        `**Non Recommended Version**\nYour device has a non recommended version. This means you have to let the builder replace the stock YouTube with a recommended version.\nContinue?`
       );
 
       if (confirmVer)
-        return sendCommand({ event: 'getAppVersion', useVer: true });
-      else return sendCommand({ event: 'getAppVersion' });
+        return sendCommand({
+          event: 'getAppVersion',
+          installLatestRecommended: true
+        });
+      else {
+        if (confirm('Alright, proceed with the non-recommended version?'))
+          return sendCommand({
+            event: 'getAppVersion',
+            useVer: true
+          });
+      }
     }
 
     case 'appList': {

wsEvents/checkForUpdates.js

@@ -1,6 +1,6 @@
 const { getDownloadLink } = require('../utils/FileDownloader.js');
 
-const currentVersion = 'v3.8.0';
+const currentVersion = 'v3.9.0';
 
 /**
  * @param {import('ws').WebSocket} ws

wsEvents/getAppVersion.js

@@ -3,6 +3,7 @@ const exec = require('../utils/promisifiedExec.js');
 const fetch = require('node-fetch');
 const { load } = require('cheerio');
 const semver = require('semver');
+const { join: joinPath } = require('path');
 
 const { getAppVersion: getAppVersion_ } = require('../utils/getAppVersion.js');
 const { downloadApp: downloadApp_ } = require('../utils/downloadApp.js');
@@ -29,6 +30,68 @@ async function getPage(url) {
   return fetch(url).then((res) => res.text());
 }
 
+async function installRecommendedStock(ws, dId) {
+  try {
+    const latestVer = global.versions[global.versions.length - 1];
+    global.apkInfo.version = latestVer;
+    ws.send(
+      JSON.stringify({
+        event: 'installingStockApp',
+        status: 'DOWNLOAD_STARTED'
+      })
+    );
+    await downloadApp_(ws);
+    const downloadedApkPath = `${joinPath(
+      global.revancedDir,
+      global.jarNames.selectedApp.packageName
+    )}.apk`;
+    ws.send(
+      JSON.stringify({
+        event: 'installingStockApp',
+        status: 'DOWNLOAD_COMPLETE'
+      })
+    );
+    if (dId === 'CURRENT_DEVICE') {
+      await exec(
+        `su -c pm uninstall ${global.jarNames.selectedApp.packageName}`
+      );
+      ws.send(
+        JSON.stringify({
+          event: 'installingStockApp',
+          status: 'UNINSTALL_COMPLETE'
+        })
+      );
+      await exec(`su -c pm install ${downloadedApkPath}`);
+    } else {
+      ws.send(
+        JSON.stringify({
+          event: 'installingStockApp',
+          status: 'UNINSTALL_COMPLETE'
+        })
+      );
+      await exec(
+        `adb -s ${dId} uninstall ${global.jarNames.selectedApp.packageName}`
+      );
+      await exec(`adb -s ${dId} install ${downloadedApkPath}`);
+    }
+    ws.send(
+      JSON.stringify({
+        event: 'installingStockApp',
+        status: 'ALL_DONE'
+      })
+    );
+  } catch (_) {
+    return ws.send(
+      JSON.stringify({
+        event: 'error',
+        error: `An error occured while trying to install the stock app${
+          dId !== 'CURRENT_DEVICE' ? ` for device ID ${dId}` : ''
+        }.\nPlease install the recommended version manually and run Builder again.`
+      })
+    );
+  }
+}
+
 async function downloadApp(ws, message) {
   if (message.useVer) return await downloadApp_(ws);
   else if (message.checkVer) {
@@ -40,6 +103,12 @@ async function downloadApp(ws, message) {
         event: 'askRootVersion'
       })
     );
+  } else if (message.installLatestRecommended) {
+    const useAdb =
+      process.platform !== 'android' && global.jarNames?.devices.length !== 0;
+    if (useAdb) {
+      for (const id of global.jarNames.devices) installRecommendedStock(ws, id);
+    } else installRecommendedStock(ws, 'CURRENT_DEVICE');
   } else
     return ws.send(
       JSON.stringify({