bump version

.github/workflows/build.yml

@@ -0,0 +1,50 @@
+name: Compile and Release
+
+on:
+  release:
+    types: [released]
+
+jobs:
+  build-linux:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [20.x]
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+      - run: npm ci
+      - run: npm run rebuild
+      - run: npm run pack-linux
+      - name: Add Artifact to Workflow
+        uses: actions/upload-artifact@v3
+        with:
+          name: artifact
+          path: |
+            release/*.AppImage
+
+  build-win:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        node-version: [20.x]
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+      - run: npm ci
+      - run: npm run rebuild
+      - run: npm run pack-win
+      - name: Add Artifact to Workflow
+        uses: actions/upload-artifact@v3
+        with:
+          name: artifact
+          path: |
+            release/*.exe

.vscode/launch.json

@@ -0,0 +1,17 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Debug Main Process",
+      "type": "node",
+      "request": "launch",
+      "cwd": "${workspaceFolder}",
+      "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
+      "windows": {
+        "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron.cmd"
+      },
+      "args" : ["."],
+      "outputCapture": "std"
+    }
+  ]
+}

app.js

@@ -11,8 +11,11 @@ const windowName = require('get-window-by-name');
 const terminalUtil = require('./terminalUtil');
 const osUtil = require('./osUtil');
 const appInfo = require('./appInfo');
+const executeUtil = require("./executeUtil");
 const { DownloaderHelper } = require('node-downloader-helper');
 
+let shouldPatch = false;
+let patcherLoc = undefined;
 let tempOsuPath;
 let osuWindowInfo;
 let isIngame;
@@ -36,6 +39,13 @@ const run = () => {
           if (!osuLoaded) {
             osuLoaded = true;
             //TODO: do patch
+            setTimeout(() => {
+              console.log("yes");
+              if (shouldPatch) {
+                console.log("running " + patcherLoc + " in dir " + path.dirname(patcherLoc));
+                executeUtil.runFileDetached(path.dirname(patcherLoc), patcherLoc);
+              }
+            }, 5000);
           }
           const windowTitle = firstInstance.processTitle;
           let rpcOsuVersion = "";
@@ -120,7 +130,6 @@ const run = () => {
 
   rpc.connect();
 
-
   let mainWindow;
   let tray = null
   app.whenReady().then(async () => {
@@ -149,6 +158,7 @@ const run = () => {
       {
         label: 'Exit',
         click: function () {
+          if (isIngame) return;
           app.exit(0);
         }
       }
@@ -158,6 +168,9 @@ const run = () => {
     tray.setContextMenu(trayMenu)
 
     mainWindow = createWindow();
+    mainWindow.on('close', (e) => {
+      if (isIngame) e.preventDefault();
+    });
     mainWindow.once('show', async () => {
       await updateConfigVars(mainWindow);
       await tryLogin(mainWindow);
@@ -197,9 +210,14 @@ const run = () => {
         const osuFolder = await config.get("osuPath");
         if (!osuFolder || osuFolder == "") {
           const foundFolder = await osuUtil.findOsuInstallation();
-          console.log("osu! Installation located at: ", foundFolder);
+          if (foundFolder && osuUtil.isValidOsuFolder(foundFolder)) {
+            mainWindow.webContents.send('alert_message', foundFolder);
           }
         }
+      }
+    });
+    ipcMain.on("alert_response", async (event, path) => {
+      await config.set("osuPath", path);
     })
     app.on('activate', function () {
       if (BrowserWindow.getAllWindows().length === 0) mainWindow = createWindow();
@@ -207,7 +225,13 @@ const run = () => {
     app.on('window-all-closed', () => {
       app.quit()
     })
-    ipcMain.handle('launch', async () => {
+    ipcMain.handle('launch', async (e, opts) => {
+      console.log(opts);
+      shouldPatch = "patch" in opts && opts.patch;
+      const osuFolder = await config.get("osuPath");
+      patcherLoc = path.join(osuFolder, "EZPPLauncher", "patcher.exe");
+
+      await osuUtil.updateOsuCfg(path.join(osuFolder, "osu!.cfg"));
       const osuConfig = await osuUtil.getLatestConfig(tempOsuPath);
       const username = await config.get('username');
       const password = await config.get('password');
@@ -221,13 +245,20 @@ const run = () => {
         await osuUtil.setConfigValue(osuConfig.path, "Username", "");
         await osuUtil.setConfigValue(osuConfig.path, "Password", "");
       }
+      await osuUtil.replaceUI(osuFolder, true);
       rpc.updateState("Launching osu!...");
       isIngame = true;
+      mainWindow.closable = false;
       if (mainWindow.isVisible()) mainWindow.hide();
       const result = await osuUtil.startOsuWithDevServer(tempOsuPath, "ez-pp.farm", async () => {
-        isIngame = false;
         if (!mainWindow.isVisible()) mainWindow.show();
+        setTimeout(async () => {
+          isIngame = false;
+          osuLoaded = false;
+          await osuUtil.replaceUI(osuFolder, false);
           await doUpdateCheck(mainWindow);
+          mainWindow.closable = true;
+        }, 2000);
       });
       return result;
     })

appInfo.js

@@ -2,7 +2,7 @@ const { default: axios } = require("axios");
 const { compareVersions } = require("compare-versions");
 
 const appName = "EZPPLauncher"
-const appVersion = "1.1.4";
+const appVersion = "1.2.0";
 
 const hasUpdate = async () => {
     const releaseInfo = await axios.get(`https://git.ez-pp.farm/api/v1/repos/EZPPFarm/${appName}/releases/latest`);

assets/launcher.css

@@ -13,6 +13,19 @@ body {
   background-color: hsl(var(--main-bg), 24%, 19%);
 }
 
+p.text-white {
+  margin: .5rem 0;
+  color: white;
+}
+
+.quotetext {
+  color: white;
+  background-color: #727272;
+  border-radius: .35rem;
+  font-size: .95rem;
+  padding: .25rem .5rem;
+}
+
 .sections {
   display: flex;
   flex-flow: column;

executeUtil.js

@@ -4,11 +4,12 @@ module.exports = {
         childProcess.execFile(file, args, {
             cwd: folder
         }, (_err, _stdout, _stderr) => {
+            if (onExit)
                 onExit();
         });
     },
     runFileDetached: (folder, file, args) => {
-        const subprocess = childProcess.spawn(file + " " + args, {
+        const subprocess = childProcess.spawn(file + (args ? " " + args : ''), {
             cwd: folder,
             detached: true,
             stdio: 'ignore'

html/index.html

@@ -63,9 +63,9 @@
                                         <img src="../assets/logo.png" height="150">
                                     </div>
                                     <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 />
+                                        <button class="btn btn-lg btn-launch btn-accent" id="launch-btn" disabled>Launch</button>
+                                        <div class="patch-checkbox">
+                                            <input type="checkbox" id="enablePatching" checked/>
                                             <label for="enablePatching" style="display: initial;">enable
                                                 Patching</label>
                                         </div>

osuUtil.js

@@ -8,8 +8,19 @@ const { EventEmitter } = require('events');
 const { DownloaderHelper } = require('node-downloader-helper');
 
 const checkUpdateURL = "https://osu.ppy.sh/web/check-updates.php?action=check&stream=";
+const customUIDLLPath = "https://ez-pp.farm/assets/ezpp!ui.dll";
+const customUIDLLHash = "https://ez-pp.farm/assets/ezpp!ui.md5";
+const customUIDLLName = "ezpp!ui.dll";
+
+const patcherHook = "https://ez-pp.farm/assets/patch.hook.dll";
+const patcherHookHash = "https://ez-pp.farm/assets/patch.hook.md5";
+const patcherHookName = "patch.hook.dll";
+const patcherExe = "https://ez-pp.farm/assets/patcher.exe";
+const patcherExeHash = "https://ez-pp.farm/assets/patcher.md5"
+const patcherExeName = "patcher.exe";
+
 const ignoredOsuEntities = [
-    'osu!auth.dll'
+  'osu!auth.dll',
 ]
 const osuEntities = [
   'avcodec-51.dll',
@@ -19,11 +30,8 @@ const osuEntities = [
   'bass_fx.dll',
   'collection.db',
   'd3dcompiler_47.dll',
-    'Data',
-    'Downloads',
   'libEGL.dll',
   'libGLESv2.dll',
-    'Logs',
   'Microsoft.Ink.dll',
   'OpenTK.dll',
   'osu!.cfg',
@@ -36,8 +44,6 @@ const osuEntities = [
   'presence.db',
   'pthreadGC2.dll',
   'scores.db',
-    'Skins',
-    'Songs'
 ]
 
 async function isValidOsuFolder(path) {
@@ -83,12 +89,30 @@ async function getUpdateFiles(releaseStream) {
   return releaseData.data;
 }
 
+async function getEZPPUIMD5() {
+  const releaseData = await axios.get(customUIDLLHash, {});
+  return releaseData.data;
+}
+
+async function getMD5Hash(url) {
+  const releaseData = await axios.get(url, {});
+  return releaseData.data;
+}
+
 async function filesThatNeedUpdate(osuPath, updateFiles) {
   const filesToDownload = [];
   for (const updatedFile of updateFiles) {
-        const fileName = updatedFile.filename;
-        const fileHash = updatedFile.file_hash;
-        const fileURL = updatedFile.url_full;
+    let fileName = updatedFile.filename;
+    let fileHash = updatedFile.file_hash;
+    let fileURL = updatedFile.url_full;
+
+    if ("url_patch" in updatedFile && updatedFile.url_patch != undefined) {
+      const stripped = updatedFile.url_patch.split("_");
+      fileHash = stripped[stripped.length - 1];
+      const lastIndex = fileURL.lastIndexOf("/");
+      const baseUrl = fileURL.slice(0, lastIndex);
+      fileURL = baseUrl + "/f_" + fileHash;
+    }
 
     if (ignoredOsuEntities.includes(fileName)) continue;
 
@@ -100,7 +124,7 @@ async function filesThatNeedUpdate(osuPath, updateFiles) {
         filesToDownload.push({
           fileName,
           fileURL
-                })
+        });
       }
     } else {
       filesToDownload.push({
@@ -109,6 +133,74 @@ async function filesThatNeedUpdate(osuPath, updateFiles) {
       });
     }
   }
+
+  const ezppUI = path.join(osuPath, "EZPPLauncher", customUIDLLName);
+  const hook = path.join(osuPath, "EZPPLauncher", patcherHookName);
+  const patcher = path.join(osuPath, "EZPPLauncher", patcherExeName);
+
+  if (await fu.existsAsync(hook)) {
+    const latestHookMd5Hash = (await getMD5Hash(patcherHookHash)).toLowerCase().trim();
+    const binaryHookContents = await fs.promises.readFile(hook);
+    const existingHookMD5 = crypto.createHash("md5").update(binaryHookContents).digest("hex").toLowerCase().trim();
+    if (existingHookMD5 != latestHookMd5Hash) {
+      filesToDownload.push({
+        folder: "EZPPLauncher",
+        fileName: patcherHookName,
+        fileURL: patcherHook
+      });
+      console.log("patcher has wrong hashsum (" + existingHookMD5 + " / " + latestHookMd5Hash + ")");
+    }
+  } else {
+    filesToDownload.push({
+      folder: "EZPPLauncher",
+      fileName: patcherHookName,
+      fileURL: patcherHook
+    });
+    console.log("patcher does not exist");
+  }
+
+  if (await fu.existsAsync(patcher)) {
+    const latestPatchMd5Hash = (await getMD5Hash(patcherExeHash)).toLowerCase().trim();
+    const binaryPatchContents = await fs.promises.readFile(patcher);
+    const existingPatchMD5 = crypto.createHash("md5").update(binaryPatchContents).digest("hex").toLowerCase().trim();
+    if (existingPatchMD5 != latestPatchMd5Hash) {
+      filesToDownload.push({
+        folder: "EZPPLauncher",
+        fileName: patcherExeName,
+        fileURL: patcherExe
+      });
+      console.log("patcher has wrong hashsum (" + existingPatchMD5 + " / " + latestPatchMd5Hash + ")")
+    }
+  } else {
+    filesToDownload.push({
+      folder: "EZPPLauncher",
+      fileName: patcherExeName,
+      fileURL: patcherExe
+    });
+    console.log("patcher does not exist");
+  }
+
+  if (await fu.existsAsync(ezppUI)) {
+    const latestUIMd5Hash = (await getMD5Hash(customUIDLLHash)).toLowerCase().trim();
+    const binaryUIContents = await fs.promises.readFile(ezppUI);
+    const existingUIMD5 = crypto.createHash("md5").update(binaryUIContents).digest("hex").toLowerCase().trim();
+    if (existingUIMD5 != latestUIMd5Hash) {
+      filesToDownload.push({
+        folder: "EZPPLauncher",
+        fileName: "ezpp!ui.dll",
+        fileURL: customUIDLLPath
+      })
+    }
+  } else {
+    filesToDownload.push({
+      folder: "EZPPLauncher",
+      fileName: "ezpp!ui.dll",
+      fileURL: customUIDLLPath
+    })
+  }
+
+  console.log(JSON.stringify(filesToDownload, null, 2))
+
   return filesToDownload;
 }
 
@@ -116,12 +208,19 @@ async function downloadUpdateFiles(osuPath, filesToUpdate) {
   const eventEmitter = new EventEmitter();
   let completedIndex = 0;
   filesToUpdate.forEach(async (fileToUpdate) => {
-        const filePath = path.join(osuPath, fileToUpdate.fileName);
-        console.log(filePath);
+
+    let tempPath = osuPath;
+
+    if ("folder" in fileToUpdate) {
+      tempPath = path.join(tempPath, fileToUpdate.folder);
+      if (!(await fu.existsAsync(tempPath))) await fs.promises.mkdir(tempPath);
+    }
+
+    const filePath = path.join(tempPath, fileToUpdate.fileName);
     if (await fu.existsAsync(filePath))
       await fs.promises.rm(filePath);
 
-        const fileDownload = new DownloaderHelper(fileToUpdate.fileURL, osuPath, {
+    const fileDownload = new DownloaderHelper(fileToUpdate.fileURL, tempPath, {
       fileName: fileToUpdate.fileName,
       override: true,
     });
@@ -174,6 +273,41 @@ async function setConfigValue(configPath, key, value) {
   }
   await fs.promises.writeFile(configPath, configLines.join("\n"), 'utf-8');
 }
+
+async function updateOsuCfg(cfgPath) {
+  const osuFolder = path.dirname(cfgPath);
+  const fileStream = await fs.promises.readFile(cfgPath, "utf-8");
+  const lines = fileStream.split(/\r?\n/);
+  const newLines = [];
+  for (const line of lines) {
+    if (line.includes(' = ')) {
+      const argsPair = line.split(' = ', 2);
+      const keyname = argsPair[0]
+      const value = argsPair[1];
+
+      if (keyname.startsWith("h_")) {
+        const filename = keyname.substring(2, keyname.length);
+        const filepath = path.join(osuFolder, 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(`${keyname} = ${existingFileMD5}`);
+      } else {
+        newLines.push(line);
+      }
+    }
+  }
+
+  const ezppUI = path.join(osuFolder, customUIDLLName);
+  if (fs.existsSync(ezppUI)) {
+    const binaryFileContents = await fs.promises.readFile(ezppUI);
+    const existingFileMD5 = crypto.createHash("md5").update(binaryFileContents).digest("hex");
+    newLines.push(`h_${customUIDLLName} = ${existingFileMD5}`);
+  }
+  await fs.promises.writeFile(cfgPath, newLines.join("\n"), 'utf-8');
+}
+
 async function findOsuInstallation() {
   const regedit = require('qiao-regedit');
 
@@ -183,14 +317,32 @@ async function findOsuInstallation() {
     if (line.includes("REG_SZ")) {
       let value = (line.trim().split("    ")[2]);
       value = value.substring(1, value.length - 3);
-            return value.trim();
+      return path.dirname(value.trim());
     }
   }
   return undefined;
 }
 
+async function replaceUI(folder, isStart) {
+  const ezppUIFile = path.join(folder, "EZPPLauncher", customUIDLLName);
+  const osuUIFile = path.join(folder, "osu!ui.dll");
+  const osuUIFileBackup = path.join(folder, "osu!ui.dll.bak");
+  if (isStart) {
+    if (fs.existsSync(osuUIFileBackup)) await fs.promises.unlink(osuUIFileBackup);
+    await fs.promises.rename(osuUIFile, osuUIFileBackup);
+    await new Promise((res) => setTimeout(res, 1000));
+    await fs.promises.copyFile(ezppUIFile, osuUIFile);
+  } else {
+    if (!fs.existsSync(osuUIFileBackup)) return;
+    await fs.promises.unlink(osuUIFile);
+    await new Promise((res) => setTimeout(res, 1000));
+    await fs.promises.rename(osuUIFileBackup, osuUIFile);
+  }
+
+}
+
 module.exports = {
   isValidOsuFolder, getLatestConfig, getUpdateFiles, filesThatNeedUpdate,
   downloadUpdateFiles, startOsuWithDevServer: startWithDevServer, setConfigValue,
-    findOsuInstallation
+  findOsuInstallation, replaceUI, updateOsuCfg, getEZPPUIMD5
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ezpplauncher",
-  "version": "1.1.4",
+  "version": "1.2.0",
   "main": "app.js",
   "license": "MIT",
   "author": "HorizonCode",
@@ -36,7 +36,8 @@
     "pack-win": "electron-builder --win --x64",
     "pack-linux": "electron-builder --linux --x64",
     "pack-mac": "electron-builder --mac --x64",
-    "dist": "electron-builder"
+    "dist": "electron-builder",
+    "postinstall": "electron-builder install-app-deps"
   },
   "devDependencies": {
     "electron": "^24.2.0",

preload/preload.js

@@ -48,7 +48,7 @@ window.addEventListener('DOMContentLoaded', () => {
       case "up-to-date":
         $("#launch-btn").attr('disabled', true);
         $('#launch-btn').html('Launching...');
-        const result = await ipcRenderer.invoke("launch");
+        const result = await ipcRenderer.invoke("launch", { patch: $('#enablePatching').is(':checked') });
         if (!result) {
           Swal.fire({
             title: 'Uh oh!',
@@ -188,6 +188,28 @@ window.addEventListener('DOMContentLoaded', () => {
     }
   })
 
+  ipcRenderer.on('alert_message', async (event, path) => {
+    const res = await Swal.fire({
+      title: 'Hey!',
+      html: `<p class="text-white">Detected a osu! installation at</p><span class="quotetext">${path}</span><p class="text-white">Is this correct?</p>`,
+      icon: 'info',
+      showCancelButton: true,
+      confirmButtonText: 'Yes',
+      cancelButtonText: 'No',
+    });
+    if (res.isConfirmed) {
+      $('#currentOsuPath').text(path);
+      ipcRenderer.send('alert_response', path);
+      Swal.fire({
+        title: 'Success!',
+        text: 'osu! folder set.',
+        icon: 'success',
+        confirmButtonText: 'Cool'
+      })
+      ipcRenderer.send("do-update-check");
+    }
+  })
+
   ipcRenderer.on('status_update', (event, status) => {
     switch (status.type) {
       case "up-to-date":