xmj/element-call
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Re-jig config accessors

Browse source 
We only ever used the static instance() method to get to the config
object, so just make a static instance that returns the ConfigOptions
directly, throwing an exception if it's not yet initialised. This way
the types can all be non-optional (plus it's shorter).
This commit is contained in:
David Baker 2022-12-21 10:17:53 +00:00
commit c879090a34
4 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/config/Config.ts
View file

@ -18,13 +18,15 @@ import { DEFAULT_CONFIG, ConfigOptions } from "./ConfigOptions";
export class Config {
private static internalInstance: Config;
public static get instance(): Config {
if (!this.internalInstance)
public static get(): ConfigOptions {
if (!this.internalInstance?.config)
throw new Error("Config instance read before config got initialized");
return this.internalInstance;
return this.internalInstance.config;
}
public static init(): Promise<void> {
if (Config?.internalInstance?.initPromise) {
if (Config.internalInstance?.initPromise) {
return Config.internalInstance.initPromise;
}
Config.internalInstance = new Config();
@ -39,25 +41,25 @@ export class Config {
// Convenience accessors
public static defaultHomeserverUrl(): string | undefined {
const defaultServerConfig = Config.instance.config.default_server_config;
const defaultServerConfig = Config.get().default_server_config;
if (!defaultServerConfig) {
return undefined;
}
return defaultServerConfig["m.homeserver"]?.base_url;
return defaultServerConfig["m.homeserver"].base_url;
}
public static defaultServerName(): string | undefined {
const defaultServerConfig = Config.instance.config.default_server_config;
const defaultServerConfig = Config.get().default_server_config;
if (!defaultServerConfig) {
return undefined;
}
return defaultServerConfig["m.homeserver"]?.server_name;
return defaultServerConfig["m.homeserver"].server_name;
}
public config: ConfigOptions;
private initPromise: Promise<void>;
public config?: ConfigOptions;
private initPromise?: Promise<void>;
}
async function downloadConfig(