Merge remote-tracking branch 'upstream/asar-bundle'

scripts/build/common.mts

@@ -262,6 +262,20 @@ export const stylePlugin: Plugin = {
     }
 };
 
+let buildsFinished = Promise.resolve();
+const buildsFinishedPlugin: Plugin = {
+    name: "builds-finished-plugin",
+    setup({ onEnd }) {
+        if (!watch) return;
+
+        let resolve: () => void;
+        const done = new Promise<void>(r => resolve = r);
+        buildsFinished = buildsFinished.then(() => done);
+
+        onEnd(() => resolve());
+    },
+};
+
 export const commonOpts = {
     logLevel: "info",
     bundle: true,
@@ -269,7 +283,7 @@ export const commonOpts = {
     sourcemap: watch ? "inline" : "external",
     legalComments: "linked",
     banner,
-    plugins: [fileUrlPlugin, gitHashPlugin, gitRemotePlugin, stylePlugin],
+    plugins: [fileUrlPlugin, gitHashPlugin, gitRemotePlugin, stylePlugin, buildsFinishedPlugin],
     external: ["~plugins", "~git-hash", "~git-remote", "/assets/*"],
     inject: ["./scripts/build/inject/react.mjs"],
     jsxFactory: "VencordCreateElement",
@@ -287,6 +301,8 @@ export async function buildOrWatchAll() {
     if (watch) {
         const contexts = await Promise.all(builds.map(context));
         await Promise.all(contexts.map(ctx => ctx.watch()));
+
+        await buildsFinished;
     } else {
         try {
             await Promise.all(builds.map(build));

src/main/patcher.ts

@@ -27,11 +27,7 @@ import { IS_VANILLA } from "./utils/constants";
 console.log("[Equicord] Starting up...");
 
 // FIXME: remove at some point
-const isLegacyNonAsarVencord = IS_STANDALONE && !__dirname.endsWith(".asar");
+export const isLegacyNonAsarVencord = IS_STANDALONE && !__dirname.endsWith(".asar");
-if (isLegacyNonAsarVencord) {
-    console.warn("This is a legacy non asar install! Migrating to asar and restarting...");
-    require("./updater/http").migrateLegacyToAsar();
-}
 
 // Our injector file at app/index.js
 const injectorPath = require.main!.filename;

src/main/updater/http.ts

@@ -16,10 +16,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { isLegacyNonAsarVencord } from "@main/patcher";
 import { IpcEvents } from "@shared/IpcEvents";
 import { VENCORD_USER_AGENT } from "@shared/vencordUserAgent";
 import { app, dialog, ipcMain } from "electron";
-import { writeFileSync as originalWriteFileSync } from "original-fs";
+import {
+    existsSync as originalExistsSync,
+    renameSync as originalRenameSync,
+    writeFileSync as originalWriteFileSync,
+} from "original-fs";
 import { join } from "path";
 
 import gitHash from "~git-hash";
@@ -31,6 +36,8 @@ import { ASAR_FILE, serializeErrors } from "./common";
 const API_BASE = `https://api.github.com/repos/${gitRemote}`;
 let PendingUpdate: string | null = null;
 
+let hasUpdateToApplyOnQuit = false;
+
 async function githubGet(endpoint: string) {
     return get(API_BASE + endpoint, {
         headers: {
@@ -76,7 +83,8 @@ async function applyUpdates() {
     if (!PendingUpdate) return true;
 
     const data = await get(PendingUpdate);
-    originalWriteFileSync(__dirname, data);
+    originalWriteFileSync(__dirname + ".new", data);
+    hasUpdateToApplyOnQuit = true;
 
     PendingUpdate = null;
 
@@ -88,7 +96,7 @@ ipcMain.handle(IpcEvents.GET_UPDATES, serializeErrors(calculateGitChanges));
 ipcMain.handle(IpcEvents.UPDATE, serializeErrors(fetchUpdates));
 ipcMain.handle(IpcEvents.BUILD, serializeErrors(applyUpdates));
 
-export async function migrateLegacyToAsar() {
+async function migrateLegacyToAsar() {
     try {
         const isFlatpak = process.platform === "linux" && !!process.env.FLATPAK_ID;
         if (isFlatpak) throw "Flatpak Discord can't automatically be migrated.";
@@ -112,3 +120,26 @@ export async function migrateLegacyToAsar() {
         });
     }
 }
+
+function applyPreviousUpdate() {
+    originalRenameSync(__dirname + ".new", __dirname);
+
+    app.relaunch();
+    app.exit();
+}
+
+
+app.on("will-quit", () => {
+    if (hasUpdateToApplyOnQuit)
+        originalRenameSync(__dirname + ".new", __dirname);
+});
+
+if (isLegacyNonAsarVencord) {
+    console.warn("This is a legacy non asar install! Migrating to asar and restarting...");
+    migrateLegacyToAsar();
+}
+
+if (originalExistsSync(__dirname + ".new")) {
+    console.warn("Found previous not applied update, applying now and restarting...");
+    applyPreviousUpdate();
+}