remove console logs

electron/appInfo.js

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

electron/config.js

@@ -38,7 +38,15 @@ const get = (
   return result ? result.val ?? undefined : undefined;
 };
 
+const all = () => {
+  const result = db.prepare(
+    `SELECT configKey key, configValue val FROM config WHERE 1`,
+  ).all();
+  return result ?? undefined;
+};
+
 module.exports = {
+  all,
   get,
   set,
   remove,

electron/cryptoUtil.js

@@ -0,0 +1,11 @@
+const cryptojs = require("crypto-js");
+
+const encrypt = (string, salt) => {
+  return cryptojs.AES.encrypt(string, salt).toString();
+};
+
+const decrypt = (string, salt) => {
+  return cryptojs.AES.decrypt(string, salt).toString(cryptojs.enc.Utf8);
+};
+
+module.exports = { encrypt, decrypt };

electron/executeUtil.js

@@ -0,0 +1,20 @@
+const childProcess = require("child_process");
+
+const runFile = (folder, file, args, onExit) => {
+    childProcess.execFile(file, args, {
+        cwd: folder
+    }, (_err, _stdout, _stdin) => {
+        if (onExit) onExit();
+    })
+}
+
+const runFileDetached = (folder, file, args) => {
+    const subProcess = childProcess.spawn(file + (args ? " " + args : ''), {
+        cwd: folder,
+        detached: true,
+        stdio: 'ignore'
+    });
+    subProcess.unref();
+}
+
+module.exports = { runFile, runFileDetached };

electron/formattingUtil.js

@@ -0,0 +1,13 @@
+function formatBytes(bytes, decimals = 2) {
+    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 i = Math.floor(Math.log(bytes) / Math.log(k))
+
+    return `${parseFloat((bytes / Math.pow(k, i)).toFixed(dm))}${sizes[i]}`
+}
+
+module.exports = { formatBytes };

electron/hwidUtil.js

@@ -0,0 +1,32 @@
+const child_process = require("child_process");
+const options = { encoding: "ascii", windowsHide: true, timeout: 200 };
+const platforms = {
+  win32: [
+    "REG QUERY HKLM\\SOFTWARE\\Microsoft\\Cryptography /v MachineGuid",
+    /MachineGuid\s+REG_SZ\s+(.*?)\s/,
+  ],
+  darwin: [
+    "ioreg -rd1 -c IOPlatformExpertDevice",
+    /"IOPlatformUUID" = "(.*?)"/,
+  ],
+  linux: [
+    "cat /var/lib/dbus/machine-id /etc/machine-id 2> /dev/null || true",
+    /^([\da-f]+)/,
+  ],
+};
+const crypto = require("crypto");
+
+/**
+ * Returns machine hardware id.
+ * Returns `undefined` if cannot determine.
+ * @return {string?}
+ */
+function getHwId() {
+  const getter = platforms[process.platform];
+  if (!getter) return;
+  const result = getter[1].exec(child_process.execSync(getter[0], options));
+  if (!result) return;
+  return crypto.createHash("md5").update(result[1]).digest("hex") ||
+    undefined;
+}
+exports.getHwId = getHwId;

electron/osuUtil.js

@@ -0,0 +1,478 @@
+const fs = require("fs");
+const path = require("path");
+const crypto = require("crypto");
+const EventEmitter = require("events");
+const { default: axios } = require("axios");
+const { runFile } = require("./executeUtil.js");
+
+const checkUpdateURL =
+  "https://osu.ppy.sh/web/check-updates.php?action=check&stream=";
+const ignoredOsuEntities = [
+  "osu!auth.dll",
+];
+const osuEntities = [
+  "avcodec-51.dll",
+  "avformat-52.dll",
+  "avutil-49.dll",
+  "bass.dll",
+  "bass_fx.dll",
+  "collection.db",
+  "d3dcompiler_47.dll",
+  "libEGL.dll",
+  "libGLESv2.dll",
+  "Microsoft.Ink.dll",
+  "OpenTK.dll",
+  "osu!.cfg",
+  "osu!.db",
+  "osu!.exe",
+  "osu!auth.dll",
+  "osu!gameplay.dll",
+  "osu!seasonal.dll",
+  "osu!ui.dll",
+  "presence.db",
+  "pthreadGC2.dll",
+  "scores.db",
+];
+
+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);
+  let matches = 0;
+  for (const file of allFiles) {
+    if (osuEntities.includes(file)) matches = matches + 1;
+  }
+  return (Math.round((matches / osuEntities.length) * 100) >= 60);
+}
+
+function getGlobalConfig(osuPath) {
+  const configFileInfo = {
+    name: "",
+    path: "",
+    get: async (key) => {
+      if (!configFileInfo.path) {
+        return "";
+      }
+      const fileStream = await fs.promises.readFile(
+        configFileInfo.path,
+        "utf-8",
+      );
+      const lines = fileStream.split(/\r?\n/);
+      for (const line of lines) {
+        if (line.includes(" = ")) {
+          const argsPair = line.split(" = ", 2);
+          const keyname = argsPair[0];
+          const value = argsPair[1];
+          if (keyname == key) {
+            return value;
+          }
+        }
+      }
+    },
+  };
+  const globalOsuConfig = path.join(osuPath, "osu!.cfg");
+  if (fs.existsSync(globalOsuConfig)) {
+    configFileInfo.name = "osu!.cfg";
+    configFileInfo.path = globalOsuConfig;
+  }
+  return configFileInfo;
+}
+
+function getUserConfig(osuPath) {
+  const configFileInfo = {
+    name: "",
+    path: "",
+    set: async (key, newValue) => {
+      if (!configFileInfo.path) {
+        return "";
+      }
+      const fileContents = [];
+      const fileStream = await fs.promises.readFile(
+        configFileInfo.path,
+        "utf-8",
+      );
+      const lines = fileStream.split(/\r?\n/);
+      for (const line of lines) {
+        if (line.includes(" = ")) {
+          const argsPair = line.split(" = ", 2);
+          const keyname = argsPair[0];
+          if (keyname == key) {
+            fileContents.push(`${key} = ${newValue}`);
+          } else {
+            fileContents.push(line);
+          }
+        } else {
+          fileContents.push(line);
+        }
+      }
+      await fs.promises.writeFile(configFileInfo.path, fileContents.join("\n"));
+
+      return true;
+    },
+    get: async (key) => {
+      if (!configFileInfo.path) {
+        return "";
+      }
+      const fileStream = await fs.promises.readFile(
+        configFileInfo.path,
+        "utf-8",
+      );
+      const lines = fileStream.split(/\r?\n/);
+      for (const line of lines) {
+        if (line.includes(" = ")) {
+          const argsPair = line.split(" = ", 2);
+          const keyname = argsPair[0];
+          const value = argsPair[1];
+          if (keyname == key) {
+            return value;
+          }
+        }
+      }
+    },
+  };
+  const userOsuConfig = path.join(
+    osuPath,
+    `osu!.${process.env["USERNAME"]}.cfg`,
+  );
+  if (fs.existsSync(userOsuConfig)) {
+    configFileInfo.name = `osu!.${process.env["USERNAME"]}.cfg`;
+    configFileInfo.path = userOsuConfig;
+  }
+  return configFileInfo;
+}
+
+async function getUpdateFiles(releaseStream) {
+  const releaseData = await fetch(checkUpdateURL + releaseStream);
+  return releaseData.ok ? await releaseData.json() : undefined;
+}
+
+async function getFilesThatNeedUpdate(osuPath, releaseStreamFiles) {
+  const updateFiles = [];
+  for (const updatePatch of releaseStreamFiles) {
+    const fileName = updatePatch.filename;
+    const fileHash = updatePatch.file_hash;
+
+    const fileOnDisk = path.join(osuPath, fileName);
+    if (fs.existsSync(fileOnDisk)) {
+      if (ignoredOsuEntities.includes(fileName)) continue;
+      const fileHashOnDisk = crypto.createHash("md5").update(
+        fs.readFileSync(fileOnDisk),
+      ).digest("hex");
+      if (
+        fileHashOnDisk.trim().toLowerCase() != fileHash.trim().toLowerCase()
+      ) {
+        updateFiles.push(updatePatch);
+      }
+    } else updateFiles.push(updatePatch);
+  }
+
+  return updateFiles;
+}
+
+function downloadUpdateFiles(osuPath, updateFiles) {
+  const eventEmitter = new EventEmitter();
+
+  const startDownload = async () => {
+    for (const updatePatch of updateFiles) {
+      const fileName = updatePatch.filename;
+      const fileSize = updatePatch.filesize;
+      const fileURL = updatePatch.url_full;
+
+      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),
+          });
+        },
+      });
+      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,
+          });
+        }
+        await fs.promises.writeFile(
+          path.join(osuPath, fileName),
+          axiosDownloadWithProgress.data,
+        );
+      } catch (err) {
+        console.log(err);
+        eventEmitter.emit("error", {
+          fileName,
+        });
+      }
+    }
+
+    // wait until all files are downloaded
+    return true;
+  };
+
+  return {
+    eventEmitter,
+    startDownload,
+  };
+}
+
+function runOsuWithDevServer(osuPath, serverDomain, onExit) {
+  const osuExecuteable = path.join(osuPath, "osu!.exe");
+  runFile(osuPath, osuExecuteable, ["-devserver", serverDomain], onExit);
+}
+
+async function getPatcherUpdates(osuPath) {
+  const filesToDownload = [];
+
+  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);
+  }
+
+  return filesToDownload;
+}
+
+function downloadPatcherUpdates(osuPath, patcherUpdates) {
+  const eventEmitter = new EventEmitter();
+
+  const startDownload = async () => {
+    const patcherDir = path.join(osuPath, "EZPPLauncher");
+    if (!fs.existsSync(patcherDir)) fs.mkdirSync(patcherDir);
+
+    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 { 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 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");
+    await fs.promises.rename(
+      oldOsuUIFile,
+      path.join(osuPath, "osu!ui.dll.bak"),
+    );
+    await fs.promises.rename(ezppUIFile, oldOsuUIFile);
+  } else {
+    const oldOsuUIFile = path.join(osuPath, "osu!ui.dll");
+    const ezppUIFile = path.join(osuPath, "EZPPLauncher", "ezpp!ui.dll");
+    await fs.promises.rename(oldOsuUIFile, ezppUIFile);
+    await fs.promises.rename(
+      path.join(osuPath, "osu!ui.dll.bak"),
+      oldOsuUIFile,
+    );
+  }
+}
+
+async function findOsuInstallation() {
+  const regedit = require("regedit-rs");
+
+  const osuLocationFromDefaultIcon =
+    "HKLM\\SOFTWARE\\Classes\\osu\\DefaultIcon";
+  const osuKey = regedit.listSync(osuLocationFromDefaultIcon);
+  if (osuKey[osuLocationFromDefaultIcon].exists) {
+    const key = osuKey[osuLocationFromDefaultIcon].values[""];
+    let value = key.value;
+    value = value.substring(1, value.length - 3);
+    return path.dirname(value.trim());
+  }
+  return undefined;
+}
+
+async function updateOsuConfigHashes(osuPath) {
+  const osuCfg = path.join(osuPath, "osu!.cfg");
+  const fileStream = await fs.promises.readFile(osuCfg, "utf-8");
+  const lines = fileStream.split(/\r?\n/);
+  const newLines = [];
+  for (const line of lines) {
+    if (line.includes(" = ")) {
+      const argsPair = line.split(" = ", 2);
+      const key = argsPair[0];
+      const value = argsPair[1];
+
+      if (key.startsWith("h_")) {
+        const fileName = key.substring(2, key.length);
+        const filePath = path.join(osuPath, fileName);
+        if (!fs.existsSync(filePath)) continue;
+        const binaryFileContents = await fs.promises.readFile(filePath);
+        const existingFileMD5 = crypto.createHash("md5").update(
+          binaryFileContents,
+        ).digest("hex");
+        if (value == existingFileMD5) newLines.push(line);
+        else newLines.push(`${key} = ${existingFileMD5}`);
+      } else if (line.startsWith("u_UpdaterAutoStart")) {
+        newLines.push(`${key} = 0`);
+      } else {
+        newLines.push(line);
+      }
+    } else {
+      newLines.push(line);
+    }
+  }
+
+  await fs.promises.writeFile(osuCfg, newLines.join("\n"), "utf-8");
+}
+
+module.exports = {
+  isValidOsuFolder,
+  getUserConfig,
+  getGlobalConfig,
+  getUpdateFiles,
+  getFilesThatNeedUpdate,
+  downloadUpdateFiles,
+  runOsuWithDevServer,
+  getPatcherUpdates,
+  downloadPatcherUpdates,
+  downloadUIFiles,
+  getUIFiles,
+  replaceUIFile,
+  findOsuInstallation,
+  updateOsuConfigHashes,
+};

electron/richPresence.js

@@ -0,0 +1,63 @@
+const DiscordRPC = require("discord-auto-rpc");
+const { appName, appVersion } = require("./appInfo.js");
+
+const clientId = "1032772293220384808";
+let richPresence;
+let intervalId;
+
+let currentStatus = {
+  details: "  ",
+  state: "Idle in Launcher...",
+  startTimestamp: new Date(),
+  largeImageKey: "ezppfarm",
+  largeImageText: `${appName} ${appVersion}`,
+  smallImageKey: "  ",
+  smallImageText: "  ",
+  buttons: [
+    {
+      label: "Download the Launcher",
+      url: "https://git.ez-pp.farm/EZPPFarm/EZPPLauncher/releases/latest",
+    },
+    {
+      label: "Join EZPPFarm",
+      url: "https://ez-pp.farm/discord",
+    },
+  ],
+  instance: false,
+};
+
+module.exports = {
+  connect: () => {
+    if (!richPresence) {
+      richPresence = new DiscordRPC.AutoClient({ transport: "ipc" });
+      richPresence.endlessLogin({ clientId });
+      richPresence.once("ready", () => {
+        richPresence.setActivity(currentStatus);
+        intervalId = setInterval(() => {
+          richPresence.setActivity(currentStatus);
+        }, 2500);
+      });
+    }
+  },
+  disconnect: async () => {
+    if (richPresence) {
+      clearInterval(intervalId);
+      await richPresence.clearActivity();
+      await richPresence.destroy();
+      richPresence = null;
+    }
+  },
+  updateStatus: ({ state, details }) => {
+    currentStatus.state = state ?? "  ";
+    currentStatus.details = details ?? "  ";
+  },
+  updateVersion: (osuVersion) => {
+    currentStatus.smallImageKey = osuVersion ? "osu" : "  ";
+    currentStatus.smallImageText = osuVersion ? `osu! ${osuVersion}` : "  ";
+  },
+  update: () => {
+    if (richPresence) {
+      richPresence.setActivity(currentStatus);
+    }
+  },
+};

electron/updateCheck.js

@@ -0,0 +1,25 @@
+const semver = require("semver");
+const { appVersion } = require("./appInfo");
+
+const repoApiUrl =
+  "https://git.ez-pp.farm/api/v1/repos/EZPPFarm/EZPPLauncher/releases?limit=1";
+
+const releasesUrl =
+  "https://git.ez-pp.farm/EZPPFarm/EZPPLauncher/releases/latest";
+
+module.exports = {
+  updateAvailable: async () => {
+    try {
+      const latestRelease = await fetch(repoApiUrl);
+      const json = await latestRelease.json();
+      if (json.length <= 0) return false;
+      return {
+        update: semver.lt(appVersion, json[0].tag_name),
+        release: json[0],
+      };
+    } catch (err) {
+      return { update: false };
+    }
+  },
+  releasesUrl,
+};

main.js

@@ -1,90 +1,534 @@
 // Modules to control application life and create native browser window
-const { app, BrowserWindow, Menu, ipcMain } = require("electron");
+const { app, BrowserWindow, Menu, ipcMain, dialog, shell } = require(
+  "electron",
+);
 const path = require("path");
 const serve = require("electron-serve");
 const loadURL = serve({ directory: "public" });
-const config = require("./src/config/config");
+const config = require("./electron/config");
 const { setupTitlebar, attachTitlebarToWindow } = require(
   "custom-electron-titlebar/main",
 );
+const {
+  isValidOsuFolder,
+  getUpdateFiles,
+  getGlobalConfig,
+  getFilesThatNeedUpdate,
+  downloadUpdateFiles,
+  getUserConfig,
+  runOsuWithDevServer,
+  getPatcherUpdates,
+  downloadPatcherUpdates,
+  getUIFiles,
+  downloadUIFiles,
+  replaceUIFile,
+  findOsuInstallation,
+  updateOsuConfigHashes,
+} = require("./electron/osuUtil");
+const { formatBytes } = require("./electron/formattingUtil");
+const windowName = require("get-window-by-name");
+const { existsSync } = require("fs");
+const { runFileDetached } = require("./electron/executeUtil");
+const richPresence = require("./electron/richPresence");
+const cryptUtil = require("./electron/cryptoUtil");
+const { getHwId } = require("./electron/hwidUtil");
+const { appName, appVersion } = require("./electron/appInfo");
+const { updateAvailable, releasesUrl } = require("./electron/updateCheck");
 
 // 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.
 let mainWindow;
+let osuCheckInterval;
+let userOsuPath;
+let osuLoaded = false;
+let patch = false;
+let lastOsuStatus = "";
+let lastStatusUpdate;
+
+let currentUser = undefined;
 
 function isDev() {
   return !app.isPackaged;
 }
 
+function startOsuStatus() {
+  osuCheckInterval = setInterval(async () => {
+    const osuWindowTitle = windowName.getWindowText("osu!.exe");
+    if (osuWindowTitle.length < 0) {
+      return;
+    }
+    const firstInstance = osuWindowTitle[0];
+    if (firstInstance) {
+      if (!osuLoaded) {
+        osuLoaded = true;
+        setTimeout(() => {
+          if (patch) {
+            const patcherExecuteable = path.join(
+              userOsuPath,
+              "EZPPLauncher",
+              "patcher.exe",
+            );
+            if (existsSync(patcherExecuteable)) {
+              runFileDetached(userOsuPath, patcherExecuteable);
+            }
+          }
+        }, 3000);
+      }
+
+      const windowTitle = firstInstance.processTitle;
+      lastOsuStatus = windowTitle;
+      const currentStatusRequest = await fetch(
+        "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;
+
+      let details = "Idle...";
+      let infoText = currentStatus.player_status.status.info_text.length > 0
+        ? currentStatus.player_status.status.info_text
+        : "  ";
+
+      switch (currentStatus.player_status.status.action) {
+        case 1:
+          details = "AFK...";
+          infoText = "  ";
+          break;
+        case 2:
+          details = "Playing...";
+          break;
+        case 3:
+          details = "Editing...";
+          break;
+        case 4:
+          details = "Modding...";
+          break;
+        case 5:
+          details = "Multiplayer: Selecting a Beatmap...";
+          infoText = "  ";
+          break;
+        case 6:
+          details = "Watching...";
+          break;
+        case 8:
+          details = "Testing...";
+          break;
+        case 9:
+          details = "Submitting...";
+          break;
+        case 11:
+          details = "Multiplayer: Idle...";
+          infoText = "  ";
+          break;
+        case 12:
+          details = "Multiplayer: Playing...";
+          break;
+        case 13:
+          details = "Browsing osu!direct...";
+          infoText = "  ";
+          break;
+      }
+
+      richPresence.updateStatus({
+        details,
+        state: infoText,
+      });
+
+      richPresence.update();
+    }
+  }, 2500);
+}
+
+function stopOsuStatus() {
+  clearInterval(osuCheckInterval);
+}
+
 function registerIPCPipes() {
   ipcMain.handle("ezpplauncher:login", async (e, args) => {
-    const fetchResult = await fetch("https://ez-pp.farm/login/check", {
+    const hwid = getHwId();
-      method: "POST",
+    const timeout = new AbortController();
-      body: JSON.stringify({
+    const timeoutId = setTimeout(() => timeout.abort(), 8000);
-        username: args.username,
+    try {
-        password: args.password,
+      const fetchResult = await fetch("https://ez-pp.farm/login/check", {
-      }),
+        signal: timeout.signal,
-      headers: {
+        method: "POST",
-        "Content-Type": "application/json",
+        body: JSON.stringify({
-      },
+          username: args.username,
-    });
+          password: args.password,
+        }),
+        headers: {
+          "Content-Type": "application/json",
+        },
+      });
 
-    if (fetchResult.ok) {
+      clearTimeout(timeoutId);
-      const result = await fetchResult.json();
+
-      if ("user" in result) {
+      if (fetchResult.ok) {
-        if (args.saveCredentials) {
+        const result = await fetchResult.json();
-          config.set("username", args.username);
+        if ("user" in result) {
-          config.set("password", args.password);
+          if (args.saveCredentials) {
+            config.set("username", args.username);
+            config.set("password", cryptUtil.encrypt(args.password, hwid));
+          }
+          currentUser = args;
+          config.remove("guest");
         }
-        config.remove("guest");
+        return result;
       }
-      return result;
+      return {
+        code: 500,
+        message: "Something went wrong while logging you in.",
+      };
+    } catch (err) {
+      return {
+        code: 500,
+        message: "Something went wrong while logging you in.",
+      };
     }
-    return {
-      code: 500,
-      message: "Something went wrong while logging you in.",
-    };
   });
 
-  ipcMain.handle("ezpplauncher:autologin", async (e) => {
+  ipcMain.handle("ezpplauncher:autologin-active", async (e) => {
     const username = config.get("username");
     const password = config.get("password");
     const guest = config.get("guest");
+    if (guest != undefined) return true;
+    return username != undefined && password != undefined;
+  });
+
+  ipcMain.handle("ezpplauncher:autologin", async (e) => {
+    const hwid = getHwId();
+    const username = config.get("username");
+    const guest = config.get("guest");
     if (guest) return { code: 200, message: "Login as guest", guest: true };
+    if (username == undefined) {
+      return { code: 200, message: "No autologin" };
+    }
+    const password = cryptUtil.decrypt(config.get("password"), hwid);
     if (username == undefined || password == undefined) {
       return { code: 200, message: "No autologin" };
     }
-    const fetchResult = await fetch("https://ez-pp.farm/login/check", {
+    const timeout = new AbortController();
-      method: "POST",
+    const timeoutId = setTimeout(() => timeout.abort(), 8000);
-      body: JSON.stringify({
+    try {
-        username: username,
+      const fetchResult = await fetch("https://ez-pp.farm/login/check", {
-        password: password,
+        signal: timeout.signal,
-      }),
+        method: "POST",
-      headers: {
+        body: JSON.stringify({
-        "Content-Type": "application/json",
+          username: username,
-      },
+          password: password,
-    });
+        }),
+        headers: {
+          "Content-Type": "application/json",
+        },
+      });
 
-    if (fetchResult.ok) {
+      clearTimeout(timeoutId);
-      const result = await fetchResult.json();
+
-      return result;
+      if (fetchResult.ok) {
+        const result = await fetchResult.json();
+        if ("user" in result) {
+          currentUser = {
+            username: username,
+            password: password,
+          };
+        }
+        return result;
+      } else {
+        config.remove("password");
+      }
+      return {
+        code: 500,
+        message: "Something went wrong while logging you in.",
+      };
+    } catch (err) {
+      return {
+        code: 500,
+        message: "Something went wrong while logging you in.",
+      };
     }
-    return {
-      code: 500,
-      message: "Something went wrong while logging you in.",
-    };
   });
 
   ipcMain.handle("ezpplauncher:guestlogin", (e) => {
     config.remove("username");
     config.remove("password");
     config.set("guest", "1");
+    currentUser = undefined;
   });
 
   ipcMain.handle("ezpplauncher:logout", (e) => {
     config.remove("username");
     config.remove("password");
     config.remove("guest");
+    currentUser = undefined;
+    return true;
+  });
+
+  ipcMain.handle("ezpplauncher:settings", async (e) => {
+    return config.all();
+  });
+
+  ipcMain.handle("ezpplauncher:setting-update", async (e, args) => {
+    for (const key of Object.keys(args)) {
+      const value = args[key];
+
+      if (key == "presence") {
+        if (!value) richPresence.disconnect();
+        else richPresence.connect();
+      }
+
+      if (typeof value == "boolean") {
+        config.set(key, value ? "true" : "false");
+      } else {
+        config.set(key, value);
+      }
+    }
+  });
+
+  ipcMain.handle("ezpplauncher:detect-folder", async (e) => {
+    const detected = await findOsuInstallation();
+    if (detected && await isValidOsuFolder(detected)) {
+      mainWindow.webContents.send("ezpplauncher:alert", {
+        type: "success",
+        message: "osu! path successfully saved!",
+      });
+      config.set("osuPath", detected);
+    }
+    return config.all();
+  });
+
+  ipcMain.handle("ezpplauncher:set-folder", async (e) => {
+    const folderResult = await dialog.showOpenDialog({
+      title: "Select osu! installation directory",
+      properties: ["openDirectory"],
+    });
+    if (!folderResult.canceled) {
+      const folder = folderResult.filePaths[0];
+      if (await isValidOsuFolder(folder)) {
+        config.set("osuPath", folder);
+        mainWindow.webContents.send("ezpplauncher:alert", {
+          type: "success",
+          message: "osu! path successfully saved!",
+        });
+      } else {
+        mainWindow.webContents.send("ezpplauncher:alert", {
+          type: "error",
+          message: "invalid osu! path!",
+        });
+      }
+    }
+    return config.all();
+  });
+
+  ipcMain.handle("ezpplauncher:exitAndUpdate", async (e) => {
+    await shell.openExternal(releasesUrl);
+    app.exit();
+  });
+
+  ipcMain.handle("ezpplauncher:launch", async (e) => {
+    const configPatch = config.get("patch");
+    patch = configPatch != undefined ? configPatch == "true" : true;
+    mainWindow.webContents.send("ezpplauncher:launchstatus", {
+      status: "Checking osu! directory...",
+    });
+    await new Promise((res) => setTimeout(res, 1000));
+    const osuPath = config.get("osuPath");
+    userOsuPath = osuPath;
+    if (osuPath == undefined) {
+      mainWindow.webContents.send("ezpplauncher:launchabort");
+      mainWindow.webContents.send("ezpplauncher:alert", {
+        type: "error",
+        message: "osu! path not set!",
+      });
+      return;
+    }
+    if (!(await isValidOsuFolder(osuPath))) {
+      mainWindow.webContents.send("ezpplauncher:launchabort");
+      mainWindow.webContents.send("ezpplauncher:alert", {
+        type: "error",
+        message: "invalid osu! path!",
+      });
+      return;
+    }
+    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 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) {
+      const updateDownloader = downloadUpdateFiles(osuPath, updateFiles);
+      let errored = false;
+      updateDownloader.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.`,
+        });
+      });
+      updateDownloader.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 updateDownloader.startDownload();
+      mainWindow.webContents.send("ezpplauncher:launchprogress", {
+        progress: -1,
+      });
+      if (errored) {
+        mainWindow.webContents.send("ezpplauncher:launchabort");
+        return;
+      }
+      mainWindow.webContents.send("ezpplauncher:launchstatus", {
+        status: "osu! is now up to date!",
+      });
+      await new Promise((res) => setTimeout(res, 1000));
+    } else {
+      mainWindow.webContents.send("ezpplauncher:launchstatus", {
+        status: "osu! is up to date!",
+      });
+      await new Promise((res) => setTimeout(res, 1000));
+    }
+
+    if (patch) {
+      mainWindow.webContents.send("ezpplauncher:launchstatus", {
+        status: "Looking for patcher updates...",
+      });
+      await new Promise((res) => setTimeout(res, 1000));
+      const patchFiles = await getPatcherUpdates(osuPath);
+      if (patchFiles.length > 0) {
+        const patcherDownloader = downloadPatcherUpdates(osuPath, patchFiles);
+        let errored = false;
+        patcherDownloader.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.`,
+          });
+        });
+        patcherDownloader.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 patcherDownloader.startDownload();
+        mainWindow.webContents.send("ezpplauncher:launchprogress", {
+          progress: -1,
+        });
+        if (errored) {
+          mainWindow.webContents.send("ezpplauncher:launchabort");
+          return;
+        }
+        mainWindow.webContents.send("ezpplauncher:launchstatus", {
+          status: "Patcher is now up to date!",
+        });
+      } else {
+        mainWindow.webContents.send("ezpplauncher:launchstatus", {
+          status: "Patcher is up to date!",
+        });
+      }
+      await new Promise((res) => setTimeout(res, 1000));
+    }
+
+    mainWindow.webContents.send("ezpplauncher:launchstatus", {
+      status: "Preparing launch...",
+    });
+    await updateOsuConfigHashes(osuPath);
+    await replaceUIFile(osuPath, false);
+
+    const userConfig = getUserConfig(osuPath);
+    richPresence.updateVersion(await userConfig.get("LastVersion"));
+    richPresence.update();
+    await userConfig.set("ShowInterfaceDuringRelax", "1");
+    if (currentUser) {
+      await userConfig.set("CredentialEndpoint", "ez-pp.farm");
+      await userConfig.set("SavePassword", "1");
+      await userConfig.set("SaveUsername", "1");
+      await userConfig.set("Username", currentUser.username);
+      await userConfig.set("Password", currentUser.password);
+    }
+
+    mainWindow.webContents.send("ezpplauncher:launchstatus", {
+      status: "Launching osu!...",
+    });
+
+    const onExitHook = () => {
+      mainWindow.show();
+      mainWindow.focus();
+      stopOsuStatus();
+      richPresence.updateVersion();
+      richPresence.updateStatus({
+        state: "Idle in Launcher...",
+        details: undefined,
+      });
+      richPresence.update();
+      mainWindow.webContents.send("ezpplauncher:launchstatus", {
+        status: "Waiting for cleanup...",
+      });
+
+      setTimeout(async () => {
+        await replaceUIFile(osuPath, true);
+        mainWindow.webContents.send("ezpplauncher:launchabort");
+        osuLoaded = false;
+      }, 5000);
+    };
+    runOsuWithDevServer(osuPath, "ez-pp.farm", onExitHook);
+    mainWindow.hide();
+    startOsuStatus();
+
+    /* mainWindow.webContents.send("ezpplauncher:launchprogress", {
+      progress: 0,
+    });
+    mainWindow.webContents.send("ezpplauncher:launchprogress", {
+      progress: 100,
+    }); */
     return true;
   });
 }
@@ -94,11 +538,12 @@ function createWindow() {
 
   // Create the browser window.
   mainWindow = new BrowserWindow({
-    width: 600,
+    width: 550,
-    height: 380,
+    height: 350,
     resizable: false,
     frame: false,
     titleBarStyle: "hidden",
+    title: `${appName} ${appVersion}`,
     webPreferences: {
       nodeIntegration: true,
       preload: path.join(__dirname, "preload.js"),
@@ -126,6 +571,14 @@ function createWindow() {
 
   registerIPCPipes();
 
+  const presenceEnabled = config.get("presence");
+  if (presenceEnabled == undefined) {
+    richPresence.connect();
+  } else {
+    if (presenceEnabled == "true") {
+      richPresence.connect();
+    }
+  }
   // Uncomment the following line of code when app is ready to be packaged.
   // loadURL(mainWindow);
 
@@ -145,8 +598,13 @@ function createWindow() {
 
   // Emitted when the window is ready to be shown
   // This helps in showing the window gracefully.
-  mainWindow.once("ready-to-show", () => {
+  mainWindow.once("ready-to-show", async () => {
+    const updateInfo = await updateAvailable();
+    if (updateInfo.update) {
+      mainWindow.webContents.send("ezpplauncher:update", updateInfo.release);
+    }
     mainWindow.show();
+    mainWindow.focus();
   });
 }
 
@@ -156,9 +614,10 @@ function createWindow() {
 app.on("ready", createWindow);
 
 // Quit when all windows are closed.
-app.on("window-all-closed", function () {
+app.on("window-all-closed", async function () {
   // On macOS it is common for applications and their menu bar
   // to stay active until the user quits explicitly with Cmd + Q
+  await richPresence.disconnect();
   if (process.platform !== "darwin") app.quit();
 });
 

package.json

@@ -12,7 +12,9 @@
     "files": [
       "public/**/*",
       "main.js",
-      "preload.js"
+      "preload.js",
+      "electron/*",
+      "electron/**/*"
     ],
     "win": {
       "target": [
@@ -29,20 +31,29 @@
     "start": "sirv public --no-clear",
     "electron": "wait-on http://localhost:8080 && electron .",
     "electron-dev": "concurrently \"yarn run dev\" \"yarn run electron\"",
-    "preelectron-pack": "yarn run build",
+    "preelectron-pack": "electron-rebuild && yarn run build",
     "electron-pack": "electron-builder",
+    "postinstall": "electron-builder install-app-deps",
     "check": "svelte-check --tsconfig ./tsconfig.json"
   },
   "dependencies": {
-    "@electron/rebuild": "^3.5.0",
     "@types/better-sqlite3": "^7.6.8",
     "axios": "^1.6.5",
     "better-sqlite3": "^9.2.2",
+    "crypto": "^1.0.1",
+    "crypto-js": "^4.2.0",
     "custom-electron-titlebar": "^4.2.7",
+    "discord-auto-rpc": "^1.0.17",
     "electron-serve": "^1.1.0",
-    "svelte-french-toast": "^1.2.0"
+    "get-window-by-name": "^2.0.0",
+    "regedit-rs": "^1.0.2",
+    "semver": "^7.5.4",
+    "svelte-french-toast": "^1.2.0",
+    "sweetalert2": "^11.10.3",
+    "systeminformation": "^5.21.22"
   },
   "devDependencies": {
+    "@electron/rebuild": "^3.5.0",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-image": "^3.0.3",
     "@rollup/plugin-node-resolve": "^15.2.3",

preload.js

@@ -1,5 +1,6 @@
 const { Titlebar, TitlebarColor } = require("custom-electron-titlebar");
 const { ipcRenderer } = require("electron");
+const { appName, appVersion } = require("./electron/appInfo");
 
 window.addEventListener("DOMContentLoaded", () => {
   const titlebar = new Titlebar({
@@ -9,6 +10,7 @@ window.addEventListener("DOMContentLoaded", () => {
     enableMnemonics: false,
     maximizable: false,
   });
+  titlebar.updateTitle(`${appName} ${appVersion}`);
 });
 
 window.addEventListener("login-attempt", async (e) => {
@@ -22,17 +24,94 @@ window.addEventListener("login-attempt", async (e) => {
   );
 });
 
-window.addEventListener("autologin-attempt", async (e) => {
+window.addEventListener("autologin-active", async (e) => {
+  const autologin = await ipcRenderer.invoke(
+    "ezpplauncher:autologin-active",
+  );
+  window.dispatchEvent(
+    new CustomEvent("autologin-result", { detail: autologin }),
+  );
+});
+
+window.addEventListener("autologin-attempt", async () => {
   const loginResult = await ipcRenderer.invoke("ezpplauncher:autologin");
   window.dispatchEvent(
     new CustomEvent("login-result", { detail: loginResult }),
   );
 });
 
-window.addEventListener("logout", async (e) => {
+window.addEventListener("logout", async () => {
   await ipcRenderer.invoke("ezpplauncher:logout");
 });
 
-window.addEventListener("guest-login", async (e) => {
+window.addEventListener("guest-login", async () => {
   await ipcRenderer.invoke("ezpplauncher:guestlogin");
 });
+
+window.addEventListener("launch", async (e) => {
+  await ipcRenderer.invoke("ezpplauncher:launch", e.detail);
+});
+
+window.addEventListener("settings-get", async () => {
+  const settings = await ipcRenderer.invoke("ezpplauncher:settings");
+  window.dispatchEvent(
+    new CustomEvent("settings-result", { detail: settings }),
+  );
+});
+
+window.addEventListener("setting-update", async (e) => {
+  const detail = e.detail;
+  await ipcRenderer.invoke("ezpplauncher:setting-update", detail);
+});
+
+window.addEventListener("folder-auto", async (e) => {
+  const result = await ipcRenderer.invoke("ezpplauncher:detect-folder");
+  window.dispatchEvent(
+    new CustomEvent("settings-result", { detail: result }),
+  );
+});
+
+window.addEventListener("folder-set", async (e) => {
+  const result = await ipcRenderer.invoke("ezpplauncher:set-folder");
+  window.dispatchEvent(
+    new CustomEvent("settings-result", { detail: result }),
+  );
+});
+
+window.addEventListener("settings-set", async (e) => {
+  await ipcRenderer.invoke("ezpplauncher:settings-set", e.detail);
+});
+
+window.addEventListener("updateExit", async () => {
+  await ipcRenderer.invoke("ezpplauncher:exitAndUpdate");
+});
+
+ipcRenderer.addListener("ezpplauncher:launchabort", (e, args) => {
+  window.dispatchEvent(
+    new CustomEvent("launch-abort"),
+  );
+});
+
+ipcRenderer.addListener("ezpplauncher:alert", (e, args) => {
+  window.dispatchEvent(
+    new CustomEvent("alert", { detail: args }),
+  );
+});
+
+ipcRenderer.addListener("ezpplauncher:launchstatus", (e, args) => {
+  window.dispatchEvent(
+    new CustomEvent("launchStatusUpdate", { detail: args }),
+  );
+});
+
+ipcRenderer.addListener("ezpplauncher:launchprogress", (e, args) => {
+  window.dispatchEvent(
+    new CustomEvent("launchProgressUpdate", { detail: args }),
+  );
+});
+
+ipcRenderer.addListener("ezpplauncher:update", (e, args) => {
+  window.dispatchEvent(
+    new CustomEvent("update", { detail: args }),
+  );
+});

public/index.html

@@ -18,5 +18,5 @@
     <script defer src="/build/bundle.js"></script>
   </head>
 
-  <body class="select-none bg-gray-100 dark:bg-gray-900"></body>
+  <body class="select-none bg-gray-100 dark:bg-gray-900 overflow-hidden"></body>
 </html>

rollup.config.js

@@ -9,7 +9,6 @@ import image from "@rollup/plugin-image";
 import sveltePreprocess from "svelte-preprocess";
 import typescript from "@rollup/plugin-typescript";
 import progress from "rollup-plugin-progress";
-import findUnused from "rollup-plugin-unused";
 
 const production = !process.env.ROLLUP_WATCH;
 
@@ -48,8 +47,7 @@ export default {
     file: "public/build/bundle.js",
   },
   plugins: [
-    findUnused(),
+    !production && progress({ clearLine: true }),
-    progress({ clearLine: true }),
     svelte({
       preprocess: sveltePreprocess({ sourceMap: !production }),
       compilerOptions: {
@@ -61,7 +59,7 @@ export default {
     // we'll extract any component CSS out into
     // a separate file - better for performance
     css({ output: "bundle.css" }),
-    postcss(),
+    postcss({ sourceMap: "inline" }),
 
     // If you have external dependencies installed from
     // npm, you'll most likely need these plugins. In

src/App.svelte

@@ -5,24 +5,37 @@
     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, currentUser } from "./storage/localStore";
+  import {
+    currentPage,
+    currentUser,
+    launching,
+    launchPercentage,
+    launchStatus,
+  } from "./storage/localStore";
   import { Page } from "./consts/pages";
   import Login from "./pages/Login.svelte";
   import Launch from "./pages/Launch.svelte";
-  import { Toaster } from "svelte-french-toast";
+  import toast, { Toaster } from "svelte-french-toast";
   import type { User } from "./types/user";
   import Settings from "./pages/Settings.svelte";
+  import Swal from "sweetalert2";
 
   let user: User | undefined = undefined;
   let loggedIn = false;
 
+  let updateInfo: Record<string, unknown>;
+
   currentUser.subscribe((newUser) => {
     loggedIn = newUser != undefined;
     user = newUser;
@@ -32,82 +45,178 @@
     window.dispatchEvent(new CustomEvent("logout"));
     currentUser.set(undefined);
     currentPage.set(Page.Login);
+    toast.success("Successfully logged out!", {
+      position: "bottom-center",
+      className:
+        "dark:!bg-gray-800 border-1 dark:!border-gray-700 dark:!text-gray-100",
+      duration: 2000,
+    });
   };
+
+  window.addEventListener("update", async (e) => {
+    const update = (e as CustomEvent).detail;
+    await Swal.fire({
+      html: `EZPPLauncher ${update.tag_name} is now available!<br>Click the Button bellow to download the latest release!`,
+      title: "It's your lucky day!",
+      allowOutsideClick: false,
+      allowEscapeKey: false,
+      allowEnterKey: false,
+      confirmButtonText: "Thanks!",
+    });
+    window.dispatchEvent(new CustomEvent("updateExit"));
+  });
+
+  window.addEventListener("launchStatusUpdate", (e) => {
+    const status = (e as CustomEvent).detail.status;
+    launchStatus.set(status);
+  });
+
+  window.addEventListener("launchProgressUpdate", (e) => {
+    const progress = (e as CustomEvent).detail.progress;
+    launchPercentage.set(progress);
+  });
+
+  window.addEventListener("launch-abort", () => {
+    launchPercentage.set(-1);
+    launchStatus.set("");
+    launching.set(false);
+  });
+
+  window.addEventListener("alert", (e) => {
+    console.log((e as CustomEvent).detail);
+    const toastMessage = (e as CustomEvent).detail;
+    switch (toastMessage.type) {
+      case "success": {
+        toast.success(toastMessage.message, {
+          position: "bottom-center",
+          className:
+            "dark:!bg-gray-800 border-1 dark:!border-gray-700 dark:!text-gray-100",
+          duration: 2000,
+        });
+        break;
+      }
+      case "error": {
+        toast.error(toastMessage.message, {
+          position: "bottom-center",
+          className:
+            "dark:!bg-gray-800 border-1 dark:!border-gray-700 dark:!text-gray-100",
+          duration: 4000,
+        });
+        break;
+      }
+      default: {
+        toast(toastMessage.message, {
+          icon: "ℹ",
+          position: "bottom-center",
+          className:
+            "dark:!bg-gray-800 border-1 dark:!border-gray-700 dark:!text-gray-100",
+          duration: 1500,
+        });
+      }
+    }
+  });
 </script>
 
 <Toaster></Toaster>
 
-<div class="p-2 flex flex-row justify-between items-center">
+{#if !updateInfo}
-  <div class="flex flex-row items-center">
+  <div class="p-2 flex flex-row justify-between items-center">
-    <img src={ezppLogo} alt="EZPPFarm Logo" class="w-12 h-12 mr-2" />
+    <div class="flex flex-row items-center animate-fadeIn opacity-0">
-    <span class="text-gray-700 dark:text-gray-100 text-xl font-extralight">
+      {#if $currentPage == Page.Settings}
-      EZPPLauncher
+        <Button
-    </span>
+          class="dark:active:!bg-gray-900 !ring-0 w-10 h-10 mr-1 rounded-lg animate-sideIn opacity-0 active:scale-95 transition-transform duration-75"
-  </div>
+          color="light"
-  {#if $currentPage == Page.Launch}
+          on:click={() => {
-    <div class="flex flex-row gap-2 w-fill cursor-pointer md:order-2">
+            currentPage.set(Page.Launch);
-      <Avatar
+          }}
-        class="rounded-lg border dark:border-gray-700 hover:ring-4 hover:ring-gray-200 dark:hover:ring-gray-800"
-        src={loggedIn
-          ? "https://a.ez-pp.farm/" + user?.id
-          : "https://a.ez-pp.farm/0"}
-        id="avatar-menu"
-      />
-    </div>
-    <Dropdown placement="bottom-start" triggeredBy="#avatar-menu">
-      <DropdownHeader>
-        <span class="block text-sm">{loggedIn ? user?.name : "Guest"}</span>
-        <span
-          class="block truncate text-sm font-medium text-gray-500 dark:text-gray-200"
         >
-          {loggedIn ? user?.email : "Please log in!"}
+          <ArrowLeftSolid class="outline-none border-none" size="sm" />
-        </span>
+        </Button>
-      </DropdownHeader>
-      <DropdownItem
-        class="flex flex-row gap-2 border-0 dark:!bg-gray-700 dark:active:!bg-gray-900 dark:hover:!bg-gray-800 transition-colors"
-        on:click={() => currentPage.set(Page.Settings)}
-      >
-        <UserSettingsSolid class="select-none outline-none border-none" />
-        Settings
-      </DropdownItem>
-      <DropdownDivider />
-      {#if loggedIn}
-        <DropdownItem
-          class="flex flex-row gap-2 border-0 dark:!bg-gray-700 dark:active:!bg-gray-900 dark:hover:!bg-gray-800 transition-colors"
-          on:click={logout}
-        >
-          <ArrowRightFromBracketSolid
-            class="select-none outline-none border-none"
-          />
-          Sign out
-        </DropdownItem>
-      {:else}
-        <DropdownItem
-          class="flex flex-row gap-2 border-0 dark:!bg-gray-700 dark:active:!bg-gray-900 dark:hover:!bg-gray-800 transition-colors"
-          on:click={() => currentPage.set(Page.Login)}
-        >
-          <ArrowRightToBracketSolid
-            class="select-none outline-none border-none"
-          />
-          Login
-        </DropdownItem>
       {/if}
-    </Dropdown>
+      <img src={ezppLogo} alt="EZPPFarm Logo" class="w-12 h-12 mr-2" />
+      <span class="text-gray-700 dark:text-gray-100 text-xl font-extralight">
+        EZPPLauncher
+      </span>
+    </div>
+    {#if $currentPage == Page.Launch}
+      <div
+        class="flex flex-row gap-2 w-fill cursor-pointer md:order-2 animate-lsideIn opacity-0"
+      >
+        <Avatar
+          class="rounded-lg border dark:border-gray-700 hover:ring-4 hover:ring-gray-200 dark:hover:ring-gray-800"
+          src={loggedIn
+            ? "https://a.ez-pp.farm/" + user?.id
+            : "https://a.ez-pp.farm/0"}
+          id="avatar-menu"
+        />
+        <!-- TODO: if user has donator, display heart indicator-->
+        {#if $currentUser && $currentUser.donor}
+          <Indicator
+            class="pointer-events-none"
+            color="red"
+            border
+            size="xl"
+            placement="top-right"
+          >
+            <span class="text-red-300 text-xs font-bold">
+              <HeartSolid class="select-none pointer-events-none" size="xs" />
+            </span>
+          </Indicator>
+        {/if}
+      </div>
+      <Dropdown placement="bottom-start" triggeredBy="#avatar-menu">
+        <DropdownHeader>
+          <span class="block text-sm">{loggedIn ? user?.name : "Guest"}</span>
+          <span
+            class="block truncate text-sm font-medium text-gray-500 dark:text-gray-200"
+          >
+            {loggedIn ? user?.email : "Please log in!"}
+          </span>
+        </DropdownHeader>
+        <DropdownItem
+          class="flex flex-row gap-2 border-0 dark:!bg-gray-700 dark:active:!bg-gray-900 dark:hover:!bg-gray-800 transition-colors"
+          on:click={() => {
+            if (!$launching) currentPage.set(Page.Settings);
+          }}
+        >
+          <UserSettingsSolid class="select-none outline-none border-none" />
+          Settings
+        </DropdownItem>
+        <DropdownDivider />
+        {#if loggedIn}
+          <DropdownItem
+            class="flex flex-row gap-2 border-0 dark:!bg-gray-700 dark:active:!bg-gray-900 dark:hover:!bg-gray-800 transition-colors"
+            on:click={() => {
+              if (!$launching) logout();
+            }}
+          >
+            <ArrowRightFromBracketSolid
+              class="select-none outline-none border-none"
+            />
+            Sign out
+          </DropdownItem>
+        {:else}
+          <DropdownItem
+            class="flex flex-row gap-2 border-0 dark:!bg-gray-700 dark:active:!bg-gray-900 dark:hover:!bg-gray-800 transition-colors"
+            on:click={() => {
+              if (!$launching) currentPage.set(Page.Login);
+            }}
+          >
+            <ArrowRightToBracketSolid
+              class="select-none outline-none border-none"
+            />
+            Login
+          </DropdownItem>
+        {/if}
+      </Dropdown>
+    {/if}
+  </div>
+
+  {#if $currentPage == Page.Login}
+    <Login />
+  {:else if $currentPage == Page.Settings}
+    <Settings />
+  {:else}
+    <Launch />
   {/if}
-</div>
-
-{#if $currentPage == Page.Login}
-  <Login />
-{:else if $currentPage == Page.Settings}
-  <Settings />
-{:else}
-  <Launch />
 {/if}
-
-<style>
-  .container {
-    text-align: center;
-    padding: 1em;
-    margin: auto;
-  }
-</style>

src/app.pcss

@@ -5,6 +5,8 @@
 
 * {
   font-family: "Prompt";
+  -webkit-user-select: none !important;
+  user-select: none !important;
 }
 
 html .cet-titlebar {
@@ -20,6 +22,10 @@ html .cet-titlebar .cet-control-icon svg {
   display: none;
 }
 
+.cet-container {
+  overflow: hidden !important;
+}
+
 .indeterminate {
   background-image: repeating-linear-gradient(
     90deg,
@@ -52,6 +58,24 @@ html .cet-titlebar .cet-control-icon svg {
     background-color: #202020 !important;
     color: #ececec !important;
   }
+
+  .swal2-container {
+    background: #202020 !important;
+  }
+
+  .swal2-container .swal2-popup {
+    background: #323232 !important;
+    color: #fff !important;
+  }
+}
+
+.animatedProgress div {
+  transition: width 0.35s cubic-bezier(0.65, -0.02, 0.31, 1.01);
+}
+
+.noselect {
+  -webkit-user-select: none !important;
+  user-select: none !important;
 }
 
 @keyframes progress-loading {

src/lib/Progressbar.svelte

@@ -2,9 +2,10 @@
   import { cubicOut } from "svelte/easing";
   import { tweened } from "svelte/motion";
   import { twMerge, twJoin } from "tailwind-merge";
+  import { clamp } from "../util/mathUtil";
 
-  export let progress: string | number | undefined | null = "45";
+  export let progress: number = 45;
-  export let precision = 0;
+  export let precision = 2;
   export let tweenDuration = 400;
   export let animate = false;
   export let size = "h-2.5";
@@ -12,10 +13,10 @@
   export let labelOutside = "";
   export let easing = cubicOut;
   export let color = "primary";
+  export let indeterminate = false;
   export let labelInsideClass =
     "text-primary-100 text-xs font-medium text-center p-0.5 leading-none rounded-full";
   export let divClass = "w-full bg-gray-200 rounded-full dark:bg-gray-700";
-  export let indeterminate = progress == null;
 
   const barColors: Record<string, string> = {
     primary: "bg-primary-600",
@@ -28,15 +29,14 @@
     indigo: "bg-indigo-600 dark:bg-indigo-500",
   };
 
-  const _progress = tweened(0, {
+  let _progress = tweened(0, {
-    duration: animate && !indeterminate ? tweenDuration : 0,
+    duration: tweenDuration,
     easing,
   });
 
   $: {
-    if (!indeterminate) {
+    progress = clamp(Number(progress), 0, 100);
-      _progress.set(Number(progress));
+    _progress.set(progress);
-    }
   }
 </script>
 
@@ -49,7 +49,9 @@
       >{labelOutside}</span
     >
     <span class="text-sm font-medium text-blue-700 dark:text-white"
-      >{progress}%</span
+      >{animate
+        ? $_progress.toFixed(precision)
+        : progress.toFixed(precision)}%</span
     >
   </div>
 {/if}
@@ -59,9 +61,9 @@
     {#if !indeterminate}
       <div
         class={twJoin(labelInsideClass, barColors[color])}
-        style="width: {$_progress}%"
+        style="width: {animate ? $_progress : progress}%"
       >
-        {$_progress.toFixed(precision)}%
+        {animate ? $_progress.toFixed(precision) : progress.toFixed(precision)}%
       </div>
     {:else}
       <div
@@ -75,7 +77,7 @@
   {:else if !indeterminate}
     <div
       class={twJoin(barColors[color], size, "rounded-full")}
-      style="width: {$_progress}%"
+      style="width: {animate ? $_progress : progress}%"
     />
   {:else}
     <div

src/pages/Launch.svelte

@@ -1,13 +1,23 @@
 <script lang="ts">
   import { Button, Checkbox } from "flowbite-svelte";
   import Progressbar from "../lib/Progressbar.svelte";
+  import {
+    launching,
+    patch,
+    launchStatus,
+    launchPercentage,
+  } from "./../storage/localStore";
   let progressbarFix = true;
-  let launching = false;
-  let patch = true;
 
   setTimeout(() => {
     progressbarFix = false;
   }, 1000);
+
+  const launch = () => {
+    launching.set(true);
+    const patching = $patch;
+    window.dispatchEvent(new CustomEvent("launch", { detail: { patch: patching } }));;
+  };
 </script>
 
 <main
@@ -19,26 +29,27 @@
     <Button
       color="light"
       size="xl"
-      class="dark:active:!bg-gray-900 {launching
+      class="dark:active:!bg-gray-900 {$launching
         ? ''
         : 'active:scale-95 '}transition-transform duration-75"
-      disabled={launching}
+      disabled={$launching}
-      on:click={() => (launching = !launching)}>Launch</Button
+      on:click={launch}>Launch</Button
     >
-    <Checkbox disabled={launching} bind:checked={patch}>Patch</Checkbox>
     <div
-      class="w-full flex flex-col justify-center items-center gap-2 mt-2 {launching
+      class="w-full flex flex-col justify-center items-center gap-2 mt-2 {$launching
         ? 'animate-fadeIn '
         : 'animate-fadeOut '}{progressbarFix ? '!opacity-0' : 'opacity-0'}"
     >
       <Progressbar
         animate={true}
-        progress={null}
+        progress={$launchPercentage}
+        indeterminate={$launchPercentage == -1}
         labelInside={true}
         size="h-3"
-        labelInsideClass="bg-primary-600 drop-shadow-xl text-gray-100 text-base font-medium text-center p-1 leading-none rounded-full"
+        class=""
+        labelInsideClass="bg-primary-600 drop-shadow-xl text-gray-100 text-base font-medium text-center p-1 leading-none rounded-full !text-[0.7rem] !leading-[0.45]"
       />
-      <p class="m-0 p-0 dark:text-gray-400 font-light">Waiting...</p>
+      <p class="m-0 p-0 dark:text-gray-400 font-light">{$launchStatus}</p>
     </div>
   </div>
 </main>

src/pages/Login.svelte

@@ -15,81 +15,118 @@
 
   const processLogin = async () => {
     loading = true;
-    window.addEventListener(
+    const loginPromise = new Promise<void>((res, rej) => {
-      "login-result",
+      window.addEventListener(
-      (e) => {
+        "login-result",
-        const customEvent = e as CustomEvent;
+        (e) => {
-        const resultData = customEvent.detail;
+          const customEvent = e as CustomEvent;
-        const wasSuccessful = "user" in resultData;
+          const resultData = customEvent.detail;
+          const wasSuccessful = "user" in resultData;
 
-        if (!wasSuccessful) {
+          if (!wasSuccessful) {
-          const errorResult = resultData as Error;
+            /* const errorResult = resultData as Error;
-          toast.error(errorResult.message, {
+            toast.error(errorResult.message, {
-            position: "bottom-center",
+              position: "bottom-center",
-            className:
+              className:
-              "dark:!bg-gray-800 border-1 dark:!border-gray-700 dark:!text-gray-100",
+                "dark:!bg-gray-800 border-1 dark:!border-gray-700 dark:!text-gray-100",
-            duration: 1500,
+              duration: 1500,
-          });
+            }); */
-          loading = false;
+            rej();
-          return;
+            loading = false;
-        }
+            return;
-        const userResult = resultData.user as User;
+          }
-        currentUser.set(userResult);
+          const userResult = resultData.user as User;
-        currentPage.set(Page.Launch);
+          currentUser.set(userResult);
-        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,
-        });
-      },
-      { once: true }
-    );
-    window.dispatchEvent(
-      new CustomEvent("login-attempt", {
-        detail: { username, password, saveCredentials },
-      })
-    );
-  };
-
-  const tryAutoLogin = async () => {
-    loading = true;
-    await new Promise((res) => setTimeout(res, 1500));
-    window.addEventListener(
-      "login-result",
-      (e) => {
-        const customEvent = e as CustomEvent;
-        const resultData = customEvent.detail;
-        const isGuest = "guest" in resultData;
-        const wasSuccessful = "user" in resultData;
-        if (isGuest) {
           currentPage.set(Page.Launch);
-          toast.success(`Logged in as Guest`, {
+          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,
           });
-          return;
+        },
-        }
+        { once: true }
-        if (!wasSuccessful) {
+      );
-          loading = false;
+      window.dispatchEvent(
-          return;
+        new CustomEvent("login-attempt", {
-        }
+          detail: { username, password, saveCredentials },
-        const userResult = resultData.user as User;
+        })
-        currentUser.set(userResult);
+      );
-        currentPage.set(Page.Launch);
+    });
-        toast.success(`Welcome back, ${userResult.name}!`, {
+    toast.promise(
-          position: "bottom-center",
+      loginPromise,
-          className:
+      {
-            "dark:!bg-gray-800 border-1 dark:!border-gray-700 dark:!text-gray-100",
+        loading: "Logging in...",
-          duration: 3000,
+        success: "Successfully logged in!",
-        });
+        error: "Failed to login.",
-        loading = false;
       },
-      { once: true }
+      {
+        position: "bottom-center",
+        className:
+          "dark:!bg-gray-800 border-1 dark:!border-gray-700 dark:!text-gray-100",
+        duration: 3000,
+      }
+    );
+  };
+
+  const tryAutoLogin = async () => {
+    loading = true;
+    const loginPromise = new Promise<void>((res, rej) => {
+      window.addEventListener(
+        "login-result",
+        (e) => {
+          const customEvent = e as CustomEvent;
+          const resultData = customEvent.detail;
+          const isGuest = "guest" in resultData;
+          const wasSuccessful = "user" in resultData;
+          console.log(resultData);
+          if (isGuest) {
+            currentPage.set(Page.Launch);
+            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,
+            });
+            return;
+          }
+          if (!wasSuccessful) {
+            loading = false;
+            rej();
+            return;
+          }
+          const userResult = resultData.user as User;
+          currentUser.set(userResult);
+          currentPage.set(Page.Launch);
+          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,
+          });
+          loading = false;
+        },
+        { once: true }
+      );
+      window.dispatchEvent(new CustomEvent("autologin-attempt"));
+    });
+    toast.promise(
+      loginPromise,
+      {
+        loading: "Logging in...",
+        success: "Successfully logged in!",
+        error: "Failed to login.",
+      },
+      {
+        position: "bottom-center",
+        className:
+          "dark:!bg-gray-800 border-1 dark:!border-gray-700 dark:!text-gray-100",
+        duration: 3000,
+      }
     );
-    window.dispatchEvent(new CustomEvent("autologin-attempt"));
   };
 
   const proceedAsGuest = () => {
@@ -103,10 +140,24 @@
     });
   };
 
-  if (!$startup) {
+  const shouldAutologin = async () => {
-    startup.set(true);
+    const shouldAutologin = await new Promise<boolean>((res) => {
-    tryAutoLogin();
+      window.addEventListener("autologin-result", (e) => {
-  }
+        const customEvent = e as CustomEvent;
+        const resultData = customEvent.detail;
+        res(resultData);
+      });
+      window.dispatchEvent(new CustomEvent("autologin-active"));
+    });
+    return shouldAutologin;
+  };
+
+  (async () => {
+    if (!$startup) {
+      startup.set(true);
+      if (await shouldAutologin()) tryAutoLogin();
+    }
+  })();
 </script>
 
 <main
@@ -142,8 +193,10 @@
         {/if}
       </Button>
     </Input>
-    <Checkbox bind:checked={saveCredentials}>Save credentials</Checkbox>
+    <Checkbox bind:checked={saveCredentials} disabled={loading}
-    <div class="flex flex-col justify-center items-center gap-5 mt-1">
+      >Save credentials</Checkbox
+    >
+    <div class="flex flex-col justify-center items-center gap-2 mt-1">
       <Button
         class="dark:active:!bg-gray-900  active:scale-95 transition-transform duration-75"
         color="light"

src/pages/Settings.svelte

@@ -1,36 +1,88 @@
 <script lang="ts">
-  import { Button, ButtonGroup, Input } from "flowbite-svelte";
+  import { Button, ButtonGroup, Input, Toggle } from "flowbite-svelte";
-  import { FolderSolid } from "flowbite-svelte-icons";
+  import { FileSearchSolid, FolderSolid } from "flowbite-svelte-icons";
-  import { currentPage } from "../storage/localStore";
+  import { patch, presence } from "./../storage/localStore";
-  import { Page } from "../consts/pages";
+
+  let folderPath: string = "";
+
+  window.addEventListener("settings-result", (e) => {
+    const settings: Record<string, string>[] = (e as CustomEvent).detail;
+    const osuPath = settings.find((setting) => setting.key == "osuPath");
+    const settingPatch = settings.find((setting) => setting.key == "patch");
+    const settingPresence = settings.find(
+      (setting) => setting.key == "presence"
+    );
+    patch.set(settingPatch ? settingPatch.val == "true" : true);
+    presence.set(settingPresence ? settingPresence.val == "true" : true);
+    folderPath = osuPath ? osuPath.val : "";
+  });
+  window.dispatchEvent(new CustomEvent("settings-get"));
+
+  const setFolderPath = () => {
+    window.dispatchEvent(new CustomEvent("folder-set"));
+  };
+
+  const detectFolderPath = () => {
+    window.dispatchEvent(new CustomEvent("folder-auto"));
+  };
+
+  const togglePatching = () => {
+    patch.set(!$patch);
+    window.dispatchEvent(
+      new CustomEvent("setting-update", { detail: { patch: $patch } })
+    );
+  };
+
+  const togglePresence = () => {
+    presence.set(!$presence);
+    window.dispatchEvent(
+      new CustomEvent("setting-update", { detail: { presence: $presence } })
+    );
+  };
 </script>
 
 <main
-  class="h-[265px] my-auto flex flex-col justify-center items-center p-5 animate-fadeIn opacity-0"
+  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"
   >
     <ButtonGroup class="w-full">
       <Input
         type="text"
+        id="oip"
         placeholder="Path to your osu! installation"
+        value={folderPath}
         readonly
       />
-      <Button color="light" class="dark:active:!bg-gray-900"
+      <Button
-        ><FolderSolid
+        color="light"
+        class="dark:active:!bg-gray-900"
+        on:click={detectFolderPath}
+      >
+        <FileSearchSolid
           size="sm"
           class="dark:text-gray-300 text-gray-500 outline-none border-none select-none pointer-events-none"
-        /></Button
+        />
-      >
+      </Button>
-    </ButtonGroup>
-    <div class="flex flex-row justify-center items-center gap-5">
-      <Button color="light" class="dark:active:!bg-gray-900">Save</Button>
       <Button
-        color="red"
+        color="light"
-        class="dark:active:!bg-red-900 border-red-400"
+        class="dark:active:!bg-gray-900 active:!rounded-lg"
-        on:click={() => currentPage.set(Page.Launch)}>Cancel</Button
+        on:click={setFolderPath}
       >
-    </div>
+        <FolderSolid
+          size="sm"
+          class="dark:text-gray-300 text-gray-500 outline-none border-none select-none pointer-events-none"
+        />
+      </Button>
+    </ButtonGroup>
   </div>
 </main>

src/storage/localStore.ts

@@ -3,5 +3,12 @@ import { Page } from "../consts/pages";
 import type { User } from "../types/user";
 
 export const startup = writable(false);
+export const updateAvailable = writable(false);
+export const launching = writable(false);
+export const launchStatus = writable("Waiting...");
+export const launchPercentage = writable(-1);
+export const osuPath: Writable<undefined | string> = writable(undefined);
+export const patch = writable(true);
+export const presence = writable(true);
 export const currentUser: Writable<undefined | User> = writable(undefined);
 export const currentPage = writable(Page.Login);

src/types/user.ts

@@ -1,5 +1,6 @@
 export type User = {
   id: number;
+  donor: boolean;
   name: string;
   email: string;
 };

src/util/loginUtil.ts

@@ -1,33 +0,0 @@
-import axios from "axios";
-import type { Error } from "../types/error";
-import type { User } from "../types/user";
-
-const loginCheckEndpoint = "https://ez-pp.farm/login/check";
-let retries = 0;
-
-export const performLogin = async (
-  username: string,
-  password: string,
-): Promise<Error | User> => {
-  const fetchResult = await fetch("https://ez-pp.farm/login/check", {
-    method: "POST",
-    mode: "cors",
-    body: JSON.stringify({ username, password }),
-    headers: {
-      "Content-Type": "application/json",
-    },
-  });
-
-  if (fetchResult.ok) {
-    const result = await fetchResult.json();
-    retries = 0;
-    return result.user;
-  } else {
-    if (retries++ >= 5) {
-      console.log("Login failed after 5 retries.");
-      retries = 0;
-      return { code: 403, message: "Login failed." } as Error;
-    }
-    return await performLogin(username, password);
-  }
-};

src/util/mathUtil.ts

@@ -0,0 +1,3 @@
+export const clamp = (val: number, min: number, max: number) => {
+  return Math.max(min, Math.min(val, max));
+};

tailwind.config.cjs

@@ -8,6 +8,14 @@ const config = {
   theme: {
     extend: {
       keyframes: {
+        slideIn: {
+          "0%": { opacity: "0", transform: "translateX(-5px)" },
+          "100%": { opacity: "1" },
+        },
+        lslideIn: {
+          "0%": { opacity: "0", transform: "translateX(5px)" },
+          "100%": { opacity: "1" },
+        },
         fadeIn: {
           "0%": { opacity: "0", transform: "translateY(5px)" },
           "100%": { opacity: "1" },
@@ -18,9 +26,14 @@ const config = {
         },
       },
       animation: {
+        sideIn: "slideIn 1s ease forwards",
+        lsideIn: "lslideIn 1s ease forwards",
         fadeIn: "fadeIn 1s ease forwards",
         fadeOut: "fadeOut 1s ease forwards",
       },
+      transitionProperty: {
+        "width": "width",
+      },
       colors: {
         // flowbite-svelte
         primary: {

tsconfig.json

@@ -1,7 +1,16 @@
 {
   "extends": "./node_modules/@tsconfig/svelte/tsconfig.json",
 
-  "include": ["src/**/*"],
+  "include": [
+    "src/**/*",
+    "electron/richPresence.js",
+    "electron/config.js",
+    "electron/cryptoUtil.js",
+    "electron/executeUtil.js",
+    "electron/formattingUtil.js",
+    "electron/hwidUtil.js",
+    "electron/osuUtil.js"
+  ],
   "exclude": ["node_modules/*", "__sapper__/*", "public/*"],
   "compilerOptions": {
     "typeRoots": [