forks
/
amnezia-wg-easy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: reload configuration 

* run linter
* screenshot update
This commit is contained in:
tetuaoro 2024-07-09 18:53:54 +02:00 committed by pheiduck
parent 03b7d8e537
commit e3ee09b755
5 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/screenshot.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 105 KiB

After

Width:  |  Height:  |  Size: 86 KiB

6
src/lib/Server.js
View File

@ -270,8 +270,8 @@ module.exports = class Server {
app.use(router3); app.use(router3);
router3 router3
.get('/api/wireguard/dl', defineEventHandler((event) => { .get('/api/wireguard/dl', defineEventHandler(async (event) => {
const config = WireGuard.downloadConfiguration(); const config = await WireGuard.downloadConfiguration();
setHeader(event, 'Content-Disposition', 'attachment; filename="wg0.json"'); setHeader(event, 'Content-Disposition', 'attachment; filename="wg0.json"');
setHeader(event, 'Content-Type', 'text/json'); setHeader(event, 'Content-Type', 'text/json');
return config; return config;
@ -279,7 +279,7 @@ module.exports = class Server {
.put('/api/wireguard/upload', defineEventHandler(async (event) => { .put('/api/wireguard/upload', defineEventHandler(async (event) => {
const { file } = await readBody(event); const { file } = await readBody(event);
await WireGuard.uploadConfiguration(file); await WireGuard.uploadConfiguration(file);
return { success: true } return { success: true };
})); }));
// Static assets // Static assets

8
src/lib/WireGuard.js
View File

@ -111,7 +111,7 @@ PostDown = ${WG_POST_DOWN}
[Peer] [Peer]
PublicKey = ${client.publicKey} PublicKey = ${client.publicKey}
${client.preSharedKey ? `PresharedKey = ${client.preSharedKey}\n` : '' ${client.preSharedKey ? `PresharedKey = ${client.preSharedKey}\n` : ''
}AllowedIPs = ${client.address}/32`; }AllowedIPs = ${client.address}/32`;
} }
debug('Config saving...'); debug('Config saving...');
@ -206,7 +206,7 @@ ${WG_MTU ? `MTU = ${WG_MTU}\n` : ''}\
[Peer] [Peer]
PublicKey = ${config.server.publicKey} PublicKey = ${config.server.publicKey}
${client.preSharedKey ? `PresharedKey = ${client.preSharedKey}\n` : '' ${client.preSharedKey ? `PresharedKey = ${client.preSharedKey}\n` : ''
}AllowedIPs = ${WG_ALLOWED_IPS} }AllowedIPs = ${WG_ALLOWED_IPS}
PersistentKeepalive = ${WG_PERSISTENT_KEEPALIVE} PersistentKeepalive = ${WG_PERSISTENT_KEEPALIVE}
Endpoint = ${WG_HOST}:${WG_CONFIG_PORT}`; Endpoint = ${WG_HOST}:${WG_CONFIG_PORT}`;
} }
@ -322,7 +322,9 @@ Endpoint = ${WG_HOST}:${WG_CONFIG_PORT}`;
async uploadConfiguration(config) { async uploadConfiguration(config) {
const _config = JSON.parse(config); const _config = JSON.parse(config);
await this.__saveConfig(_config); await this.__saveConfig(_config);
await this.__syncConfig(); // force restart
this.__configPromise = null;
await this.saveConfig();
} }
async downloadConfiguration() { async downloadConfiguration() {

6
src/www/js/api.js
View File

@ -141,15 +141,15 @@ class API {
async uploadConfiguration(file) { async uploadConfiguration(file) {
return this.call({ return this.call({
method: 'put', method: 'put',
path: `/wireguard/upload`, path: '/wireguard/upload',
body: { file } body: { file },
}); });
} }
async downloadConfiguration() { async downloadConfiguration() {
return this.call({ return this.call({
method: 'get', method: 'get',
path: `/wireguard/dl`, path: '/wireguard/dl',
}); });
} }

7
src/www/js/app.js
View File

@ -303,12 +303,9 @@ new Vue({
e.preventDefault(); e.preventDefault();
const file = e.currentTarget.files.item(0); const file = e.currentTarget.files.item(0);
file.text() file.text()
.then(content => { .then((content) => {
this.api.uploadConfiguration(content) this.api.uploadConfiguration(content)
.then((_result) => { .then((_result) => alert('The configuration was updated.'))
alert("The configuration was updated.");
document.location.reload();
})
.catch((err) => alert(err.message || err.toString())) .catch((err) => alert(err.message || err.toString()))
.finally(() => this.refresh().catch(console.error)); .finally(() => this.refresh().catch(console.error));
}) })