From 8566178bf828905783b3d6c3037a2e2593dcc28f Mon Sep 17 00:00:00 2001 From: Bernd Storath <999999bst@gmail.com> Date: Mon, 2 Sep 2024 14:30:58 +0200 Subject: [PATCH] update pnpm, start migrating to database --- package.json | 2 +- src/package.json | 2 +- src/server/utils/WireGuard.ts | 8 ++++++-- src/server/utils/config.ts | 2 -- src/services/database/repositories/database.ts | 1 + 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index b4123fc5..af3378b9 100644 --- a/package.json +++ b/package.json @@ -7,5 +7,5 @@ "sudostart": "sudo docker run --env WG_HOST=0.0.0.0 --name wg-easy --cap-add=NET_ADMIN --cap-add=SYS_MODULE --sysctl=\"net.ipv4.conf.all.src_valid_mark=1\" --mount type=bind,source=\"$(pwd)\"/config,target=/etc/wireguard -p 51820:51820/udp -p 51821:51821/tcp wg-easy", "start": "docker run --env WG_HOST=0.0.0.0 --name wg-easy --cap-add=NET_ADMIN --cap-add=SYS_MODULE --sysctl=\"net.ipv4.conf.all.src_valid_mark=1\" --mount type=bind,source=\"$(pwd)\"/config,target=/etc/wireguard -p 51820:51820/udp -p 51821:51821/tcp wg-easy" }, - "packageManager": "pnpm@9.7.1" + "packageManager": "pnpm@9.9.0" } diff --git a/src/package.json b/src/package.json index 43e83f86..5ae3c0ce 100644 --- a/src/package.json +++ b/src/package.json @@ -51,5 +51,5 @@ "typescript": "^5.5.4", "vue-tsc": "^2.0.29" }, - "packageManager": "pnpm@9.7.1" + "packageManager": "pnpm@9.9.0" } diff --git a/src/server/utils/WireGuard.ts b/src/server/utils/WireGuard.ts index 40b8a331..e72c2d95 100644 --- a/src/server/utils/WireGuard.ts +++ b/src/server/utils/WireGuard.ts @@ -462,9 +462,13 @@ Endpoint = ${WG_HOST}:${WG_CONFIG_PORT}`; async cronJobEveryMinute() { const config = await this.getConfig(); + const system = await Database.getSystem(); + if (!system) { + throw new Error('Invalid Database'); + } let needSaveConfig = false; // Expires Feature - if (WG_ENABLE_EXPIRES_TIME === 'true') { + if (system.clientExpiration.enabled) { for (const client of Object.values(config.clients)) { if (client.enabled !== true) continue; if ( @@ -479,7 +483,7 @@ Endpoint = ${WG_HOST}:${WG_CONFIG_PORT}`; } } // One Time Link Feature - if (WG_ENABLE_ONE_TIME_LINKS === 'true') { + if (system.oneTimeLinks.enabled) { for (const client of Object.values(config.clients)) { if ( client.oneTimeLink !== null && diff --git a/src/server/utils/config.ts b/src/server/utils/config.ts index f147e3ba..6f74f162 100644 --- a/src/server/utils/config.ts +++ b/src/server/utils/config.ts @@ -2,8 +2,6 @@ import type { SessionConfig } from 'h3'; import debug from 'debug'; -export const PORT = process.env.PORT || '51821'; -export const WEBUI_HOST = process.env.WEBUI_HOST || '0.0.0.0'; export const MAX_AGE = process.env.MAX_AGE ? parseInt(process.env.MAX_AGE, 10) * 60 : 0; diff --git a/src/services/database/repositories/database.ts b/src/services/database/repositories/database.ts index 36d791d6..a27a3e45 100644 --- a/src/services/database/repositories/database.ts +++ b/src/services/database/repositories/database.ts @@ -35,6 +35,7 @@ export abstract class DatabaseProvider abstract disconnect(): Promise; abstract getSystem(): Promise; + // TODO: remove abstract getLang(): Promise; abstract getUsers(): Promise;