fix: Some additional fixes

Author: TheKing-OfTime

src/main/modules/patcher.js

@@ -199,6 +199,7 @@ export async function installMod(callback, { patchType = PatchTypes.DEFAULT, fro
     await prepareModAsarFile(patchType, asarPath, callback);
 
     await createBackups(callback, asarPath);
+
     await replaceAsar(callback, patchType, fromAsarSrc, asarPath);
 
     const isAsarIntegrityBypassed = await bypassAsarIntegrity(YM_PATH, callback);
@@ -209,6 +210,7 @@ export async function installMod(callback, { patchType = PatchTypes.DEFAULT, fro
     }
 
     callback(1, 'Installed!');
+
     logger.log('Installed mod version:', modVersion, 'YM version:', ymMetadata.version, 'Patch type:', patchType);
 
     await clearCaches(callback);
@@ -248,7 +250,7 @@ async function downloadAsar(callback, metadata) {
 
     const downloadPath = shouldDecompress ? (compressionType === 'zst' ? ASAR_ZST_TMP_PATH : ASAR_GZ_TMP_PATH) : ASAR_TMP_PATH;
 
-    await downloadFile(url, path.join(downloadPath),
+    await downloadFile(url, downloadPath,
         (progress, label) => {
             callback(progress*0.6, label);
         }
@@ -286,7 +288,7 @@ async function createDirIfNotExist(target) {
 }
 
 async function decompressFile(target, dest, compressionType) {
-    const compressedData = await fsp.readFile(target);
+    const compressedData = await fso.promises.readFile(target);
 
     const decompressedData = await (compressionType === 'zst' ? zstdDecompressPromise(compressedData) : unzipPromise(compressedData));
 

src/main/modules/utils.js

@@ -1,9 +1,10 @@
 import path from "path";
 import { promisify } from 'util'
+import { pipeline } from 'stream/promises';
 import { exec, spawn } from 'child_process'
 import { app, nativeImage } from "electron";
 import axios from "axios";
-import o_fs from "original-fs";
+import fso from "original-fs";
 import unzipper from "unzipper";
 import fs from "fs";
 import { Logger } from "./Logger.js";
@@ -24,7 +25,7 @@ export const getNativeImg = (relativePath) => {
         : path.join(__dirname, '..', '..', 'assets')
 
     const filePath = path.join(basePath, relativePath);
-    if (!filePath || !o_fs.existsSync(filePath)) {
+    if (!filePath || !fso.existsSync(filePath)) {
         logger.log(`File path is undefined for relative path: ${filePath}`);
     }
     return nativeImage.createFromPath(filePath)
@@ -130,36 +131,19 @@ export async function downloadFile(url, dest, callback) {
         onDownloadProgress: progress => {
             callback(progress.progress, `Downloading ${path.basename(dest)}...`);
         }
-    })
-    return new Promise((resolve, reject) => {
-        const writer = o_fs.createWriteStream(dest);
-
-        response.data.pipe(writer);
-
-        writer.on('finish', () => {
-            writer.close((err)=>{
-                if (err) {
-                    callback(-1, 'Error closing file: ' + err);
-                    reject(err);
-                    return;
-                }
-                callback(1, 'Download completed: ' + path.basename(dest));
-            });
-            resolve(dest);
-        });
-
-        writer.on('error', (error) => {
-            writer.close?.();
-            callback(-1, 'Download error: ' + error);
-            reject(error);
-        });
-
-        response.data.on('error', (error) => {
-            writer.close?.();
-            callback(-1, 'Download error: ' + error);
-            reject(error);
-        });
     });
+
+    const writer = fso.createWriteStream(dest);
+
+    try {
+        await pipeline(response.data, writer);
+        callback(1, 'Download completed: ' + path.basename(dest));
+        return dest;
+    } catch (err) {
+        writer.close();
+        callback(-1, 'Download error: ' + err);
+        throw err;
+    }
 }
 
 export async function checkIfLegacyYMInstalled() {