Skip to content

Commit 6055a07

Browse files
nimisha-gjnimisha-gj
committed
style: format codebase with ESLint
1 parent d146f30 commit 6055a07

File tree

8 files changed

+199
-198
lines changed

8 files changed

+199
-198
lines changed

‎src/config/constants.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
export const WIREGUARD_COMMANDS = {
2-
ADD_PEER: (comment: string, allowedAddress: string, key: string) =>
3-
`/interface wireguard peers add comment="${comment}" allowed-address=${allowedAddress} interface=wg0 public-key="${key}"`,
4-
REMOVE_PEER: (key: string) => `/interface wireguard peers remove [find public-key="${key}"]`,
5-
LIST_PEERS: `/interface wireguard peers print`,
6-
GET_INTERFACE_INFO: `/interface wireguard print`,
2+
ADD_PEER: (comment: string, allowedAddress: string, key: string) =>
3+
`/interface wireguard peers add comment="${comment}" allowed-address=${allowedAddress} interface=wg0 public-key="${key}"`,
4+
REMOVE_PEER: (key: string) => `/interface wireguard peers remove [find public-key="${key}"]`,
5+
LIST_PEERS: `/interface wireguard peers print`,
6+
GET_INTERFACE_INFO: `/interface wireguard print`,
77
};
88

99
export const WIREGUARD_FIELDS = {
10-
LISTEN_PORT: 'listen-port=',
11-
PUBLIC_KEY: 'public-key='
10+
LISTEN_PORT: 'listen-port=',
11+
PUBLIC_KEY: 'public-key='
1212
}
1313

1414
export const CLIENT_ADD_SUCCESS = 'VPN client added successfully';
@@ -25,4 +25,4 @@ export const PARSE_LISTEN_PORT_ERROR = 'Failed to retrieve listen-port from the
2525

2626
export const PARSE_PUBLIC_KEY_ERROR = 'Failed to retrieve public-key from the WireGuard interface output';
2727

28-
export const NO_CLIENTS_FOUND = "No valid IP addresses found from the clients.";
28+
export const NO_CLIENTS_FOUND = "No valid IP addresses found from the clients.";

‎src/index.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { MikroTikWireGuardClientManager } from './lib/MikroTikWireGuardClientManager';
2-
import { MikroTikSSHClient } from "./lib/MikrotikSSHClient";
1+
import {MikroTikWireGuardClientManager} from './lib/MikroTikWireGuardClientManager';
2+
import {MikroTikSSHClient} from "./lib/MikrotikSSHClient";
33

4-
export { MikroTikWireGuardClientManager, MikroTikSSHClient };
4+
export {MikroTikWireGuardClientManager, MikroTikSSHClient};

‎src/lib/MikroTikWireGuardClientManager.ts‎

Lines changed: 114 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -1,132 +1,132 @@
1-
import { AddClientResponse, RemoveClientResponse } from '../types/responses';
2-
import { PeerClient } from "../types/peerClient";
3-
import { SSHClient } from "./MikrotikSSHClient";
1+
import {AddClientResponse, RemoveClientResponse} from '../types/responses';
2+
import {PeerClient} from "../types/peerClient";
3+
import {SSHClient} from "./MikrotikSSHClient";
44
import {
5-
CLIENT_ADD_FAILED,
6-
CLIENT_ADD_SUCCESS,
7-
CLIENT_REMOVE_FAILED,
8-
CLIENT_REMOVE_SUCCESS,
9-
LIST_CLIENTS_ERROR, NO_CLIENTS_FOUND,
10-
PARSE_LISTEN_PORT_ERROR,
11-
PARSE_PUBLIC_KEY_ERROR,
12-
WIREGUARD_COMMANDS,
13-
WIREGUARD_FIELDS
5+
CLIENT_ADD_FAILED,
6+
CLIENT_ADD_SUCCESS,
7+
CLIENT_REMOVE_FAILED,
8+
CLIENT_REMOVE_SUCCESS,
9+
LIST_CLIENTS_ERROR, NO_CLIENTS_FOUND,
10+
PARSE_LISTEN_PORT_ERROR,
11+
PARSE_PUBLIC_KEY_ERROR,
12+
WIREGUARD_COMMANDS,
13+
WIREGUARD_FIELDS
1414
} from "../config/constants";
1515

1616

1717
export class MikroTikWireGuardClientManager {
18-
private sshClient: SSHClient;
19-
20-
constructor(sshClient: SSHClient) {
21-
this.sshClient = sshClient;
22-
}
23-
24-
public async addClient(publicKey: string, comment: string): Promise<AddClientResponse> {
25-
try {
26-
const clientAddress = await this.getNextAvailableIp();
27-
const command = WIREGUARD_COMMANDS.ADD_PEER(comment, clientAddress, publicKey);
28-
await this.sshClient.executeCommand(command);
29-
30-
const wireGuardInfo = await this.getWireGuardInterfaceInfo();
31-
return {
32-
success: true,
33-
message: CLIENT_ADD_SUCCESS,
34-
config: {
35-
clientAddress,
36-
routerPublicKey: wireGuardInfo.publicKey,
37-
listenPort: wireGuardInfo.listenPort
38-
}
39-
};
40-
} catch (error) {
41-
return {success: false, message: CLIENT_ADD_FAILED};
18+
private sshClient: SSHClient;
19+
20+
constructor(sshClient: SSHClient) {
21+
this.sshClient = sshClient;
22+
}
23+
24+
public async addClient(publicKey: string, comment: string): Promise<AddClientResponse> {
25+
try {
26+
const clientAddress = await this.getNextAvailableIp();
27+
const command = WIREGUARD_COMMANDS.ADD_PEER(comment, clientAddress, publicKey);
28+
await this.sshClient.executeCommand(command);
29+
30+
const wireGuardInfo = await this.getWireGuardInterfaceInfo();
31+
return {
32+
success: true,
33+
message: CLIENT_ADD_SUCCESS,
34+
config: {
35+
clientAddress,
36+
routerPublicKey: wireGuardInfo.publicKey,
37+
listenPort: wireGuardInfo.listenPort
4238
}
39+
};
40+
} catch (error) {
41+
return {success: false, message: `${CLIENT_ADD_FAILED}:${error}`};
4342
}
44-
45-
public async removeClient(publicKey: string): Promise<RemoveClientResponse> {
46-
try {
47-
const command = WIREGUARD_COMMANDS.REMOVE_PEER(publicKey);
48-
await this.sshClient.executeCommand(command);
49-
return {success: true, message: CLIENT_REMOVE_SUCCESS};
50-
} catch (error) {
51-
return {success: false, message: CLIENT_REMOVE_FAILED};
52-
}
43+
}
44+
45+
public async removeClient(publicKey: string): Promise<RemoveClientResponse> {
46+
try {
47+
const command = WIREGUARD_COMMANDS.REMOVE_PEER(publicKey);
48+
await this.sshClient.executeCommand(command);
49+
return {success: true, message: CLIENT_REMOVE_SUCCESS};
50+
} catch (error) {
51+
return {success: false, message: `${CLIENT_REMOVE_FAILED}:${error}`};
5352
}
53+
}
5454

55-
public async listClients(): Promise<PeerClient[]> {
56-
try {
57-
const command = WIREGUARD_COMMANDS.LIST_PEERS;
58-
const output = await this.sshClient.executeCommand(command);
55+
public async listClients(): Promise<PeerClient[]> {
56+
try {
57+
const command = WIREGUARD_COMMANDS.LIST_PEERS;
58+
const output = await this.sshClient.executeCommand(command);
5959

60-
return this.parseWireGuardPeers(output);
61-
} catch (error) {
62-
throw new Error(LIST_CLIENTS_ERROR);
60+
return this.parseWireGuardPeers(output);
61+
} catch {
62+
throw new Error(LIST_CLIENTS_ERROR);
63+
}
64+
}
65+
66+
private parseWireGuardPeers(output: string): PeerClient[] {
67+
const clients: PeerClient[] = [];
68+
const lines = output.split('\n');
69+
let currentComment = '';
70+
lines.forEach((line) => {
71+
const trimmedLine = line.trim();
72+
if (trimmedLine.startsWith(';;;')) {
73+
currentComment = trimmedLine.slice(4).trim();
74+
} else if (trimmedLine.length > 0) {
75+
const parts = trimmedLine.split(/\s+/);
76+
if (parts.length >= 4) {
77+
clients.push({
78+
index: parts[0],
79+
interface: parts[1],
80+
publicKey: parts[2],
81+
allowedIp: parts[4],
82+
comment: currentComment,
83+
});
6384
}
85+
}
86+
});
87+
return clients;
88+
}
89+
90+
private async getWireGuardInterfaceInfo(): Promise<{ publicKey: string; listenPort: number }> {
91+
const command = WIREGUARD_COMMANDS.GET_INTERFACE_INFO;
92+
const output = await this.sshClient.executeCommand(command);
93+
const lines = output.split('\n');
94+
let publicKey = '';
95+
let listenPort = 0;
96+
97+
lines.forEach(line => {
98+
const trimmedLine = line.trim();
99+
if (trimmedLine.includes(WIREGUARD_FIELDS.PUBLIC_KEY)) {
100+
publicKey = trimmedLine.split(WIREGUARD_FIELDS.PUBLIC_KEY)[1].replace(/"/g, '');
101+
}
102+
if (trimmedLine.includes(WIREGUARD_FIELDS.LISTEN_PORT)) {
103+
listenPort = parseInt(trimmedLine.split(WIREGUARD_FIELDS.LISTEN_PORT)[1], 10);
104+
}
105+
});
106+
107+
if (!publicKey) {
108+
throw new Error(PARSE_PUBLIC_KEY_ERROR);
64109
}
65-
66-
private parseWireGuardPeers(output: string): PeerClient[] {
67-
const clients: PeerClient[] = [];
68-
const lines = output.split('\n');
69-
let currentComment = '';
70-
lines.forEach((line) => {
71-
const trimmedLine = line.trim();
72-
if (trimmedLine.startsWith(';;;')) {
73-
currentComment = trimmedLine.slice(4).trim();
74-
} else if (trimmedLine.length > 0) {
75-
const parts = trimmedLine.split(/\s+/);
76-
if (parts.length >= 4) {
77-
clients.push({
78-
index: parts[0],
79-
interface: parts[1],
80-
publicKey: parts[2],
81-
allowedIp: parts[4],
82-
comment: currentComment,
83-
});
84-
}
85-
}
86-
});
87-
return clients;
110+
if (!listenPort) {
111+
throw new Error(PARSE_LISTEN_PORT_ERROR);
88112
}
89113

90-
private async getWireGuardInterfaceInfo(): Promise<{ publicKey: string; listenPort: number }> {
91-
const command = WIREGUARD_COMMANDS.GET_INTERFACE_INFO;
92-
const output = await this.sshClient.executeCommand(command);
93-
const lines = output.split('\n');
94-
let publicKey = '';
95-
let listenPort = 0;
96-
97-
lines.forEach(line => {
98-
const trimmedLine = line.trim();
99-
if (trimmedLine.includes(WIREGUARD_FIELDS.PUBLIC_KEY)) {
100-
publicKey = trimmedLine.split(WIREGUARD_FIELDS.PUBLIC_KEY)[1].replace(/"/g, '');
101-
}
102-
if (trimmedLine.includes(WIREGUARD_FIELDS.LISTEN_PORT)) {
103-
listenPort = parseInt(trimmedLine.split(WIREGUARD_FIELDS.LISTEN_PORT)[1], 10);
104-
}
105-
});
106-
107-
if (!publicKey) {
108-
throw new Error(PARSE_PUBLIC_KEY_ERROR);
109-
}
110-
if (!listenPort) {
111-
throw new Error(PARSE_LISTEN_PORT_ERROR);
112-
}
114+
return {publicKey, listenPort};
115+
}
113116

114-
return {publicKey, listenPort};
117+
private async getNextAvailableIp(): Promise<string> {
118+
const clients = await this.listClients();
119+
const validClients = clients.filter(client => client.allowedIp.includes('/'));
120+
if (validClients.length === 0) {
121+
throw new Error(NO_CLIENTS_FOUND);
115122
}
116123

117-
private async getNextAvailableIp(): Promise<string> {
118-
const clients = await this.listClients();
119-
const validClients = clients.filter(client => client.allowedIp.includes('/'));
120-
if (validClients.length === 0) {
121-
throw new Error(NO_CLIENTS_FOUND);
122-
}
123-
124-
const firstClientIp = validClients[0].allowedIp.split('/')[0];
125-
const subnet = validClients[0].allowedIp.split('/')[1];
126-
const baseIp = firstClientIp.split('.').slice(0, 3).join('.');
127-
const lastOctets = validClients.map(client => parseInt(client.allowedIp.split('.')[3])).sort((a, b) => a - b);
128-
const nextOctet = (lastOctets[lastOctets.length - 1] || 1) + 1;
124+
const firstClientIp = validClients[0].allowedIp.split('/')[0];
125+
const subnet = validClients[0].allowedIp.split('/')[1];
126+
const baseIp = firstClientIp.split('.').slice(0, 3).join('.');
127+
const lastOctets = validClients.map(client => parseInt(client.allowedIp.split('.')[3])).sort((a, b) => a - b);
128+
const nextOctet = (lastOctets[lastOctets.length - 1] || 1) + 1;
129129

130-
return `${baseIp}.${nextOctet}/${subnet}`;
131-
}
132-
}
130+
return `${baseIp}.${nextOctet}/${subnet}`;
131+
}
132+
}

‎src/lib/MikrotikSSHClient.ts‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
import {executeSSHCommand} from "../utils/ssh";
22

33
export interface SSHClient {
4-
executeCommand(command: string): Promise<string>;
4+
executeCommand(command: string): Promise<string>;
55
}
66

77
export class MikroTikSSHClient implements SSHClient {
8-
private readonly host: string;
9-
private readonly port: number;
10-
private readonly username: string;
11-
private readonly password: string;
8+
private readonly host: string;
9+
private readonly port: number;
10+
private readonly username: string;
11+
private readonly password: string;
1212

13-
constructor(host: string, port: number, username: string, password: string) {
14-
this.host = host;
15-
this.port = port;
16-
this.username = username;
17-
this.password = password;
18-
}
13+
constructor(host: string, port: number, username: string, password: string) {
14+
this.host = host;
15+
this.port = port;
16+
this.username = username;
17+
this.password = password;
18+
}
1919

20-
public async executeCommand(command: string): Promise<string> {
21-
return await executeSSHCommand(command, this.host, this.port, this.username, this.password);
22-
}
23-
}
20+
public async executeCommand(command: string): Promise<string> {
21+
return await executeSSHCommand(command, this.host, this.port, this.username, this.password);
22+
}
23+
}

‎src/types/clientConfig.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export interface ClientConfig {
2-
clientAddress: string;
3-
routerPublicKey: string;
4-
listenPort: number;
5-
}
2+
clientAddress: string;
3+
routerPublicKey: string;
4+
listenPort: number;
5+
}

‎src/types/peerClient.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export interface PeerClient {
2-
index: string;
3-
interface: string;
4-
publicKey: string;
5-
allowedIp: string;
6-
comment: string;
7-
}
2+
index: string;
3+
interface: string;
4+
publicKey: string;
5+
allowedIp: string;
6+
comment: string;
7+
}

‎src/types/responses.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { ClientConfig } from "./clientConfig";
1+
import {ClientConfig} from "./clientConfig";
22

33
export interface AddClientResponse {
4-
success: boolean;
5-
message: string;
6-
config?: ClientConfig;
4+
success: boolean;
5+
message: string;
6+
config?: ClientConfig;
77
}
88

99
export interface RemoveClientResponse {
10-
success: boolean;
11-
message: string;
10+
success: boolean;
11+
message: string;
1212
}

0 commit comments

Comments
 (0)