From 02f386db2dfdb93119f735517e61c5cd30721c24 Mon Sep 17 00:00:00 2001 From: Vendicated Date: Fri, 19 Jul 2024 02:48:52 +0200 Subject: [PATCH] migrate vencord loader to asar --- src/main/constants.ts | 9 ++++--- src/main/ipc.ts | 8 +++--- src/main/mainWindow.ts | 10 ++++---- src/main/utils/vencordLoader.ts | 44 +++++++++------------------------ 4 files changed, 26 insertions(+), 45 deletions(-) diff --git a/src/main/constants.ts b/src/main/constants.ts index 40d91a5..6c4dc80 100644 --- a/src/main/constants.ts +++ b/src/main/constants.ts @@ -47,9 +47,12 @@ export const VENCORD_THEMES_DIR = join(DATA_DIR, "themes"); // needs to be inline require because of circular dependency // as otherwise "DATA_DIR" (which is used by ./settings) will be uninitialised -export const VENCORD_FILES_DIR = - (require("./settings") as typeof import("./settings")).State.store.vencordDir || - join(SESSION_DATA_DIR, "vencordFiles"); +export const VENCORD_ASAR_FILE = (() => { + const { State } = require("./settings") as typeof import("./settings"); + return State.store.vencordDir + ? join(State.store.vencordDir, "vesktop.asar") + : join(SESSION_DATA_DIR, "vencord.asar"); +})(); export const USER_AGENT = `Vesktop/${app.getVersion()} (https://github.com/Vencord/Vesktop)`; diff --git a/src/main/ipc.ts b/src/main/ipc.ts index 4fa662c..677ad7f 100644 --- a/src/main/ipc.ts +++ b/src/main/ipc.ts @@ -17,7 +17,7 @@ import { debounce } from "shared/utils/debounce"; import { IpcEvents } from "../shared/IpcEvents"; import { setBadgeCount } from "./appBadge"; import { autoStart } from "./autoStart"; -import { VENCORD_FILES_DIR, VENCORD_QUICKCSS_FILE, VENCORD_THEMES_DIR } from "./constants"; +import { VENCORD_ASAR_FILE, VENCORD_QUICKCSS_FILE, VENCORD_THEMES_DIR } from "./constants"; import { mainWin } from "./mainWindow"; import { Settings, State } from "./settings"; import { handle, handleSync } from "./utils/ipcWrappers"; @@ -25,10 +25,8 @@ import { PopoutWindows } from "./utils/popout"; import { isDeckGameMode, showGamePage } from "./utils/steamOS"; import { isValidVencordInstall } from "./utils/vencordLoader"; -handleSync(IpcEvents.GET_VENCORD_PRELOAD_FILE, () => join(VENCORD_FILES_DIR, "vencordDesktopPreload.js")); -handleSync(IpcEvents.GET_VENCORD_RENDERER_SCRIPT, () => - readFileSync(join(VENCORD_FILES_DIR, "vencordDesktopRenderer.js"), "utf-8") -); +handleSync(IpcEvents.GET_VENCORD_PRELOAD_FILE, () => join(VENCORD_ASAR_FILE, "preload.js")); +handleSync(IpcEvents.GET_VENCORD_RENDERER_SCRIPT, () => readFileSync(join(VENCORD_ASAR_FILE, "renderer.js"), "utf-8")); handleSync(IpcEvents.GET_RENDERER_SCRIPT, () => readFileSync(join(__dirname, "renderer.js"), "utf-8")); handleSync(IpcEvents.GET_RENDERER_CSS_FILE, () => join(__dirname, "renderer.css")); diff --git a/src/main/mainWindow.ts b/src/main/mainWindow.ts index d860b37..e30792b 100644 --- a/src/main/mainWindow.ts +++ b/src/main/mainWindow.ts @@ -34,13 +34,13 @@ import { MessageBoxChoice, MIN_HEIGHT, MIN_WIDTH, - VENCORD_FILES_DIR + VENCORD_ASAR_FILE } from "./constants"; import { Settings, State, VencordSettings } from "./settings"; import { createSplashWindow } from "./splash"; import { makeLinksOpenExternally } from "./utils/makeLinksOpenExternally"; import { applyDeckKeyboardFix, askToApplySteamLayout, isDeckGameMode } from "./utils/steamOS"; -import { downloadVencordFiles, ensureVencordFiles } from "./utils/vencordLoader"; +import { downloadVencordAsar, ensureVencordFiles } from "./utils/vencordLoader"; let isQuitting = false; let tray: Tray; @@ -93,7 +93,7 @@ function initTray(win: BrowserWindow) { { label: "Repair Vencord", async click() { - await downloadVencordFiles(); + await downloadVencordAsar(); app.relaunch(); app.quit(); } @@ -167,7 +167,7 @@ function initMenuBar(win: BrowserWindow) { { label: "Force Update Vencord", async click() { - await downloadVencordFiles(); + await downloadVencordAsar(); app.relaunch(); app.quit(); }, @@ -465,7 +465,7 @@ function createMainWindow() { return win; } -const runVencordMain = once(() => require(join(VENCORD_FILES_DIR, "vencordDesktopMain.js"))); +const runVencordMain = once(() => require(VENCORD_ASAR_FILE)); export async function createWindows() { const startMinimized = process.argv.includes("--start-minimized"); diff --git a/src/main/utils/vencordLoader.ts b/src/main/utils/vencordLoader.ts index c0bac6a..30fa9df 100644 --- a/src/main/utils/vencordLoader.ts +++ b/src/main/utils/vencordLoader.ts @@ -4,22 +4,14 @@ * Copyright (c) 2023 Vendicated and Vencord contributors */ -import { mkdirSync } from "fs"; -import { access, constants as FsConstants } from "fs/promises"; +import { existsSync } from "fs"; import { join } from "path"; -import { USER_AGENT, VENCORD_FILES_DIR } from "../constants"; +import { USER_AGENT, VENCORD_ASAR_FILE } from "../constants"; import { downloadFile, fetchie } from "./http"; const API_BASE = "https://api.github.com"; -export const FILES_TO_DOWNLOAD = [ - "vencordDesktopMain.js", - "vencordDesktopPreload.js", - "vencordDesktopRenderer.js", - "vencordDesktopRenderer.css" -]; - export interface ReleaseData { name: string; tag_name: string; @@ -43,33 +35,21 @@ export async function githubGet(endpoint: string) { return fetchie(API_BASE + endpoint, opts, { retryOnNetworkError: true }); } -export async function downloadVencordFiles() { - const release = await githubGet("/repos/Vendicated/Vencord/releases/latest"); - - const { assets }: ReleaseData = await release.json(); - - await Promise.all( - assets - .filter(({ name }) => FILES_TO_DOWNLOAD.some(f => name.startsWith(f))) - .map(({ name, browser_download_url }) => - downloadFile(browser_download_url, join(VENCORD_FILES_DIR, name), {}, { retryOnNetworkError: true }) - ) +export async function downloadVencordAsar() { + await downloadFile( + "https://github.com/Vendicated/Vencord/releases/latest/download/desktop.asar", + VENCORD_ASAR_FILE, + {}, + { retryOnNetworkError: true } ); } -const existsAsync = (path: string) => - access(path, FsConstants.F_OK) - .then(() => true) - .catch(() => false); - -export async function isValidVencordInstall(dir: string) { - return Promise.all(FILES_TO_DOWNLOAD.map(f => existsAsync(join(dir, f)))).then(arr => !arr.includes(false)); +export function isValidVencordInstall(dir: string) { + return existsSync(join(dir, "vesktop.asar")); } export async function ensureVencordFiles() { - if (await isValidVencordInstall(VENCORD_FILES_DIR)) return; + if (existsSync(VENCORD_ASAR_FILE)) return; - mkdirSync(VENCORD_FILES_DIR, { recursive: true }); - - await downloadVencordFiles(); + await downloadVencordAsar(); }