Update src to match master

.prettierignore

@@ -0,0 +1 @@
+**

src/lib/Server.js

@@ -39,18 +39,6 @@ module.exports = class Server {
     const app = createApp();
     this.app = app;
 
-    // Middleware to add CORS headers
-    app.use('*', defineEventHandler((event) => {
-      setHeader(event, 'Access-Control-Allow-Origin', '*'); // Allows all origins
-      setHeader(event, 'Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS'); // Allowed methods
-      setHeader(event, 'Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept'); // Allowed headers
-      // If the request method is OPTIONS, return an early response
-      if (event.req.method === 'OPTIONS') {
-        event.res.statusCode = 204;
-        return '';
-      }
-    }));
-
     app.use(fromNodeMiddleware(expressSession({
       secret: crypto.randomBytes(256).toString('hex'),
       resave: true,
@@ -61,42 +49,28 @@ module.exports = class Server {
     app.use(router);
 
     router
-      .get(
+      .get('/api/release', defineEventHandler((event) => {
-        '/api/release',
-        defineEventHandler((event) => {
         setHeader(event, 'Content-Type', 'application/json');
         return RELEASE;
-        })
+      }))
-      )
 
-      .get(
+      .get('/api/lang', defineEventHandler((event) => {
-        '/api/lang',
-        defineEventHandler((event) => {
         setHeader(event, 'Content-Type', 'application/json');
         return `"${LANG}"`;
-        })
+      }))
-      )
 
-      .get(
+      .get('/api/ui-traffic-stats', defineEventHandler((event) => {
-        '/api/ui-traffic-stats',
-        defineEventHandler((event) => {
         setHeader(event, 'Content-Type', 'application/json');
         return `"${UI_TRAFFIC_STATS}"`;
-        })
+      }))
-      )
 
-      .get(
+      .get('/api/ui-chart-type', defineEventHandler((event) => {
-        '/api/ui-chart-type',
-        defineEventHandler((event) => {
         setHeader(event, 'Content-Type', 'application/json');
         return `"${UI_CHART_TYPE}"`;
-        })
+      }))
-      )
 
       // Authentication
-      .get(
+      .get('/api/session', defineEventHandler((event) => {
-        '/api/session',
-        defineEventHandler((event) => {
         const requiresPassword = !!process.env.PASSWORD;
         const authenticated = requiresPassword
           ? !!(event.node.req.session && event.node.req.session.authenticated)
@@ -106,11 +80,8 @@ module.exports = class Server {
           requiresPassword,
           authenticated,
         };
-        })
+      }))
-      )
+      .post('/api/session', defineEventHandler(async (event) => {
-      .post(
-        '/api/session',
-        defineEventHandler(async (event) => {
         const { password } = await readBody(event);
 
         if (typeof password !== 'string') {
@@ -133,8 +104,7 @@ module.exports = class Server {
         debug(`New Session: ${event.node.req.session.id}`);
 
         return { succcess: true };
-        })
+      }));
-      );
 
     // WireGuard
     app.use(
@@ -148,12 +118,7 @@ module.exports = class Server {
         }
 
         if (req.url.startsWith('/api/') && req.headers['authorization']) {
-          if (
+          if (bcrypt.compareSync(req.headers['authorization'], bcrypt.hashSync(PASSWORD, 10))) {
-            bcrypt.compareSync(
-              req.headers['authorization'],
-              bcrypt.hashSync(PASSWORD, 10)
-            )
-          ) {
             return next();
           }
           return res.status(401).json({
@@ -164,42 +129,31 @@ module.exports = class Server {
         return res.status(401).json({
           error: 'Not Logged In',
         });
-      })
+      }),
     );
 
     const router2 = createRouter();
     app.use(router2);
 
     router2
-      .delete(
+      .delete('/api/session', defineEventHandler((event) => {
-        '/api/session',
-        defineEventHandler((event) => {
         const sessionId = event.node.req.session.id;
 
         event.node.req.session.destroy();
 
         debug(`Deleted Session: ${sessionId}`);
         return { success: true };
-        })
+      }))
-      )
+      .get('/api/wireguard/client', defineEventHandler(() => {
-      .get(
-        '/api/wireguard/client',
-        defineEventHandler(() => {
         return WireGuard.getClients();
-        })
+      }))
-      )
+      .get('/api/wireguard/client/:clientId/qrcode.svg', defineEventHandler(async (event) => {
-      .get(
-        '/api/wireguard/client/:clientId/qrcode.svg',
-        defineEventHandler(async (event) => {
         const clientId = getRouterParam(event, 'clientId');
         const svg = await WireGuard.getClientQRCodeSVG({ clientId });
         setHeader(event, 'Content-Type', 'image/svg+xml');
         return svg;
-        })
+      }))
-      )
+      .get('/api/wireguard/client/:clientId/configuration', defineEventHandler(async (event) => {
-      .get(
-        '/api/wireguard/client/:clientId/configuration',
-        defineEventHandler(async (event) => {
         const clientId = getRouterParam(event, 'clientId');
         const client = await WireGuard.getClient({ clientId });
         const config = await WireGuard.getClientConfiguration({ clientId });
@@ -208,96 +162,57 @@ module.exports = class Server {
           .replace(/(-{2,}|-$)/g, '-')
           .replace(/-$/, '')
           .substring(0, 32);
-          setHeader(
+        setHeader(event, 'Content-Disposition', `attachment; filename="${configName || clientId}.conf"`);
-            event,
-            'Content-Disposition',
-            `attachment; filename="${configName || clientId}.conf"`
-          );
         setHeader(event, 'Content-Type', 'text/plain');
         return config;
-        })
+      }))
-      )
+      .post('/api/wireguard/client', defineEventHandler(async (event) => {
-      .post(
-        '/api/wireguard/client',
-        defineEventHandler(async (event) => {
         const { name } = await readBody(event);
         await WireGuard.createClient({ name });
         return { success: true };
-        })
+      }))
-      )
+      .delete('/api/wireguard/client/:clientId', defineEventHandler(async (event) => {
-      .delete(
-        '/api/wireguard/client/:clientId',
-        defineEventHandler(async (event) => {
         const clientId = getRouterParam(event, 'clientId');
         await WireGuard.deleteClient({ clientId });
         return { success: true };
-        })
+      }))
-      )
+      .post('/api/wireguard/client/:clientId/enable', defineEventHandler(async (event) => {
-      .post(
-        '/api/wireguard/client/:clientId/enable',
-        defineEventHandler(async (event) => {
         const clientId = getRouterParam(event, 'clientId');
-          if (
+        if (clientId === '__proto__' || clientId === 'constructor' || clientId === 'prototype') {
-            clientId === '__proto__' ||
-            clientId === 'constructor' ||
-            clientId === 'prototype'
-          ) {
           throw createError({ status: 403 });
         }
         await WireGuard.enableClient({ clientId });
         return { success: true };
-        })
+      }))
-      )
+      .post('/api/wireguard/client/:clientId/disable', defineEventHandler(async (event) => {
-      .post(
-        '/api/wireguard/client/:clientId/disable',
-        defineEventHandler(async (event) => {
         const clientId = getRouterParam(event, 'clientId');
-          if (
+        if (clientId === '__proto__' || clientId === 'constructor' || clientId === 'prototype') {
-            clientId === '__proto__' ||
-            clientId === 'constructor' ||
-            clientId === 'prototype'
-          ) {
           throw createError({ status: 403 });
         }
         await WireGuard.disableClient({ clientId });
         return { success: true };
-        })
+      }))
-      )
+      .put('/api/wireguard/client/:clientId/name', defineEventHandler(async (event) => {
-      .put(
-        '/api/wireguard/client/:clientId/name',
-        defineEventHandler(async (event) => {
         const clientId = getRouterParam(event, 'clientId');
-          if (
+        if (clientId === '__proto__' || clientId === 'constructor' || clientId === 'prototype') {
-            clientId === '__proto__' ||
-            clientId === 'constructor' ||
-            clientId === 'prototype'
-          ) {
           throw createError({ status: 403 });
         }
         const { name } = await readBody(event);
         await WireGuard.updateClientName({ clientId, name });
         return { success: true };
-        })
+      }))
-      )
+      .put('/api/wireguard/client/:clientId/address', defineEventHandler(async (event) => {
-      .put(
-        '/api/wireguard/client/:clientId/address',
-        defineEventHandler(async (event) => {
         const clientId = getRouterParam(event, 'clientId');
-          if (
+        if (clientId === '__proto__' || clientId === 'constructor' || clientId === 'prototype') {
-            clientId === '__proto__' ||
-            clientId === 'constructor' ||
-            clientId === 'prototype'
-          ) {
           throw createError({ status: 403 });
         }
         const { address } = await readBody(event);
         await WireGuard.updateClientAddress({ clientId, address });
         return { success: true };
-        })
+      }));
-      );
 
     // Static assets
-    const publicDir = '/app/www';
+    const publicDir = 'www';
     app.use(
       defineEventHandler((event) => {
         return serveStatic(event, {
@@ -326,7 +241,7 @@ module.exports = class Server {
             };
           },
         });
-      })
+      }),
     );
 
     createServer(toNodeListener(app)).listen(PORT, WEBUI_HOST);