fix: Make utils.js/copy recursive

Author: TheKing-OfTime

src/main/constants/paths.js

@@ -5,6 +5,7 @@ import electron from 'electron';
 export const TMP_PATH = path.join(electron.app.getPath('userData'), '/temp');
 export const ASAR_TMP_PATH = path.join(TMP_PATH, 'app.asar');
 export const ASAR_UNPACKED_ZIP_TMP_PATH = path.join(TMP_PATH, 'app.asar.unpacked.zip');
+export const ASAR_UNPACKED_TMP_PATH = path.join(TMP_PATH, 'app.asar.unpacked');
 export const ASAR_GZ_TMP_PATH = path.join(TMP_PATH, 'app.asar.gz');
 export const ASAR_ZST_TMP_PATH = path.join(TMP_PATH, 'app.asar.zst');
 export const ASAR_TMP_BACKUP_PATH = path.join(TMP_PATH, 'app.asar.backup');

src/main/modules/patcher.js

@@ -13,7 +13,7 @@ import plist from 'plist';
 import { getState } from "./state.js";
 import Events from "../types/Events.js";
 import PatchTypes from '../types/PatchTypes.js';
-import { ASAR_ZST_TMP_PATH, ASAR_GZ_TMP_PATH, ASAR_TMP_PATH, EXTRACTED_ENTITLEMENTS_PATH, TMP_PATH, ASAR_TMP_BACKUP_PATH, YM_EXE_TMP_BACKUP_PATH, ASAR_UNPACKED_ZIP_TMP_PATH } from '../constants/paths.js';
+import { ASAR_ZST_TMP_PATH, ASAR_GZ_TMP_PATH, ASAR_TMP_PATH, EXTRACTED_ENTITLEMENTS_PATH, TMP_PATH, ASAR_TMP_BACKUP_PATH, YM_EXE_TMP_BACKUP_PATH, ASAR_UNPACKED_ZIP_TMP_PATH, ASAR_UNPACKED_TMP_PATH } from '../constants/paths.js';
 import { Logger } from "./Logger.js";
 import { execFile } from 'child_process';
 
@@ -28,7 +28,7 @@ import {
     launchYandexMusic,
     unzipFolder,
     createDirIfNotExist,
-    copyFile,
+    copy,
     decompressFile,
 } from "./utils.js";
 import { LATEST_MOD_RELEASE_URL, YM_RELEASE_METADATA_URL } from '../constants/urls.js';
@@ -81,6 +81,7 @@ async function clearCaches(callback) {
     if (fso.existsSync(ASAR_ZST_TMP_PATH)) await fso.promises.unlink(ASAR_ZST_TMP_PATH);
     if (fso.existsSync(ASAR_GZ_TMP_PATH)) await fso.promises.unlink(ASAR_GZ_TMP_PATH);
     if (fso.existsSync(ASAR_TMP_PATH)) await fso.promises.unlink(ASAR_TMP_PATH);
+    if (fso.existsSync(ASAR_UNPACKED_TMP_PATH)) await fso.promises.unlink(ASAR_UNPACKED_TMP_PATH);
     if (fso.existsSync(ASAR_UNPACKED_ZIP_TMP_PATH)) await fso.promises.unlink(ASAR_UNPACKED_ZIP_TMP_PATH);
     if (fso.existsSync(ASAR_TMP_BACKUP_PATH)) await fso.promises.unlink(ASAR_TMP_BACKUP_PATH);
     if (fso.existsSync(YM_EXE_TMP_BACKUP_PATH)) await fso.promises.unlink(YM_EXE_TMP_BACKUP_PATH);
@@ -111,25 +112,25 @@ async function postInstallTasks(ymMetadata, wasYmClosed, callback) {
 async function applyBackups(callback, asarPath) {
 
     callback(-1, 'Reverting ASAR replace...');
-    await copyFile(ASAR_TMP_BACKUP_PATH, asarPath);
+    await copy(ASAR_TMP_BACKUP_PATH, asarPath);
     callback(-1, 'ASAR replace reverted.');
 
     if (isWin && YM_EXE_PATH && fs.existsSync(YM_EXE_PATH) && fs.existsSync(YM_EXE_TMP_BACKUP_PATH)) {
         callback(-1, 'Reverting EXE patch...');
-        await copyFile(YM_EXE_TMP_BACKUP_PATH, YM_EXE_PATH);
+        await copy(YM_EXE_TMP_BACKUP_PATH, YM_EXE_PATH);
         callback(-1, 'EXE patch reverted.');
     }
 }
 
 async function createBackups(callback, asarPath) {
     callback(0.9, 'Creating ASAR backup...', undefined, 'vrb');
-    await copyFile(asarPath, ASAR_TMP_BACKUP_PATH);
+    await copy(asarPath, ASAR_TMP_BACKUP_PATH);
     callback(0.9, 'ASAR backup created.', undefined, 'vrb');
 }
 
 async function replaceAsar(callback, patchType, fromAsarSrc, asarPath) {
     callback(0.9, 'Replacing ASAR...');
-    await copyFile((patchType === PatchTypes.FROM_MOD && fromAsarSrc) ? fromAsarSrc : ASAR_TMP_PATH, asarPath);
+    await copy((patchType === PatchTypes.FROM_MOD && fromAsarSrc) ? fromAsarSrc : ASAR_TMP_PATH, asarPath);
     callback(0.9, 'ASAR replaced.');
 }
 
@@ -174,9 +175,14 @@ async function prepareModAsarFile(patchType, asarPath, callback) {
 
     callback(0.8, 'Unzipping app.asar.unpacked.zip file...', undefined, 'vrb');
 
-    await unzipFolder(ASAR_UNPACKED_ZIP_TMP_PATH, path.join(path.dirname(asarPath), 'app.asar.unpacked'));
+    await unzipFolder(ASAR_UNPACKED_ZIP_TMP_PATH, ASAR_UNPACKED_TMP_PATH);
 
     callback(0.9, 'Asar.unpacked unzipped...');
+
+
+    callback(0.9, 'Copying asar.unpacked to app directory...', undefined, 'vrb');
+    await copy(ASAR_UNPACKED_TMP_PATH, path.join(path.dirname(asarPath), 'app.asar.unpacked'));
+    callback(0.9, 'Asar.unpacked copied.');
 }
 
 export async function installMod(callback, { patchType = PatchTypes.DEFAULT, fromAsarSrc = undefined, customPathToYMAsar = undefined }) {
@@ -321,7 +327,7 @@ export async function checkMacPermissions() {
     if (!isMac) return true
     const asarPath = getYMAsarDefaultPath();
     try {
-        await copyFile(asarPath, asarPath);
+        await copy(asarPath, asarPath);
         return true;
     } catch(e) {
         return false

src/main/modules/utils.js

@@ -203,16 +203,16 @@ export function formatTimeStampDiff(date1, date2) {
     return result;
 }
 
-export async function copyFile(target, dest) {
+export async function copy(target, dest) {
     try {
-        await fso.promises.copyFile(target, dest);
+        await fso.promises.cp(target, dest, { recursive: true });
     } catch (error) {
         if (process.platform === 'linux' && error.code === 'EACCES') {
             const encodedTarget = target.replaceAll("'", "\\'");
             const encodedDest = dest.replaceAll("'", "\\'");
-            await execFileAsync('pkexec', ['bash', '-c', `cp '${encodedTarget}' '${encodedDest}'`]);
+            await execFileAsync('pkexec', ['bash', '-c', `cp '${encodedTarget}' '${encodedDest}' -r`]);
         } else {
-            logger.error('File copying failed:', error);
+            logger.error('Copying failed:', error);
         }
     }
 }
@@ -241,9 +241,6 @@ export async function decompressFile(target, dest, compressionType) {
 }
 
 export async function unzipFolder(zipPath, outputFolder) {
-
-    await createDirIfNotExist(outputFolder);
-
     await new Promise((resolve, reject) => {
         fs.createReadStream(zipPath)
             .pipe(unzipper.Extract({ path: outputFolder }))