diff --git a/src/plugins/devCompanion.dev/initWs.tsx b/src/plugins/devCompanion.dev/initWs.tsx index 941e84bb..ae96d57f 100644 --- a/src/plugins/devCompanion.dev/initWs.tsx +++ b/src/plugins/devCompanion.dev/initWs.tsx @@ -136,8 +136,6 @@ export function initWs(isManual = false) { ws.send(JSON.stringify(toSend)); } - logger.info("Received Message:", d.type, "\n", d.data); - switch (d.type) { case "disable": { const m = d.data; @@ -176,7 +174,7 @@ export function initWs(isManual = false) { case "search": { let moduleId: number; if (m.findType === "string") - moduleId = +findModuleId([m.idOrSearch.toString()]); + moduleId = +findModuleId([canonicalizeMatch(m.idOrSearch.toString())]); else moduleId = +findModuleId(mkRegexFind(m.idOrSearch)); const p = extractOrThrow(moduleId); @@ -217,7 +215,7 @@ export function initWs(isManual = false) { type: "extract", ok: true, data: { - module: extractModule(m.idOrSearch), + module: extractModule(m.idOrSearch, m.usePatched ?? undefined), moduleNumber: m.idOrSearch, }, }); @@ -227,7 +225,7 @@ export function initWs(isManual = false) { case "search": { let moduleId; if (m.findType === "string") - moduleId = +findModuleId([m.idOrSearch.toString()]); + moduleId = +findModuleId([canonicalizeMatch(m.idOrSearch.toString())]); else moduleId = +findModuleId(mkRegexFind(m.idOrSearch)); @@ -235,7 +233,7 @@ export function initWs(isManual = false) { type: "extract", ok: true, data: { - module: extractModule(moduleId), + module: extractModule(moduleId, m.usePatched ?? undefined), moduleNumber: moduleId }, }); @@ -445,7 +443,6 @@ interface AllModulesNotiProps { const AllModulesNoti = ErrorBoundary.wrap(function ({ done, close }: AllModulesNotiProps) { const [state, setState] = useState<0 | 1 | -1>(0); done.then(setState.bind(null, 1)).catch(setState.bind(null, -1)); - console.log("test"); if (state === 1) setTimeout(close, 5000); return (<> {state === 0 && "Loading lazy modules, restarting could lead to errors"} diff --git a/src/plugins/devCompanion.dev/types/recieve.ts b/src/plugins/devCompanion.dev/types/recieve.ts index bb82ba48..4e2b7b99 100644 --- a/src/plugins/devCompanion.dev/types/recieve.ts +++ b/src/plugins/devCompanion.dev/types/recieve.ts @@ -27,7 +27,9 @@ export type SearchData = ); export type FindOrSearchData = - | SearchData + | (SearchData & { + usePatched: boolean | null; + }) | ({ extractType: "find"; } & _PrefixKeys<_CapitalizeKeys, "find">);