ulysia/Vencord
1
0
Fork 0
Code Pull requests Activity

fix: apply update only on quit

Browse source
This commit is contained in:
Vendicated 2024-07-21 02:52:28 +02:00
parent f9fb3bbba7
commit 7781dface9
No known key found for this signature in database
GPG key ID: D66986BAF75ECF18
2 changed files with 35 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/patcher.ts
View file

@ -27,11 +27,7 @@ import { IS_VANILLA } from "./utils/constants";
console.log("[Vencord] Starting up..."); console.log("[Vencord] Starting up...");
// FIXME: remove at some point // 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 // Our injector file at app/index.js
const injectorPath = require.main!.filename; const injectorPath = require.main!.filename;

37
src/main/updater/http.ts
View file

@ -16,10 +16,15 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import { isLegacyNonAsarVencord } from "@main/patcher";
import { IpcEvents } from "@shared/IpcEvents"; import { IpcEvents } from "@shared/IpcEvents";
import { VENCORD_USER_AGENT } from "@shared/vencordUserAgent"; import { VENCORD_USER_AGENT } from "@shared/vencordUserAgent";
import { app, dialog, ipcMain } from "electron"; 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 { join } from "path";
import gitHash from "~git-hash"; import gitHash from "~git-hash";
@ -31,6 +36,8 @@ import { ASAR_FILE, serializeErrors } from "./common";
const API_BASE = `https://api.github.com/repos/${gitRemote}`; const API_BASE = `https://api.github.com/repos/${gitRemote}`;
let PendingUpdate: string | null = null; let PendingUpdate: string | null = null;
let hasUpdateToApplyOnQuit = false;
async function githubGet(endpoint: string) { async function githubGet(endpoint: string) {
return get(API_BASE + endpoint, { return get(API_BASE + endpoint, {
headers: { headers: {
@ -76,7 +83,8 @@ async function applyUpdates() {
if (!PendingUpdate) return true; if (!PendingUpdate) return true;
const data = await get(PendingUpdate); const data = await get(PendingUpdate);
originalWriteFileSync(__dirname, data); originalWriteFileSync(__dirname + ".new", data);
hasUpdateToApplyOnQuit = true;
PendingUpdate = null; PendingUpdate = null;
@ -88,7 +96,7 @@ ipcMain.handle(IpcEvents.GET_UPDATES, serializeErrors(calculateGitChanges));
ipcMain.handle(IpcEvents.UPDATE, serializeErrors(fetchUpdates)); ipcMain.handle(IpcEvents.UPDATE, serializeErrors(fetchUpdates));
ipcMain.handle(IpcEvents.BUILD, serializeErrors(applyUpdates)); ipcMain.handle(IpcEvents.BUILD, serializeErrors(applyUpdates));
export async function migrateLegacyToAsar() { async function migrateLegacyToAsar() {
try { try {
const isFlatpak = process.platform === "linux" && !!process.env.FLATPAK_ID; const isFlatpak = process.platform === "linux" && !!process.env.FLATPAK_ID;
if (isFlatpak) throw "Flatpak Discord can't automatically be migrated."; 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();
}