Format code

inotia00 · Sep 20, 2022 · 10213ae · 10213ae
1 parent 2e27317
commit 10213ae
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 37 deletions.
diff --git a/public/index.js b/public/index.js
@@ -1,7 +1,8 @@
 /* eslint-disable no-unused-vars */
 
-const WS_URI = `${window?.location?.protocol === 'https:' ? 'wss' : 'ws'}://${window?.location?.host ?? 'localhost:8080'
-  }`;
+const WS_URI = `${window?.location?.protocol === 'https:' ? 'wss' : 'ws'}://${
+  window?.location?.host ?? 'localhost:8080'
+}`;
 const ws = new WebSocket(WS_URI);
 
 let currentFile;
@@ -158,9 +159,10 @@ function getAppVersions(isRooted) {
   document.getElementsByTagName('header')[0].innerHTML = `
     <h1>Select the version you want to download</h1>
     <span>Versions marked as beta might have bugs or can be unstable, unless marked as recommended<span>
-    ${isRooted
-      ? '<span><strong>You are building rooted ReVanced</strong>, ReVanced Builder will automatically download the correct version for you.<br>If you didn\'t intend on doing a rooted build, include all "Root required to exclude" patches<span>'
-      : ''
+    ${
+      isRooted
+        ? '<span><strong>You are building rooted ReVanced</strong>, ReVanced Builder will automatically download the correct version for you.<br>If you didn\'t intend on doing a rooted build, include all "Root required to exclude" patches<span>'
+        : ''
     }
     `;
 
@@ -261,13 +263,18 @@ ws.onmessage = (msg) => {
           const patch = message.patchList[i];
 
           patchListElement.innerHTML += `<li>
-  <input class="select" id="select-patch-${i}" data-patch-name="${patch.name
-            }" data-excluded="${patch.excluded ? '1' : '0'}" type="checkbox">
+  <input class="select" id="select-patch-${i}" data-patch-name="${
+            patch.name
+          }" data-excluded="${patch.excluded ? '1' : '0'}" type="checkbox">
   <label for="select-patch-${i}">
-    <span style="float:right;"><strong>${patch.isRooted ? 'Needed for Non-Root Building' : ''
-            }</strong></span>
-    <span><strong class="patchName">${toTitleCase(patch.name)}</strong>&nbsp;&nbsp;(${patch.maxVersion !== ' ' ? patch.maxVersion : 'ALL'
-            })</span>
+    <span style="float:right;"><strong>${
+      patch.isRooted ? 'Needed for Non-Root Building' : ''
+    }</strong></span>
+    <span><strong class="patchName">${toTitleCase(
+      patch.name
+    )}</strong>&nbsp;&nbsp;(${
+            patch.maxVersion !== ' ' ? patch.maxVersion : 'ALL'
+          })</span>
     <span class="patch-description">${patch.description}</span>
   </label>
 </li>`;
@@ -278,7 +285,7 @@ ws.onmessage = (msg) => {
           if (searchText.lenght === 0) return;
 
           for (const e of document.getElementsByTagName('li'))
-            e.style.display = 'none'
+            e.style.display = 'none';
 
           for (const e of document.getElementsByClassName('patchName')) {
             if (e.innerText.toLowerCase().startsWith(searchText)) {
@@ -341,12 +348,16 @@ ws.onmessage = (msg) => {
 
           versionsElement.innerHTML += `
             <li>
-            <input type="radio" name="version" id="app-${i}" value="${version.version
-            }" data-beta="${version.beta ? '1' : '0'}" ${!noRec ? ('data-recommended=' + version.recommended ? 1 : 0) : ''
-            }/>
-            <label for="app-${i}">${version.version} ${version.beta ? ' (beta)' : ''
-            } ${!noRec ? (version.recommended ? ' (recommended)' : '') : ''
-            }</label></li>`;
+            <input type="radio" name="version" id="app-${i}" value="${
+            version.version
+          }" data-beta="${version.beta ? '1' : '0'}" ${
+            !noRec ? ('data-recommended=' + version.recommended ? 1 : 0) : ''
+          }/>
+            <label for="app-${i}">${version.version} ${
+            version.beta ? ' (beta)' : ''
+          } ${
+            !noRec ? (version.recommended ? ' (recommended)' : '') : ''
+          }</label></li>`;
         }
 
         if (message.selectedApp === 'music' && !message.foundDevice)
@@ -384,8 +395,8 @@ ws.onmessage = (msg) => {
         const logLevel = message.log.includes('WARNING')
           ? 'warn'
           : message.log.includes('SEVERE')
-            ? 'error'
-            : 'info';
+          ? 'error'
+          : 'info';
 
         document.getElementsByClassName(
           'log'
@@ -400,11 +411,13 @@ ws.onmessage = (msg) => {
         // TODO: on a root install, if the file already exists and the user selects yes it skips checking if a device is plugged in
         document.getElementsByTagName('header')[0].innerHTML = `
             <h1>Use already downloaded APK?</h1>
-            <span>The APK already exists in the revanced folder.${message.isRooted ? ' ' : '<br>'
-          }Do you want to use it?${message.isRooted
+            <span>The APK already exists in the revanced folder.${
+              message.isRooted ? ' ' : '<br>'
+            }Do you want to use it?${
+          message.isRooted
             ? '<br>(Saying no is recommended for rooted building)<br>If you didn\'t intend on doing a rooted build, include all "Root required to exclude" patches'
             : ''
-          }</span>`;
+        }</span>`;
 
         const continueButton = document.getElementById('continue');
         const backButton = document.getElementById('back');
@@ -465,9 +478,12 @@ ws.onmessage = (msg) => {
       break;
     }
     case 'askRootVersion': {
-      const confirmVer = confirm(`**Non Recommended Version**\nYour device has an non recommended version, do you want to patch it?`);
+      const confirmVer = confirm(
+        `**Non Recommended Version**\nYour device has an non recommended version, do you want to patch it?`
+      );
 
-      if (confirmVer) return sendCommand({ event: 'getAppVersion', useVer: true });
+      if (confirmVer)
+        return sendCommand({ event: 'getAppVersion', useVer: true });
       else return sendCommand({ event: 'getAppVersion' });
     }
   }

diff --git a/public/patches/index.html b/public/patches/index.html
@@ -22,7 +22,11 @@ <h1>Select patches to include</h1>
             <button onclick="toggle(false)">Deselect all</button>
           </div>
           <div>
-            <input id="search" type="text" placeholder="Search for a patch...">
+            <input
+              id="search"
+              type="text"
+              placeholder="Search for a patch..."
+            />
           </div>
         </header>
         <div id="content--wrapper">

diff --git a/utils/downloadApp.js b/utils/downloadApp.js
@@ -100,8 +100,8 @@ async function downloadApp(ws) {
       event: 'finished'
     })
   );
-};
+}
 
 module.exports = {
   downloadApp
-}
+};
diff --git a/wsEvents/getAppVersion.js b/wsEvents/getAppVersion.js
@@ -30,15 +30,22 @@ async function getPage(url) {
 async function downloadApp(ws, message) {
   if (message.useVer) return await downloadApp_(ws);
   else if (message.checkVer) {
-    if (global.versions.includes(global.apkInfo.version)) return await downloadApp_(ws);
-
-    return ws.send(JSON.stringify({
-      event: 'askRootVersion'
-    }));
-  } else return ws.send(JSON.stringify({
-    event: 'error',
-    error: 'You did not choose to use the non recommended version. Please downgrade.'
-  }));
+    if (global.versions.includes(global.apkInfo.version))
+      return await downloadApp_(ws);
+
+    return ws.send(
+      JSON.stringify({
+        event: 'askRootVersion'
+      })
+    );
+  } else
+    return ws.send(
+      JSON.stringify({
+        event: 'error',
+        error:
+          'You did not choose to use the non recommended version. Please downgrade.'
+      })
+    );
 }
 
 /**