Skip to content

Commit

Permalink
perf(settings): Cache proxies
Browse files Browse the repository at this point in the history
  • Loading branch information
Vendicated committed Nov 28, 2022
1 parent a0a1a4d commit 3b4879f
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions src/api/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,18 @@ try {
var settings = JSON.parse(VencordNative.ipc.sendSync(IpcEvents.GET_SETTINGS)) as Settings;
mergeDefaults(settings, DefaultSettings);
} catch (err) {
console.error("Corrupt settings file. ", err);
var settings = mergeDefaults({} as Settings, DefaultSettings);
logger.error("An error occurred while loading the settings. Corrupt settings file?\n", err);
}

type SubscriptionCallback = ((newValue: any, path: string) => void) & { _path?: string; };
const subscriptions = new Set<SubscriptionCallback>();

const proxyCache = {} as Record<string, any>;

// Wraps the passed settings object in a Proxy to nicely handle change listeners and default values
function makeProxy(settings: any, root = settings, path = ""): Settings {
return new Proxy(settings, {
return proxyCache[path] ??= new Proxy(settings, {
get(target, p: string) {
const v = target[p];

Expand All @@ -67,7 +69,7 @@ function makeProxy(settings: any, root = settings, path = ""): Settings {
if (path === "plugins" && p in plugins)
return target[p] = makeProxy({
enabled: plugins[p].required ?? false
}, root, `plugins/${p}`);
}, root, `plugins.${p}`);

// Since the property is not set, check if this is a plugin's setting and if so, try to resolve
// the default value.
Expand Down

0 comments on commit 3b4879f

Please sign in to comment.