fix building scripts, update electron

.gitignore

@@ -1,3 +1,4 @@
 node_modules/
 release/
 yarn.lock
+pnpm-lock.yaml

README.md

@@ -1,16 +1,18 @@
 # EZPPLauncher
-
 Welcome to the EZPPLauncher! A new way to connect to the EZPPFarm server.
 
 Just one click and you are ready to go!
 
+## Preview Image
+![preview](https://git.ez-pp.farm/EZPPFarm/EZPPLauncher/raw/branch/master/preview/EZPPLauncher.png)
+
 ## Installation
 The Launcher is a "plug and play thing", download it, place it on the desktop and execute!
 
 ## Features
 
 * Automatic osu! client updating before Launch
-* Account saving (soon)
+* Account saving
 
 ## Used Libraries
 
@@ -18,14 +20,16 @@ The Launcher is a "plug and play thing", download it, place it on the desktop an
 * [custom-electron-titlebar](https://www.npmjs.com/package/custom-electron-titlebar)
 * [axios](https://www.npmjs.com/package/axios)
 * [jquery](https://www.npmjs.com/package/jquery)
+* [discord-auto-rpc](https://www.npmjs.com/package/discord-auto-rpc)
+* [get-window-by-name](https://www.npmjs.com/package/get-window-by-name)
+* [sweetalert2](https://www.npmjs.com/package/sweetalert2)
+* [node-downloader-helper](https://www.npmjs.com/package/node-downloader-helper)
 
 ## Build from source
 
 - clone repo
 - cd into the repo
 - use `yarn install` to install all dependencies
-- (if node-gyp cant build the natives try clearing the cache at `%localappdata%\node-gyp\Cache\`)
-- run `yarn rebuild` to rebuild the natives to the current `NODE_MODULE_VERSION`
 - use the buildscript `pack-win` to build a executeable
 
 ## License

app.js

@@ -5,8 +5,17 @@ const osuUtil = require('./osuUtil');
 const ezppUtil = require('./ezppUtil');
 const config = require('./config');
 const fs = require('fs');
+const rpc = require('./discordPresence');
+const windowName = require('get-window-by-name');
+const terminalUtil = require('./terminalUtil');
+const osUtil = require('./osUtil');
 
 let tempOsuPath;
+let osuWindowInfo;
+let isIngame;
+const platform = process.platform;
+let linuxWMCtrlFound = false;
+let osuLoaded = false;
 
 const run = () => {
     const gotTheLock = app.requestSingleInstanceLock()
@@ -15,8 +24,100 @@ const run = () => {
         return;
     }
 
+    setInterval(async () => {
+        if (platform == "win32") {
+            osuWindowInfo = windowName.getWindowText("osu!.exe");
+            const firstInstance = osuWindowInfo[0];
+            if (firstInstance) {
+                if (firstInstance.processTitle && firstInstance.processTitle.length > 0) {
+                    if (!osuLoaded) {
+                        osuLoaded = true;
+                        //TODO: do patch
+                    }
+                    const windowTitle = firstInstance.processTitle;
+                    let rpcOsuVersion = "";
+                    let currentMap = undefined;
+                    if (!windowTitle.includes("-")) {
+                        rpcOsuVersion = windowTitle;
+                        rpc.updateState("Idle...");
+                    } else {
+                        var string = windowTitle;
+                        var components = string.split(' - ');
+                        const splitArray = [components.shift(), components.join(' - ')];
+                        rpcOsuVersion = splitArray[0];
+                        currentMap = splitArray[1];
+                        if (currentMap.endsWith(".osu")) {
+                            rpc.updateState("Editing...");
+                            currentMap = currentMap.substring(0, currentMap.length - 4);
+                        } else rpc.updateState("Playing...");
+                    }
+
+                    rpc.updateStatus(currentMap, rpcOsuVersion);
+                } else {
+                    if (osuLoaded) osuLoaded = false;
+                    rpc.updateState("Idle in Launcher...");
+                    rpc.updateStatus(undefined, undefined);
+                }
+            } else {
+                if (osuLoaded) osuLoaded = false;
+                rpc.updateState("Idle in Launcher...");
+                rpc.updateStatus(undefined, undefined);
+            }
+        } else if (platform == "linux") {
+            if (!linuxWMCtrlFound) {
+                if (isIngame) {
+                    rpc.updateState("Playing...");
+                    rpc.updateStatus("Clicking circles!", "runningunderwine");
+                } else {
+                    rpc.updateState("Idle in Launcher...");
+                    rpc.updateStatus(undefined, undefined);
+                }
+                return;
+            }
+            const processesOutput = await terminalUtil.execCommand(`wmctrl -l|awk '{$3=""; $2=""; $1=""; print $0}'`);
+            const allLines = processesOutput.split("\n");
+            const filteredProcesses = allLines.filter((line) => line.trim().startsWith("osu!"));
+            if (filteredProcesses.length > 0) {
+                const windowTitle = filteredProcesses[0].trim();
+                let rpcOsuVersion = "";
+                let currentMap = undefined;
+                if (!windowTitle.includes("-")) {
+                    rpcOsuVersion = windowTitle;
+                    rpc.updateState("Idle...");
+                } else {
+                    var string = windowTitle;
+                    var components = string.split(' - ');
+                    const splitArray = [components.shift(), components.join(' - ')];
+                    rpcOsuVersion = splitArray[0];
+                    currentMap = splitArray[1];
+                    if (currentMap.endsWith(".osu")) {
+                        rpc.updateState("Editing/Modding...");
+                        currentMap = currentMap.substring(0, currentMap.length - 4);
+                    }
+                    else rpc.updateState("Playing...");
+                }
+
+                rpc.updateStatus(currentMap, rpcOsuVersion);
+            } else {
+                rpc.updateState("Idle in Launcher...");
+                rpc.updateStatus(undefined, undefined);
+            }
+        } else {
+            if (isIngame) {
+                rpc.updateState("Playing...");
+                rpc.updateStatus("Clicking circles!", "runningunderwine");
+            } else {
+                rpc.updateState("Idle in Launcher...");
+                rpc.updateStatus(undefined, undefined);
+            }
+        }
+    }, 2000);
+
     setupTitlebar();
 
+    rpc.connect();
+
+
     let mainWindow;
     app.whenReady().then(() => {
 
@@ -25,6 +126,44 @@ const run = () => {
             await updateConfigVars(mainWindow);
             await tryLogin(mainWindow);
             await doUpdateCheck(mainWindow);
+            if (platform === "linux") {
+                const linuxDistroInfo = await osUtil.getLinuxDistroInfo();
+                if (linuxDistroInfo?.id != "arch") {
+                    if (linuxDistroInfo?.id_like != "arch") {
+                        mainWindow.webContents.send('status_update', {
+                            type: "info",
+                            message: "We detected that you are running the Launcher under Linux. It's currently just compatible with Arch like distributions!"
+                        });
+                    }
+                }
+                try {
+                    await terminalUtil.execCommand(`osu-stable -h`);
+                } catch (err) {
+                    mainWindow.webContents.send('status_update', {
+                        type: "package-issue",
+                        message: "Seems like you dont have the osu AUR Package installed, please install it."
+                    });
+                    return;
+                }
+                /* mainWindow.webContents.send('status_update', {
+                    type: "info",
+                    message: "We detected that you are running the Launcher under Linux. It's currently just compatible with Arch and the osu AUR package!"
+                }); */
+                const terminalTest = await terminalUtil.execCommand(`wmctrl -l|awk '{$3=""; $2=""; $1=""; print $0}'`);
+                const isFailed = terminalTest.trim() == "";
+                if (isFailed) {
+                    mainWindow.webContents.send('status_update', {
+                        type: "info",
+                        message: "Seems like you are missing the wmctrl package, please install it for the RPC to work!"
+                    });
+                } else linuxWMCtrlFound = true;
+            } else {
+                const osuFolder = await config.get("osuPath");
+                if (!osuFolder || osuFolder == "") {
+                    const foundFolder = await osuUtil.findOsuInstallation();
+                    console.log("osu! Installation located at: ",foundFolder);
+                }
+            }
         })
         app.on('activate', function () {
             if (BrowserWindow.getAllWindows().length === 0) mainWindow = createWindow();
@@ -40,13 +179,18 @@ const run = () => {
                 await osuUtil.setConfigValue(osuConfig.path, "SaveUsername", "1");
                 await osuUtil.setConfigValue(osuConfig.path, "SavePassword", "1");
                 await osuUtil.setConfigValue(osuConfig.path, "Username", username);
-                await osuUtil.setConfigValue(osuConfig.path, "Password", await osuUtil.decryptString(password));
+                await osuUtil.setConfigValue(osuConfig.path, "Password", password);
                 await osuUtil.setConfigValue(osuConfig.path, "CredentialEndpoint", "ez-pp.farm");
             } else {
                 await osuUtil.setConfigValue(osuConfig.path, "Username", "");
                 await osuUtil.setConfigValue(osuConfig.path, "Password", "");
             }
+            rpc.updateState("Launching osu!...");
+            isIngame = true;
+            mainWindow.hide();
             const result = await osuUtil.startOsuWithDevServer(tempOsuPath, "ez-pp.farm", async () => {
+                isIngame = false;
+                mainWindow.show();
                 await doUpdateCheck(mainWindow);
             });
             return result;
@@ -113,7 +257,7 @@ const run = () => {
             const loginData = await ezppUtil.performLogin(username, password);
             if (loginData && loginData.code === 200) {
                 await config.set("username", username);
-                await config.set("password", await osuUtil.encryptString(password));
+                await config.set("password", password);
             }
             return loginData;
         })
@@ -135,7 +279,7 @@ async function tryLogin(window) {
     const username = await config.get("username", "");
     const password = await config.get("password", "");
     if ((username && username.length > 0) && (password && password.length > 0)) {
-        const passwordPlain = await osuUtil.decryptString(password);
+        const passwordPlain = password;
         const loginResponse = await ezppUtil.performLogin(username, passwordPlain);
         if (loginResponse && loginResponse.code === 200) {
             window.webContents.send('account_update', {
@@ -192,7 +336,7 @@ async function doUpdateCheck(window) {
 
 function createWindow() {
     // Create the browser window.
-    const win = windowManager.createWindow(700, 420);
+    const win = windowManager.createWindow(700, 460);
 
     win.loadFile('./html/index.html');
 

appInfo.js

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

assets/checkbox.css

@@ -0,0 +1,85 @@
+[type="checkbox"]:not(:checked),
+[type="checkbox"]:checked {
+    position: absolute;
+    left: 0;
+    opacity: 0.01;
+}
+
+[type="checkbox"]:not(:checked)+label,
+[type="checkbox"]:checked+label {
+    position: relative;
+    padding-left: 2.3em;
+    font-size: 1.05em;
+    line-height: 1.7;
+    cursor: pointer;
+}
+
+/* checkbox aspect */
+[type="checkbox"]:not(:checked)+label:before,
+[type="checkbox"]:checked+label:before {
+    content: '';
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 1.4em;
+    height: 1.4em;
+    border: 1px solid #565656;
+    background: #4c4c4c;
+    border-radius: .2em;
+    box-shadow: inset 0 1px 3px rgba(0, 0, 0, .1), 0 0 0 hsla(var(--main-accent), 93%, 48%, 20%);
+    -webkit-transition: all .275s;
+    transition: all .275s;
+}
+
+/* checked mark aspect */
+[type="checkbox"]:not(:checked)+label:after,
+[type="checkbox"]:checked+label:after {
+    content: '✕';
+    position: absolute;
+    top: .525em;
+    left: .18em;
+    font-size: 1.375em;
+    font-weight: bolder;
+    color: hsl(var(--main-accent), 93%, 48%);
+    line-height: 0;
+    -webkit-transition: all .2s;
+    transition: all .2s;
+}
+
+/* checked mark aspect changes */
+[type="checkbox"]:not(:checked)+label:after {
+    opacity: 0;
+    -webkit-transform: scale(0) rotate(45deg);
+    transform: scale(0) rotate(45deg);
+}
+
+[type="checkbox"]:checked+label:after {
+    opacity: 1;
+    -webkit-transform: scale(1) rotate(0);
+    transform: scale(1) rotate(0);
+    translate: -1.5px -1px;
+}
+
+/* Disabled checkbox */
+[type="checkbox"]:disabled:not(:checked)+label:before,
+[type="checkbox"]:disabled:checked+label:before {
+    box-shadow: none;
+    border-color: #565656;
+    background-color: #4c4c4c;
+    cursor: not-allowed;
+}
+
+[type="checkbox"]:disabled:checked+label:after {
+    color: #777;
+}
+
+[type="checkbox"]:disabled+label {
+    color: #aaa;
+    cursor: not-allowed;
+}
+
+/* Accessibility */
+[type="checkbox"]:checked:focus+label:before,
+[type="checkbox"]:not(:checked):focus+label:before {
+    box-shadow: inset 0 1px 3px rgba(0, 0, 0, .1), 0 0 0 6px hsla(var(--main-accent), 93%, 48%, 20%);
+}

assets/launcher.css

@@ -2,12 +2,17 @@
 
 :root {
     --main-accent: 335deg;
+    --main-bg: 230deg;
 }
 
 * {
     font-family: 'Exo 2', 'Roboto' !important;
 }
 
+body {
+    background-color: hsl(var(--main-bg), 24%, 19%);
+}
+
 .sections {
     display: flex;
     flex-flow: column;
@@ -23,6 +28,15 @@
     width: 100%;
 }
 
+.launch-button-section {
+    display: flex;
+    flex-direction: column;
+}
+
+.launch-button-section button {
+    margin-bottom: 10px;
+}
+
 .loading-section,
 .login-section {
     margin-top: 35px;
@@ -48,7 +62,7 @@
 }
 
 .folder-section {
-    margin-top: 45px;
+    margin-top: 50px;
     display: flex;
     flex-flow: column;
     justify-content: center;
@@ -85,6 +99,11 @@
     gap: 20px;
 }
 
+.server-logo img {
+    user-select: none;
+    pointer-events: none;
+}
+
 .user-info {
     text-align: start;
     display: flex;
@@ -122,13 +141,11 @@
     border: 5px solid white;
     border-radius: 0.4rem;
     box-shadow: 0 0 10px rgba(0, 0, 0, 0.349);
-}
-
-#user-img {
-    border-radius: .2rem;
-    width: 80px;
-    /* somehow its misplaced without that */
-    transform: translate(-0.25px, 0.25px) scale(1.05);
+    background-image: url(https://a.ez-pp.farm/0);
+    width: 100px;
+    height: 100px;
+    background-size: cover;
+    background-position: center;
 }
 
 .form-outline .form-control:focus~.form-notch .form-notch-leading {
@@ -159,7 +176,7 @@
 
 .btn-accent:hover {
     background: hsl(var(--main-accent), 93%, 42%);
-    color: #fff;
+    color: #fff ;
 }
 
 .btn-grey,

assets/sweetalert2.dark.css

@@ -346,12 +346,17 @@
     border: 0;
     border-radius: 0.25em;
     background: initial;
-    background-color: #7066e0;
+    background: hsl(var(--main-accent), 93%, 48%);
     color: #fff;
+    transition: all .35s ease;
     font-size: 1em;
   }
+  .swal2-styled.swal2-confirm:hover {
+    background: hsl(var(--main-accent), 93%, 42%);
+    color: #fff;
+  }
   .swal2-styled.swal2-confirm:focus {
-    box-shadow: 0 0 0 3px rgba(112, 102, 224, 0.5);
+    box-shadow: 0 0 0 0px rgba(112, 102, 224, 0.0);
   }
   .swal2-styled.swal2-deny {
     border: 0;

config.js

@@ -1,14 +1,13 @@
 const path = require('path');
 const fs = require('fs');
 
-const configFolder = path.join(process.env['LOCALAPPDATA'], 'EZPPLauncher');
+const configFolder = path.join(process.platform == "win32" ? process.env['LOCALAPPDATA'] : process.env['HOME'], 'EZPPLauncher');
 if (!fs.existsSync(configFolder)) fs.mkdirSync(configFolder);
 
 const configLocation = path.join(configFolder, `ezpplauncher.${path.basename(process.env['USERNAME'])}.cfg`);
 if (!fs.existsSync(configLocation)) fs.writeFileSync(configLocation, "");
 
 
-
 async function get(key, defaultValue) {
     const fileStream = await fs.promises.readFile(configLocation, "utf-8");
     const lines = fileStream.split(/\r?\n/)

discordPresence.js

@@ -0,0 +1,61 @@
+const appInfo = require('./appInfo.js');
+const DiscordAutoRPC = require("discord-auto-rpc");
+const { app } = require('electron');
+const DiscordRPC = require("discord-rpc").default;
+const clientId = "1032772293220384808";
+let client = undefined;
+let lastState = "Idle in Launcher...";
+let presenceEnabled = true;
+let startDate = new Date();
+const actionButtons = [
+    {
+        label: "Download the Launcher",
+        url: "https://git.ez-pp.farm/EZPPFarm/EZPPLauncher/releases/latest"
+    },
+    {
+        label: "Join EZPPFarm",
+        url: "https://ez-pp.farm/discord"
+    }
+]
+let lastActivity = {
+    details: "  ",
+    state: lastState,
+    startTimestamp: startDate,
+    largeImageKey: "ezppfarm",
+    largeImageText: appInfo.appName + " " + appInfo.appVersion,
+    buttons: actionButtons,
+    instance: false,
+};
+
+module.exports = {
+    connect: () => {
+        if (client === undefined) {
+            client = new DiscordAutoRPC.AutoClient({ transport: "ipc" });
+            client.endlessLogin({ clientId: clientId });
+            client.once("ready", () => {
+                setInterval(() => {
+                    if (lastActivity !== undefined)
+                        lastActivity.state = lastState;
+                    client.setActivity(presenceEnabled ? lastActivity : undefined);
+                }, 2500);
+            });
+        }
+    },
+    enablePresence: () => presenceEnabled = true,
+    disablePresence: () => presenceEnabled = false,
+    updateStartDate: () => startDate = new Date(),
+    updateState: (state) => lastState = state,
+    updateStatus: (details, osuVersion) => {
+        lastActivity = {
+            details: details ? details : "  ",
+            state: lastState,
+            startTimestamp: startDate,
+            smallImageKey: osuVersion ? "osu" : "  ",
+            smallImageText: osuVersion ? osuVersion : "  ",
+            largeImageKey: "ezppfarm",
+            largeImageText: appInfo.appName + " " + appInfo.appVersion,
+            buttons: actionButtons,
+            instance: false,
+        }
+    }
+}

ezppUtil.js

@@ -1,6 +1,6 @@
 const axios = require('axios').default;
 
-const loginCheckEndpoint = 'https://new.ez-pp.farm/login/check';
+const loginCheckEndpoint = 'https://ez-pp.farm/login/check';
 
 const performLogin = async (username, password) => {
     const result = await axios.post(loginCheckEndpoint, { username, password });

html/index.html

@@ -8,6 +8,7 @@
     <link rel="icon" type="image/png" href="../assets/logo.png" />
     <link href="../assets/mdb.min.css" rel="stylesheet" />
     <link href="../assets/launcher.css" rel="stylesheet" />
+    <link href="../assets/checkbox.css" rel="stylesheet" />
     <style>
         * {
             user-select: none;
@@ -25,7 +26,7 @@
                 <div class="launcher-window position-relative overflow-hidden">
                     <div class="container px-1 py-2 w-100 mw-100 h-100">
                         <div class="row d-flex justify-content-center align-items-center h-100">
-                            <div id="loading-page" class="sections col col-xl-10" style="//display: none;">
+                            <div id="loading-page" class="sections col col-xl-10">
                                 <div class="launch-section flex-row">
                                     <div class="server-logo">
                                         <img src="../assets/logo.png" height="120">
@@ -47,7 +48,6 @@
                             <div id="launch-page" class="sections col col-xl-10" style="display: none;">
                                 <div class="account-section">
                                     <div class="user-image">
-                                        <img id="user-img" src="https://a.ez-pp.farm/0">
                                     </div>
                                     <div class="user-info">
                                         <div class="welcome-text" id="welcome-text">
@@ -62,8 +62,13 @@
                                     <div class="server-logo">
                                         <img src="../assets/logo.png" height="150">
                                     </div>
-                                    <div class="launch-button">
+                                    <div class="launch-button-section">
                                         <button class="btn btn-lg btn-launch btn-accent" id="launch-btn">Launch</button>
+                                        <div class="patch-checkbox" style="display: none;">
+                                            <input type="checkbox" id="enablePatching" disabled />
+                                            <label for="enablePatching" style="display: initial;">enable
+                                                Patching</label>
+                                        </div>
                                     </div>
                                 </div>
                                 <div class="folder-section">
@@ -71,7 +76,7 @@
                                         Current osu! directory: <span id="currentOsuPath"></span>
                                     </div>
                                     <div class="folder-action" id="change-folder-btn">
-                                        Not right?
+                                        Not correct?
                                     </div>
                                 </div>
                             </div>
@@ -88,7 +93,8 @@
                                         <label class="form-label" for="login-username">Username</label>
                                     </div>
                                     <div class="form-outline mb-3 w-50">
-                                        <input type="password" id="login-password" class="form-control form-control-lg" />
+                                        <input type="password" id="login-password"
+                                            class="form-control form-control-lg" />
                                         <label class="form-label" for="login-password">Password</label>
                                     </div>
                                     <div class="pt-1 mb-4">
@@ -109,6 +115,7 @@
         </div>
     </main>
 </body>
+
 <script type="text/javascript" src="../assets/mdb.min.js"></script>
 
 </html>

osUtil.js

@@ -0,0 +1,17 @@
+const fs = require("fs");
+
+const getLinuxDistroInfo = async() => {
+    let os = await fs.promises.readFile('/etc/os-release', 'utf8')
+    let opj = {}
+
+    os?.split('\n')?.forEach((line, index) => {
+        let words = line?.split('=')
+        let key = words[0]?.toLowerCase()
+        if (key === '') return
+        let value = words[1]?.replace(/"/g, '')
+        opj[key] = value
+    })
+    return opj;
+}
+
+module.exports = { getLinuxDistroInfo };

osuUtil.js

@@ -3,13 +3,14 @@ const fu = require('./fileUtil');
 const path = require('path');
 const crypto = require('crypto');
 const axios = require('axios').default;
-const dpapi = require('wincrypt');
 const executeUtil = require('./executeUtil');
 const { EventEmitter } = require('events');
 const { DownloaderHelper } = require('node-downloader-helper');
 
 const checkUpdateURL = "https://osu.ppy.sh/web/check-updates.php?action=check&stream=";
-const osuEncryptBuffer = Buffer.from('cu24180ncjeiu0ci1nwui', "utf-8")
+const ignoredOsuEntities = [
+    'osu!auth.dll'
+]
 const osuEntities = [
     'avcodec-51.dll',
     'avformat-52.dll',
@@ -89,6 +90,8 @@ async function filesThatNeedUpdate(osuPath, updateFiles) {
         const fileHash = updatedFile.file_hash;
         const fileURL = updatedFile.url_full;
 
+        if (ignoredOsuEntities.includes(fileName)) continue;
+
         const fileOnDisk = path.join(osuPath, fileName);
         if (await fu.existsAsync(fileOnDisk)) {
             const binaryFileContents = await fs.promises.readFile(fileOnDisk);
@@ -98,14 +101,12 @@ async function filesThatNeedUpdate(osuPath, updateFiles) {
                     fileName,
                     fileURL
                 })
-                //console.log("hashes are not matching", `(${existingFileMD5} - ${fileHash})`);
             }
         } else {
             filesToDownload.push({
                 fileName,
                 fileURL
             });
-            //console.log("new file " + fileName);
         }
     }
     return filesToDownload;
@@ -143,17 +144,15 @@ async function downloadUpdateFiles(osuPath, filesToUpdate) {
 async function startWithDevServer(osuPath, serverDomain, onExit) {
     const osuExe = path.join(osuPath, "osu!.exe");
     if (!await fu.existsAsync(osuExe)) return false;
+    switch (process.platform) {
+        case "linux":
+            executeUtil.runFile(osuPath, 'osu-stable', ["-devserver", serverDomain], onExit);
+            return true;
+        case "win32":
             executeUtil.runFile(osuPath, osuExe, ["-devserver", serverDomain], onExit);
             return true;
-}
-
-async function encryptString(value) {
-    return Buffer.from(await dpapi.protect(Buffer.from(value, 'utf-8'), osuEncryptBuffer, 'CurrentUser'), 'utf-8').toString('base64');
-}
-
-async function decryptString(value) {
-    const decrypted = await dpapi.unprotect(Buffer.from(value, 'base64'), osuEncryptBuffer, 'CurrentUser');
-    return decrypted.toString();
+    }
+    return false;
 }
 
 async function setConfigValue(configPath, key, value) {
@@ -175,9 +174,23 @@ async function setConfigValue(configPath, key, value) {
     }
     await fs.promises.writeFile(configPath, configLines.join("\n"), 'utf-8');
 }
+async function findOsuInstallation() {
+    const regedit = require('qiao-regedit');
+
+    const osuLocationFromDefaultIcon = "HKLM\\SOFTWARE\\Classes\\osu\\DefaultIcon";
+    const osuStruct = await regedit.listValuesSync(osuLocationFromDefaultIcon);
+    for (const line of osuStruct.split("\n")) {
+        if (line.includes("REG_SZ")) {
+            let value = (line.trim().split("    ")[2]);
+            value = value.substring(1, value.length - 3);
+            return value.trim();
+        }
+    }
+    return undefined;
+}
 
 module.exports = {
     isValidOsuFolder, getLatestConfig, getUpdateFiles, filesThatNeedUpdate,
     downloadUpdateFiles, startOsuWithDevServer: startWithDevServer, setConfigValue,
-    encryptString, decryptString
+    findOsuInstallation
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ezpplauncher",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "main": "app.js",
   "license": "MIT",
   "author": "HorizonCode",
@@ -32,27 +32,27 @@
   },
   "scripts": {
     "start": "electron .",
-    "test": "electron ./test/encrypt.js",
-    "rebuild": "electron-rebuild -f -w wincrypt",
-    "pack-win": "electron-builder --x64",
-    "pack-win32": "electron-builder --ia32",
-    "pack-winarm": "electron-builder --arm64",
-    "pack-linux": "electron-builder --dir --linux --ia32 --arm64 --x64",
-    "pack-mac": "electron-builder --dir --mac --ia32 --arm64 --x64",
+    "rebuild": "electron-rebuild -f -w get-window-by-name",
+    "pack-win": "electron-builder --win --arm64 --x64",
+    "pack-linux": "electron-builder --linux --arm64 --x64",
+    "pack-mac": "electron-builder --mac --arm64 --x64",
     "dist": "electron-builder"
   },
   "devDependencies": {
-    "electron": "^21.1.1",
-    "electron-builder": "^23.0.3",
-    "electron-packager": "^15.5.1",
+    "electron": "^24.2.0",
+    "electron-builder": "^23.6.0",
+    "electron-packager": "^17.1.1",
     "electron-rebuild": "^3.2.9"
   },
   "dependencies": {
     "axios": "^0.27.2",
     "custom-electron-titlebar": "^4.1.1",
+    "discord-auto-rpc": "^1.0.17",
+    "discord-rpc": "^4.0.1",
+    "get-window-by-name": "^2.0.0",
     "jquery": "^3.6.0",
     "node-downloader-helper": "^2.1.4",
-    "sweetalert2": "^11.5.2",
-    "wincrypt": "^1.5.0"
+    "qiao-regedit": "^0.1.5",
+    "sweetalert2": "^11.5.2"
   }
 }

preload/preload.js

@@ -7,7 +7,7 @@ let loggedIn = false;
 
 window.addEventListener('DOMContentLoaded', () => {
     titlebar = new Titlebar({
-        backgroundColor: Color.fromHex("#303030"),
+        backgroundColor: Color.fromHex("#24283B"),
         itemBackgroundColor: Color.fromHex("#121212"),
         menu: null,
         maximizable: false
@@ -16,7 +16,6 @@ window.addEventListener('DOMContentLoaded', () => {
     titlebar.updateTitle(`${appInfo.appName} ${appInfo.appVersion}`);
 
     const $ = require('jquery');
-    const axios = require('axios').default;
     const Swal = require('sweetalert2');
 
     $('#account-action').on('click', () => {
@@ -25,7 +24,7 @@ window.addEventListener('DOMContentLoaded', () => {
         } else {
             $('#welcome-text').text(`Nice to see you!`);
             $('#account-action').text('Click to login');
-            $('#user-img').prop('src', `https://a.ez-pp.farm/0`)
+            $('.user-image').css('background-image', `url(https://a.ez-pp.farm/0)`)
             loggedIn = false;
             ipcRenderer.send("perform-logout");
             Swal.fire({
@@ -69,6 +68,28 @@ window.addEventListener('DOMContentLoaded', () => {
                 $('#launch-btn').html('Updating...');
                 ipcRenderer.send("do-update");
                 break;
+            case "missing-folder":
+                const responseData = await ipcRenderer.invoke('set-osu-dir');
+                if (!responseData)
+                    return;
+                if (responseData.validOsuDir) {
+                    Swal.fire({
+                        title: 'Success!',
+                        text: 'osu! folder set.',
+                        icon: 'success',
+                        confirmButtonText: 'Cool'
+                    })
+                    $('#currentOsuPath').text(responseData.folderPath);
+                    ipcRenderer.send("do-update-check");
+                } else {
+                    Swal.fire({
+                        title: 'Uh oh!',
+                        text: 'The selected folder is not a osu! directory.',
+                        icon: 'error',
+                        confirmButtonText: 'Oops.. my bad!'
+                    })
+                }
+                break;
         }
     });
 
@@ -95,7 +116,7 @@ window.addEventListener('DOMContentLoaded', () => {
         $('#login-password').val("");
         $('#welcome-text').text(`Welcome back, ${responseData.user.name}!`);
         $('#account-action').text('Not you?');
-        $('#user-img').prop('src', `https://a.ez-pp.farm/${responseData.user.id}`);
+        $('.user-image').css('background-image', `url(https://a.ez-pp.farm/${responseData.user.id})`);
         loggedIn = true;
         changePage('launch');
     })
@@ -138,26 +159,28 @@ window.addEventListener('DOMContentLoaded', () => {
                 changePage("launch");
                 $('#welcome-text').text(`Welcome back, ${data.user.name}!`);
                 $('#account-action').text('Not you?');
-                $('#user-img').prop('src', `https://a.ez-pp.farm/${data.user.id}`)
+                $('.user-image').css('background-image', `url(https://a.ez-pp.farm/${data.user.id})`);
                 loggedIn = true;
                 break;
         }
     })
 
     ipcRenderer.on('status_update', (event, status) => {
-        currentState = status.type;
         switch (status.type) {
             case "up-to-date":
                 $("#launch-btn").attr('disabled', false);
                 $('#launch-btn').html('Launch');
+                currentState = status.type;
                 break;
             case "update-available":
                 $("#launch-btn").attr('disabled', false);
                 $('#launch-btn').html('Update');
+                currentState = status.type;
                 break;
             case "missing-folder":
-                $("#launch-btn").attr('disabled', true);
+                $("#launch-btn").attr('disabled', false);
                 $('#launch-btn').html('set your osu! folder');
+                currentState = status.type;
                 break;
             case "error":
                 Swal.fire({
@@ -168,6 +191,24 @@ window.addEventListener('DOMContentLoaded', () => {
                 });
                 ipcRenderer.send("do-update-check");
                 break;
+            case "info":
+                Swal.fire({
+                    title: 'Info!',
+                    text: status.message,
+                    icon: 'info',
+                    confirmButtonText: 'Okay'
+                });
+                break;
+            case "package-issue":
+                Swal.fire({
+                    title: 'Uh oh!',
+                    text: status.message,
+                    icon: 'error',
+                    confirmButtonText: 'Okay'
+                });
+                $("#launch-btn").attr('disabled', true);
+                $('#launch-btn').html('missing packages');
+                break;
             case "update-complete":
                 Swal.fire({
                     title: 'Yaaay!',

terminalUtil.js

@@ -0,0 +1,16 @@
+const exec = require('child_process').exec;
+
+const execPromise = function (cmd) {
+    return new Promise(function (resolve, reject) {
+        exec(cmd, function (err, stdout) {
+            if (err) return reject(err);
+            resolve(stdout);
+        });
+    });
+}
+
+const execCommand = async (command) => {
+    return await execPromise(command);
+}
+
+module.exports = { execCommand };

test/encrypt.js

@@ -1,26 +0,0 @@
-const dpapi = require('wincrypt');
-const entropyBuffer = Buffer.from('cu24180ncjeiu0ci1nwui', 'utf-8');
-
-const run = async () => {
-    const stringToEncrypt = "Test123456!";
-    
-
-    const encrypted = await encryptString(stringToEncrypt)
-    console.log(encrypted);
-    const decrypted = await decryptString(encrypted);
-    console.log(decrypted);
-
-}
-
-async function encryptString(value) {
-    const encryptedString = await dpapi.protect(Buffer.from(value, 'utf-8'), entropyBuffer, 'CurrentUser');
-    const encodedBase64 = Buffer.from(encryptedString, 'utf-8').toString('base64');
-    return encodedBase64;
-}
-
-async function decryptString(value) {
-    const decrypted = await dpapi.unprotect(Buffer.from(value, 'base64'), entropyBuffer, 'CurrentUser');
-    return decrypted.toString();
-}
-
-run();

ui/windowManager.js

@@ -12,7 +12,7 @@ module.exports = {
             minWidth: windowWidth / 1.25,
             frame: false,
             titleBarStyle: 'hidden',
-            backgroundColor: "#121212",
+            backgroundColor: "#24283B",
             resizable: false,
             maximizable: false,
             minimizable: true,
@@ -34,9 +34,6 @@ module.exports = {
 
         window.webContents.setUserAgent(`${appInfo.appName} ${appInfo.appVersion}`);
         attachTitlebarToWindow(window);
-        // window.webContents.openDevTools({
-        //     mode: "detach"
-        // });
 
         return window;
     },