From a7ccbcfca4f181790b86199a7f31d1ae19e0253f Mon Sep 17 00:00:00 2001 From: Vendicated Date: Wed, 31 Aug 2022 20:47:07 +0200 Subject: Refactor webpack; Add ErrorBoundary --- src/webpack/common.ts | 31 +++++++++++++++ src/webpack/index.ts | 106 +------------------------------------------------ src/webpack/webpack.ts | 84 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 117 insertions(+), 104 deletions(-) create mode 100644 src/webpack/common.ts create mode 100644 src/webpack/webpack.ts (limited to 'src/webpack') diff --git a/src/webpack/common.ts b/src/webpack/common.ts new file mode 100644 index 0000000..f678a94 --- /dev/null +++ b/src/webpack/common.ts @@ -0,0 +1,31 @@ +import { startAll } from "../plugins"; +import { waitFor, filters } from './webpack'; + +export let FluxDispatcher: any; +export let React: typeof import("react"); +export let UserStore: any; +export let Forms: any; +export let Button: any; +export let ButtonProps: any; +export let Switch: any; +export let Flex: any; +export let Card: any; + +waitFor("useState", m => React = m); +waitFor(["dispatch", "subscribe"], m => { + FluxDispatcher = m; + const cb = () => { + m.unsubscribe("CONNECTION_OPEN", cb); + startAll(); + }; + m.subscribe("CONNECTION_OPEN", cb); +}); +waitFor(["getCurrentUser", "initialize"], m => UserStore = m); +waitFor("FormSection", m => Forms = m); +waitFor(["ButtonLooks", "default"], m => { + Button = m.default; + ButtonProps = m; +}); +waitFor(filters.byDisplayName("SwitchItem"), m => Switch = m.default); +waitFor(filters.byDisplayName("Flex"), m => Flex = m.default); +waitFor(filters.byDisplayName("Card"), m => Card = m.default); \ No newline at end of file diff --git a/src/webpack/index.ts b/src/webpack/index.ts index 2c5a455..a388dbd 100644 --- a/src/webpack/index.ts +++ b/src/webpack/index.ts @@ -1,104 +1,2 @@ -import { startAll } from "../plugins"; - -let webpackCache: typeof window.webpackChunkdiscord_app; - -export const subscriptions = new Map(); -export const listeners = new Set(); - -type FilterFn = (mod: any) => boolean; -type CallbackFn = (mod: any) => void; - -export let React: typeof import("react"); -export let FluxDispatcher: any; -export let Forms: any; -export let UserStore: any; - -export function _initWebpack(instance: typeof window.webpackChunkdiscord_app) { - if (webpackCache !== void 0) throw "no."; - - webpackCache = instance.push([[Symbol()], {}, (r) => r.c]); - instance.pop(); - - // Abandon Hope All Ye Who Enter Here - - let started = false; - waitFor("getCurrentUser", x => UserStore = x); - waitFor(["dispatch", "subscribe"], x => { - FluxDispatcher = x; - const cb = () => { - console.info("Connection open"); - x.unsubscribe("CONNECTION_OPEN", cb); - startAll(); - }; - x.subscribe("CONNECTION_OPEN", cb); - }); - waitFor("useState", x => (React = x)); - waitFor("FormSection", x => Forms = x); -} - -export function find(filter: FilterFn, getDefault = true) { - if (typeof filter !== "function") - throw new Error("Invalid filter. Expected a function got", filter); - - for (const key in webpackCache) { - const mod = webpackCache[key]; - if (mod?.exports && filter(mod.exports)) - return mod.exports; - if (mod?.exports?.default && filter(mod.exports.default)) - return getDefault ? mod.exports.default : mod.exports; - } - - return null; -} - -export function findAll(filter: FilterFn, getDefault = true) { - if (typeof filter !== "function") throw new Error("Invalid filter. Expected a function got", filter); - - const ret = [] as any[]; - for (const key in webpackCache) { - const mod = webpackCache[key]; - if (mod?.exports && filter(mod.exports)) ret.push(mod.exports); - if (mod?.exports?.default && filter(mod.exports.default)) ret.push(getDefault ? mod.exports.default : mod.exports); - } - - return ret; -} - -export const filters = { - byProps: (props: string[]): FilterFn => - props.length === 1 - ? m => m[props[0]] !== void 0 - : m => props.every(p => m[p] !== void 0), - byDisplayName: (deezNuts: string): FilterFn => m => m.default?.displayName === deezNuts -}; - -export function findByProps(...props: string[]) { - return find(filters.byProps(props)); -} - -export function findAllByProps(...props: string[]) { - return findAll(filters.byProps(props)); -} - -export function findByDisplayName(deezNuts: string) { - return find(filters.byDisplayName(deezNuts)); -} - -export function waitFor(filter: string | string[] | FilterFn, callback: CallbackFn) { - if (typeof filter === "string") filter = filters.byProps([filter]); - else if (Array.isArray(filter)) filter = filters.byProps(filter); - else if (typeof filter !== "function") throw new Error("filter must be a string, string[] or function, got", filter); - - const existing = find(filter!); - if (existing) return void callback(existing); - - subscriptions.set(filter, callback); -} - -export function addListener(callback: CallbackFn) { - listeners.add(callback); -} - -export function removeListener(callback: CallbackFn) { - listeners.delete(callback); -} \ No newline at end of file +export * from "./webpack"; +export * as Common from "./common"; \ No newline at end of file diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts new file mode 100644 index 0000000..a616ac2 --- /dev/null +++ b/src/webpack/webpack.ts @@ -0,0 +1,84 @@ +let webpackCache: typeof window.webpackChunkdiscord_app; + +export type FilterFn = (mod: any) => boolean; + +export const filters = { + byProps: (props: string[]): FilterFn => + props.length === 1 + ? m => m[props[0]] !== void 0 + : m => props.every(p => m[p] !== void 0), + byDisplayName: (deezNuts: string): FilterFn => m => m.default?.displayName === deezNuts +}; + +export const subscriptions = new Map(); +export const listeners = new Set(); + +export type CallbackFn = (mod: any) => void; + +export function _initWebpack(instance: typeof window.webpackChunkdiscord_app) { + if (webpackCache !== void 0) throw "no."; + + webpackCache = instance.push([[Symbol()], {}, (r) => r.c]); + instance.pop(); +} + +export function find(filter: FilterFn, getDefault = true) { + if (typeof filter !== "function") + throw new Error("Invalid filter. Expected a function got", filter); + + for (const key in webpackCache) { + const mod = webpackCache[key]; + if (mod?.exports && filter(mod.exports)) + return mod.exports; + if (mod?.exports?.default && filter(mod.exports.default)) + return getDefault ? mod.exports.default : mod.exports; + } + + return null; +} + +export function findAll(filter: FilterFn, getDefault = true) { + if (typeof filter !== "function") throw new Error("Invalid filter. Expected a function got", filter); + + const ret = [] as any[]; + for (const key in webpackCache) { + const mod = webpackCache[key]; + if (mod?.exports && filter(mod.exports)) ret.push(mod.exports); + if (mod?.exports?.default && filter(mod.exports.default)) ret.push(getDefault ? mod.exports.default : mod.exports); + } + + return ret; +} + + + +export function findByProps(...props: string[]) { + return find(filters.byProps(props)); +} + +export function findAllByProps(...props: string[]) { + return findAll(filters.byProps(props)); +} + +export function findByDisplayName(deezNuts: string) { + return find(filters.byDisplayName(deezNuts)); +} + +export function waitFor(filter: string | string[] | FilterFn, callback: CallbackFn) { + if (typeof filter === "string") filter = filters.byProps([filter]); + else if (Array.isArray(filter)) filter = filters.byProps(filter); + else if (typeof filter !== "function") throw new Error("filter must be a string, string[] or function, got", filter); + + const existing = find(filter!); + if (existing) return void callback(existing); + + subscriptions.set(filter, callback); +} + +export function addListener(callback: CallbackFn) { + listeners.add(callback); +} + +export function removeListener(callback: CallbackFn) { + listeners.delete(callback); +} \ No newline at end of file -- cgit