Merge pull request 'add dynamic beatmap images to presence' (#12 ) from dev into master

Reviewed-on: #12
Merge pull request 'oops' (#10 ) from dev into master
2024-03-11 17:55:54 +00:00 · 2024-01-30 08:52:43 +00:00 · 2024-01-29 07:58:55 +00:00 · 2024-01-29 07:57:48 +00:00 · 2024-01-25 13:20:12 +00:00 · 2024-01-25 11:05:15 +00:00
24 changed files with 1296 additions and 1559 deletions
--- a/README.md
+++ b/README.md
@@ -12,7 +12,6 @@ The Launcher is a "plug and play thing", download it, place it on the desktop an

 - Automatic osu! client updating before Launch
 - Custom osu! Logo in MainMenu
- Relax misses and much more
 - Account saving

 ## Build from source
--- a/electron/appInfo.js
+++ b/electron/appInfo.js
@@ -1,4 +1,4 @@
 const appName = "EZPPLauncher";
-const appVersion = "2.1.7";
+const appVersion = "2.1.1";

 module.exports = { appName, appVersion };
--- a/electron/executeUtil.js
+++ b/electron/executeUtil.js
@@ -2,19 +2,19 @@ const childProcess = require("child_process");

 const runFile = (folder, file, args, onExit) => {
    childProcess.execFile(file, args, {
-    cwd: folder,
+        cwd: folder
    }, (_err, _stdout, _stdin) => {
        if (onExit) onExit();
-  });
-};
+    })
+}

 const runFileDetached = (folder, file, args) => {
-  const subProcess = childProcess.spawn(file + (args ? " " + args : ""), {
+    const subProcess = childProcess.spawn(file + (args ? " " + args : ''), {
        cwd: folder,
        detached: true,
-    stdio: "ignore",
+        stdio: 'ignore'
    });
    subProcess.unref();
-};
+}

 module.exports = { runFile, runFileDetached };
--- a/electron/fileUtil.js
+++ b/electron/fileUtil.js
@@ -1,15 +0,0 @@
-const fs = require("fs");
-
-function isWritable(filePath) {
-  let fileAccess = false;
-  try {
-    fs.closeSync(fs.openSync(filePath, "r+"));
-    fileAccess = true;
-  } catch {
-  }
-  return fileAccess;
-}
-
-module.exports = {
-  isWritable,
-};
--- a/electron/formattingUtil.js
+++ b/electron/formattingUtil.js
@@ -1,13 +1,13 @@
 function formatBytes(bytes, decimals = 2) {
-  if (!+bytes) return "0 B";
+    if (!+bytes) return '0 Bytes'

-  const k = 1024;
-  const dm = decimals < 0 ? 0 : decimals;
-  const sizes = ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
+    const k = 1024
+    const dm = decimals < 0 ? 0 : decimals
+    const sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']

-  const i = Math.floor(Math.log(bytes) / Math.log(k));
+    const i = Math.floor(Math.log(bytes) / Math.log(k))

-  return `${parseFloat((bytes / Math.pow(k, i)).toFixed(dm))}${sizes[i]}`;
+    return `${parseFloat((bytes / Math.pow(k, i)).toFixed(dm))}${sizes[i]}`
 }

 module.exports = { formatBytes };
--- a/electron/hwidUtil.js
+++ b/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"));
-      }
-      resolve(crypto.createHash("md5").update(defaultHWID).digest("hex"));
-    } catch {
-      resolve(crypto.createHash("md5").update(defaultHWID).digest("hex"));
-    }
-  })
+  if (!result) return;
+  return crypto.createHash("md5").update(result[1]).digest("hex") ||
+    undefined;
 }
 exports.getHwId = getHwId;
--- a/electron/imageUtil.js
+++ b/electron/imageUtil.js
@@ -1,12 +1,6 @@
 async function checkImageExists(url) {
  try {
-    const response = await fetch(url, {
-      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",
-      },
-    });
+    const response = await fetch(url, { method: "HEAD" });
    if (!response.ok) {
      return false;
    }
--- a/electron/logging.js
+++ b/electron/logging.js
@@ -1,44 +0,0 @@
-const fs = require("fs");
-const path = require("path");
-
-class Logger {
-  constructor(directory) {
-    this.directory = directory;
-    this.enabled = false;
-  }
-
-  async init() {
-    const filename = `${new Date().toISOString().replace(/:/g, "-")}.log`;
-    this.logPath = path.join(this.directory, filename);
-  }
-
-  async log(message) {
-    if (this.logPath === undefined || this.enabled == false) {
-      return;
-    }
-    if (!fs.existsSync(this.logPath)) {
-      await fs.promises.mkdir(this.directory, { recursive: true });
-      await fs.promises.writeFile(this.logPath, "");
-    }
-    const logMessage = `[${new Date().toISOString()}] LOG: ${message}`;
-    await fs.promises.appendFile(this.logPath, `${logMessage}\n`);
-    console.log(logMessage);
-  }
-
-  async error(message, error) {
-    if (this.logPath === undefined || this.enabled == false) {
-      return;
-    }
-    if (!fs.existsSync(this.logPath)) {
-      await fs.promises.mkdir(this.directory, { recursive: true });
-      await fs.promises.writeFile(this.logPath, "");
-    }
-    const errorMessage = `[${
-      new Date().toISOString()
-    }] ERROR: ${message}\n${error.stack}`;
-    await fs.promises.appendFile(this.logPath, `${errorMessage}\n`);
-    console.error(errorMessage);
-  }
-}
-
-module.exports = Logger;
--- a/electron/netUtils.js
+++ b/electron/netUtils.js
@@ -1,26 +0,0 @@
-const { exec } = require("child_process");
-
-async function isNet8Installed() {
-    return new Promise((resolve) => {
-        exec("dotnet --list-runtimes", (error, stdout, stderr) => {
-            if (error) {
-                resolve(false);
-                return;
-            }
-            if (stderr) {
-                resolve(false);
-                return;
-            }
-            const version = stdout.trim();
-            for (const line of version.split('\n')) {
-                if (line.startsWith("Microsoft.WindowsDesktop.App 8.")) {
-                    resolve(true);
-                    break;
-                }
-            }
-            resolve(false);
-        })
-    });
-}
-
-module.exports = { isNet8Installed };
--- a/electron/osuUtil.js
+++ b/electron/osuUtil.js
@@ -10,16 +10,6 @@ const checkUpdateURL =
 const ignoredOsuEntities = [
  "osu!auth.dll",
 ];
-const gamemodes = {
-  0: "osu!",
-  1: "taiko",
-  2: "catch",
-  3: "mania",
-  4: "osu!(rx)",
-  5: "taiko(rx)",
-  6: "catch(rx)",
-  8: "osu!(ap)",
-};
 const osuEntities = [
  "avcodec-51.dll",
  "avformat-52.dll",
@@ -44,7 +34,26 @@ const osuEntities = [
  "scores.db",
 ];

-const ezppLauncherUpdateList = "https://ez-pp.farm/ezpplauncher";
+const patcherFiles = [
+  {
+    name: "patcher.exe",
+    url_download: "https://ez-pp.farm/assets/patcher.exe",
+    url_hash: "https://ez-pp.farm/assets/patcher.md5",
+  },
+  {
+    name: "patch.hook.dll",
+    url_download: "https://ez-pp.farm/assets/patch.hook.dll",
+    url_hash: "https://ez-pp.farm/assets/patch.hook.md5",
+  },
+];
+
+const uiFiles = [
+  {
+    name: "ezpp!ui.dll",
+    url_download: "https://ez-pp.farm/assets/ezpp!ui.dll",
+    url_hash: "https://ez-pp.farm/assets/ezpp!ui.md5",
+  },
+];

 async function isValidOsuFolder(path) {
  const allFiles = await fs.promises.readdir(path);
@@ -152,12 +161,7 @@ function getUserConfig(osuPath) {
 }

 async function getUpdateFiles(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",
-    },
-  });
+  const releaseData = await fetch(checkUpdateURL + releaseStream);
  return releaseData.ok ? await releaseData.json() : undefined;
 }

@@ -189,7 +193,6 @@ function downloadUpdateFiles(osuPath, updateFiles) {

  const startDownload = async () => {
    for (const updatePatch of updateFiles) {
-      try {
      const fileName = updatePatch.filename;
      const fileSize = updatePatch.filesize;
      const fileURL = updatePatch.url_full;
@@ -206,7 +209,15 @@ function downloadUpdateFiles(osuPath, updateFiles) {
          });
        },
      });
-
+      axiosDownloadWithProgress.data.on("end", () => {
+        eventEmitter.emit("data", {
+          fileName,
+          loaded: fileSize,
+          total: fileSize,
+          progress: 100,
+        });
+      });
+      try {
        if (fs.existsSync(path.join(osuPath, fileName))) {
          await fs.promises.rm(path.join(osuPath, fileName), {
            force: true,
@@ -220,7 +231,6 @@ function downloadUpdateFiles(osuPath, updateFiles) {
        console.log(err);
        eventEmitter.emit("error", {
          fileName,
-          error: err,
        });
      }
    }
@@ -245,115 +255,66 @@ function runOsuWithDevServer(osuPath, serverDomain, onExit) {
  runFile(osuPath, osuExecuteable, ["-devserver", serverDomain], onExit);
 }

-async function getEZPPLauncherUpdateFiles(osuPath) {
+async function getPatcherUpdates(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) {
-    const filePath = path.join(
-      osuPath,
-      ...updateFile.folder.split("/"),
-      updateFile.name,
-    );
-    if (fs.existsSync(filePath)) {
-      const fileHash = updateFile.md5.toLowerCase();
-      const localFileHash = crypto.createHash("md5").update(
-        fs.readFileSync(filePath),
-      ).digest("hex").toLowerCase();
-      if (fileHash !== localFileHash) {
-        filesToDownload.push(updateFile);
+
+  const patcherDir = path.join(osuPath, "EZPPLauncher");
+  if (!fs.existsSync(patcherDir)) fs.mkdirSync(patcherDir);
+
+  for (const patcherFile of patcherFiles) {
+    if (fs.existsSync(path.join(patcherDir, patcherFile.name))) {
+      const latestPatchFileHash = await (await fetch(patcherFile.url_hash))
+        .text();
+      const localPatchFileHash = crypto.createHash("md5").update(
+        fs.readFileSync(path.join(patcherDir, patcherFile.name)),
+      ).digest("hex");
+      if (
+        latestPatchFileHash.trim().toLowerCase() !=
+          localPatchFileHash.trim().toLowerCase()
+      ) filesToDownload.push(patcherFile);
+    } else filesToDownload.push(patcherFile);
  }
-    } else {
-      filesToDownload.push(updateFile);
-    }
-  }
-  return [filesToDownload, updateFiles];
+
+  return filesToDownload;
 }

-async function downloadEZPPLauncherUpdateFiles(osuPath, updateFiles, allFiles) {
+function downloadPatcherUpdates(osuPath, patcherUpdates) {
  const eventEmitter = new EventEmitter();

  const startDownload = async () => {
-    //NOTE: delete files that are not in the updateFiles array
-    const foldersToPrune = allFiles.map((file) =>
-      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!") {
-        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) =>
-            path.dirname(filePath).endsWith(file.folder)
-          );
-          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 {}
-            }
-          }
-        }
-      }
-    }
+    const patcherDir = path.join(osuPath, "EZPPLauncher");
+    if (!fs.existsSync(patcherDir)) fs.mkdirSync(patcherDir);

-    for (const updateFile of updateFiles) {
-      try {
-        const filePath = path.join(
-          osuPath,
-          ...updateFile.folder.split("/"),
-          updateFile.name,
-        );
-        const folder = path.dirname(filePath);
-        if (!fs.existsSync(folder)) {
-          await fs.promises.mkdir(folder, { recursive: true });
-        }
-        const axiosDownloadWithProgress = await axios.get(updateFile.url, {
+    for (const patcherFile of patcherUpdates) {
+      const fileName = patcherFile.name;
+      const fileURL = patcherFile.url_download;
+      const axiosDownloadWithProgress = await axios.get(fileURL, {
        responseType: "stream",
        onDownloadProgress: (progressEvent) => {
-            const fileSize = updateFile.size;
-            const { loaded } = progressEvent;
+          const { loaded, total } = progressEvent;
          eventEmitter.emit("data", {
-              fileName: path.basename(filePath),
+            fileName,
            loaded,
-              total: fileSize,
-              progress: Math.floor((loaded / fileSize) * 100),
+            total,
+            progress: Math.floor((loaded / total) * 100),
          });
        },
      });

-        if (fs.existsSync(filePath)) {
-          await fs.promises.rm(filePath, {
+      try {
+        if (fs.existsSync(path.join(osuPath, "EZPPLauncher", fileName))) {
+          await fs.promises.rm(path.join(osuPath, "EZPPLauncher", fileName), {
            force: true,
          });
        }
        await fs.promises.writeFile(
-          filePath,
+          path.join(osuPath, "EZPPLauncher", fileName),
          axiosDownloadWithProgress.data,
        );
      } catch (err) {
        console.log(err);
        eventEmitter.emit("error", {
-          fileName: path.basename(filePath),
-          error: err,
+          fileName,
        });
      }
    }
@@ -365,49 +326,93 @@ async function downloadEZPPLauncherUpdateFiles(osuPath, updateFiles, allFiles) {
  };
 }

-async function replaceUIFiles(osuPath, revert) {
+async function getUIFiles(osuPath) {
+  const filesToDownload = [];
+
+  const ezppLauncherDir = path.join(osuPath, "EZPPLauncher");
+  if (!fs.existsSync(ezppLauncherDir)) fs.mkdirSync(ezppLauncherDir);
+
+  for (const uiFile of uiFiles) {
+    if (fs.existsSync(path.join(ezppLauncherDir, uiFile.name))) {
+      const latestPatchFileHash = await (await fetch(uiFile.url_hash)).text();
+      const localPatchFileHash = crypto.createHash("md5").update(
+        fs.readFileSync(path.join(ezppLauncherDir, uiFile.name)),
+      ).digest("hex");
+      if (
+        latestPatchFileHash.trim().toLowerCase() !=
+          localPatchFileHash.trim().toLowerCase()
+      ) filesToDownload.push(uiFile);
+    } else filesToDownload.push(uiFile);
+  }
+
+  return filesToDownload;
+}
+
+function downloadUIFiles(osuPath, uiFiles) {
+  const eventEmitter = new EventEmitter();
+
+  const startDownload = async () => {
+    const ezpplauncherDir = path.join(osuPath, "EZPPLauncher");
+    if (!fs.existsSync(ezpplauncherDir)) fs.mkdirSync(ezpplauncherDir);
+
+    for (const uiFile of uiFiles) {
+      const fileName = uiFile.name;
+      const fileURL = uiFile.url_download;
+      const axiosDownloadWithProgress = await axios.get(fileURL, {
+        responseType: "stream",
+        onDownloadProgress: (progressEvent) => {
+          const { loaded, total } = progressEvent;
+          eventEmitter.emit("data", {
+            fileName,
+            loaded,
+            total,
+            progress: Math.floor((loaded / total) * 100),
+          });
+        },
+      });
+      try {
+        if (fs.existsSync(path.join(osuPath, "EZPPLauncher", fileName))) {
+          await fs.promises.rm(path.join(osuPath, "EZPPLauncher", fileName), {
+            force: true,
+          });
+        }
+
+        await fs.promises.writeFile(
+          path.join(osuPath, "EZPPLauncher", fileName),
+          axiosDownloadWithProgress.data,
+        );
+      } catch (err) {
+        console.log(err);
+        eventEmitter.emit("error", {
+          fileName,
+        });
+      }
+    }
+  };
+
+  return {
+    eventEmitter,
+    startDownload,
+  };
+}
+
+async function replaceUIFile(osuPath, revert) {
  if (!revert) {
    const ezppUIFile = path.join(osuPath, "EZPPLauncher", "ezpp!ui.dll");
    const oldOsuUIFile = path.join(osuPath, "osu!ui.dll");
-    const ezppGameplayFile = path.join(
-      osuPath,
-      "EZPPLauncher",
-      "ezpp!gameplay.dll",
-    );
-    const oldOsuGameplayFile = path.join(osuPath, "osu!gameplay.dll");
-
    await fs.promises.rename(
      oldOsuUIFile,
      path.join(osuPath, "osu!ui.dll.bak"),
    );
    await fs.promises.rename(ezppUIFile, oldOsuUIFile);
-
-    await fs.promises.rename(
-      oldOsuGameplayFile,
-      path.join(osuPath, "osu!gameplay.dll.bak"),
-    );
-    await fs.promises.rename(ezppGameplayFile, oldOsuGameplayFile);
  } else {
    const oldOsuUIFile = path.join(osuPath, "osu!ui.dll");
    const ezppUIFile = path.join(osuPath, "EZPPLauncher", "ezpp!ui.dll");
-    const oldOsuGameplayFile = path.join(osuPath, "osu!gameplay.dll");
-    const ezppGameplayFile = path.join(
-      osuPath,
-      "EZPPLauncher",
-      "ezpp!gameplay.dll",
-    );
-
    await fs.promises.rename(oldOsuUIFile, ezppUIFile);
    await fs.promises.rename(
      path.join(osuPath, "osu!ui.dll.bak"),
      oldOsuUIFile,
    );
-
-    await fs.promises.rename(oldOsuGameplayFile, ezppGameplayFile);
-    await fs.promises.rename(
-      path.join(osuPath, "osu!gameplay.dll.bak"),
-      oldOsuGameplayFile,
-    );
  }
 }

@@ -468,11 +473,12 @@ module.exports = {
  getFilesThatNeedUpdate,
  downloadUpdateFiles,
  runOsuWithDevServer,
-  replaceUIFiles,
+  getPatcherUpdates,
+  downloadPatcherUpdates,
+  downloadUIFiles,
+  getUIFiles,
+  replaceUIFile,
  findOsuInstallation,
  updateOsuConfigHashes,
  runOsuUpdater,
-  getEZPPLauncherUpdateFiles,
-  downloadEZPPLauncherUpdateFiles,
-  gamemodes,
 };
--- a/electron/richPresence.js
+++ b/electron/richPresence.js
@@ -34,22 +34,21 @@ module.exports = {
    if (!richPresence) {
      richPresence = new DiscordRPC.AutoClient({ transport: "ipc" });
      richPresence.endlessLogin({ clientId });
-      richPresence.once("ready", async () => {
-        console.log(
-          "connected presence with user " + richPresence.user.username,
-        );
-        await richPresence.setActivity(currentStatus);
-        intervalId = setInterval(() => richPresence.setActivity(currentStatus), 2500);
+      richPresence.once("ready", () => {
+        console.log("connected presence with user " + richPresence.user.username);
+        richPresence.setActivity(currentStatus);
+        intervalId = setInterval(() => {
+          richPresence.setActivity(currentStatus);
+        }, 2500);
      });
    }
  },
  disconnect: async () => {
    if (richPresence) {
-      const presence = richPresence;
-      richPresence = null;
      clearInterval(intervalId);
-      await presence.clearActivity();
-      await presence.destroy();
+      await richPresence.clearActivity();
+      await richPresence.destroy();
+      richPresence = null;
    }
  },
  updateStatus: ({ state, details, largeImageKey }) => {
@@ -61,9 +60,9 @@ module.exports = {
    currentStatus.smallImageKey = id ? `https://a.ez-pp.farm/${id}` : "  ";
    currentStatus.smallImageText = username ?? "  ";
  },
-  update: async () => {
+  update: () => {
    if (richPresence && richPresence.user) {
-      await richPresence.setActivity(currentStatus);
+      richPresence.setActivity(currentStatus);
    }
  },
  hasPresence: () => richPresence != undefined,
--- a/electron/updateCheck.js
+++ b/electron/updateCheck.js
@@ -10,12 +10,7 @@ const releasesUrl =
 module.exports = {
  updateAvailable: async () => {
    try {
-      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 latestRelease = await fetch(repoApiUrl);
      const json = await latestRelease.json();
      if (json.length <= 0) return false;
      return {
--- a/main.js
+++ b/main.js
@@ -1,8 +1,17 @@
 // Modules to control application life and create native browser window
-const { app, BrowserWindow, Menu, ipcMain, dialog, shell, protocol, session } = require(
+const { app, BrowserWindow, Menu, ipcMain, dialog, shell } = require(
  "electron",
 );

+/* const unhandled = require("electron-unhandled");
+unhandled({
+  logger: console.error,
+  showDialog: true,
+  reportButton: () => {
+    shell.openExternal("https://ez-pp.farm/discord");
+  },
+}); */
+
 const path = require("path");
 const serve = require("electron-serve");
 const loadURL = serve({ directory: "public" });
@@ -18,12 +27,14 @@ const {
  downloadUpdateFiles,
  getUserConfig,
  runOsuWithDevServer,
-  replaceUIFiles,
+  getPatcherUpdates,
+  downloadPatcherUpdates,
+  getUIFiles,
+  downloadUIFiles,
+  replaceUIFile,
  findOsuInstallation,
+  updateOsuConfigHashes,
  runOsuUpdater,
-  gamemodes,
-  getEZPPLauncherUpdateFiles,
-  downloadEZPPLauncherUpdateFiles,
 } = require("./electron/osuUtil");
 const { formatBytes } = require("./electron/formattingUtil");
 const windowName = require("get-window-by-name");
@@ -36,9 +47,6 @@ const { appName, appVersion } = require("./electron/appInfo");
 const { updateAvailable, releasesUrl } = require("./electron/updateCheck");
 const fkill = require("fkill");
 const { checkImageExists } = require("./electron/imageUtil");
-const { isNet8Installed } = require("./electron/netUtils");
-const Logger = require("./electron/logging");
-const { isWritable } = require("./electron/fileUtil");

 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
@@ -47,13 +55,6 @@ let osuCheckInterval;
 let userOsuPath;
 let osuLoaded = false;
 let patch = false;
-let logger = new Logger(path.join(
-  process.platform == "win32"
-    ? process.env["LOCALAPPDATA"]
-    : process.env["HOME"],
-  "EZPPLauncher",
-  "logs",
-));

 let currentUser = undefined;

@@ -74,34 +75,21 @@ function startOsuStatus() {
        osuLoaded = true;

        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 currentUserInfo = await fetch(`https://api.ez-pp.farm/get_player_info?name=${currentUser.username}&scope=info`);
          const currentUserInfoJson = await currentUserInfo.json();
-          if (
-            "player" in currentUserInfoJson &&
-            currentUserInfoJson.player != null
-          ) {
-            if (
-              "info" in currentUserInfoJson.player &&
-              currentUserInfoJson.player.info != null
-            ) {
+          if ("player" in currentUserInfoJson && currentUserInfoJson.player != null) {
+            if ("info" in currentUserInfoJson.player && currentUserInfoJson.player.info != null) {
              const id = currentUserInfoJson.player.info.id;
              const username = currentUserInfoJson.player.info.name;
              richPresence.updateUser({
                id,
                username,
              });
-              await richPresence.update();
+              richPresence.update();
            }
          }
        } catch {
+
        }

        setTimeout(() => {
@@ -109,8 +97,7 @@ function startOsuStatus() {
            const patcherExecuteable = path.join(
              userOsuPath,
              "EZPPLauncher",
-              "patcher",
-              "osu!.patcher.exe",
+              "patcher.exe",
            );
            if (fs.existsSync(patcherExecuteable)) {
              runFileDetached(userOsuPath, patcherExecuteable);
@@ -122,40 +109,13 @@ function startOsuStatus() {
      const windowTitle = firstInstance.processTitle;
      lastOsuStatus = windowTitle;
      const currentStatusRequest = await fetch(
-        "https://api.ez-pp.farm/v1/get_player_status?name=" +
-        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",
-          },
-        },
+        "https://api.ez-pp.farm/get_player_status?name=" + currentUser.username,
      );
      const currentStatus = await currentStatusRequest.json();

      if (!("player_status" in currentStatus)) return;
      if (!("status" in currentStatus.player_status)) return;

-      const currentMode = currentStatus.player_status.status.mode;
-      const currentModeString = gamemodes[currentMode];
-
-      const currentInfoRequest = await fetch(
-        "https://api.ez-pp.farm/v1/get_player_info?name=" +
-        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;
-      const currentId = currentInfo.player.info.id;
-      const currentStats = currentInfo.player.stats[currentMode];
-
-      currentUsername += ` (#${currentStats.rank})`;
-
      let largeImageKey = "ezppfarm";
      let details = "Idle...";
      let infoText = currentStatus.player_status.status.info_text.length > 0
@@ -222,20 +182,13 @@ function startOsuStatus() {
          break;
      }

-      details = `[${currentModeString}] ${details}`;
-
-      richPresence.updateUser({
-        username: currentUsername,
-        id: currentId,
-      });
-
      richPresence.updateStatus({
        details,
        state: infoText,
        largeImageKey,
      });

-      await richPresence.update();
+      richPresence.update();
    }
  }, 2500);
 }
@@ -246,19 +199,9 @@ function stopOsuStatus() {

 function registerIPCPipes() {
  ipcMain.handle("ezpplauncher:login", async (e, args) => {
-    let hwid = "";
-    try {
-      hwid = await getHwId();
-    } catch (err) {
-      logger.error(`Failed to get HWID.`, err);
-      return {
-        code: 500,
-        message: "Failed to get HWID.",
-      };
-    }
+    const hwid = getHwId();
    const timeout = new AbortController();
-    const timeoutId = setTimeout(() => timeout.abort(), 1000 * 10);
-    logger.log(`Logging in with user ${args.username}...`);
+    const timeoutId = setTimeout(() => timeout.abort(), 8000);
    try {
      const fetchResult = await fetch("https://ez-pp.farm/login/check", {
        signal: timeout.signal,
@@ -269,8 +212,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",
        },
      });

@@ -285,20 +226,14 @@ function registerIPCPipes() {
          }
          currentUser = args;
          config.remove("guest");
-          logger.log(`Logged in as user ${args.username}!`);
-        } else logger.log(`Login failed for user ${args.username}.`);
+        }
        return result;
      }
-      logger.log(
-        `Login failed for user ${args.username}.\nResponse:\n${await fetchResult
-          .text()}`,
-      );
      return {
        code: 500,
        message: "Something went wrong while logging you in.",
      };
    } catch (err) {
-      logger.error("Error while logging in:", err);
      return {
        code: 500,
        message: "Something went wrong while logging you in.",
@@ -315,7 +250,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 };
@@ -328,7 +263,6 @@ function registerIPCPipes() {
    }
    const timeout = new AbortController();
    const timeoutId = setTimeout(() => timeout.abort(), 8000);
-    logger.log(`Logging in with user ${username}...`);
    try {
      const fetchResult = await fetch("https://ez-pp.farm/login/check", {
        signal: timeout.signal,
@@ -339,8 +273,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",
        },
      });

@@ -353,23 +285,16 @@ function registerIPCPipes() {
            username: username,
            password: password,
          };
-          logger.log(`Logged in as user ${username}!`);
-        } else logger.log(`Login failed for user ${username}.`);
-
+        }
        return result;
      } else {
        config.remove("password");
      }
-      logger.log(
-        `Login failed for user ${username}.\nResponse:\n${await fetchResult
-          .text()}`,
-      );
      return {
        code: 500,
        message: "Something went wrong while logging you in.",
      };
    } catch (err) {
-      logger.error("Error while logging in:", err);
      return {
        code: 500,
        message: "Something went wrong while logging you in.",
@@ -382,7 +307,6 @@ function registerIPCPipes() {
    config.remove("password");
    config.set("guest", "1");
    currentUser = undefined;
-    logger.log("Logged in as guest user.");
  });

  ipcMain.handle("ezpplauncher:logout", (e) => {
@@ -390,7 +314,6 @@ function registerIPCPipes() {
    config.remove("password");
    config.remove("guest");
    currentUser = undefined;
-    logger.log("Loging out.");
    return true;
  });

@@ -407,10 +330,6 @@ function registerIPCPipes() {
        else richPresence.connect();
      }

-      if (key == "logging") {
-        logger.enabled = value;
-      }
-
      if (typeof value == "boolean") {
        config.set(key, value ? "true" : "false");
      } else {
@@ -454,31 +373,12 @@ function registerIPCPipes() {
    return config.all();
  });

-  ipcMain.handle("ezpplauncher:checkUpdate", async (e) => {
-    const updateInfo = await updateAvailable();
-    if (updateInfo.update) {
-      mainWindow.webContents.send("ezpplauncher:update", updateInfo.release);
-    }
-  });
-
  ipcMain.handle("ezpplauncher:exitAndUpdate", async (e) => {
    await shell.openExternal(releasesUrl);
    app.exit();
  });

  ipcMain.handle("ezpplauncher:launch", async (e) => {
-    try {
-      const osuWindowTitle = windowName.getWindowText("osu!.exe");
-      if (osuWindowTitle.length > 0) {
-        mainWindow.webContents.send("ezpplauncher:alert", {
-          type: "error",
-          message: "osu! is running, please exit.",
-        });
-        mainWindow.webContents.send("ezpplauncher:launchabort");
-        return;
-      }
-
-      logger.log("Preparing launch...");
    const configPatch = config.get("patch");
    patch = configPatch != undefined ? configPatch == "true" : true;
    mainWindow.webContents.send("ezpplauncher:launchstatus", {
@@ -493,8 +393,6 @@ function registerIPCPipes() {
        type: "error",
        message: "osu! path not set!",
      });
-        mainWindow.webContents.send("ezpplauncher:open-settings");
-        logger.log("osu! path is not set.");
      return;
    }
    if (!(await isValidOsuFolder(osuPath))) {
@@ -503,42 +401,51 @@ function registerIPCPipes() {
        type: "error",
        message: "invalid osu! path!",
      });
-        logger.log("osu! path is invalid.");
      return;
    }
-      if (patch) {
-        if (!(await isNet8Installed())) {
-          mainWindow.webContents.send("ezpplauncher:launchabort");
-          mainWindow.webContents.send("ezpplauncher:alert", {
-            type: "error",
-            message: ".NET 8 is not installed.",
-          });
-          //open .net 8 download in browser
-          shell.openExternal(
-            "https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-desktop-8.0.4-windows-x64-installer",
-          );
-          logger.log(".NET 8 is not installed.");
-        }
-      }
    mainWindow.webContents.send("ezpplauncher:launchstatus", {
      status: "Checking for osu! updates...",
    });
    await new Promise((res) => setTimeout(res, 1000));
-      const releaseStream = await getGlobalConfig(osuPath).get(
-        "_ReleaseStream",
-      );
+    const releaseStream = await getGlobalConfig(osuPath).get("_ReleaseStream");
    const latestFiles = await getUpdateFiles(releaseStream);
+    const uiFiles = await getUIFiles(osuPath);
    const updateFiles = await getFilesThatNeedUpdate(osuPath, latestFiles);
+    if (uiFiles.length > 0) {
+      const uiDownloader = downloadUIFiles(osuPath, uiFiles);
+      let errored = false;
+      uiDownloader.eventEmitter.on("error", (data) => {
+        const filename = data.fileName;
+        errored = true;
+        mainWindow.webContents.send("ezpplauncher:alert", {
+          type: "error",
+          message:
+            `Failed to download/replace ${filename}!\nMaybe try to restart EZPPLauncher.`,
+        });
+      });
+      uiDownloader.eventEmitter.on("data", (data) => {
+        mainWindow.webContents.send("ezpplauncher:launchprogress", {
+          progress: Math.ceil(data.progress),
+        });
+        mainWindow.webContents.send("ezpplauncher:launchstatus", {
+          status: `Downloading ${data.fileName}(${formatBytes(data.loaded)}/${formatBytes(data.total)
+            })...`,
+        });
+      });
+      await uiDownloader.startDownload();
+      mainWindow.webContents.send("ezpplauncher:launchprogress", {
+        progress: -1,
+      });
+      if (errored) {
+        mainWindow.webContents.send("ezpplauncher:launchabort");
+        return;
+      }
+    }
    if (updateFiles.length > 0) {
-        logger.log("osu! updates found.");
      const updateDownloader = downloadUpdateFiles(osuPath, updateFiles);
      let errored = false;
      updateDownloader.eventEmitter.on("error", (data) => {
        const filename = data.fileName;
-          logger.error(
-            `Failed to download/replace ${filename}!`,
-            data.error,
-          );
        errored = true;
        mainWindow.webContents.send("ezpplauncher:alert", {
          type: "error",
@@ -547,9 +454,6 @@ function registerIPCPipes() {
        });
      });
      updateDownloader.eventEmitter.on("data", (data) => {
-          if (data.progress >= 100) {
-            logger.log(`Downloaded ${data.fileName} successfully.`);
-          }
        mainWindow.webContents.send("ezpplauncher:launchprogress", {
          progress: Math.ceil(data.progress),
        });
@@ -582,20 +486,12 @@ function registerIPCPipes() {
        status: "Looking for patcher updates...",
      });
      await new Promise((res) => setTimeout(res, 1000));
-        const [patchFiles, allUpdateFiles] = await getEZPPLauncherUpdateFiles(
-          osuPath,
-        );
+      const patchFiles = await getPatcherUpdates(osuPath);
      if (patchFiles.length > 0) {
-          logger.log("EZPPLauncher updates found.");
-          const patcherDownloader = await downloadEZPPLauncherUpdateFiles(
-            osuPath,
-            patchFiles,
-            allUpdateFiles,
-          );
+        const patcherDownloader = downloadPatcherUpdates(osuPath, patchFiles);
        let errored = false;
        patcherDownloader.eventEmitter.on("error", (data) => {
          const filename = data.fileName;
-            logger.error(`Failed to download/replace ${filename}!`, data.error);
          errored = true;
          mainWindow.webContents.send("ezpplauncher:alert", {
            type: "error",
@@ -604,24 +500,12 @@ function registerIPCPipes() {
          });
        });
        patcherDownloader.eventEmitter.on("data", (data) => {
-            if (data.progress >= 100) {
-              logger.log(`Downloaded ${data.fileName} successfully.`);
-            }
          mainWindow.webContents.send("ezpplauncher:launchprogress", {
            progress: Math.ceil(data.progress),
          });
          mainWindow.webContents.send("ezpplauncher:launchstatus", {
-              status: `Downloading ${data.fileName}(${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}...`,
+            status: `Downloading ${data.fileName}(${formatBytes(data.loaded)}/${formatBytes(data.total)
+              })...`,
          });
        });
        await patcherDownloader.startDownload();
@@ -674,40 +558,26 @@ function registerIPCPipes() {
      status: "Preparing launch...",
    });

-      /* await updateOsuConfigHashes(osuPath); */
-      logger.log("Replacing UI files...");
-      try {
-        await replaceUIFiles(osuPath, false);
-        logger.log("UI files replaced successfully.");
-      } catch (err) {
-        logger.error("Failed to replace UI files:", err);
-        mainWindow.webContents.send("ezpplauncher:alert", {
-          type: "error",
-          message: "Failed to replace UI files. try restarting EZPPLauncher.",
-        });
-        mainWindow.webContents.send("ezpplauncher:launchabort");
-        return;
-      }
+    await updateOsuConfigHashes(osuPath);
+    await replaceUIFile(osuPath, false);

    const forceUpdateFiles = [
      ".require_update",
      "help.txt",
      "_pending",
    ];
-
+    //TODO: needs testing
    try {
      for (const updateFileName of forceUpdateFiles) {
        const updateFile = path.join(osuPath, updateFileName);
        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,
          });
        }
      }
-      } catch (err) {
-        logger.error("Failed to remove force update files:", err);
-      }
+    } catch { }

    const userConfig = getUserConfig(osuPath);
    if (richPresence.hasPresence) {
@@ -726,57 +596,40 @@ function registerIPCPipes() {
      status: "Launching osu!...",
    });

-      await new Promise((res) => setTimeout(res, 1000));
-
-      logger.log("Launching osu!...");
-
-      const onExitHook = async () => {
-        logger.log("osu! has exited.");
+    const onExitHook = () => {
      mainWindow.show();
      mainWindow.focus();
      stopOsuStatus();
      richPresence.updateUser({
        username: "  ",
-          id: undefined,
+        id: undefined
      });
      richPresence.updateStatus({
        state: "Idle in Launcher...",
        details: undefined,
      });
-        await richPresence.update();
+      richPresence.update();
      mainWindow.webContents.send("ezpplauncher:launchstatus", {
        status: "Waiting for cleanup...",
      });
-        const timeStart = performance.now();
-        logger.log("Waiting for cleanup...");

-        const cleanup = setInterval(async () => {
-          const osuUIFile = path.join(osuPath, "osu!ui.dll");
-          const osuGameplayFile = path.join(osuPath, "osu!gameplay.dll");
-          if (isWritable(osuUIFile) && isWritable(osuGameplayFile)) {
-            logger.log(
-              `Cleanup complete, took ${((performance.now() - timeStart) / 1000).toFixed(3)
-              } seconds.`,
-            );
-            clearInterval(cleanup);
-            await replaceUIFiles(osuPath, true);
+      setTimeout(async () => {
+        await replaceUIFile(osuPath, true);
        mainWindow.webContents.send("ezpplauncher:launchabort");
        osuLoaded = false;
-          }
-        }, 1000);
+      }, 5000);
    };
    runOsuWithDevServer(osuPath, "ez-pp.farm", onExitHook);
    mainWindow.hide();
    startOsuStatus();
-      return true;
-    } catch (err) {
-      logger.error("Failed to launch", err);
-      mainWindow.webContents.send("ezpplauncher:alert", {
-        type: "error",
-        message: "Failed to launch osu!. Please try again.",
+
+    /* mainWindow.webContents.send("ezpplauncher:launchprogress", {
+      progress: 0,
    });
-      mainWindow.webContents.send("ezpplauncher:launchabort");
-    }
+    mainWindow.webContents.send("ezpplauncher:launchprogress", {
+      progress: 100,
+    }); */
+    return true;
  });
 }

@@ -786,18 +639,7 @@ function createWindow() {
    app.quit();
    return;
  }
-  app.on('second-instance', (e, argv) => {
-    if (process.platform !== 'darwin') {
-      // Find the arg that is our custom protocol url and store it
-      const deeplinkingUrl = argv.find((arg) => arg.startsWith('ezpplauncher://'));
-      console.log(deeplinkingUrl);
-    }

-    if (mainWindow) {
-      if (mainWindow.isMinimized()) mainWindow.restore();
-      mainWindow.focus();
-    }
-  });
  setupTitlebar();

  // Create the browser window.
@@ -843,13 +685,6 @@ function createWindow() {
      richPresence.connect();
    }
  }
-
-  logger.init();
-
-  const loggingEnabled = config.get("logging");
-  if (loggingEnabled && loggingEnabled == "true") {
-    logger.enabled = true;
-  }
  // Uncomment the following line of code when app is ready to be packaged.
  // loadURL(mainWindow);

@@ -870,6 +705,10 @@ function createWindow() {
  // Emitted when the window is ready to be shown
  // This helps in showing the window gracefully.
  mainWindow.once("ready-to-show", async () => {
+    const updateInfo = await updateAvailable();
+    if (updateInfo.update) {
+      mainWindow.webContents.send("ezpplauncher:update", updateInfo.release);
+    }
    mainWindow.show();
    mainWindow.focus();
  });
@@ -878,16 +717,7 @@ function createWindow() {
 // This method will be called when Electron has finished
 // initialization and is ready to create browser windows.
 // Some APIs can only be used after this event occurs.
-app.whenReady().then(() => {
-  createWindow();
-  if (isDev() && process.platform === 'win32') {
-    app.setAsDefaultProtocolClient('ezpplauncher', process.execPath, [
-      path.resolve(process.argv[1])
-    ]);
-  } else {
-    app.setAsDefaultProtocolClient('ezpplauncher');
-  }
-})
+app.on("ready", createWindow);

 // Quit when all windows are closed.
 app.on("window-all-closed", async function () {
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "ezpplauncher-next",
-  "version": "2.1.7",
+  "version": "2.1.1",
  "description": "EZPPLauncher rewritten with Svelte.",
  "private": false,
  "license": "MIT",
@@ -22,15 +22,7 @@
      ]
    },
    "linux": {},
-    "mac": {},
-    "protocols": [
-      {
-        "name": "ezpplauncher",
-        "schemes": [
-          "ezpplauncher"
-        ]
-      }
-    ]
+    "mac": {}
  },
  "scripts": {
    "build": "rollup -c --bundleConfigAsCjs",
@@ -59,7 +51,7 @@
    "regedit-rs": "^1.0.2",
    "semver": "^7.5.4",
    "svelte-french-toast": "^1.2.0",
-    "sweetalert2": "^11.6.13",
+    "sweetalert2": "^11.10.3",
    "systeminformation": "^5.21.22"
  },
  "devDependencies": {
@@ -69,6 +61,7 @@
    "@rollup/plugin-node-resolve": "^15.2.3",
    "@rollup/plugin-terser": "^0.4.4",
    "@rollup/plugin-typescript": "^11.1.5",
+    "@sveltejs/vite-plugin-svelte": "^3.0.1",
    "@tsconfig/svelte": "^5.0.2",
    "autoprefixer": "^10.4.16",
    "concurrently": "^8.2.2",
--- a/preload.js
+++ b/preload.js
@@ -82,10 +82,6 @@ window.addEventListener("settings-set", async (e) => {
  await ipcRenderer.invoke("ezpplauncher:settings-set", e.detail);
 });

-window.addEventListener("updateCheck", async () => {
-  await ipcRenderer.invoke("ezpplauncher:checkUpdate");
-})
-
 window.addEventListener("updateExit", async () => {
  await ipcRenderer.invoke("ezpplauncher:exitAndUpdate");
 });
@@ -119,9 +115,3 @@ ipcRenderer.addListener("ezpplauncher:update", (e, args) => {
    new CustomEvent("update", { detail: args }),
  );
 });
-
-ipcRenderer.addListener("ezpplauncher:open-settings", (e, args) => {
-  window.dispatchEvent(
-    new CustomEvent("open-settings"),
-  );
-});
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -69,7 +69,6 @@ export default {
    resolve({
      browser: true,
      dedupe: ["svelte"],
-      exportConditions: ["svelte"],
    }),
    typescript({
      sourceMap: !production,
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -1,16 +1,20 @@
 <script lang="ts">
-  import Avatar from "flowbite-svelte/Avatar.svelte";
-  import Dropdown from "flowbite-svelte/Dropdown.svelte";
-  import DropdownItem from "flowbite-svelte/DropdownItem.svelte";
-  import DropdownHeader from "flowbite-svelte/DropdownHeader.svelte";
-  import DropdownDivider from "flowbite-svelte/DropdownDivider.svelte";
-  import Button from "flowbite-svelte/Button.svelte";
-  import Indicator from "flowbite-svelte/Indicator.svelte";
-  import ArrowLeftSolid from "flowbite-svelte-icons/ArrowLeftSolid.svelte";
-  import ArrowRightFromBracketSolid from "flowbite-svelte-icons/ArrowRightFromBracketSolid.svelte";
-  import ArrowRightToBracketSolid from "flowbite-svelte-icons/ArrowRightToBracketSolid.svelte";
-  import HeartSolid from "flowbite-svelte-icons/HeartSolid.svelte";
-  import UserSettingsSolid from "flowbite-svelte-icons/UserSettingsSolid.svelte";
+  import {
+    Avatar,
+    Dropdown,
+    DropdownItem,
+    DropdownHeader,
+    DropdownDivider,
+    Button,
+    Indicator,
+  } from "flowbite-svelte";
+  import {
+    ArrowLeftSolid,
+    ArrowRightFromBracketSolid,
+    ArrowRightToBracketSolid,
+    HeartSolid,
+    UserSettingsSolid,
+  } from "flowbite-svelte-icons";
  import ezppLogo from "../public/favicon.png";
  import {
    currentPage,
@@ -62,12 +66,6 @@
    window.dispatchEvent(new CustomEvent("updateExit"));
  });

-  window.dispatchEvent(new CustomEvent("updateCheck"));
-
-  window.addEventListener("open-settings", (e) => {
-    currentPage.set(Page.Settings);
-  });
-
  window.addEventListener("launchStatusUpdate", (e) => {
    const status = (e as CustomEvent).detail.status;
    launchStatus.set(status);
--- a/src/lib/Progressbar.svelte
+++ b/src/lib/Progressbar.svelte
@@ -26,12 +26,12 @@
    green: "bg-green-600 dark:bg-green-500",
    yellow: "bg-yellow-400",
    purple: "bg-purple-600 dark:bg-purple-500",
-    indigo: "bg-indigo-600 dark:bg-indigo-500"
+    indigo: "bg-indigo-600 dark:bg-indigo-500",
  };

  let _progress = tweened(0, {
    duration: tweenDuration,
-    easing
+    easing,
  });

  $: {
@@ -50,11 +50,7 @@
    >
    <span class="text-sm font-medium text-blue-700 dark:text-white"
      >{animate
-        ? isNaN($_progress)
-          ? parseInt("100").toFixed(precision)
-          : $_progress.toFixed(precision)
-        : isNaN(progress)
-          ? parseInt("100").toFixed(precision)
+        ? $_progress.toFixed(precision)
        : progress.toFixed(precision)}%</span
    >
  </div>
@@ -67,13 +63,7 @@
        class={twJoin(labelInsideClass, barColors[color])}
        style="width: {animate ? $_progress : progress}%"
      >
-        {animate
-          ? isNaN($_progress)
-            ? parseInt("100").toFixed(precision)
-            : $_progress.toFixed(precision)
-          : isNaN(progress)
-            ? parseInt("100").toFixed(precision)
-            : progress.toFixed(precision)}%
+        {animate ? $_progress.toFixed(precision) : progress.toFixed(precision)}%
      </div>
    {:else}
      <div
--- a/src/pages/Launch.svelte
+++ b/src/pages/Launch.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Button from "flowbite-svelte/Button.svelte";
+  import { Button, Checkbox } from "flowbite-svelte";
  import Progressbar from "../lib/Progressbar.svelte";
  import {
    launching,
--- a/src/pages/Login.svelte
+++ b/src/pages/Login.svelte
@@ -1,14 +1,11 @@
 <script lang="ts">
-  import Input from "flowbite-svelte/Input.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 { Input, Button, Spinner, Checkbox } from "flowbite-svelte";
+  import type { User } from "../types/user";
+  import type { Error } from "../types/error";
  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 from "flowbite-svelte-icons/EyeSlashSolid.svelte";
+  import { EyeSlashSolid, EyeSolid } from "flowbite-svelte-icons";

  let loading = false;
  let username = "";
@@ -17,20 +14,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,14 +31,14 @@
                "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:
@@ -71,20 +59,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,7 +82,7 @@
          const wasSuccessful = "user" in resultData;
          if (isGuest) {
            currentPage.set(Page.Launch);
-            res("");
+            res();
            toast.success(`Logged in as Guest`, {
              position: "bottom-center",
              className:
@@ -105,13 +93,13 @@
          }
          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:
@@ -129,13 +117,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,
      }
    );
  };
--- a/src/pages/Settings.svelte
+++ b/src/pages/Settings.svelte
@@ -1,11 +1,7 @@
 <script lang="ts">
-  import Button from "flowbite-svelte/Button.svelte";
-  import ButtonGroup from "flowbite-svelte/ButtonGroup.svelte";
-  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";
+  import { Button, ButtonGroup, Input, Toggle } from "flowbite-svelte";
+  import { FileSearchSolid, FolderSolid } from "flowbite-svelte-icons";
+  import { patch, presence } from "./../storage/localStore";

  let folderPath: string = "";

@@ -16,10 +12,8 @@
    const settingPresence = settings.find(
      (setting) => setting.key == "presence"
    );
-    const settingLogging = settings.find((setting) => setting.key == "logging");
    patch.set(settingPatch ? settingPatch.val == "true" : true);
    presence.set(settingPresence ? settingPresence.val == "true" : true);
-    logging.set(settingLogging ? settingLogging.val == "true" : false);
    folderPath = osuPath ? osuPath.val : "";
  });
  window.dispatchEvent(new CustomEvent("settings-get"));
@@ -45,18 +39,19 @@
      new CustomEvent("setting-update", { detail: { presence: $presence } })
    );
  };
-
-  const toggleLogging = () => {
-    logging.set(!$logging);
-    window.dispatchEvent(
-      new CustomEvent("setting-update", { detail: { logging: $logging } })
-    );
-  };
 </script>

 <main
  class="h-[265px] flex flex-col justify-start p-3 animate-fadeIn opacity-0"
 >
+  <div class="flex flex-col gap-2 p-3">
+    <Toggle class="w-fit" bind:checked={$presence} on:click={togglePresence}
+      >Discord Presence</Toggle
+    >
+    <Toggle class="w-fit" bind:checked={$patch} on:click={togglePatching}
+      >Patching</Toggle
+    >
+  </div>
  <div
    class="container flex flex-col items-center justify-center gap-5 rounded-lg p-3"
  >
@@ -82,15 +77,4 @@
      </Button>
    </ButtonGroup>
  </div>
-  <div class="flex flex-col gap-2 p-3">
-    <Toggle class="w-fit" bind:checked={$presence} on:click={togglePresence}
-      >Discord Presence</Toggle
-    >
-    <Toggle class="w-fit" bind:checked={$patch} on:click={togglePatching}
-      >Patching</Toggle
-    >
-    <Toggle class="w-fit" bind:checked={$logging} on:click={toggleLogging}
-      >Debug Logging</Toggle
-    >
-  </div>
 </main>
--- a/src/storage/localStore.ts
+++ b/src/storage/localStore.ts
@@ -7,11 +7,8 @@ export const updateAvailable = writable(false);
 export const launching = writable(false);
 export const launchStatus = writable("Waiting...");
 export const launchPercentage = writable(-1);
-
-export const currentUser: Writable<undefined | User> = writable(undefined);
-export const currentPage = writable(Page.Login);
-
 export const osuPath: Writable<undefined | string> = writable(undefined);
 export const patch = writable(true);
 export const presence = writable(true);
-export const logging = writable(false);
+export const currentUser: Writable<undefined | User> = writable(undefined);
+export const currentPage = writable(Page.Login);
--- a/svelte.config.js
+++ b/svelte.config.js
@@ -1,7 +1,7 @@
-const preprocess = require("svelte-preprocess");
+const { vitePreprocess } = require("@sveltejs/vite-plugin-svelte");

 const config = {
-  preprocess: [preprocess()],
+  preprocess: [vitePreprocess({})],
 };

 module.exports = config;
Author	SHA1	Message	Date
HorizonCode	c3f0882951	Merge pull request 'add dynamic beatmap images to presence' (#12 ) from dev into master Reviewed-on: #12	2024-03-11 17:55:54 +00:00
HorizonCode	4c33323e9e	Merge pull request 'oops' (#10 ) from dev into master Reviewed-on: #10	2024-01-30 08:52:43 +00:00
HorizonCode	eb166c0165	Merge pull request 'bump patch version' (#9 ) from dev into master Reviewed-on: #9	2024-01-29 07:58:55 +00:00
HorizonCode	6bca0b32a9	Merge pull request 'disable unhandled error logging for now' (#8 ) from dev into master Reviewed-on: #8	2024-01-29 07:57:48 +00:00
HorizonCode	401be3c977	Merge pull request 'remove console logging, add unhandled error dialog' (#7 ) from dev into master Reviewed-on: #7	2024-01-25 13:20:12 +00:00
HorizonCode	d2d2a618c5	Merge pull request 'bump version, disable image drag' (#6 ) from dev into master Reviewed-on: #6	2024-01-25 11:05:15 +00:00
HorizonCode	fc6ec3bd69	Merge pull request 'remove class overrides' (#5 ) from dev into master Reviewed-on: #5	2024-01-25 09:23:35 +00:00