Browse Source

update pnpm, start migrating to database

pull/1342/head
Bernd Storath 2 years ago
parent
commit
8566178bf8
  1. 2
      package.json
  2. 2
      src/package.json
  3. 8
      src/server/utils/WireGuard.ts
  4. 2
      src/server/utils/config.ts
  5. 1
      src/services/database/repositories/database.ts

2
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"
}

2
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"
}

8
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 &&

2
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;

1
src/services/database/repositories/database.ts

@ -35,6 +35,7 @@ export abstract class DatabaseProvider
abstract disconnect(): Promise<void>;
abstract getSystem(): Promise<System | null>;
// TODO: remove
abstract getLang(): Promise<Lang>;
abstract getUsers(): Promise<User[]>;

Loading…
Cancel
Save