Vencord Standalone without git/node (#148)

src/api/Commands/index.ts

@@ -18,7 +18,7 @@
 
 import { makeCodeblock } from "../../utils/misc";
 import { generateId, sendBotMessage } from "./commandHelpers";
-import { ApplicationCommandInputType, ApplicationCommandType, Argument, Command, CommandContext, CommandReturnValue,Option } from "./types";
+import { ApplicationCommandInputType, ApplicationCommandType, Argument, Command, CommandContext, Option } from "./types";
 
 export * from "./commandHelpers";
 export * from "./types";

src/api/settings.ts

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import plugins from "plugins";
+import plugins from "~plugins";
 
 import IpcEvents from "../utils/IpcEvents";
 import { mergeDefaults } from "../utils/misc";

src/components/Monaco.ts

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import monacoHtml from "@fileContent/monacoWin.html";
+import monacoHtml from "~fileContent/monacoWin.html";
 
 import { IpcEvents } from "../utils";
 import { debounce } from "../utils/debounce";

src/components/PluginSettings/index.tsx

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import Plugins from "plugins";
+import Plugins from "~plugins";
 
 import { showNotice } from "../../api/Notices";
 import { Settings, useSettings } from "../../api/settings";

src/components/Settings.tsx

@@ -50,7 +50,6 @@ export default ErrorBoundary.wrap(function Settings() {
         }));
     }, []);
 
-
     return (
         <Forms.FormSection tag="h1" title="Vencord">
             <Forms.FormTitle tag="h5">

src/components/Updater.tsx

@@ -16,10 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import gitHash from "git-hash";
+import gitHash from "~git-hash";
 
 import { classes, useAwaiter } from "../utils/misc";
-import { changes, checkForUpdates, getRepo, isNewer,isOutdated, rebuild, update, updateError, UpdateLogger } from "../utils/updater";
+import { changes, checkForUpdates, getRepo, isNewer, rebuild, update, updateError, UpdateLogger } from "../utils/updater";
 import { Alerts, Button, Card, Forms, Margins, Parser, React, Toasts } from "../webpack/common";
 import ErrorBoundary from "./ErrorBoundary";
 import { ErrorCard } from "./ErrorCard";

src/globals.d.ts

@@ -31,6 +31,8 @@ declare global {
      * replace: `${IS_WEB}?foo:bar`
      */
     export var IS_WEB: boolean;
+    export var IS_STANDALONE: boolean;
+
     export var VencordNative: typeof import("./VencordNative").default;
     export var Vencord: typeof import("./Vencord");
     export var appSettings: {

src/ipcMain/extensions.ts

@@ -19,33 +19,15 @@
 import { session } from "electron";
 import { unzip } from "fflate";
 import { constants as fsConstants } from "fs";
-import { access,mkdir, rm, writeFile } from "fs/promises";
-import https from "https";
+import { access, mkdir, rm, writeFile } from "fs/promises";
 import { join } from "path";
 
 import { DATA_DIR } from "./constants";
 import { crxToZip } from "./crxToZip";
+import { get } from "./simpleGet";
 
 const extensionCacheDir = join(DATA_DIR, "ExtensionCache");
 
-function download(url: string) {
-    return new Promise<Buffer>((resolve, reject) => {
-        https.get(url, res => {
-            const { statusCode, statusMessage, headers } = res;
-            if (statusCode! >= 400)
-                return void reject(`${statusCode}: ${statusMessage} - ${url}`);
-            if (statusCode! >= 300)
-                return void resolve(download(headers.location!));
-
-            const chunks = [] as Buffer[];
-            res.on("error", reject);
-
-            res.on("data", chunk => chunks.push(chunk));
-            res.once("end", () => resolve(Buffer.concat(chunks)));
-        });
-    });
-}
-
 async function extract(data: Buffer, outDir: string) {
     await mkdir(outDir, { recursive: true });
     return new Promise<void>((resolve, reject) => {
@@ -86,7 +68,7 @@ export async function installExt(id: string) {
         await access(extDir, fsConstants.F_OK);
     } catch (err) {
         const url = `https://clients2.google.com/service/update2/crx?response=redirect&acceptformat=crx2,crx3&x=id%3D${id}%26uc&prodversion=32`;
-        const buf = await download(url);
+        const buf = await get(url);
         await extract(crxToZip(buf), extDir);
     }
 

src/ipcMain/index.ts

@@ -18,19 +18,18 @@
 
 import "./updater";
 
-import monacoHtml from "@fileContent/../components/monacoWin.html;base64";
-import { app, BrowserWindow, desktopCapturer, ipcMain, shell } from "electron";
+import { BrowserWindow, desktopCapturer, ipcMain, shell } from "electron";
 import { mkdirSync, readFileSync, watch } from "fs";
 import { open, readFile, writeFile } from "fs/promises";
 import { join } from "path";
 
+import monacoHtml from "~fileContent/../components/monacoWin.html;base64";
+
 import { debounce } from "../utils/debounce";
 import IpcEvents from "../utils/IpcEvents";
 import { Queue } from "../utils/Queue";
 import { ALLOWED_PROTOCOLS, QUICKCSS_PATH, SETTINGS_DIR, SETTINGS_FILE } from "./constants";
 
-
-
 mkdirSync(SETTINGS_DIR, { recursive: true });
 
 function readCss() {

src/ipcMain/simpleGet.ts

@@ -0,0 +1,37 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2022 Vendicated and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import https from "https";
+
+export function get(url: string, options: https.RequestOptions = {}) {
+    return new Promise<Buffer>((resolve, reject) => {
+        https.get(url, options, res => {
+            const { statusCode, statusMessage, headers } = res;
+            if (statusCode! >= 400)
+                return void reject(`${statusCode}: ${statusMessage} - ${url}`);
+            if (statusCode! >= 300)
+                return void resolve(get(headers.location!, options));
+
+            const chunks = [] as Buffer[];
+            res.on("error", reject);
+
+            res.on("data", chunk => chunks.push(chunk));
+            res.once("end", () => resolve(Buffer.concat(chunks)));
+        });
+    });
+}

src/ipcMain/updater/common.ts

@@ -0,0 +1,59 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2022 Vendicated and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { createHash } from "crypto";
+import { createReadStream } from "fs";
+import { join } from "path";
+
+export async function calculateHashes() {
+    const hashes = {} as Record<string, string>;
+
+    await Promise.all(
+        ["patcher.js", "preload.js", "renderer.js"].map(file => new Promise<void>(r => {
+            const fis = createReadStream(join(__dirname, file));
+            const hash = createHash("sha1", { encoding: "hex" });
+            fis.once("end", () => {
+                hash.end();
+                hashes[file] = hash.read();
+                r();
+            });
+            fis.pipe(hash);
+        }))
+    );
+
+    return hashes;
+}
+
+export function serializeErrors(func: (...args: any[]) => any) {
+    return async function () {
+        try {
+            return {
+                ok: true,
+                value: await func(...arguments)
+            };
+        } catch (e: any) {
+            return {
+                ok: false,
+                error: e instanceof Error ? {
+                    // prototypes get lost, so turn error into plain object
+                    ...e
+                } : e
+            };
+        }
+    };
+}

src/ipcMain/updater/git.ts

@@ -17,13 +17,12 @@
 */
 
 import { execFile as cpExecFile } from "child_process";
-import { createHash } from "crypto";
 import { ipcMain } from "electron";
-import { createReadStream } from "fs";
 import { join } from "path";
 import { promisify } from "util";
 
-import IpcEvents from "../utils/IpcEvents";
+import IpcEvents from "../../utils/IpcEvents";
+import { calculateHashes, serializeErrors } from "./common";
 
 const VENCORD_SRC_DIR = join(__dirname, "..");
 
@@ -35,44 +34,6 @@ function git(...args: string[]) {
     });
 }
 
-async function calculateHashes() {
-    const hashes = {} as Record<string, string>;
-
-    await Promise.all(
-        ["patcher.js", "preload.js", "renderer.js"].map(file => new Promise<void>(r => {
-            const fis = createReadStream(join(__dirname, file));
-            const hash = createHash("sha1", { encoding: "hex" });
-            fis.once("end", () => {
-                hash.end();
-                hashes[file] = hash.read();
-                r();
-            });
-            fis.pipe(hash);
-        }))
-    );
-
-    return hashes;
-}
-
-function serializeErrors(func: (...args: any[]) => any) {
-    return async function () {
-        try {
-            return {
-                ok: true,
-                value: await func(...arguments)
-            };
-        } catch (e: any) {
-            return {
-                ok: false,
-                error: e instanceof Error ? {
-                    // prototypes get lost, so turn error into plain object
-                    ...e
-                } : e
-            };
-        }
-    };
-}
-
 async function getRepo() {
     const res = await git("remote", "get-url", "origin");
     return res.stdout.trim()

src/ipcMain/updater/http.ts

@@ -0,0 +1,86 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2022 Vendicated and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { ipcMain } from "electron";
+import { writeFile } from "fs/promises";
+import { join } from "path";
+
+import gitHash from "~git-hash";
+import gitRemote from "~git-remote";
+
+import { VENCORD_USER_AGENT } from "../../utils/constants";
+import IpcEvents from "../../utils/IpcEvents";
+import { get } from "../simpleGet";
+import { calculateHashes, serializeErrors } from "./common";
+
+const API_BASE = `https://api.github.com/repos/${gitRemote}`;
+let PendingUpdates = [] as [string, Buffer][];
+
+async function githubGet(endpoint: string) {
+    return get(API_BASE + endpoint, {
+        headers: {
+            Accept: "application/vnd.github+json",
+            // "All API requests MUST include a valid User-Agent header.
+            // Requests with no User-Agent header will be rejected."
+            "User-Agent": VENCORD_USER_AGENT,
+            // todo: perhaps add support for (optional) api token?
+            // unauthorised rate limit is 60 reqs/h
+            // https://github.com/settings/tokens/new?description=Vencord%20Updater
+        }
+    });
+}
+
+async function calculateGitChanges() {
+    const res = await githubGet(`/compare/${gitHash}...HEAD`);
+
+    const data = JSON.parse(res.toString("utf-8"));
+    return data.commits.map(c => ({
+        // github api only sends the long sha
+        hash: c.sha.slice(0, 7),
+        author: c.author.login,
+        message: c.commit.message
+    }));
+}
+
+async function fetchUpdates() {
+    const release = await githubGet("/releases/latest");
+
+    const data = JSON.parse(release.toString());
+    const hash = data.name.slice(data.name.lastIndexOf(" ") + 1);
+    if (hash === gitHash)
+        return true;
+
+    await Promise.all(data.assets.map(async ({ name, browser_download_url }) => {
+        if (["patcher.js", "preload.js", "renderer.js"].some(s => name.startsWith(s))) {
+            PendingUpdates.push([name, await get(browser_download_url)]);
+        }
+    }));
+    return true;
+}
+
+async function applyUpdates() {
+    await Promise.all(PendingUpdates.map(([name, data]) => writeFile(join(__dirname, name), data)));
+    PendingUpdates = [];
+    return true;
+}
+
+ipcMain.handle(IpcEvents.GET_HASHES, serializeErrors(calculateHashes));
+ipcMain.handle(IpcEvents.GET_REPO, serializeErrors(() => `https://github.com/${gitRemote}`));
+ipcMain.handle(IpcEvents.GET_UPDATES, serializeErrors(calculateGitChanges));
+ipcMain.handle(IpcEvents.UPDATE, serializeErrors(fetchUpdates));
+ipcMain.handle(IpcEvents.BUILD, serializeErrors(applyUpdates));

src/ipcMain/updater/index.ts

@@ -0,0 +1,19 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2022 Vendicated and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import(IS_STANDALONE ? "./http" : "./git");

src/modules.d.ts

@@ -19,17 +19,21 @@
 // eslint-disable-next-line spaced-comment
 /// <reference types="standalone-electron-types"/>
 
-declare module "plugins" {
+declare module "~plugins" {
     const plugins: Record<string, import("./utils/types").Plugin>;
     export default plugins;
 }
 
-declare module "git-hash" {
+declare module "~git-hash" {
     const hash: string;
     export default hash;
 }
+declare module "~git-remote" {
+    const remote: string;
+    export default remote;
+}
 
-declare module "@fileContent/*" {
+declare module "~fileContent/*" {
     const content: string;
     export default content;
 }

src/patcher.ts

@@ -87,6 +87,22 @@ Object.defineProperty(global, "appSettings", {
 process.env.DATA_DIR = join(app.getPath("userData"), "..", "Vencord");
 
 electron.app.whenReady().then(() => {
+    // Source Maps! Maybe there's a better way but since the renderer is executed
+    // from a string I don't think any other form of sourcemaps would work
+    electron.protocol.registerFileProtocol("vencord", ({ url: unsafeUrl }, cb) => {
+        let url = unsafeUrl.slice("vencord://".length);
+        if (url.endsWith("/")) url = url.slice(0, -1);
+        switch (url) {
+            case "renderer.js.map":
+            case "preload.js.map":
+            case "patcher.js.map": // doubt
+                cb(join(__dirname, url));
+                break;
+            default:
+                cb({ statusCode: 403 });
+        }
+    });
+
     try {
         const settings = JSON.parse(readSettings());
         if (settings.enableReactDevtools)

src/plugins/index.ts

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import Plugins from "plugins";
+import Plugins from "~plugins";
 
 import { registerCommand, unregisterCommand } from "../api/Commands";
 import { Settings } from "../api/settings";

src/plugins/pronoundb/components/PronounsProfileWrapper.tsx

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { classes,useAwaiter } from "../../../utils";
+import { useAwaiter } from "../../../utils";
 import { Settings } from "../../../Vencord";
 import { UserStore } from "../../../webpack/common";
 import { PronounMapping, UserProfileProps } from "../types";

src/plugins/pronoundb/utils.ts

@@ -16,9 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import gitHash from "git-hash";
-
-import { debounce } from "../../utils";
+import { VENCORD_USER_AGENT } from "../../utils/constants";
+import { debounce } from "../../utils/debounce";
 import { Settings } from "../../Vencord";
 import { PronounsFormat } from ".";
 import { PronounCode, PronounMapping, PronounsResponse } from "./types";
@@ -64,7 +63,7 @@ async function bulkFetchPronouns(ids: string[]): Promise<PronounsResponse> {
             method: "GET",
             headers: {
                 "Accept": "application/json",
-                "X-PronounDB-Source": `Vencord/${gitHash} (github.com/Vendicated/Vencord)`
+                "X-PronounDB-Source": VENCORD_USER_AGENT
             }
         });
         return await req.json()

src/plugins/sendify.ts

@@ -16,9 +16,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Message } from "discord-types/general";
-import { PartialDeep } from "type-fest";
-
 import { ApplicationCommandInputType, sendBotMessage } from "../api/Commands";
 import { lazyWebpack } from "../utils";
 import { Devs } from "../utils/constants";
@@ -27,33 +24,33 @@ import { filters } from "../webpack";
 import { FluxDispatcher } from "../webpack/common";
 
 interface Album {
-    id: string
+    id: string;
     image: {
-        height: number
-        width: number
-        url: string
-    }
-    name: string
+        height: number;
+        width: number;
+        url: string;
+    };
+    name: string;
 }
 
 interface Artist {
     external_urls: {
-        spotify: string
-    }
-    href: string
-    id: string
-    name: string
-    type: "artist" | string
-    uri: string
+        spotify: string;
+    };
+    href: string;
+    id: string;
+    name: string;
+    type: "artist" | string;
+    uri: string;
 }
 
 interface Track {
-    id: string
-    album: Album
-    artists: Artist[]
-    duration: number
-    isLocal: boolean
-    name: string
+    id: string;
+    album: Album;
+    artists: Artist[];
+    duration: number;
+    isLocal: boolean;
+    name: string;
 }
 
 const Spotify = lazyWebpack(filters.byProps(["getPlayerState"]));

src/plugins/settings.ts

@@ -1,6 +1,6 @@
 /*
  * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2022 Vendicated and contributors
+ * Copyright (c) 2022 Vendicated and Megumin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import gitHash from "git-hash";
+import gitHash from "~git-hash";
 
 import { Devs } from "../utils/constants";
 import definePlugin from "../utils/types";
@@ -34,7 +34,13 @@ export default definePlugin({
                 replace: m => {
                     const idx = m.indexOf("Host") - 1;
                     const template = m.slice(0, idx);
-                    let r = `${m}, ${template}"Vencord ", "${gitHash}${IS_WEB ? " (Web)" : ""}"), " ")`;
+                    const additionalInfo = IS_WEB
+                        ? " (Web)"
+                        : IS_STANDALONE
+                            ? " (Standalone)"
+                            : "";
+
+                    let r = `${m}, ${template}"Vencord ", "${gitHash}${additionalInfo}"), " ")`;
                     if (!IS_WEB) {
                         r += `,${template} "Electron ",VencordNative.getVersions().electron)," "),`;
                         r += `${template} "Chrome ",VencordNative.getVersions().chrome)," ")`;

src/utils/constants.ts

@@ -16,8 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import gitHash from "~git-hash";
+import gitRemote from "~git-remote";
+
 export const WEBPACK_CHUNK = "webpackChunkdiscord_app";
 export const REACT_GLOBAL = "Vencord.Webpack.Common.React";
+export const VENCORD_USER_AGENT = `Vencord/${gitHash}${gitRemote ? ` (https://github.com/${gitRemote})` : ""}`;
 
 // Add yourself here if you made more than one plugin
 export const Devs = Object.freeze({

src/utils/updater.ts

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import gitHash from "git-hash";
+import gitHash from "~git-hash";
 
 import IpcEvents from "./IpcEvents";
 import Logger from "./logger";