lightcordwarez
/
BetterDiscordApp-rauenzi
mirror of https://github.com/rauenzi/BetterDiscordApp.git
1
0
Fork 0
Code Issues 3 Releases Wiki Activity

Switch to indirect eval

This commit is contained in:
Zack Rauen 2022-06-29 15:36:53 -04:00
parent 1368667144
commit b7af7380b9
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
renderer/src/modules/pluginmanager.js
View File

@ -115,19 +115,17 @@ export default new class PluginManager extends AddonManager {
}
finalizeRequire(module, fileContent, meta) {
fileContent += normalizeExports(meta.exports || meta.name);
fileContent += `\n//# sourceURL=betterdiscord://plugins/${module.filename}`;
try {
// Test if the code is valid gracefully
vm.compileFunction(fileContent, ["require", "module", "exports", "__filename", "__dirname"]);
const wrappedPlugin = new Function(["require", "module", "exports", "__filename", "__dirname"], fileContent); // eslint-disable-line no-new-func
fileContent += normalizeExports(meta.exports || meta.name);
const compiled = `(${vm.compileFunction(fileContent, ["require", "module", "exports", "__filename", "__dirname"]).toString()})\n//# sourceURL=betterdiscord://plugins/${path.basename(module.filename)}`;
const wrappedPlugin = (0, eval)(compiled); // eslint-disable-line no-eval
wrappedPlugin(window.require, module, module.exports, module.filename, this.addonFolder);
meta.exports = module.exports;
module.exports = meta;
}
catch (err) {
return new AddonError(meta.name || path.basename(module.filename), module.filename, "Plugin could not be compiled", {message: err.message, stack: err.stack}, this.prefix);
}
meta.exports = module.exports;
module.exports = meta;
}
startAddon(id) {return this.startPlugin(id);}