mirrors/Vencord
1
0
Fork 1
mirror of https://github.com/Vendicated/Vencord.git synced 2025-01-10 18:06:22 +00:00
Code Activity

add diffing and start work on reporter GUI

Browse source
This commit is contained in:
sadan 2024-08-20 12:37:47 -04:00
parent 219c764680
commit da01d52e50
No known key found for this signature in database
4 changed files with 71 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/debug/runReporter.ts
View file

@ -11,7 +11,36 @@ import { patches } from "plugins";
import { loadLazyChunks } from "./loadLazyChunks"; import { loadLazyChunks } from "./loadLazyChunks";
const ReporterLogger = new Logger("Reporter"); const ReporterLogger = new Logger("Reporter");
interface ReporterData {
failedPatches: {
/**
* pluginName > array of failed modules
*/
foundNoModule: Record<string, string[]>;
};
failedWebpack: Record<Webpack.TypeWebpackSearchHistory, string[][]>;
}
const reporterData: ReporterData = {
failedPatches: {
foundNoModule: {}
},
failedWebpack: {
find: [[]],
findByProps: [[]],
findByCode: [[]],
findStore: [[]],
findComponent: [[]],
findComponentByCode: [[]],
findExportedComponent: [[]],
waitFor: [[]],
waitForComponent: [[]],
waitForStore: [[]],
proxyLazyWebpack: [[]],
LazyComponentWebpack: [[]],
extractAndLoadChunks: [[]],
mapMangledModule: [[]]
}
};
async function runReporter() { async function runReporter() {
try { try {
ReporterLogger.log("Starting test..."); ReporterLogger.log("Starting test...");
@ -70,7 +99,7 @@ async function runReporter() {
logMessage += `("${args[0]}", {\n${failedMappings.map(mapping => `\t${mapping}: ${args[1][mapping].toString().slice(0, 147)}...`).join(",\n")}\n})`; logMessage += `("${args[0]}", {\n${failedMappings.map(mapping => `\t${mapping}: ${args[1][mapping].toString().slice(0, 147)}...`).join(",\n")}\n})`;
} }
else logMessage += `(${args.map(arg => `"${arg}"`).join(", ")})`; else logMessage += `(${args.map(arg => `"${arg}"`).join(", ")})`;
reporterData.failedWebpack[method].push(args.map(a => String(a)));
ReporterLogger.log("Webpack Find Fail:", logMessage); ReporterLogger.log("Webpack Find Fail:", logMessage);
} }
} }
@ -82,3 +111,4 @@ async function runReporter() {
} }
runReporter(); runReporter();
console.log(reporterData);

63
src/plugins/devCompanion.dev/index.tsx
View file

@ -131,35 +131,42 @@ function initWs(isManual = false) {
switch (type) { switch (type) {
case "diff": { case "diff": {
const { extractType, idOrSearch } = data; try {
switch (extractType) { const { extractType, idOrSearch } = data;
case "id": { switch (extractType) {
if (typeof idOrSearch !== "number") case "id": {
throw new Error("Id is not a number, got :" + typeof idOrSearch); if (typeof idOrSearch !== "number")
replyData({ throw new Error("Id is not a number, got :" + typeof idOrSearch);
type: "diff", replyData({
ok: true, type: "diff",
data: { ok: true,
patched: extractOrThrow(idOrSearch), data: {
source: extractModule(idOrSearch, false) patched: extractOrThrow(idOrSearch),
}, source: extractModule(idOrSearch, false)
moduleNumber: idOrSearch },
}); moduleNumber: idOrSearch
break; });
} break;
case "search": { }
const moduleId = +findModuleId([idOrSearch.toString()]); case "search": {
replyData({ const moduleId = +findModuleId([idOrSearch.toString()]);
type: "diff", const p = extractOrThrow(moduleId);
ok: true, const p2 = extractModule(moduleId, false);
data: { console.log(p, p2, "done");
patched: extractOrThrow(moduleId), replyData({
source: extractModule(moduleId, false) type: "diff",
}, ok: true,
moduleNumber: moduleId data: {
}); patched: p,
break; source: p2
},
moduleNumber: moduleId
});
break;
}
} }
} catch (error) {
reply(String(error));
} }
break; break;
} }

2
src/plugins/devCompanion.dev/util.tsx
View file

@ -63,7 +63,7 @@ export function extractModule(id: number, patched = settings.store.usePatchedMod
const module = wreq.m[id]; const module = wreq.m[id];
if (!module) if (!module)
throw new Error("No module found for module id:" + id); throw new Error("No module found for module id:" + id);
return patched ? module.$$vencordPatchedSource ?? module.original : module.original; return patched ? module.$$vencordPatchedSource ?? module.original.toString() : module.original.toString();
} export function parseNode(node: Node) { } export function parseNode(node: Node) {
switch (node.type) { switch (node.type) {
case "string": case "string":

4
src/webpack/webpack.ts
View file

@ -287,7 +287,9 @@ export function findModuleFactory(...code: CodeFilter) {
return wreq.m[id]; return wreq.m[id];
} }
export const lazyWebpackSearchHistory = [] as Array<["find" | "findByProps" | "findByCode" | "findStore" | "findComponent" | "findComponentByCode" | "findExportedComponent" | "waitFor" | "waitForComponent" | "waitForStore" | "proxyLazyWebpack" | "LazyComponentWebpack" | "extractAndLoadChunks" | "mapMangledModule", any[]]>; // FIXME: give this a better name
export type TypeWebpackSearchHistory = "find" | "findByProps" | "findByCode" | "findStore" | "findComponent" | "findComponentByCode" | "findExportedComponent" | "waitFor" | "waitForComponent" | "waitForStore" | "proxyLazyWebpack" | "LazyComponentWebpack" | "extractAndLoadChunks" | "mapMangledModule";
export const lazyWebpackSearchHistory = [] as Array<[TypeWebpackSearchHistory, any[]]>;
/** /**
* This is just a wrapper around {@link proxyLazy} to make our reporter test for your webpack finds. * This is just a wrapper around {@link proxyLazy} to make our reporter test for your webpack finds.