Browse Source

Cleanup unnecessary code

pull/1714/head
yanghuanglin 5 months ago
parent
commit
4b0a40f141
  1. 8
      src/server/api/setup/migrate.post.ts
  2. 16
      src/server/database/repositories/client/service.ts
  3. 4
      src/server/database/repositories/client/types.ts
  4. 12
      src/server/utils/wgHelper.ts

8
src/server/api/setup/migrate.post.ts

@ -63,19 +63,11 @@ export default defineSetupEventHandler('migrate', async ({ event }) => {
const clients = await Database.clients.getAll(); const clients = await Database.clients.getAll();
const ipv6Address = nextIP(6, ipv6Cidr, clients); const ipv6Address = nextIP(6, ipv6Cidr, clients);
const preUp = '';
const postUp = '';
const preDown = '';
const postDown = '';
await Database.clients.createFromExisting({ await Database.clients.createFromExisting({
...clientConfig, ...clientConfig,
ipv4Address: clientConfig.address, ipv4Address: clientConfig.address,
ipv6Address, ipv6Address,
preUp,
postUp,
preDown,
postDown,
}); });
} }

16
src/server/database/repositories/client/service.ts

@ -101,10 +101,6 @@ export class ClientService {
const ipv4Address = nextIP(4, ipv4Cidr, clients); const ipv4Address = nextIP(4, ipv4Cidr, clients);
const ipv6Cidr = parseCidr(clientInterface.ipv6Cidr); const ipv6Cidr = parseCidr(clientInterface.ipv6Cidr);
const ipv6Address = nextIP(6, ipv6Cidr, clients); const ipv6Address = nextIP(6, ipv6Cidr, clients);
const preUp = '';
const postUp = '';
const preDown = '';
const postDown = '';
await tx await tx
.insert(client) .insert(client)
@ -118,10 +114,6 @@ export class ClientService {
preSharedKey, preSharedKey,
ipv4Address, ipv4Address,
ipv6Address, ipv6Address,
preUp,
postUp,
preDown,
postDown,
mtu: clientConfig.defaultMtu, mtu: clientConfig.defaultMtu,
allowedIps: clientConfig.defaultAllowedIps, allowedIps: clientConfig.defaultAllowedIps,
dns: clientConfig.defaultDns, dns: clientConfig.defaultDns,
@ -153,10 +145,6 @@ export class ClientService {
preSharedKey, preSharedKey,
privateKey, privateKey,
publicKey, publicKey,
preUp,
postUp,
preDown,
postDown
}: ClientCreateFromExistingType) { }: ClientCreateFromExistingType) {
const clientConfig = await Database.userConfigs.get(); const clientConfig = await Database.userConfigs.get();
@ -170,10 +158,6 @@ export class ClientService {
preSharedKey, preSharedKey,
ipv4Address, ipv4Address,
ipv6Address, ipv6Address,
preUp,
postUp,
preDown,
postDown,
mtu: clientConfig.defaultMtu, mtu: clientConfig.defaultMtu,
allowedIps: clientConfig.defaultAllowedIps, allowedIps: clientConfig.defaultAllowedIps,
dns: clientConfig.defaultDns, dns: clientConfig.defaultDns,

4
src/server/database/repositories/client/types.ts

@ -101,10 +101,6 @@ export type ClientCreateFromExistingType = Pick<
| 'name' | 'name'
| 'ipv4Address' | 'ipv4Address'
| 'ipv6Address' | 'ipv6Address'
| 'preUp'
| 'postUp'
| 'preDown'
| 'postDown'
| 'privateKey' | 'privateKey'
| 'preSharedKey' | 'preSharedKey'
| 'publicKey' | 'publicKey'

12
src/server/utils/wgHelper.ts

@ -108,10 +108,6 @@ Endpoint = ${userConfig.host}:${userConfig.port}`;
string, string,
string, string,
string, string,
string,
string,
string,
string,
]; ];
return rawDump return rawDump
@ -129,10 +125,6 @@ Endpoint = ${userConfig.host}:${userConfig.port}`;
transferRx, transferRx,
transferTx, transferTx,
persistentKeepalive, persistentKeepalive,
preUp,
postUp,
preDown,
postDown
] = splitLines as wgDumpLine; ] = splitLines as wgDumpLine;
return { return {
@ -147,10 +139,6 @@ Endpoint = ${userConfig.host}:${userConfig.port}`;
transferRx: Number.parseInt(transferRx), transferRx: Number.parseInt(transferRx),
transferTx: Number.parseInt(transferTx), transferTx: Number.parseInt(transferTx),
persistentKeepalive: persistentKeepalive, persistentKeepalive: persistentKeepalive,
preUp: preUp,
postUp: postUp,
preDown: preDown,
postDown: postDown
}; };
}); });
}, },

Loading…
Cancel
Save