Merge pull request 'chore: prune old update files, fix update dialog' (#17) from dev into master

Reviewed-on: #17

electron/appInfo.js

@@ -1,4 +1,4 @@
 const appName = "EZPPLauncher";
-const appVersion = "2.1.7";
+const appVersion = "2.1.6";
 
 module.exports = { appName, appVersion };

electron/hwidUtil.js

@@ -16,24 +16,17 @@ const platforms = {
 };
 const crypto = require("crypto");
 
-const defaultHWID = "recorderinthesandybridge";
-
 /**
  * Returns machine hardware id.
- * @return {Promise<string>}
+ * Returns `undefined` if cannot determine.
+ * @return {string?}
  */
 function getHwId() {
-  return new Promise((resolve) => {
-    try {
   const getter = platforms[process.platform];
-      if (getter) {
+  if (!getter) return;
   const result = getter[1].exec(child_process.execSync(getter[0], options));
-        if (result) resolve(crypto.createHash("md5").update(result[1]).digest("hex"));
+  if (!result) return;
-      }
+  return crypto.createHash("md5").update(result[1]).digest("hex") ||
-      resolve(crypto.createHash("md5").update(defaultHWID).digest("hex"));
+    undefined;
-    } catch {
-      resolve(crypto.createHash("md5").update(defaultHWID).digest("hex"));
-    }
-  })
 }
 exports.getHwId = getHwId;

electron/imageUtil.js

@@ -1,12 +1,6 @@
 async function checkImageExists(url) {
   try {
-    const response = await fetch(url, {
+    const response = await fetch(url, { method: "HEAD" });
-      method: "HEAD",
-      headers: {
-        "User-Agent":
-          "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36 Edg/128.0.0.0",
-      },
-    });
     if (!response.ok) {
       return false;
     }

electron/osuUtil.js

@@ -152,12 +152,7 @@ function getUserConfig(osuPath) {
 }
 
 async function getUpdateFiles(releaseStream) {
-  const releaseData = await fetch(checkUpdateURL + releaseStream, {
+  const releaseData = await fetch(checkUpdateURL + releaseStream);
-    headers: {
-      "User-Agent":
-        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36 Edg/128.0.0.0",
-    },
-  });
   return releaseData.ok ? await releaseData.json() : undefined;
 }
 
@@ -249,10 +244,6 @@ async function getEZPPLauncherUpdateFiles(osuPath) {
   const filesToDownload = [];
   const updateFilesRequest = await fetch(ezppLauncherUpdateList, {
     method: "PATCH",
-    headers: {
-      "User-Agent":
-        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36 Edg/128.0.0.0",
-    },
   });
   const updateFiles = await updateFilesRequest.json();
   for (const updateFile of updateFiles) {
@@ -273,44 +264,24 @@ async function getEZPPLauncherUpdateFiles(osuPath) {
       filesToDownload.push(updateFile);
     }
   }
-  return [filesToDownload, updateFiles];
+  return filesToDownload;
 }
 
-async function downloadEZPPLauncherUpdateFiles(osuPath, updateFiles, allFiles) {
+async function downloadEZPPLauncherUpdateFiles(osuPath, updateFiles) {
   const eventEmitter = new EventEmitter();
 
   const startDownload = async () => {
     //NOTE: delete files that are not in the updateFiles array
-    const foldersToPrune = allFiles.map((file) =>
+    const foldersToPrune = updateFiles.map(file => path.dirname(path.join(osuPath, ...file.folder.split("/"), file.name))).filter((folder, index, self) => self.indexOf(folder) === index);
-      path.dirname(path.join(osuPath, ...file.folder.split("/"), file.name))
-    ).filter((folder, index, self) => self.indexOf(folder) === index);
     for (const pruneFolder of foldersToPrune) {
       //NOTE: check if the folder is not the osu root folder.
-      if (path.basename(pruneFolder) == "osu!") {
+      if (path.basename(pruneFolder) == "osu!")
         continue;
-      }
-      if (fs.existsSync(pruneFolder)) {
       for (const files of await fs.promises.readdir(pruneFolder)) {
         const filePath = path.join(pruneFolder, files);
-          const validFolder = allFiles.find((file) =>
+        if (!updateFiles.some(file => path.join(osuPath, ...file.folder.split("/"), file.name) === filePath)) {
-            path.dirname(filePath).endsWith(file.folder)
+
-          );
+          await fs.promises.rm(filePath, { recursive: true, force: true });
-          if (!validFolder) {
-            if (
-              allFiles.find((file) => file.name == path.basename(filePath)) ===
-                undefined
-            ) {
-              eventEmitter.emit("data", {
-                fileName: path.basename(filePath),
-              });
-              try {
-                await fs.promises.rm(filePath, {
-                  recursive: true,
-                  force: true,
-                });
-              } catch {}
-            }
-          }
         }
       }
     }

electron/updateCheck.js

@@ -10,12 +10,7 @@ const releasesUrl =
 module.exports = {
   updateAvailable: async () => {
     try {
-      const latestRelease = await fetch(repoApiUrl, {
+      const latestRelease = await fetch(repoApiUrl);
-        headers: {
-          "User-Agent":
-            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36 Edg/128.0.0.0",
-        },
-      });
       const json = await latestRelease.json();
       if (json.length <= 0) return false;
       return {

main.js

@@ -76,12 +76,6 @@ function startOsuStatus() {
         try {
           const currentUserInfo = await fetch(
             `https://api.ez-pp.farm/get_player_info?name=${currentUser.username}&scope=info`,
-            {
-              headers: {
-                "User-Agent":
-                  "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36 Edg/128.0.0.0",
-              },
-            },
           );
           const currentUserInfoJson = await currentUserInfo.json();
           if (
@@ -122,14 +116,7 @@ function startOsuStatus() {
       const windowTitle = firstInstance.processTitle;
       lastOsuStatus = windowTitle;
       const currentStatusRequest = await fetch(
-        "https://api.ez-pp.farm/v1/get_player_status?name=" +
+        "https://api.ez-pp.farm/v1/get_player_status?name=" + currentUser.username,
-          currentUser.username,
-        {
-          headers: {
-            "User-Agent":
-              "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36 Edg/128.0.0.0",
-          },
-        },
       );
       const currentStatus = await currentStatusRequest.json();
 
@@ -140,14 +127,7 @@ function startOsuStatus() {
       const currentModeString = gamemodes[currentMode];
 
       const currentInfoRequest = await fetch(
-        "https://api.ez-pp.farm/v1/get_player_info?name=" +
+        "https://api.ez-pp.farm/v1/get_player_info?name=" + currentUser.username + "&scope=all",
-          currentUser.username + "&scope=all",
-        {
-          headers: {
-            "User-Agent":
-              "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36 Edg/128.0.0.0",
-          },
-        },
       );
       const currentInfo = await currentInfoRequest.json();
       let currentUsername = currentInfo.player.info.name;
@@ -248,7 +228,7 @@ function registerIPCPipes() {
   ipcMain.handle("ezpplauncher:login", async (e, args) => {
     let hwid = "";
     try {
-      hwid = await getHwId();
+      hwid = getHwId();
     } catch (err) {
       logger.error(`Failed to get HWID.`, err);
       return {
@@ -257,7 +237,7 @@ function registerIPCPipes() {
       };
     }
     const timeout = new AbortController();
-    const timeoutId = setTimeout(() => timeout.abort(), 1000 * 10);
+    const timeoutId = setTimeout(() => timeout.abort(), 8000);
     logger.log(`Logging in with user ${args.username}...`);
     try {
       const fetchResult = await fetch("https://ez-pp.farm/login/check", {
@@ -269,8 +249,6 @@ function registerIPCPipes() {
         }),
         headers: {
           "Content-Type": "application/json",
-          "User-Agent":
-            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36 Edg/128.0.0.0",
         },
       });
 
@@ -290,7 +268,7 @@ function registerIPCPipes() {
         return result;
       }
       logger.log(
-        `Login failed for user ${args.username}.\nResponse:\n${await fetchResult
+        `Login failed for user ${username}.\nResponse:\n${await fetchResult
           .text()}`,
       );
       return {
@@ -315,7 +293,7 @@ function registerIPCPipes() {
   });
 
   ipcMain.handle("ezpplauncher:autologin", async (e) => {
-    const hwid = await getHwId();
+    const hwid = getHwId();
     const username = config.get("username");
     const guest = config.get("guest");
     if (guest) return { code: 200, message: "Login as guest", guest: true };
@@ -339,8 +317,6 @@ function registerIPCPipes() {
         }),
         headers: {
           "Content-Type": "application/json",
-          "User-Agent":
-            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36 Edg/128.0.0.0",
         },
       });
 
@@ -408,7 +384,7 @@ function registerIPCPipes() {
       }
 
       if (key == "logging") {
-        logger.enabled = value;
+        logger.enabled = logging;
       }
 
       if (typeof value == "boolean") {
@@ -456,9 +432,8 @@ function registerIPCPipes() {
 
   ipcMain.handle("ezpplauncher:checkUpdate", async (e) => {
     const updateInfo = await updateAvailable();
-    if (updateInfo.update) {
+    if (updateInfo.update)
       mainWindow.webContents.send("ezpplauncher:update", updateInfo.release);
-    }
   });
 
   ipcMain.handle("ezpplauncher:exitAndUpdate", async (e) => {
@@ -554,8 +529,7 @@ function registerIPCPipes() {
             progress: Math.ceil(data.progress),
           });
           mainWindow.webContents.send("ezpplauncher:launchstatus", {
-            status: `Downloading ${data.fileName}(${formatBytes(data.loaded)}/${
+            status: `Downloading ${data.fileName}(${formatBytes(data.loaded)}/${formatBytes(data.total)
-              formatBytes(data.total)
               })...`,
           });
         });
@@ -583,15 +557,12 @@ function registerIPCPipes() {
           status: "Looking for patcher updates...",
         });
         await new Promise((res) => setTimeout(res, 1000));
-        const [patchFiles, allUpdateFiles] = await getEZPPLauncherUpdateFiles(
+        const patchFiles = await getEZPPLauncherUpdateFiles(osuPath);
-          osuPath,
-        );
         if (patchFiles.length > 0) {
           logger.log("EZPPLauncher updates found.");
           const patcherDownloader = await downloadEZPPLauncherUpdateFiles(
             osuPath,
             patchFiles,
-            allUpdateFiles,
           );
           let errored = false;
           patcherDownloader.eventEmitter.on("error", (data) => {
@@ -612,20 +583,10 @@ function registerIPCPipes() {
               progress: Math.ceil(data.progress),
             });
             mainWindow.webContents.send("ezpplauncher:launchstatus", {
-              status: `Downloading ${data.fileName}(${
+              status: `Downloading ${data.fileName}(${formatBytes(data.loaded)
-                formatBytes(data.loaded)
                 }/${formatBytes(data.total)})...`,
             });
           });
-          patcherDownloader.eventEmitter.on("delete", (data) => {
-            logger.log(`Deleting ${data.fileName}!`);
-            mainWindow.webContents.send("ezpplauncher:launchprogress", {
-              progress: -1,
-            });
-            mainWindow.webContents.send("ezpplauncher:launchstatus", {
-              status: `Deleting ${data.fileName}...`,
-            });
-          });
           await patcherDownloader.startDownload();
           mainWindow.webContents.send("ezpplauncher:launchprogress", {
             progress: -1,
@@ -703,7 +664,7 @@ function registerIPCPipes() {
           if (fs.existsSync(updateFile)) {
             await fs.promises.rm(updateFile, {
               force: true,
-              recursive: (await fs.promises.lstat(updateFile)).isDirectory(),
+              recursive: (await fs.promises.lstat(updateFile)).isDirectory,
             });
           }
         }
@@ -757,8 +718,7 @@ function registerIPCPipes() {
           const osuGameplayFile = path.join(osuPath, "osu!gameplay.dll");
           if (isWritable(osuUIFile) && isWritable(osuGameplayFile)) {
             logger.log(
-              `Cleanup complete, took ${
+              `Cleanup complete, took ${((performance.now() - timeStart) / 1000).toFixed(3)
-                ((performance.now() - timeStart) / 1000).toFixed(3)
               } seconds.`,
             );
             clearInterval(cleanup);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ezpplauncher-next",
-  "version": "2.1.7",
+  "version": "2.1.6",
   "description": "EZPPLauncher rewritten with Svelte.",
   "private": false,
   "license": "MIT",

rollup.config.js

@@ -69,7 +69,6 @@ export default {
     resolve({
       browser: true,
       dedupe: ["svelte"],
-      exportConditions: ["svelte"],
     }),
     typescript({
       sourceMap: !production,

src/App.svelte

@@ -1,16 +1,20 @@
 <script lang="ts">
-  import Avatar from "flowbite-svelte/Avatar.svelte";
+  import {
-  import Dropdown from "flowbite-svelte/Dropdown.svelte";
+    Avatar,
-  import DropdownItem from "flowbite-svelte/DropdownItem.svelte";
+    Dropdown,
-  import DropdownHeader from "flowbite-svelte/DropdownHeader.svelte";
+    DropdownItem,
-  import DropdownDivider from "flowbite-svelte/DropdownDivider.svelte";
+    DropdownHeader,
-  import Button from "flowbite-svelte/Button.svelte";
+    DropdownDivider,
-  import Indicator from "flowbite-svelte/Indicator.svelte";
+    Button,
-  import ArrowLeftSolid from "flowbite-svelte-icons/ArrowLeftSolid.svelte";
+    Indicator,
-  import ArrowRightFromBracketSolid from "flowbite-svelte-icons/ArrowRightFromBracketSolid.svelte";
+  } from "flowbite-svelte";
-  import ArrowRightToBracketSolid from "flowbite-svelte-icons/ArrowRightToBracketSolid.svelte";
+  import {
-  import HeartSolid from "flowbite-svelte-icons/HeartSolid.svelte";
+    ArrowLeftSolid,
-  import UserSettingsSolid from "flowbite-svelte-icons/UserSettingsSolid.svelte";
+    ArrowRightFromBracketSolid,
+    ArrowRightToBracketSolid,
+    HeartSolid,
+    UserSettingsSolid,
+  } from "flowbite-svelte-icons";
   import ezppLogo from "../public/favicon.png";
   import {
     currentPage,

src/pages/Launch.svelte

@@ -1,11 +1,11 @@
 <script lang="ts">
-  import Button from "flowbite-svelte/Button.svelte";
+  import { Button } from "flowbite-svelte";
   import Progressbar from "../lib/Progressbar.svelte";
   import {
     launching,
     patch,
     launchStatus,
-    launchPercentage,
+    launchPercentage
   } from "./../storage/localStore";
   let progressbarFix = true;
 

src/pages/Login.svelte

@@ -1,14 +1,10 @@
 <script lang="ts">
-  import Input from "flowbite-svelte/Input.svelte";
+  import { Input, Button, Spinner, Checkbox } from "flowbite-svelte";
-  import Button from "flowbite-svelte/Button.svelte";
-  import Spinner from "flowbite-svelte/Spinner.svelte";
-  import Checkbox from "flowbite-svelte/Checkbox.svelte";
   import { type User } from "../types/user";
   import { currentPage, currentUser, startup } from "../storage/localStore";
   import toast from "svelte-french-toast";
   import { Page } from "../consts/pages";
-  import EyeSolid from "flowbite-svelte-icons/EyeSolid.svelte";
+  import { EyeSlashSolid, EyeSolid } from "flowbite-svelte-icons";
-  import EyeSlashSolid from "flowbite-svelte-icons/EyeSlashSolid.svelte";
 
   let loading = false;
   let username = "";
@@ -17,20 +13,11 @@
   let showPassword = false;
 
   const processLogin = async () => {
-    if (username.length <= 0 || password.length <= 0) {
-      toast.error(`Please provice a valid Username and Password!`, {
-        position: "bottom-center",
-        className:
-          "dark:!bg-gray-800 border-1 dark:!border-gray-700 dark:!text-gray-100",
-        duration: 3000,
-      });
-      return;
-    }
     loading = true;
-    const loginPromise = new Promise<string>((res, rej) => {
+    const loginPromise = new Promise<void>((res, rej) => {
       window.addEventListener(
         "login-result",
-        async (e) => {
+        (e) => {
           const customEvent = e as CustomEvent;
           const resultData = customEvent.detail;
           const wasSuccessful = "user" in resultData;
@@ -43,26 +30,26 @@
                 "dark:!bg-gray-800 border-1 dark:!border-gray-700 dark:!text-gray-100",
               duration: 1500,
             }); */
-            rej(resultData.message);
+            rej();
             loading = false;
             return;
           }
           const userResult = resultData.user as User;
           currentUser.set(userResult);
           currentPage.set(Page.Launch);
-          res("");
+          res();
           toast.success(`Welcome back, ${userResult.name}!`, {
             position: "bottom-center",
             className:
               "dark:!bg-gray-800 border-1 dark:!border-gray-700 dark:!text-gray-100",
-            duration: 3000,
+            duration: 3000
           });
         },
         { once: true }
       );
       window.dispatchEvent(
         new CustomEvent("login-attempt", {
-          detail: { username, password, saveCredentials },
+          detail: { username, password, saveCredentials }
         })
       );
     });
@@ -71,20 +58,20 @@
       {
         loading: "Logging in...",
         success: "Successfully logged in!",
-        error: (e) => e,
+        error: "Invalid Username or Password!"
       },
       {
         position: "bottom-center",
         className:
           "dark:!bg-gray-800 border-1 dark:!border-gray-700 dark:!text-gray-100",
-        duration: 0,
+        duration: 3000
       }
     );
   };
 
   const tryAutoLogin = async () => {
     loading = true;
-    const loginPromise = new Promise<string>((res, rej) => {
+    const loginPromise = new Promise<void>((res, rej) => {
       window.addEventListener(
         "login-result",
         (e) => {
@@ -94,29 +81,29 @@
           const wasSuccessful = "user" in resultData;
           if (isGuest) {
             currentPage.set(Page.Launch);
-            res("");
+            res();
             toast.success(`Logged in as Guest`, {
               position: "bottom-center",
               className:
                 "dark:!bg-gray-800 border-1 dark:!border-gray-700 dark:!text-gray-100",
-              duration: 3000,
+              duration: 3000
             });
             return;
           }
           if (!wasSuccessful) {
             loading = false;
-            rej(resultData.message);
+            rej();
             return;
           }
           const userResult = resultData.user as User;
           currentUser.set(userResult);
           currentPage.set(Page.Launch);
-          res("");
+          res();
           toast.success(`Welcome back, ${userResult.name}!`, {
             position: "bottom-center",
             className:
               "dark:!bg-gray-800 border-1 dark:!border-gray-700 dark:!text-gray-100",
-            duration: 3000,
+            duration: 3000
           });
           loading = false;
         },
@@ -129,13 +116,13 @@
       {
         loading: "Logging in...",
         success: "Successfully logged in!",
-        error: (e) => e,
+        error: "Failed to login."
       },
       {
         position: "bottom-center",
         className:
           "dark:!bg-gray-800 border-1 dark:!border-gray-700 dark:!text-gray-100",
-        duration: 0,
+        duration: 3000
       }
     );
   };
@@ -147,7 +134,7 @@
       position: "bottom-center",
       className:
         "dark:!bg-gray-800 border-1 dark:!border-gray-700 dark:!text-gray-100",
-      duration: 3000,
+      duration: 3000
     });
   };
 

src/pages/Settings.svelte

@@ -1,10 +1,6 @@
 <script lang="ts">
-  import Button from "flowbite-svelte/Button.svelte";
+  import { Button, ButtonGroup, Input, Toggle } from "flowbite-svelte";
-  import ButtonGroup from "flowbite-svelte/ButtonGroup.svelte";
+  import { FileSearchSolid, FolderSolid } from "flowbite-svelte-icons";
-  import Input from "flowbite-svelte/Input.svelte";
-  import Toggle from "flowbite-svelte/Toggle.svelte";
-  import FileSearchSolid from "flowbite-svelte-icons/FileSearchSolid.svelte";
-  import FolderSolid from "flowbite-svelte-icons/FolderSolid.svelte";
   import { patch, presence, logging } from "./../storage/localStore";
 
   let folderPath: string = "";