optimize settings helper
This commit is contained in:
parent
730c25a9a1
commit
a8edc19f34
11 changed files with 343 additions and 119 deletions
|
|
@ -103,7 +103,7 @@ export default abstract class BackupHelper {
|
|||
let files = FileSystemHelper.getFilesInDirectory("backup", ".json");
|
||||
let sorted = files.sort((a, b) => new Date(b.split(".")[0]).getTime() - new Date(a.split(".")[0]).getTime());
|
||||
|
||||
const filesToDelete = sorted.slice(SettingHelper.getSetting("backup.copies") as number);
|
||||
const filesToDelete = sorted.slice(SettingHelper.getSetting("backup.copies"));
|
||||
for (const file of filesToDelete) {
|
||||
FileSystemHelper.deleteFile("backup", file);
|
||||
}
|
||||
|
|
@ -117,7 +117,7 @@ export default abstract class BackupHelper {
|
|||
let diffInMs = new Date().getTime() - lastBackup.getTime();
|
||||
let diffInDays = diffInMs / (1000 * 60 * 60 * 24);
|
||||
|
||||
if (diffInDays >= (SettingHelper.getSetting("backup.interval") as number)) {
|
||||
if (diffInDays >= SettingHelper.getSetting("backup.interval")) {
|
||||
await this.createBackup({});
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,8 +36,8 @@ export abstract class CalendarHelper {
|
|||
location: i.location,
|
||||
categories: [i.type.type],
|
||||
organizer: {
|
||||
name: SettingHelper.getSetting("club.name") as string,
|
||||
email: SettingHelper.getSetting("mail.username") as string,
|
||||
name: SettingHelper.getSetting("club.name"),
|
||||
email: SettingHelper.getSetting("mail.username"),
|
||||
},
|
||||
created: moment(i.createdAt)
|
||||
.format("YYYY-M-D-H-m")
|
||||
|
|
@ -49,9 +49,7 @@ export abstract class CalendarHelper {
|
|||
.map((a) => parseInt(a)) as [number, number, number, number, number],
|
||||
transp: "OPAQUE" as "OPAQUE",
|
||||
status: "CONFIRMED",
|
||||
...(SettingHelper.getSetting("club.website") != ""
|
||||
? { url: SettingHelper.getSetting("club.website") as string }
|
||||
: {}),
|
||||
...(SettingHelper.getSetting("club.website") != "" ? { url: SettingHelper.getSetting("club.website") } : {}),
|
||||
alarms: [
|
||||
{
|
||||
action: "display",
|
||||
|
|
|
|||
69
src/helpers/convertHelper.ts
Normal file
69
src/helpers/convertHelper.ts
Normal file
|
|
@ -0,0 +1,69 @@
|
|||
import ms from "ms";
|
||||
|
||||
export abstract class TypeConverter<T> {
|
||||
abstract fromString(value: string): T;
|
||||
abstract toString(value: T): string;
|
||||
abstract validate(value: string): boolean;
|
||||
}
|
||||
|
||||
export abstract class StringTypeConverter extends TypeConverter<string> {
|
||||
fromString(value: string): string {
|
||||
return value;
|
||||
}
|
||||
toString(value: string): string {
|
||||
return value;
|
||||
}
|
||||
validate(value: string): boolean {
|
||||
return typeof value === "string";
|
||||
}
|
||||
}
|
||||
|
||||
export abstract class NumberTypeConverter extends TypeConverter<number> {
|
||||
fromString(value: string): number {
|
||||
return Number(value);
|
||||
}
|
||||
toString(value: number): string {
|
||||
return String(value);
|
||||
}
|
||||
validate(value: string): boolean {
|
||||
const num = Number(value);
|
||||
return !isNaN(num);
|
||||
}
|
||||
}
|
||||
|
||||
export abstract class BooleanTypeConverter extends TypeConverter<boolean> {
|
||||
fromString(value: string): boolean {
|
||||
return value === "true";
|
||||
}
|
||||
toString(value: boolean): string {
|
||||
return value ? "true" : "false";
|
||||
}
|
||||
validate(value: string): boolean {
|
||||
return value === "true" || value === "false";
|
||||
}
|
||||
}
|
||||
|
||||
export abstract class MsTypeConverter extends TypeConverter<ms.StringValue> {
|
||||
fromString(value: string): ms.StringValue {
|
||||
return value as ms.StringValue;
|
||||
}
|
||||
toString(value: ms.StringValue): string {
|
||||
return String(value);
|
||||
}
|
||||
validate(value: string): boolean {
|
||||
try {
|
||||
const result = ms(value as ms.StringValue);
|
||||
return result !== undefined;
|
||||
} catch (e) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Konkrete Implementierungen der Converter
|
||||
export class StringConverter extends StringTypeConverter {}
|
||||
export class LongStringConverter extends StringTypeConverter {}
|
||||
export class UrlConverter extends StringTypeConverter {}
|
||||
export class NumberConverter extends NumberTypeConverter {}
|
||||
export class BooleanConverter extends BooleanTypeConverter {}
|
||||
export class MsConverter extends MsTypeConverter {}
|
||||
|
|
@ -6,10 +6,12 @@ export default abstract class MailHelper {
|
|||
private static transporter: Transporter;
|
||||
|
||||
static createTransport() {
|
||||
this.transporter?.close();
|
||||
|
||||
this.transporter = createTransport({
|
||||
host: SettingHelper.getSetting("mail.host"),
|
||||
port: SettingHelper.getSetting("mail.port"),
|
||||
secure: SettingHelper.getSetting("mail.secure") as boolean,
|
||||
secure: SettingHelper.getSetting("mail.secure"),
|
||||
auth: {
|
||||
user: SettingHelper.getSetting("mail.username"),
|
||||
pass: SettingHelper.getSetting("mail.password"),
|
||||
|
|
@ -17,6 +19,13 @@ export default abstract class MailHelper {
|
|||
} as TransportOptions);
|
||||
}
|
||||
|
||||
static initialize() {
|
||||
SettingHelper.onSettingTopicChanged("mail", () => {
|
||||
this.createTransport();
|
||||
});
|
||||
this.createTransport();
|
||||
}
|
||||
|
||||
/**
|
||||
* @description send mail
|
||||
* @param {string} target
|
||||
|
|
|
|||
|
|
@ -1,135 +1,242 @@
|
|||
import { SettingString, settingsType } from "../type/settingTypes";
|
||||
import ms from "ms";
|
||||
import { SettingString, settingsType, SettingTopic, SettingTypeAtom, SettingValueMapping } from "../type/settingTypes";
|
||||
import { CodingHelper } from "./codingHelper";
|
||||
import SettingCommandHandler from "../command/settingCommandHandler";
|
||||
import SettingService from "../service/settingService";
|
||||
import { APPLICATION_SECRET } from "../env.defaults";
|
||||
import {
|
||||
BooleanConverter,
|
||||
LongStringConverter,
|
||||
MsConverter,
|
||||
NumberConverter,
|
||||
StringConverter,
|
||||
TypeConverter,
|
||||
UrlConverter,
|
||||
} from "./convertHelper";
|
||||
|
||||
export default abstract class SettingHelper {
|
||||
private static settings: { [key in SettingString]?: string } = {};
|
||||
|
||||
public static getSetting(key: SettingString): string | number | boolean | ms.StringValue {
|
||||
let settingType = settingsType[key];
|
||||
let setting = this.settings[key] ?? String(settingType.default ?? "");
|
||||
private static listeners: Map<SettingString, Array<(newValue: any, oldValue: any) => void>> = new Map();
|
||||
private static topicListeners: Map<SettingTopic, Array<() => void>> = new Map();
|
||||
|
||||
private static readonly converters: Record<SettingTypeAtom, TypeConverter<any>> = {
|
||||
longstring: new LongStringConverter(),
|
||||
string: new StringConverter(),
|
||||
url: new UrlConverter(),
|
||||
number: new NumberConverter(),
|
||||
boolean: new BooleanConverter(),
|
||||
ms: new MsConverter(),
|
||||
};
|
||||
|
||||
/**
|
||||
* Returns the value of a setting with the correct type based on the key
|
||||
* @param key The key of the setting
|
||||
* @returns The typed value of the setting
|
||||
*/
|
||||
public static getSetting<K extends SettingString>(key: K): SettingValueMapping[K] {
|
||||
const settingType = settingsType[key];
|
||||
const rawValue = this.settings[key] ?? String(settingType.default ?? "");
|
||||
|
||||
if (Array.isArray(settingType.type)) {
|
||||
return setting;
|
||||
return rawValue as unknown as SettingValueMapping[K];
|
||||
}
|
||||
|
||||
if (settingType.type.includes("/crypt")) {
|
||||
setting = CodingHelper.decrypt(APPLICATION_SECRET, String(setting));
|
||||
let processedValue = rawValue;
|
||||
if (typeof settingType.type === "string" && settingType.type.includes("/crypt")) {
|
||||
processedValue = CodingHelper.decrypt(APPLICATION_SECRET, processedValue);
|
||||
}
|
||||
|
||||
if (settingType.type.startsWith("string")) {
|
||||
return setting;
|
||||
}
|
||||
if (settingType.type.startsWith("ms")) {
|
||||
return setting as ms.StringValue;
|
||||
}
|
||||
if (settingType.type.startsWith("number")) {
|
||||
return Number(setting);
|
||||
}
|
||||
if (settingType.type.startsWith("boolean")) {
|
||||
return setting == "true";
|
||||
}
|
||||
return setting;
|
||||
const baseType =
|
||||
typeof settingType.type === "string"
|
||||
? (settingType.type.split("/")[0] as SettingTypeAtom)
|
||||
: (settingType.type as SettingTypeAtom);
|
||||
|
||||
return this.converters[baseType].fromString(processedValue) as unknown as SettingValueMapping[K];
|
||||
}
|
||||
|
||||
public static async setSetting(key: SettingString, value: string) {
|
||||
if (value == undefined || value == null) return;
|
||||
let settingType = settingsType[key];
|
||||
/**
|
||||
* Sets a setting
|
||||
* @param key The key of the setting
|
||||
* @param value The value to set
|
||||
*/
|
||||
public static async setSetting(key: SettingString, value: string): Promise<void> {
|
||||
if (value === undefined || value === null) return;
|
||||
|
||||
let result = value;
|
||||
const settingType = settingsType[key];
|
||||
this.validateSetting(key, value);
|
||||
|
||||
this.checkSettings(key, result);
|
||||
const oldValue = this.getSetting(key);
|
||||
let finalValue = value;
|
||||
|
||||
if (!Array.isArray(settingType.type) && settingType.type.includes("/crypt")) {
|
||||
result = CodingHelper.encrypt(APPLICATION_SECRET, value);
|
||||
if (typeof settingType.type === "string" && settingType.type.includes("/crypt")) {
|
||||
finalValue = CodingHelper.encrypt(APPLICATION_SECRET, value);
|
||||
}
|
||||
|
||||
this.settings[key] = finalValue;
|
||||
const [topic, settingKey] = key.split(".") as [SettingTopic, string];
|
||||
|
||||
await SettingCommandHandler.create({
|
||||
topic: key.split(".")[0],
|
||||
key: key.split(".")[1],
|
||||
value: result,
|
||||
topic,
|
||||
key: settingKey,
|
||||
value: finalValue,
|
||||
});
|
||||
|
||||
const newValue = this.getSetting(key);
|
||||
this.notifyListeners(key, newValue, oldValue);
|
||||
}
|
||||
|
||||
public static async resetSetting(key: SettingString) {
|
||||
let settingType = settingsType[key];
|
||||
/**
|
||||
* Resets a setting to its default value
|
||||
* @param key The key of the setting
|
||||
*/
|
||||
public static async resetSetting(key: SettingString): Promise<void> {
|
||||
const oldValue = this.getSetting(key);
|
||||
|
||||
const settingType = settingsType[key];
|
||||
this.settings[key] = String(settingType.default ?? "");
|
||||
|
||||
const [topic, settingKey] = key.split(".") as [SettingTopic, string];
|
||||
await SettingCommandHandler.delete({
|
||||
topic: key.split(".")[0],
|
||||
key: key.split(".")[1],
|
||||
topic,
|
||||
key: settingKey,
|
||||
});
|
||||
|
||||
const newValue = this.getSetting(key);
|
||||
this.notifyListeners(key, newValue, oldValue);
|
||||
}
|
||||
|
||||
public static async configure() {
|
||||
console.log("Configured Settings");
|
||||
let settings = await SettingService.getSettings();
|
||||
public static async configure(): Promise<void> {
|
||||
console.log("Configuring Settings");
|
||||
const settings = await SettingService.getSettings();
|
||||
|
||||
for (const element of settings) {
|
||||
let ref = `${element.topic}.${element.key}` as SettingString;
|
||||
const ref = `${element.topic}.${element.key}` as SettingString;
|
||||
this.settings[ref] = element.value;
|
||||
this.checkSettings(ref);
|
||||
}
|
||||
}
|
||||
|
||||
private static checkSettings(key: SettingString, value?: string) {
|
||||
let settingType = settingsType[key];
|
||||
|
||||
if (!value) {
|
||||
value = this.getSetting(key).toString();
|
||||
}
|
||||
|
||||
if (
|
||||
!Array.isArray(settingType.type) &&
|
||||
settingType.type.startsWith("string") &&
|
||||
this.checkIfEmptyOrNotString(value)
|
||||
) {
|
||||
throw new Error(`set valid value to ${key}`);
|
||||
}
|
||||
if (
|
||||
!Array.isArray(settingType.type) &&
|
||||
settingType.type.startsWith("ms") &&
|
||||
this.checkIfNotMS(value as ms.StringValue)
|
||||
) {
|
||||
throw new Error(`set valid ms value to ${key} -> [0-9]*(y|d|h|m|s)`);
|
||||
}
|
||||
if (!Array.isArray(settingType.type) && settingType.type.startsWith("number") && isNaN(Number(value))) {
|
||||
throw new Error(`set valid numeric value to ${key}`);
|
||||
}
|
||||
if (
|
||||
!Array.isArray(settingType.type) &&
|
||||
settingType.type.startsWith("number") &&
|
||||
settingType.min &&
|
||||
Number(value) < settingType.min
|
||||
) {
|
||||
throw new Error(`${key} has to be at least ${settingType.min}`);
|
||||
}
|
||||
if (
|
||||
!Array.isArray(settingType.type) &&
|
||||
settingType.type.startsWith("boolean") &&
|
||||
value != "true" &&
|
||||
value != "false"
|
||||
) {
|
||||
throw new Error(`"set 'true' or 'false' to ${key}`);
|
||||
}
|
||||
}
|
||||
|
||||
private static checkIfEmptyOrNotString(val: any) {
|
||||
return typeof val != "string" || val == "";
|
||||
}
|
||||
|
||||
private static checkIfNotMS(input: ms.StringValue): boolean {
|
||||
try {
|
||||
const result = ms(input);
|
||||
if (result === undefined) {
|
||||
return true;
|
||||
try {
|
||||
this.validateSetting(ref);
|
||||
} catch (error) {
|
||||
console.warn(`Invalid setting ${ref}: ${error.message}`);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Validates a setting
|
||||
* @param key The key of the setting
|
||||
* @param value Optional value to validate
|
||||
*/
|
||||
private static validateSetting(key: SettingString, value?: string): void {
|
||||
const settingType = settingsType[key];
|
||||
const valueToCheck = value ?? this.settings[key] ?? String(settingType.default ?? "");
|
||||
|
||||
if (Array.isArray(settingType.type)) {
|
||||
return;
|
||||
}
|
||||
|
||||
let processedValue = valueToCheck;
|
||||
if (typeof settingType.type === "string" && settingType.type.includes("/crypt")) {
|
||||
try {
|
||||
processedValue = CodingHelper.decrypt(APPLICATION_SECRET, processedValue);
|
||||
} catch (error) {
|
||||
throw new Error(`Unable to decrypt value for ${key}: ${error.message}`);
|
||||
}
|
||||
}
|
||||
|
||||
const baseType =
|
||||
typeof settingType.type === "string"
|
||||
? (settingType.type.split("/")[0] as SettingTypeAtom)
|
||||
: (settingType.type as SettingTypeAtom);
|
||||
|
||||
if (!this.converters[baseType].validate(processedValue)) {
|
||||
throw new Error(`Invalid value for ${key} of type ${baseType}`);
|
||||
}
|
||||
|
||||
if (baseType === "number" && settingType.min !== undefined) {
|
||||
const numValue = Number(processedValue);
|
||||
if (numValue < settingType.min) {
|
||||
throw new Error(`${key} must be at least ${settingType.min}`);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Registers a listener for changes to a specific setting
|
||||
* @param key The setting to monitor
|
||||
* @param callback Function to be called when changes occur
|
||||
*/
|
||||
public static onSettingChanged<K extends SettingString>(
|
||||
key: K,
|
||||
callback: (newValue: SettingValueMapping[K], oldValue: SettingValueMapping[K]) => void
|
||||
): void {
|
||||
if (!this.listeners.has(key)) {
|
||||
this.listeners.set(key, []);
|
||||
}
|
||||
|
||||
this.listeners.get(key)!.push(callback);
|
||||
}
|
||||
|
||||
/**
|
||||
* Registers a listener for changes to a specific setting
|
||||
* @param key The setting to monitor
|
||||
* @param callback Function to be called when changes occur
|
||||
*/
|
||||
public static onSettingTopicChanged<K extends SettingTopic>(key: K, callback: () => void): void {
|
||||
if (!this.topicListeners.has(key)) {
|
||||
this.topicListeners.set(key, []);
|
||||
}
|
||||
|
||||
this.topicListeners.get(key)!.push(callback);
|
||||
}
|
||||
|
||||
/**
|
||||
* Removes a registered listener
|
||||
* @param key The setting
|
||||
* @param callback The callback to remove
|
||||
*/
|
||||
public static removeSettingListener<K extends SettingString>(
|
||||
key: K,
|
||||
callback: (newValue: SettingValueMapping[K], oldValue: SettingValueMapping[K]) => void
|
||||
): void {
|
||||
if (!this.listeners.has(key)) return;
|
||||
|
||||
const callbacks = this.listeners.get(key)!;
|
||||
const index = callbacks.indexOf(callback);
|
||||
|
||||
if (index !== -1) {
|
||||
callbacks.splice(index, 1);
|
||||
}
|
||||
|
||||
if (callbacks.length === 0) {
|
||||
this.listeners.delete(key);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Notifies all registered listeners about changes
|
||||
* @param key The changed setting
|
||||
* @param newValue The new value
|
||||
* @param oldValue The old value
|
||||
*/
|
||||
private static notifyListeners(key: SettingString, newValue: any, oldValue: any): void {
|
||||
if (!this.listeners.has(key)) return;
|
||||
|
||||
const callbacks = this.listeners.get(key)!;
|
||||
for (const callback of callbacks) {
|
||||
try {
|
||||
callback(newValue, oldValue);
|
||||
} catch (error) {
|
||||
console.error(`Error in setting listener for ${key}:`, error);
|
||||
}
|
||||
}
|
||||
|
||||
const topicCallbacks = this.topicListeners.get(key.split(".")[0] as SettingTopic)!;
|
||||
for (const callback of topicCallbacks) {
|
||||
try {
|
||||
callback();
|
||||
} catch (error) {
|
||||
console.error(`Error in setting listener for ${key.split(".")[0]}:`, error);
|
||||
}
|
||||
} catch (e) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue