From 4b0a40f141ec7f2ca701c10a55993cc3cb1805f4 Mon Sep 17 00:00:00 2001 From: yanghuanglin Date: Thu, 6 Mar 2025 23:01:41 +0800 Subject: [PATCH] Cleanup unnecessary code --- src/server/api/setup/migrate.post.ts | 8 -------- .../database/repositories/client/service.ts | 16 ---------------- src/server/database/repositories/client/types.ts | 4 ---- src/server/utils/wgHelper.ts | 12 ------------ 4 files changed, 40 deletions(-) diff --git a/src/server/api/setup/migrate.post.ts b/src/server/api/setup/migrate.post.ts index fac7d057..9c0a549a 100644 --- a/src/server/api/setup/migrate.post.ts +++ b/src/server/api/setup/migrate.post.ts @@ -63,19 +63,11 @@ export default defineSetupEventHandler('migrate', async ({ event }) => { const clients = await Database.clients.getAll(); const ipv6Address = nextIP(6, ipv6Cidr, clients); - const preUp = ''; - const postUp = ''; - const preDown = ''; - const postDown = ''; await Database.clients.createFromExisting({ ...clientConfig, ipv4Address: clientConfig.address, ipv6Address, - preUp, - postUp, - preDown, - postDown, }); } diff --git a/src/server/database/repositories/client/service.ts b/src/server/database/repositories/client/service.ts index 91c52217..3cc5a2b9 100644 --- a/src/server/database/repositories/client/service.ts +++ b/src/server/database/repositories/client/service.ts @@ -101,10 +101,6 @@ export class ClientService { const ipv4Address = nextIP(4, ipv4Cidr, clients); const ipv6Cidr = parseCidr(clientInterface.ipv6Cidr); const ipv6Address = nextIP(6, ipv6Cidr, clients); - const preUp = ''; - const postUp = ''; - const preDown = ''; - const postDown = ''; await tx .insert(client) @@ -118,10 +114,6 @@ export class ClientService { preSharedKey, ipv4Address, ipv6Address, - preUp, - postUp, - preDown, - postDown, mtu: clientConfig.defaultMtu, allowedIps: clientConfig.defaultAllowedIps, dns: clientConfig.defaultDns, @@ -153,10 +145,6 @@ export class ClientService { preSharedKey, privateKey, publicKey, - preUp, - postUp, - preDown, - postDown }: ClientCreateFromExistingType) { const clientConfig = await Database.userConfigs.get(); @@ -170,10 +158,6 @@ export class ClientService { preSharedKey, ipv4Address, ipv6Address, - preUp, - postUp, - preDown, - postDown, mtu: clientConfig.defaultMtu, allowedIps: clientConfig.defaultAllowedIps, dns: clientConfig.defaultDns, diff --git a/src/server/database/repositories/client/types.ts b/src/server/database/repositories/client/types.ts index 46387d68..fb369efc 100644 --- a/src/server/database/repositories/client/types.ts +++ b/src/server/database/repositories/client/types.ts @@ -101,10 +101,6 @@ export type ClientCreateFromExistingType = Pick< | 'name' | 'ipv4Address' | 'ipv6Address' - | 'preUp' - | 'postUp' - | 'preDown' - | 'postDown' | 'privateKey' | 'preSharedKey' | 'publicKey' diff --git a/src/server/utils/wgHelper.ts b/src/server/utils/wgHelper.ts index 60e9921d..18a3c126 100644 --- a/src/server/utils/wgHelper.ts +++ b/src/server/utils/wgHelper.ts @@ -108,10 +108,6 @@ Endpoint = ${userConfig.host}:${userConfig.port}`; string, string, string, - string, - string, - string, - string, ]; return rawDump @@ -129,10 +125,6 @@ Endpoint = ${userConfig.host}:${userConfig.port}`; transferRx, transferTx, persistentKeepalive, - preUp, - postUp, - preDown, - postDown ] = splitLines as wgDumpLine; return { @@ -147,10 +139,6 @@ Endpoint = ${userConfig.host}:${userConfig.port}`; transferRx: Number.parseInt(transferRx), transferTx: Number.parseInt(transferTx), persistentKeepalive: persistentKeepalive, - preUp: preUp, - postUp: postUp, - preDown: preDown, - postDown: postDown }; }); },