ulysia/Vencord
1
0
Fork 0
Code Pull requests Activity

migrate legacy installs

Browse source
This commit is contained in:
Vendicated 2024-07-19 00:52:32 +02:00
parent 7148c29ed1
commit 2ace675c00
No known key found for this signature in database
GPG key ID: D66986BAF75ECF18
2 changed files with 35 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/main/patcher.ts
View file

@ -22,18 +22,23 @@ import { dirname, join } from "path";
import { initIpc } from "./ipcMain"; import { initIpc } from "./ipcMain";
import { RendererSettings } from "./settings"; import { RendererSettings } from "./settings";
import { migrateLegacyToAsar } from "./updater/http";
import { IS_VANILLA } from "./utils/constants"; import { IS_VANILLA } from "./utils/constants";
console.log("[Vencord] Starting up..."); console.log("[Vencord] Starting up...");
// FIXME: remove at some point
const isLegacyNonAsarVencord = IS_STANDALONE && !__dirname.endsWith(".asar");
if (isLegacyNonAsarVencord) {
console.warn("This is a legacy non asar install! Migrating to asar and restarting...");
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;
// special discord_arch_electron injection method
const asarName = require.main!.path.endsWith("app.asar") ? "_app.asar" : "app.asar";
// The original app.asar // The original app.asar
const asarPath = join(dirname(injectorPath), "..", asarName); const asarPath = join(dirname(injectorPath), "..", "_app.asar");
const discordPkg = require(join(asarPath, "package.json")); const discordPkg = require(join(asarPath, "package.json"));
require.main!.filename = join(asarPath, discordPkg.main); require.main!.filename = join(asarPath, discordPkg.main);
@ -41,7 +46,7 @@ require.main!.filename = join(asarPath, discordPkg.main);
// @ts-ignore Untyped method? Dies from cringe // @ts-ignore Untyped method? Dies from cringe
app.setAppPath(asarPath); app.setAppPath(asarPath);
if (!IS_VANILLA) { if (!IS_VANILLA && !isLegacyNonAsarVencord) {
const settings = RendererSettings.store; const settings = RendererSettings.store;
// Repatch after host updates on Windows // Repatch after host updates on Windows
if (process.platform === "win32") { if (process.platform === "win32") {
@ -157,5 +162,7 @@ if (!IS_VANILLA) {
console.log("[Vencord] Running in vanilla mode. Not loading Vencord"); console.log("[Vencord] Running in vanilla mode. Not loading Vencord");
} }
console.log("[Vencord] Loading original Discord app.asar"); if (!isLegacyNonAsarVencord) {
require(require.main!.filename); console.log("[Vencord] Loading original Discord app.asar");
require(require.main!.filename);
}

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

@ -18,7 +18,7 @@
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 { ipcMain } from "electron"; import { app, dialog, ipcMain } from "electron";
import { writeFile } from "fs/promises"; import { writeFile } from "fs/promises";
import { join } from "path"; import { join } from "path";
@ -76,14 +76,7 @@ async function applyUpdates() {
if (!PendingUpdate) return true; if (!PendingUpdate) return true;
const data = await get(PendingUpdate); const data = await get(PendingUpdate);
await writeFile(__dirname, data);
if (__dirname.endsWith(".asar")) {
await writeFile(__dirname, data);
} else { // legacy plain folder install
await writeFile(join(__dirname, "../vencord.asar"), data);
await writeFile(__filename, '// legacy install workaround\n\nrequire("../vencord.asar");');
}
PendingUpdate = null; PendingUpdate = null;
@ -94,3 +87,22 @@ ipcMain.handle(IpcEvents.GET_REPO, serializeErrors(() => `https://github.com/${g
ipcMain.handle(IpcEvents.GET_UPDATES, serializeErrors(calculateGitChanges)); 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() {
try {
const data = await get(`https://github.com/${gitRemote}/releases/latest/desktop.asar`);
await writeFile(join(__dirname, "../vencord.asar"), data);
await writeFile(__filename, "// Legacy shim for new asar\n\nrequire(\"../vencord.asar\");");
app.relaunch();
} catch (e) {
console.error("Failed to migrate to asar", e);
app.whenReady().then(() => {
dialog.showErrorBox(
"Legacy Install",
"The way Vencord loaded was changed and the updater failed to migrate. Please reinstall using the Vencord Installer!"
);
app.quit();
});
}
}