fix building scripts, update electron

README.md

@@ -12,7 +12,7 @@ The Launcher is a "plug and play thing", download it, place it on the desktop an
 ## Features
 
 * Automatic osu! client updating before Launch
-* Account saving (soon)
+* Account saving
 
 ## Used Libraries
 

app.js

@@ -8,6 +8,7 @@ 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;
@@ -90,7 +91,7 @@ const run = () => {
                     rpcOsuVersion = splitArray[0];
                     currentMap = splitArray[1];
                     if (currentMap.endsWith(".osu")) {
-                        rpc.updateState("Editing...");
+                        rpc.updateState("Editing/Modding...");
                         currentMap = currentMap.substring(0, currentMap.length - 4);
                     }
                     else rpc.updateState("Playing...");
@@ -126,6 +127,15 @@ const run = () => {
             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) {

appInfo.js

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

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;

discordPresence.js

@@ -7,22 +7,23 @@ 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: [
+    buttons: actionButtons,
-        {
-            label: "Download the Launcher",
-            url: "https://ez-pp.farm/download"
-        },
-        {
-            label: "Join EZPPFarm",
-            url: "https://discord.com/invite/g8Bh7RaKPg"
-        }
-    ],
     instance: false,
 };
 
@@ -53,16 +54,7 @@ module.exports = {
             smallImageText: osuVersion ? osuVersion : "  ",
             largeImageKey: "ezppfarm",
             largeImageText: appInfo.appName + " " + appInfo.appVersion,
-            buttons: [
+            buttons: actionButtons,
-                {
-                    label: "Download the Launcher",
-                    url: "https://ez-pp.farm/download"
-                },
-                {
-                    label: "Join EZPPFarm",
-                    url: "https://discord.com/invite/g8Bh7RaKPg"
-                }
-            ],
             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

@@ -64,9 +64,10 @@
                                     </div>
                                     <div class="launch-button-section">
                                         <button class="btn btn-lg btn-launch btn-accent" id="launch-btn">Launch</button>
-                                        <div class="patch-checkbox">
+                                        <div class="patch-checkbox" style="display: none;">
                                             <input type="checkbox" id="enablePatching" disabled />
-                                            <label for="enablePatching" style="display: initial;">enable Patching</label>
+                                            <label for="enablePatching" style="display: initial;">enable
+                                                Patching</label>
                                         </div>
                                     </div>
                                 </div>
@@ -114,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

@@ -8,6 +8,9 @@ const { EventEmitter } = require('events');
 const { DownloaderHelper } = require('node-downloader-helper');
 
 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',
@@ -87,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);
@@ -96,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;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ezpplauncher",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "main": "app.js",
   "license": "MIT",
   "author": "HorizonCode",
@@ -33,17 +33,15 @@
   "scripts": {
     "start": "electron .",
     "rebuild": "electron-rebuild -f -w get-window-by-name",
-    "pack-win": "electron-builder --x64",
+    "pack-win": "electron-builder --win --arm64 --x64",
-    "pack-win32": "electron-builder --ia32",
+    "pack-linux": "electron-builder --linux --arm64 --x64",
-    "pack-winarm": "electron-builder --arm64",
+    "pack-mac": "electron-builder --mac --arm64 --x64",
-    "pack-linux": "electron-builder --dir --linux --ia32 --arm64 --x64",
-    "pack-mac": "electron-builder --dir --mac --ia32 --arm64 --x64",
     "dist": "electron-builder"
   },
   "devDependencies": {
-    "electron": "^21.1.1",
+    "electron": "^24.2.0",
-    "electron-builder": "^23.0.3",
+    "electron-builder": "^23.6.0",
-    "electron-packager": "^15.5.1",
+    "electron-packager": "^17.1.1",
     "electron-rebuild": "^3.2.9"
   },
   "dependencies": {

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

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;
     },