From 03efbfd4470fe353cc92d33af9e8aead32b17bcc Mon Sep 17 00:00:00 2001 From: Zerebos Date: Sun, 6 Nov 2022 14:33:47 -0500 Subject: [PATCH] Change how patching modules works (#1474) --- preload/src/patcher.js | 3 +- renderer/src/modules/patcher.js | 495 ++++++++++++++------------------ 2 files changed, 225 insertions(+), 273 deletions(-) diff --git a/preload/src/patcher.js b/preload/src/patcher.js index d01c7f52..09fab12a 100644 --- a/preload/src/patcher.js +++ b/preload/src/patcher.js @@ -41,7 +41,8 @@ export default function () { if (!Reflect.has(exports, key) || target[key]) continue; Object.defineProperty(target, key, { - get: exports[key], + get: () => exports[key](), + set: v => {exports[key] = () => v;}, enumerable: true, configurable: true }); diff --git a/renderer/src/modules/patcher.js b/renderer/src/modules/patcher.js index ed392b16..3564c469 100644 --- a/renderer/src/modules/patcher.js +++ b/renderer/src/modules/patcher.js @@ -3,275 +3,226 @@ * instead of the original function. Can also alter arguments and return values. */ -import Logger from "common/logger"; -import DiscordModules from "./discordmodules"; -import WebpackModules from "./webpackmodules"; - -export default class Patcher { - - static get patches() {return this._patches || (this._patches = []);} - - /** - * Returns all the patches done by a specific caller - * @param {string} name - Name of the patch caller - * @method - */ - static getPatchesByCaller(name) { - if (!name) return []; - const patches = []; - for (const patch of this.patches) { - for (const childPatch of patch.children) { - if (childPatch.caller === name) patches.push(childPatch); - } - } - return patches; - } - - /** - * Unpatches all patches passed, or when a string is passed unpatches all - * patches done by that specific caller. - * @param {Array|string} patches - Either an array of patches to unpatch or a caller name - */ - static unpatchAll(patches) { - if (typeof patches === "string") patches = this.getPatchesByCaller(patches); - - for (const patch of patches) { - patch.unpatch(); - } - } - - static resolveModule(module) { - if (!module || typeof(module) === "function" || (typeof(module) === "object" && !Array.isArray(module))) return module; - if (typeof module === "string") return DiscordModules[module]; - if (Array.isArray(module)) return WebpackModules.findByUniqueProperties(module); - return null; - } - - static makeOverride(patch) { - return function () { - let returnValue; - if (!patch.children || !patch.children.length) return patch.originalFunction.apply(this, arguments); - for (const superPatch of patch.children.filter(c => c.type === "before")) { - try { - superPatch.callback(this, arguments); - } - catch (err) { - Logger.err("Patcher", `Could not fire before callback of ${patch.functionName} for ${superPatch.caller}`, err); - } - } - - const insteads = patch.children.filter(c => c.type === "instead"); - if (!insteads.length) {returnValue = patch.originalFunction.apply(this, arguments);} - else { - for (const insteadPatch of insteads) { - try { - const tempReturn = insteadPatch.callback(this, arguments, patch.originalFunction.bind(this)); - if (typeof(tempReturn) !== "undefined") returnValue = tempReturn; - } - catch (err) { - Logger.err("Patcher", `Could not fire instead callback of ${patch.functionName} for ${insteadPatch.caller}`, err); - } - } - } - - for (const slavePatch of patch.children.filter(c => c.type === "after")) { - try { - const tempReturn = slavePatch.callback(this, arguments, returnValue); - if (typeof(tempReturn) !== "undefined") returnValue = tempReturn; - } - catch (err) { - Logger.err("Patcher", `Could not fire after callback of ${patch.functionName} for ${slavePatch.caller}`, err); - } - } - return returnValue; - }; - } - - static rePatch(patch) { - patch.proxyFunction = patch.module[patch.functionName] = this.makeOverride(patch); - } - - static makePatch(module, functionName, name) { - const patch = { - name, - module, - functionName, - originalFunction: module[functionName], - proxyFunction: null, - revert: () => { // Calling revert will destroy any patches added to the same module after this - if (patch.getter) { - Object.defineProperty(patch.module, functionName, { - ...Object.getOwnPropertyDescriptor(patch.module, functionName), - get: () => patch.originalFunction, - set: undefined - }); - } - else { - patch.module[patch.functionName] = patch.originalFunction; - } - - patch.proxyFunction = null; - patch.children = []; - }, - counter: 0, - children: [] - }; - - patch.proxyFunction = this.makeOverride(patch); - - const descriptor = Object.getOwnPropertyDescriptor(module, functionName); - - if (descriptor?.get) { - patch.getter = true; - Object.defineProperty(module, functionName, { - configurable: true, - enumerable: true, - ...descriptor, - get: () => patch.proxyFunction, - // eslint-disable-next-line no-setter-return - set: value => (patch.originalFunction = value) - }); - } - else { - patch.getter = false; - module[functionName] = patch.proxyFunction; - } - - const descriptors = Object.assign({}, Object.getOwnPropertyDescriptors(patch.originalFunction), { - __originalFunction: { - get: () => patch.originalFunction, - configurable: true, - enumerable: true, - writeable: true - }, - toString: { - value: () => patch.originalFunction.toString(), - configurable: true, - enumerable: true, - writeable: true - } - }); - - Object.defineProperties(patch.proxyFunction, descriptors); - - this.patches.push(patch); - return patch; - } - - /** - * Function with no arguments and no return value that may be called to revert changes made by {@link module:Patcher}, restoring (unpatching) original method. - * @callback module:Patcher~unpatch - */ - - /** - * A callback that modifies method logic. This callback is called on each call of the original method and is provided all data about original call. Any of the data can be modified if necessary, but do so wisely. - * - * The third argument for the callback will be `undefined` for `before` patches. `originalFunction` for `instead` patches and `returnValue` for `after` patches. - * - * @callback module:Patcher~patchCallback - * @param {object} thisObject - `this` in the context of the original function. - * @param {args} args - The original arguments of the original function. - * @param {(function|*)} extraValue - For `instead` patches, this is the original function from the module. For `after` patches, this is the return value of the function. - * @return {*} Makes sense only when using an `instead` or `after` patch. If something other than `undefined` is returned, the returned value replaces the value of `returnValue`. If used for `before` the return value is ignored. - */ - - /** - * This method patches onto another function, allowing your code to run beforehand. - * Using this, you are also able to modify the incoming arguments before the original method is run. - * - * @param {string} caller - Name of the caller of the patch function. Using this you can undo all patches with the same name using {@link module:Patcher.unpatchAll}. Use `""` if you don't care. - * @param {object} moduleToPatch - Object with the function to be patched. Can also patch an object's prototype. - * @param {string} functionName - Name of the method to be patched - * @param {module:Patcher~patchCallback} callback - Function to run before the original method - * @param {object} options - Object used to pass additional options. - * @param {string} [options.displayName] You can provide meaningful name for class/object provided in `what` param for logging purposes. By default, this function will try to determine name automatically. - * @param {boolean} [options.forcePatch=true] Set to `true` to patch even if the function doesnt exist. (Adds noop function in place). - * @return {module:Patcher~unpatch} Function with no arguments and no return value that should be called to cancel (unpatch) this patch. You should save and run it when your plugin is stopped. - */ - static before(caller, moduleToPatch, functionName, callback, options = {}) {return this.pushChildPatch(caller, moduleToPatch, functionName, callback, Object.assign(options, {type: "before"}));} - - /** - * This method patches onto another function, allowing your code to run after. - * Using this, you are also able to modify the return value, using the return of your code instead. - * - * @param {string} caller - Name of the caller of the patch function. Using this you can undo all patches with the same name using {@link module:Patcher.unpatchAll}. Use `""` if you don't care. - * @param {object} moduleToPatch - Object with the function to be patched. Can also patch an object's prototype. - * @param {string} functionName - Name of the method to be patched - * @param {module:Patcher~patchCallback} callback - Function to run instead of the original method - * @param {object} options - Object used to pass additional options. - * @param {string} [options.displayName] You can provide meaningful name for class/object provided in `what` param for logging purposes. By default, this function will try to determine name automatically. - * @param {boolean} [options.forcePatch=true] Set to `true` to patch even if the function doesnt exist. (Adds noop function in place). - * @return {module:Patcher~unpatch} Function with no arguments and no return value that should be called to cancel (unpatch) this patch. You should save and run it when your plugin is stopped. - */ - static after(caller, moduleToPatch, functionName, callback, options = {}) {return this.pushChildPatch(caller, moduleToPatch, functionName, callback, Object.assign(options, {type: "after"}));} - - /** - * This method patches onto another function, allowing your code to run instead. - * Using this, you are also able to modify the return value, using the return of your code instead. - * - * @param {string} caller - Name of the caller of the patch function. Using this you can undo all patches with the same name using {@link module:Patcher.unpatchAll}. Use `""` if you don't care. - * @param {object} moduleToPatch - Object with the function to be patched. Can also patch an object's prototype. - * @param {string} functionName - Name of the method to be patched - * @param {module:Patcher~patchCallback} callback - Function to run after the original method - * @param {object} options - Object used to pass additional options. - * @param {string} [options.displayName] You can provide meaningful name for class/object provided in `what` param for logging purposes. By default, this function will try to determine name automatically. - * @param {boolean} [options.forcePatch=true] Set to `true` to patch even if the function doesnt exist. (Adds noop function in place). - * @return {module:Patcher~unpatch} Function with no arguments and no return value that should be called to cancel (unpatch) this patch. You should save and run it when your plugin is stopped. - */ - static instead(caller, moduleToPatch, functionName, callback, options = {}) {return this.pushChildPatch(caller, moduleToPatch, functionName, callback, Object.assign(options, {type: "instead"}));} - - /** - * This method patches onto another function, allowing your code to run before, instead or after the original function. - * Using this you are able to modify the incoming arguments before the original function is run as well as the return - * value before the original function actually returns. - * - * @param {string} caller - Name of the caller of the patch function. Using this you can undo all patches with the same name using {@link module:Patcher.unpatchAll}. Use `""` if you don't care. - * @param {object} moduleToPatch - Object with the function to be patched. Can also patch an object's prototype. - * @param {string} functionName - Name of the method to be patched - * @param {module:Patcher~patchCallback} callback - Function to run after the original method - * @param {object} options - Object used to pass additional options. - * @param {string} [options.type=after] - Determines whether to run the function `before`, `instead`, or `after` the original. - * @param {string} [options.displayName] You can provide meaningful name for class/object provided in `what` param for logging purposes. By default, this function will try to determine name automatically. - * @param {boolean} [options.forcePatch=true] Set to `true` to patch even if the function doesnt exist. (Adds noop function in place). - * @return {module:Patcher~unpatch} Function with no arguments and no return value that should be called to cancel (unpatch) this patch. You should save and run it when your plugin is stopped. - */ - static pushChildPatch(caller, moduleToPatch, functionName, callback, options = {}) { - const {type = "after", forcePatch = true} = options; - const module = this.resolveModule(moduleToPatch); - if (!module) return null; - if (!module[functionName] && forcePatch) module[functionName] = function() {}; - if (!(module[functionName] instanceof Function)) return null; - - const descriptor = Object.getOwnPropertyDescriptor(module, functionName); - if (descriptor && !descriptor?.configurable) { - Logger.err("Patcher", `Cannot patch ${functionName} of Module, property is readonly.`); - return null; - } - - if (typeof moduleToPatch === "string") options.displayName = moduleToPatch; - const displayName = options.displayName || module.displayName || module.name || module.constructor.displayName || module.constructor.name; - - const patchId = `${displayName}.${functionName}`; - const patch = this.patches.find(p => p.module == module && p.functionName == functionName) || this.makePatch(module, functionName, patchId); - if (!patch.proxyFunction) this.rePatch(patch); - const child = { - caller, - type, - id: patch.counter, - callback, - unpatch: () => { - patch.children.splice(patch.children.findIndex(cpatch => cpatch.id === child.id && cpatch.type === type), 1); - if (patch.children.length <= 0) { - const patchNum = this.patches.findIndex(p => p.module == module && p.functionName == functionName); - if (patchNum < 0) return; - this.patches[patchNum].revert(); - this.patches.splice(patchNum, 1); - } - } - }; - patch.children.push(child); - patch.counter++; - return child.unpatch; - } - -} + import Logger from "common/logger"; + import DiscordModules from "./discordmodules"; + import WebpackModules from "./webpackmodules"; + + export default class Patcher { + + static get patches() {return this._patches || (this._patches = []);} + + /** + * Returns all the patches done by a specific caller + * @param {string} name - Name of the patch caller + * @method + */ + static getPatchesByCaller(name) { + if (!name) return []; + const patches = []; + for (const patch of this.patches) { + for (const childPatch of patch.children) { + if (childPatch.caller === name) patches.push(childPatch); + } + } + return patches; + } + + /** + * Unpatches all patches passed, or when a string is passed unpatches all + * patches done by that specific caller. + * @param {Array|string} patches - Either an array of patches to unpatch or a caller name + */ + static unpatchAll(patches) { + if (typeof patches === "string") patches = this.getPatchesByCaller(patches); + + for (const patch of patches) { + patch.unpatch(); + } + } + + static resolveModule(module) { + if (!module || typeof(module) === "function" || (typeof(module) === "object" && !Array.isArray(module))) return module; + if (typeof module === "string") return DiscordModules[module]; + if (Array.isArray(module)) return WebpackModules.findByUniqueProperties(module); + return null; + } + + static makeOverride(patch) { + return function () { + let returnValue; + if (!patch.children || !patch.children.length) return patch.originalFunction.apply(this, arguments); + for (const superPatch of patch.children.filter(c => c.type === "before")) { + try { + superPatch.callback(this, arguments); + } + catch (err) { + Logger.err("Patcher", `Could not fire before callback of ${patch.functionName} for ${superPatch.caller}`, err); + } + } + + const insteads = patch.children.filter(c => c.type === "instead"); + if (!insteads.length) {returnValue = patch.originalFunction.apply(this, arguments);} + else { + for (const insteadPatch of insteads) { + try { + const tempReturn = insteadPatch.callback(this, arguments, patch.originalFunction.bind(this)); + if (typeof(tempReturn) !== "undefined") returnValue = tempReturn; + } + catch (err) { + Logger.err("Patcher", `Could not fire instead callback of ${patch.functionName} for ${insteadPatch.caller}`, err); + } + } + } + + for (const slavePatch of patch.children.filter(c => c.type === "after")) { + try { + const tempReturn = slavePatch.callback(this, arguments, returnValue); + if (typeof(tempReturn) !== "undefined") returnValue = tempReturn; + } + catch (err) { + Logger.err("Patcher", `Could not fire after callback of ${patch.functionName} for ${slavePatch.caller}`, err); + } + } + return returnValue; + }; + } + + static rePatch(patch) { + patch.proxyFunction = patch.module[patch.functionName] = this.makeOverride(patch); + } + + static makePatch(module, functionName, name) { + const patch = { + name, + module, + functionName, + originalFunction: module[functionName], + proxyFunction: null, + revert: () => { // Calling revert will destroy any patches added to the same module after this + patch.module[patch.functionName] = patch.originalFunction; + patch.proxyFunction = null; + patch.children = []; + }, + counter: 0, + children: [] + }; + patch.proxyFunction = module[functionName] = this.makeOverride(patch); + Object.assign(module[functionName], patch.originalFunction); + module[functionName].__originalFunction = patch.originalFunction; + module[functionName].toString = () => patch.originalFunction.toString(); + this.patches.push(patch); + return patch; + } + + /** + * Function with no arguments and no return value that may be called to revert changes made by {@link module:Patcher}, restoring (unpatching) original method. + * @callback module:Patcher~unpatch + */ + + /** + * A callback that modifies method logic. This callback is called on each call of the original method and is provided all data about original call. Any of the data can be modified if necessary, but do so wisely. + * + * The third argument for the callback will be `undefined` for `before` patches. `originalFunction` for `instead` patches and `returnValue` for `after` patches. + * + * @callback module:Patcher~patchCallback + * @param {object} thisObject - `this` in the context of the original function. + * @param {arguments} args - The original arguments of the original function. + * @param {(function|*)} extraValue - For `instead` patches, this is the original function from the module. For `after` patches, this is the return value of the function. + * @return {*} Makes sense only when using an `instead` or `after` patch. If something other than `undefined` is returned, the returned value replaces the value of `returnValue`. If used for `before` the return value is ignored. + */ + + /** + * This method patches onto another function, allowing your code to run beforehand. + * Using this, you are also able to modify the incoming arguments before the original method is run. + * + * @param {string} caller - Name of the caller of the patch function. Using this you can undo all patches with the same name using {@link module:Patcher.unpatchAll}. Use `""` if you don't care. + * @param {object} moduleToPatch - Object with the function to be patched. Can also patch an object's prototype. + * @param {string} functionName - Name of the method to be patched + * @param {module:Patcher~patchCallback} callback - Function to run before the original method + * @param {object} options - Object used to pass additional options. + * @param {string} [options.displayName] You can provide meaningful name for class/object provided in `what` param for logging purposes. By default, this function will try to determine name automatically. + * @param {boolean} [options.forcePatch=true] Set to `true` to patch even if the function doesnt exist. (Adds noop function in place). + * @return {module:Patcher~unpatch} Function with no arguments and no return value that should be called to cancel (unpatch) this patch. You should save and run it when your plugin is stopped. + */ + static before(caller, moduleToPatch, functionName, callback, options = {}) {return this.pushChildPatch(caller, moduleToPatch, functionName, callback, Object.assign(options, {type: "before"}));} + + /** + * This method patches onto another function, allowing your code to run after. + * Using this, you are also able to modify the return value, using the return of your code instead. + * + * @param {string} caller - Name of the caller of the patch function. Using this you can undo all patches with the same name using {@link module:Patcher.unpatchAll}. Use `""` if you don't care. + * @param {object} moduleToPatch - Object with the function to be patched. Can also patch an object's prototype. + * @param {string} functionName - Name of the method to be patched + * @param {module:Patcher~patchCallback} callback - Function to run instead of the original method + * @param {object} options - Object used to pass additional options. + * @param {string} [options.displayName] You can provide meaningful name for class/object provided in `what` param for logging purposes. By default, this function will try to determine name automatically. + * @param {boolean} [options.forcePatch=true] Set to `true` to patch even if the function doesnt exist. (Adds noop function in place). + * @return {module:Patcher~unpatch} Function with no arguments and no return value that should be called to cancel (unpatch) this patch. You should save and run it when your plugin is stopped. + */ + static after(caller, moduleToPatch, functionName, callback, options = {}) {return this.pushChildPatch(caller, moduleToPatch, functionName, callback, Object.assign(options, {type: "after"}));} + + /** + * This method patches onto another function, allowing your code to run instead. + * Using this, you are also able to modify the return value, using the return of your code instead. + * + * @param {string} caller - Name of the caller of the patch function. Using this you can undo all patches with the same name using {@link module:Patcher.unpatchAll}. Use `""` if you don't care. + * @param {object} moduleToPatch - Object with the function to be patched. Can also patch an object's prototype. + * @param {string} functionName - Name of the method to be patched + * @param {module:Patcher~patchCallback} callback - Function to run after the original method + * @param {object} options - Object used to pass additional options. + * @param {string} [options.displayName] You can provide meaningful name for class/object provided in `what` param for logging purposes. By default, this function will try to determine name automatically. + * @param {boolean} [options.forcePatch=true] Set to `true` to patch even if the function doesnt exist. (Adds noop function in place). + * @return {module:Patcher~unpatch} Function with no arguments and no return value that should be called to cancel (unpatch) this patch. You should save and run it when your plugin is stopped. + */ + static instead(caller, moduleToPatch, functionName, callback, options = {}) {return this.pushChildPatch(caller, moduleToPatch, functionName, callback, Object.assign(options, {type: "instead"}));} + + /** + * This method patches onto another function, allowing your code to run before, instead or after the original function. + * Using this you are able to modify the incoming arguments before the original function is run as well as the return + * value before the original function actually returns. + * + * @param {string} caller - Name of the caller of the patch function. Using this you can undo all patches with the same name using {@link module:Patcher.unpatchAll}. Use `""` if you don't care. + * @param {object} moduleToPatch - Object with the function to be patched. Can also patch an object's prototype. + * @param {string} functionName - Name of the method to be patched + * @param {module:Patcher~patchCallback} callback - Function to run after the original method + * @param {object} options - Object used to pass additional options. + * @param {string} [options.type=after] - Determines whether to run the function `before`, `instead`, or `after` the original. + * @param {string} [options.displayName] You can provide meaningful name for class/object provided in `what` param for logging purposes. By default, this function will try to determine name automatically. + * @param {boolean} [options.forcePatch=true] Set to `true` to patch even if the function doesnt exist. (Adds noop function in place). + * @return {module:Patcher~unpatch} Function with no arguments and no return value that should be called to cancel (unpatch) this patch. You should save and run it when your plugin is stopped. + */ + static pushChildPatch(caller, moduleToPatch, functionName, callback, options = {}) { + const {type = "after", forcePatch = true} = options; + const module = this.resolveModule(moduleToPatch); + if (!module) return null; + if (!module[functionName] && forcePatch) module[functionName] = function() {}; + if (!(module[functionName] instanceof Function)) return null; + + if (typeof moduleToPatch === "string") options.displayName = moduleToPatch; + const displayName = options.displayName || module.displayName || module.name || module.constructor.displayName || module.constructor.name; + + const patchId = `${displayName}.${functionName}`; + const patch = this.patches.find(p => p.module == module && p.functionName == functionName) || this.makePatch(module, functionName, patchId); + if (!patch.proxyFunction) this.rePatch(patch); + const child = { + caller, + type, + id: patch.counter, + callback, + unpatch: () => { + patch.children.splice(patch.children.findIndex(cpatch => cpatch.id === child.id && cpatch.type === type), 1); + if (patch.children.length <= 0) { + const patchNum = this.patches.findIndex(p => p.module == module && p.functionName == functionName); + if (patchNum < 0) return; + this.patches[patchNum].revert(); + this.patches.splice(patchNum, 1); + } + } + }; + patch.children.push(child); + patch.counter++; + return child.unpatch; + } + + } + \ No newline at end of file