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

Addd ResolvedConfigOptions back

Browse source
This commit is contained in:
David Baker 2022-12-21 15:25:08 +00:00
commit 3581aceb5a
2 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/config/Config.ts
View file

@ -14,7 +14,11 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
import { DEFAULT_CONFIG, ConfigOptions } from "./ConfigOptions"; import {
DEFAULT_CONFIG,
ConfigOptions,
ResolvedConfigOptions,
} from "./ConfigOptions";
export class Config { export class Config {
private static internalInstance: Config; private static internalInstance: Config;
@ -48,7 +52,7 @@ export class Config {
return Config.get().default_server_config["m.homeserver"].server_name; return Config.get().default_server_config["m.homeserver"].server_name;
} }
public config?: ConfigOptions; public config?: ResolvedConfigOptions;
private initPromise?: Promise<void>; private initPromise?: Promise<void>;
} }

11
src/config/ConfigOptions.ts
View file

@ -22,6 +22,15 @@ export interface ConfigOptions {
// Describes the default homeserver to use. The same format as Element Web // Describes the default homeserver to use. The same format as Element Web
// (without identity servers as we don't use them). // (without identity servers as we don't use them).
default_server_config?: {
["m.homeserver"]: {
base_url: string;
server_name: string;
};
};
}
export interface ResolvedConfigOptions extends ConfigOptions {
default_server_config: { default_server_config: {
["m.homeserver"]: { ["m.homeserver"]: {
base_url: string; base_url: string;
@ -30,7 +39,7 @@ export interface ConfigOptions {
}; };
} }
export const DEFAULT_CONFIG: ConfigOptions = { export const DEFAULT_CONFIG: ResolvedConfigOptions = {
default_server_config: { default_server_config: {
["m.homeserver"]: { ["m.homeserver"]: {
base_url: "http://localhost:8008", base_url: "http://localhost:8008",