Move to core injection

.github/FUNDING.yml

@@ -1,3 +1 @@
 github: rauenzi
-patreon: Zerebos
-custom: ["https://paypal.me/ZackRauen"]

README.md

@@ -12,7 +12,7 @@
   A simple standalone program which automates the installation, removal and maintenance of <a href="https://github.com/BetterDiscord/BetterDiscord">BetterDiscord</a>.
   <br/>
   <br/>
-  <a href="https://discord.gg/0Tmfo5ZbORCRqbAd" target="_blank">
+  <a href="https://betterdiscord.app/invite" target="_blank">
     <img src="https://img.shields.io/badge/discord-join-green?labelColor=0c0d10&color=3a71c1&style=for-the-badge&logo=data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI0OCIgaGVpZ2h0PSI0OCIgdmlld0JveD0iMCAwIDQ4IDQ4IiBmaWxsPSJub25lIj4NCjxwYXRoIGQ9Ik0xNi41MzUzIDUuNDUwNTNDMzMuODIzMyAtMS40NjgwOSA1MC44ODE1IDE2Ljg4NjMgNDEuNTkyNSAzMy42MDY2QzM3LjM3MzIgNDEuMjAxMiAyNi44OTA0IDQ3LjMxNyAxNC42ODQyIDQxLjUzMjZMNi4xOTk5IDQzLjk1NjdDNC44ODM0NiA0NC4zMzI4IDMuNjY2OTMgNDMuMTIxMiA0LjAzNjM0IDQxLjgwMzdDNC41NDI3MiAzOS45OTc2IDUuNzQyNTcgMzUuNzM5OCA2LjQ0NDEgMzMuNDMyM0MxLjE4Mjc5IDI0LjA0NCA0LjczMDUgMTAuMTc0OCAxNi41MzUzIDUuNDUwNTNaTTE1Ljk5NTQgMjAuMjQ5NkMxNS45OTU0IDIwLjkzOTkgMTYuNTU1IDIxLjQ5OTYgMTcuMjQ1NCAyMS40OTk2SDMwLjc0OThDMzEuNDQwMSAyMS40OTk2IDMxLjk5OTggMjAuOTM5OSAzMS45OTk4IDIwLjI0OTZDMzEuOTk5OCAxOS41NTkyIDMxLjQ0MDEgMTguOTk5NiAzMC43NDk4IDE4Ljk5OTZIMTcuMjQ1NEMxNi41NTUgMTguOTk5NiAxNS45OTU0IDE5LjU1OTIgMTUuOTk1NCAyMC4yNDk2Wk0xNy4yNDk4IDI2LjQ3NDZDMTYuNTU5NCAyNi40NzQ2IDE1Ljk5OTggMjcuMDM0MiAxNS45OTk4IDI3LjcyNDZDMTUuOTk5OCAyOC40MTQ5IDE2LjU1OTQgMjguOTc0NiAxNy4yNDk4IDI4Ljk3NDZIMjYuNzQ5OEMyNy40NDAxIDI4Ljk3NDYgMjcuOTk5OCAyOC40MTQ5IDI3Ljk5OTggMjcuNzI0NkMyNy45OTk4IDI3LjAzNDIgMjcuNDQwMSAyNi40NzQ2IDI2Ljc0OTggMjYuNDc0NkgxNy4yNDk4WiIgZmlsbD0iIzNhNzFjMSIvPg0KPC9zdmc+" alt="Chat"/>
     </a>
    <a href="https://github.com/BetterDiscord/installer/releases/" target="_blank">

package.json

@@ -18,8 +18,8 @@
     "source-map-support": "^0.5.16"
   },
   "devDependencies": {
-    "electron": "^9.4.0",
-    "electron-builder": "^22.4.1",
+    "electron": "^13.6.9",
+    "electron-builder": "^23.6.0",
     "electron-webpack": "^2.8.2",
     "eslint": "^7.21.0",
     "eslint-plugin-svelte3": "^3.1.2",

src/renderer/actions/install.js

@@ -4,6 +4,7 @@ import {remote, shell} from "electron";
 import {promises as fs} from "fs";
 import path from "path";
 import phin from "phin";
+import rimraf from "rimraf";
 
 import {log, lognewline} from "./utils/log";
 import succeed from "./utils/succeed";
@@ -18,7 +19,7 @@ const MAKE_DIR_PROGRESS = 30;
 const CHECK_OLD_INSTALL = 40;
 const TRANSFER_OLD_ADDONS = 50;
 const DOWNLOAD_PACKAGE_PROGRESS = 60;
-const INJECT_SHIM_PROGRESS = 90;
+const INJECT_SHIM_PROGRESS = 80;
 const RESTART_DISCORD_PROGRESS = 100;
 
 const oldBDFolder = path.join(remote.app.getPath("home"), "Library", "Preferences", "betterdiscord"); // Old MacOS
@@ -78,19 +79,32 @@ const getJSON = phin.defaults({method: "GET", parse: "json", followRedirects: tr
 const downloadFile = phin.defaults({method: "GET", followRedirects: true, headers: {"User-Agent": "BetterDiscord Installer", "Accept": "application/octet-stream"}});
 const asarPath = path.join(bdDataFolder, "betterdiscord.asar");
 async function downloadAsar() {
-    let downloadUrl = "https://api.github.com/repos/BetterDiscord/BetterDiscord/releases";
+    const releaseApiUrl = "https://api.github.com/repos/BetterDiscord/BetterDiscord/releases";
     try {
-        const response = await getJSON(downloadUrl);
+        const response = await getJSON(releaseApiUrl);
         const releases = response.body;
-        const asset = releases && releases.length ? releases[0].assets.find(a => a.name === "betterdiscord.asar") : "https://api.github.com/repos/BetterDiscord/BetterDiscord/releases/assets/39982244"; // temporary workaround
-        downloadUrl = asset.url;
-
-        const resp = await downloadFile(downloadUrl);
-        const originalFs = require("original-fs").promises; // because electron doesn't like when I write asar files
-        await originalFs.writeFile(asarPath, resp.body);
+        const asset = releases && releases.length && releases[0].assets && releases[0].assets.find(a => a.name.toLowerCase() === "betterdiscord.asar");
+        const assetUrl = asset && asset.url;
+        if (!assetUrl) {
+            let errMessage = "Could not get the asset url";
+            if (!asset) errMessage = "Could not get asset object";
+            if (!releases) errMessage = "Could not get response body";
+            if (!response) errMessage = "Could not get any response";
+            throw new Error(errMessage);
+        }
+        try {
+            const resp = await downloadFile(assetUrl);
+            const originalFs = require("original-fs").promises; // because electron doesn't like when I write asar files
+            await originalFs.writeFile(asarPath, resp.body);
+        }
+        catch (error) {
+            log(`❌ Failed to download package from ${assetUrl}`);
+            log(`❌ ${error.message}`);
+            return error;
+        }
     }
     catch (err) {
-        log(`❌ Failed to download package ${downloadUrl}`);
+        log(`❌ Failed to get asset url from ${releaseApiUrl}`);
         log(`❌ ${err.message}`);
         return err;
     }
@@ -100,18 +114,28 @@ async function injectShims(paths) {
     const progressPerLoop = (INJECT_SHIM_PROGRESS - progress.value) / paths.length;
     for (const discordPath of paths) {
         log("Injecting into: " + discordPath);
+        const appAsar = path.join(discordPath, "app.asar");
+        const discordAsar = path.join(discordPath, "discord.asar");
         const appPath = path.join(discordPath, "app");
         const pkgFile = path.join(appPath, "package.json");
         const indexFile = path.join(appPath, "index.js");
         try {
-            if (process.platform === "win32" || process.platform === "darwin") {
-                if (!(await exists(appPath))) await fs.mkdir(appPath);
-                await fs.writeFile(pkgFile, JSON.stringify({name: "betterdiscord", main: "index.js"}));
-                await fs.writeFile(indexFile, `require("${asarPath.replace(/\\/g, "\\\\").replace(/"/g, "\\\"")}");`);
-            }
-            else {
+            // if (process.platform === "win32" || process.platform === "darwin") {
+            //     const originalFs = require("original-fs").promises;
+            //     if (await exists(appAsar)) {
+            //         await originalFs.rename(appAsar, discordAsar);
+            //         // await originalFs.copyFile(appAsar, discordAsar);
+            //         // await originalFs.unlink(appAsar);
+            //         // const error = await new Promise(resolve => rimraf(appAsar, originalFs, resolve));
+            //         // if (error) throw error;
+            //     }
+            //     if (!(await exists(appPath))) await fs.mkdir(appPath);
+            //     await fs.writeFile(pkgFile, JSON.stringify({name: "betterdiscord", main: "index.js"}));
+            //     await fs.writeFile(indexFile, `require("${asarPath.replace(/\\/g, "\\\\").replace(/"/g, "\\\"")}");`);
+            // }
+            // else {
                 await fs.writeFile(path.join(discordPath, "index.js"), `require("${asarPath.replace(/\\/g, "\\\\").replace(/"/g, "\\\"")}");\nmodule.exports = require("./core.asar");`);
-            }
+            // }
             log("✅ Injection successful");
             progress.set(progress.value + progressPerLoop);
         }

src/renderer/actions/paths.js

@@ -22,10 +22,7 @@ const getDiscordPath = function(releaseChannel) {
         if (!fs.existsSync(basedir)) return "";
         const version = fs.readdirSync(basedir).filter(f => safeIsDir(path.join(basedir, f)) && f.split(".").length > 1).sort().reverse()[0];
         if (!version) return "";
-        resourcePath = path.join(basedir, version, "resources");
-    }
-    else if (process.platform === "darwin") {
-        resourcePath = path.join("/Applications", `${releaseChannel}.app`, "Contents", "Resources");
+        resourcePath = path.join(basedir, version, "modules", "discord_desktop_core-1", "discord_desktop_core");
     }
     else {
         const basedir = path.join(remote.app.getPath("userData"), "..", releaseChannel.toLowerCase().replace(" ", ""));
@@ -45,14 +42,12 @@ for (const channel in platforms) {
 
 export const getBrowsePath = function(channel) {
     if (process.platform === "win32") return path.join(process.env.LOCALAPPDATA, platforms[channel].replace(" ", ""));
-    else if (process.platform === "darwin") return path.join("/Applications", `${platforms[channel]}.app`);
     return path.join(remote.app.getPath("userData"), "..", platforms[channel].toLowerCase().replace(" ", ""));
 };
 
 export const validatePath = function(channel, proposedPath) {
     if (process.platform === "win32") return validateWindows(channel, proposedPath);
-    else if (process.platform === "darwin") return validateMac(channel, proposedPath);
-    return validateLinux(channel, proposedPath);
+    return validateLinuxMac(channel, proposedPath);
 };
 
 const validateWindows = function(channel, proposedPath) {
@@ -61,36 +56,24 @@ const validateWindows = function(channel, proposedPath) {
     const isParentDir = fs.existsSync(path.join(proposedPath, channelName));
     if (isParentDir) proposedPath = path.join(proposedPath, channelName);
 
-    let resourcePath = "";
+    let corePath = "";
     const selected = path.basename(proposedPath);
     const isBaseDir = selected === channelName;
     if (isBaseDir) {
         const version = fs.readdirSync(proposedPath).filter(f => safeIsDir(path.join(proposedPath, f)) && f.split(".").length > 1).sort().reverse()[0];
         if (!version) return "";
-        resourcePath = path.join(proposedPath, version, "resources");
+        corePath = path.join(proposedPath, version, "modules", "discord_desktop_core-1", "discord_desktop_core");
     }
 
-    if (selected.startsWith("app-") && selected.split(".").length > 2) resourcePath = path.join(proposedPath, "resources");
-    if (selected === "resources") resourcePath = proposedPath;
-
-    const executablePath = path.join(resourcePath, "..", `${channelName}.exe`);
-    if (fs.existsSync(executablePath)) return resourcePath;
-    return "";
-};
-
-const validateMac = function(channel, proposedPath) {
-    let resourcePath = "";
-    const selected = path.basename(proposedPath);
-    if (selected === `${platforms[channel]}.app`) resourcePath = path.join(proposedPath, "Contents", "Resources");
-    if (selected === "Contents") resourcePath = path.join(proposedPath, "Resources");
-    if (selected === "Resources") resourcePath = proposedPath;
+    if (selected.split(".").length > 2) corePath = path.join(proposedPath, "modules", "discord_desktop_core-1", "discord_desktop_core");
+    if (selected === "discord_desktop_core") corePath = proposedPath;
 
-    const executablePath = path.join(resourcePath, "..", "MacOS", platforms[channel]);
-    if (fs.existsSync(executablePath)) return resourcePath;
+    const coreAsar = path.join(corePath, `core.asar`);
+    if (fs.existsSync(coreAsar)) return corePath;
     return "";
 };
 
-const validateLinux = function(channel, proposedPath) {
+const validateLinuxMac = function(channel, proposedPath) {
     if (proposedPath.includes("/snap/")) {
         remote.dialog.showErrorBox("BetterDiscord Incompatible", "BetterDiscord is currently incompatible with Snap installs of Discord. Support for snap installs is coming soon!");
         return "";

src/renderer/actions/repair.js

@@ -1,5 +1,5 @@
 
-import {progress, status} from "../stores/installation";
+import {progress} from "../stores/installation";
 import {remote} from "electron";
 import {promises as fs} from "fs";
 import originalFs from "original-fs";
@@ -17,7 +17,7 @@ import doSanityCheck from "./utils/sanity";
 
 const KILL_DISCORD_PROGRESS = 20;
 const DELETE_APP_DIRS_PROGRESS = 50;
-const DELETE_MODULE_DIRS_PROGRESS = 100;
+const DELETE_PLUGINS_JSON_PROGRESS = 100;
 
 async function deleteAppDirs(paths) {
     const progressPerLoop = (DELETE_APP_DIRS_PROGRESS - progress.value) / paths.length;
@@ -37,29 +37,26 @@ async function deleteAppDirs(paths) {
     }
 }
 
-const platforms = {stable: "Discord", ptb: "Discord PTB", canary: "Discord Canary"};
-async function deleteModuleDirs(config) {
-    const size = Object.keys(config).length;
-    const progressPerLoop = (DELETE_MODULE_DIRS_PROGRESS - progress.value) / size;
-    for (const channel in config) {
-        const roaming = path.join(remote.app.getPath("userData"), "..", platforms[channel].replace(" ", "").toLowerCase());
+const bdFolder = path.join(remote.app.getPath("appData"), "BetterDiscord");
+const bdDataFolder = path.join(bdFolder, "data");
+async function disableAllPlugins(channels) {
+    const progressPerLoop = (DELETE_PLUGINS_JSON_PROGRESS - progress.value) / channels.length;
+    for (const channel of channels) {
+        const channelFolder = path.join(bdDataFolder, channel);
+        const pluginsJson = path.join(channelFolder, "plugins.json");
         try {
-            const versionDir = (await fs.readdir(roaming)).find(d => d.split(".").length > 2);
-            const modulesPath = path.join(roaming, versionDir, "modules");
-            log("Removing " + modulesPath);
-            if (await exists(modulesPath)) {
-                const error = await new Promise(resolve => rimraf(path.join(modulesPath), originalFs, resolve));
-                if (error) {
-                    log(`❌ Could not delete modules in ${roaming}`);
-                    log(`❌ ${error.message}`);
-                    return error;
-                }
+            if (originalFs.existsSync(pluginsJson)) {
+                await fs.unlink(pluginsJson);
+                log(`✅ Deleted plugins.json`);
+            }
+            else {
+                log(`✅ plugins.json does not exist`);
             }
-            log("✅ Deletion successful");
             progress.set(progress.value + progressPerLoop);
+
         }
         catch (err) {
-            log(`❌ Could not delete modules in ${roaming}`);
+            log(`❌ Failed to delete plugins.json: ${pluginsJson}`);
             log(`❌ ${err.message}`);
             return err;
         }
@@ -117,11 +114,11 @@ export default async function(config) {
 
 
     await new Promise(r => setTimeout(r, 200));
-    lognewline("Deleting discord modules...");
-    const deleteModulesErr = await deleteModuleDirs(config);
-    if (deleteModulesErr) return fail();
-    log("✅ Modules deleted");
-    progress.set(DELETE_MODULE_DIRS_PROGRESS);
+    lognewline("Disabling all plugins...");
+    const deleteJsonErr = await disableAllPlugins(channels);
+    if (deleteJsonErr) return fail();
+    log("✅ Plugins disabled");
+    progress.set(DELETE_PLUGINS_JSON_PROGRESS);
 
 
     showInstallNotice(config);

src/renderer/actions/utils/fail.js

@@ -1,7 +1,7 @@
 import {log} from "./log";
 import {action, status} from "../../stores/installation";
 
-const discordURL = "https://discord.gg/0Tmfo5ZbORCRqbAd";
+const discordURL = "https://betterdiscord.app/invite";
 
 export default function fail() {
     log("");

src/renderer/common/SocialLinks.svelte

@@ -3,7 +3,7 @@
 
     const webUrl = "https://betterdiscord.app";
     const githubUrl = "http://github.com/BetterDiscord/BetterDiscord";
-    const donateUrl = "https://www.patreon.com/Zerebos";
+    const donateUrl = "https://github.com/sponsors/rauenzi/";
 </script>
 
 <div class="social-links">