Actually fix reisxd#450 (also run fmt)

inotia00 · Sep 27, 2022 · c70c1ab · c70c1ab
1 parent 56be930
commit c70c1ab
Show file tree

Hide file tree

Showing 13 changed files with 79 additions and 26 deletions.
diff --git a/public/apps/index.html b/public/apps/index.html
@@ -29,10 +29,12 @@ <h1>Select the app you want to patch</h1>
                 /><label for="app-1">YouTube</label>
               </li>
               <li>
-                <input type="radio" name="app" id="app-2" value="youtube.music" /><label
-                  for="app-2"
-                  >YouTube Music</label
-                >
+                <input
+                  type="radio"
+                  name="app"
+                  id="app-2"
+                  value="youtube.music"
+                /><label for="app-2">YouTube Music</label>
               </li>
               <li>
                 <input

diff --git a/public/index.html b/public/index.html
@@ -18,7 +18,9 @@
             <h1>
               Welcome to <span class="accent-fun">ReVanced </span>Builder!
             </h1>
-            <p style="font-family: 'Roboto', sans-serif;">A simple tool to patch ReVanced supported applications</p>
+            <p style="font-family: 'Roboto', sans-serif">
+              A simple tool to patch ReVanced supported applications
+            </p>
             <button
               class="highlighted"
               id="continue"

diff --git a/utils/FileDownloader.js b/utils/FileDownloader.js
@@ -13,20 +13,17 @@ let ws;
  */
 async function overWriteJarNames(fileName) {
   const filePath = joinPath(global.revancedDir, fileName);
-  if (fileName.includes('revanced-cli'))
-    global.jarNames.cli = filePath;
+  if (fileName.includes('revanced-cli')) global.jarNames.cli = filePath;
 
   if (fileName.includes('revanced-patches') && fileName.endsWith('.jar'))
     global.jarNames.patchesJar = filePath;
 
   if (fileName.endsWith('.apk') && !fileName.startsWith('VancedMicroG'))
     global.jarNames.integrations = filePath;
 
-  if (fileName.startsWith('VancedMicroG'))
-    global.jarNames.microG = filePath;
+  if (fileName.startsWith('VancedMicroG')) global.jarNames.microG = filePath;
 
-  if (fileName.endsWith('.json'))
-    global.jarNames.patchesList = filePath;
+  if (fileName.endsWith('.json')) global.jarNames.patchesList = filePath;
 }
 
 /**
@@ -93,7 +90,10 @@ async function downloadFile(assets) {
 
     if (dir.includes(fileName)) continue;
 
-    await dloadFromURL(asset.browser_download_url, joinPath(global.revancedDir, fileName));
+    await dloadFromURL(
+      asset.browser_download_url,
+      joinPath(global.revancedDir, fileName)
+    );
   }
 }
 

diff --git a/utils/PatchListRememberer.js b/utils/PatchListRememberer.js
@@ -46,7 +46,9 @@ function getPatchesList(pkgName) {
     readFileSync('includedPatchesList.json', 'utf8')
   );
 
-  const package = patchesList.packages.find((package) => package.name === pkgName);
+  const package = patchesList.packages.find(
+    (package) => package.name === pkgName
+  );
 
   if (!package) {
     rmSync('includedPatchesList.json');

diff --git a/utils/checkJDKAndAapt2.js b/utils/checkJDKAndAapt2.js
@@ -29,20 +29,40 @@ module.exports = async function checkJDKAndAapt2(ws) {
       'revanced/aapt2.zip',
       ws
     );
-    await exec(`unzip ${joinPath(global.revancedDir, 'aapt2.zip')} -d ${global.revancedDir}`);
+    await exec(
+      `unzip ${joinPath(global.revancedDir, 'aapt2.zip')} -d ${
+        global.revancedDir
+      }`
+    );
 
     switch (process.arch) {
       case 'arm64':
-        await exec(`cp ${joinPath(global.revancedDir, 'arm64-v8a/aapt2')} ${joinPath(global.revancedDir, 'aapt2')}`);
+        await exec(
+          `cp ${joinPath(global.revancedDir, 'arm64-v8a/aapt2')} ${joinPath(
+            global.revancedDir,
+            'aapt2'
+          )}`
+        );
         await exec(`chmod +x ${joinPath(global.revancedDir, 'aapt2')}`);
         break;
       case 'arm':
-        await exec(`cp ${joinPath(global.revancedDir, 'armeabi-v7a/aapt2')} ${joinPath(global.revancedDir, 'aapt2')}`);
-        await exec(`chmod +x ${joinPath(global.revancedDir, aapt2)}`);
+        await exec(
+          `cp ${joinPath(global.revancedDir, 'armeabi-v7a/aapt2')} ${joinPath(
+            global.revancedDir,
+            'aapt2'
+          )}`
+        );
+        await exec(`chmod +x ${joinPath(global.revancedDir, 'aapt2')}`);
     }
 
     await exec(
-      `rm -rf ${joinPath(global.revancedDir, 'arm64-v8a')} ${joinPath(global.revancedDir, 'armeabi-v7a')} ${joinPath(global.revancedDir, 'x86')} ${joinPath(global.revancedDir, 'aapt2.zip')}`
+      `rm -rf ${joinPath(global.revancedDir, 'arm64-v8a')} ${joinPath(
+        global.revancedDir,
+        'armeabi-v7a'
+      )} ${joinPath(global.revancedDir, 'x86')} ${joinPath(
+        global.revancedDir,
+        'aapt2.zip'
+      )}`
     );
   }
 };
diff --git a/utils/downloadApp.js b/utils/downloadApp.js
@@ -76,6 +76,14 @@ async function downloadApp(ws) {
           .first()
           .attr('href');
 
+  if (!dlLink) {
+    return ws.send(
+      JSON.stringify({
+        event: 'error',
+        error: `The version ${version} does not have an APK available, please use an older version.`
+      })
+    );
+  }
   const downloadLinkPage = await fetch(
     `https://www.apkmirror.com${dlLink}`
   ).then((res) => res.text());

diff --git a/utils/mountReVanced.js b/utils/mountReVanced.js
@@ -13,7 +13,10 @@ module.exports = async function mountReVanced(pkg, ws) {
 
   // Copy ReVanced APK to the folder **directly**
   await exec(
-    `su -c 'cp "${joinPath(global.revancedDir, global.outputName)}" "/data/adb/revanced/"'`
+    `su -c 'cp "${joinPath(
+      global.revancedDir,
+      global.outputName
+    )}" "/data/adb/revanced/"'`
   );
 
   // Unmount the already existing ReVanced APK, so it can be updated

diff --git a/utils/mountReVancedInstaller.js b/utils/mountReVancedInstaller.js
@@ -38,7 +38,10 @@ module.exports = async function mountReVancedInstaller(deviceId) {
 
   // Copy ReVanced APK to temp.
   await exec(
-    `adb -s ${deviceId} push revanced/${joinPath(global.revancedDir, global.outputName)} /data/local/tmp/revanced.delete`
+    `adb -s ${deviceId} push revanced/${joinPath(
+      global.revancedDir,
+      global.outputName
+    )} /data/local/tmp/revanced.delete`
   );
   // Create folder
   await runCommand('su -c \'mkdir -p "/data/adb/revanced/"\'', deviceId);

diff --git a/wsEvents/checkFileAlreadyExists.js b/wsEvents/checkFileAlreadyExists.js
@@ -7,7 +7,9 @@ const { existsSync } = require('node:fs');
 module.exports = function checkFileAlreadyExists(ws) {
   ws.send(
     JSON.stringify({
-      event: existsSync(join(global.revancedDir, `${global.jarNames.selectedApp}.apk`))
+      event: existsSync(
+        join(global.revancedDir, `${global.jarNames.selectedApp}.apk`)
+      )
         ? 'fileExists'
         : 'fileDoesntExist',
       isRooted: global.jarNames.isRooted

diff --git a/wsEvents/installReVanced.js b/wsEvents/installReVanced.js
@@ -16,7 +16,12 @@ module.exports = async function installReVanced(ws) {
         })
       );
       try {
-        await exec(`adb -s ${deviceId} install ${joinPath(global.revancedDir, global.outputName)}`);
+        await exec(
+          `adb -s ${deviceId} install ${joinPath(
+            global.revancedDir,
+            global.outputName
+          )}`
+        );
 
         ws.send(
           JSON.stringify({

diff --git a/wsEvents/patchApp.js b/wsEvents/patchApp.js
@@ -44,7 +44,9 @@ async function afterBuild(ws) {
 
   if (!global.jarNames.isRooted && process.platform === 'android') {
     await exec(
-      `cp ${join(global.revancedDir, global.outputName)} /storage/emulated/0/${global.outputName}`
+      `cp ${join(global.revancedDir, global.outputName)} /storage/emulated/0/${
+        global.outputName
+      }`
     );
     await exec(`cp ${global.jarNames.microG} /storage/emulated/0/microg.apk`);
 
@@ -97,7 +99,10 @@ async function reinstallReVanced() {
     `adb -s ${global.jarNames.deviceID} uninstall ${pkgNameToGetUninstalled}`
   );
   await exec(
-    `adb -s ${global.jarNames.deviceID} install ${join(global.revancedDir, global.outputName)}`
+    `adb -s ${global.jarNames.deviceID} install ${join(
+      global.revancedDir,
+      global.outputName
+    )}`
   );
 }
 

diff --git a/wsEvents/selectAppVersion.js b/wsEvents/selectAppVersion.js
@@ -9,7 +9,8 @@ module.exports = async function selectAppVersion(message, ws) {
   let arch = message.arch;
 
   if (
-    (global.jarNames.selectedApp === 'youtube.music' && global.jarNames.devices[0]) ||
+    (global.jarNames.selectedApp === 'youtube.music' &&
+      global.jarNames.devices[0]) ||
     process.platform === 'android'
   ) {
     arch = await getDeviceArch(ws);

diff --git a/wsEvents/updateFiles.js b/wsEvents/updateFiles.js
@@ -5,7 +5,7 @@ const { downloadFiles } = require('../utils/FileDownloader.js');
 const checkJDKAndAapt2 = require('../utils/checkJDKAndAapt2.js');
 const checkJDkAndADB = require('../utils/checkJDKAndADB.js');
 
-global.revancedDir = joinPath(process.cwd(), "revanced");
+global.revancedDir = joinPath(process.cwd(), 'revanced');
 global.jarNames = {
   cli: '',
   patchesJar: global.revancedDir,