Update Server.js to serve the correct directory on "/"

src/lib/Server.js

@@ -35,43 +35,60 @@ const {
 } = require('../config');
 
 module.exports = class Server {
-
   constructor() {
     const app = createApp();
     this.app = app;
 
-    app.use(fromNodeMiddleware(expressSession({
+    app.use(
+      fromNodeMiddleware(
+        expressSession({
           secret: crypto.randomBytes(256).toString('hex'),
           resave: true,
           saveUninitialized: true,
-    })));
+        })
+      )
+    );
 
     const router = createRouter();
     app.use(router);
 
     router
-      .get('/api/release', defineEventHandler((event) => {
+      .get(
+        '/api/release',
+        defineEventHandler((event) => {
           setHeader(event, 'Content-Type', 'application/json');
           return RELEASE;
-      }))
+        })
+      )
 
-      .get('/api/lang', defineEventHandler((event) => {
+      .get(
+        '/api/lang',
+        defineEventHandler((event) => {
           setHeader(event, 'Content-Type', 'application/json');
           return `"${LANG}"`;
-      }))
+        })
+      )
 
-      .get('/api/ui-traffic-stats', defineEventHandler((event) => {
+      .get(
+        '/api/ui-traffic-stats',
+        defineEventHandler((event) => {
           setHeader(event, 'Content-Type', 'application/json');
           return `"${UI_TRAFFIC_STATS}"`;
-      }))
+        })
+      )
 
-      .get('/api/ui-chart-type', defineEventHandler((event) => {
+      .get(
+        '/api/ui-chart-type',
+        defineEventHandler((event) => {
           setHeader(event, 'Content-Type', 'application/json');
           return `"${UI_CHART_TYPE}"`;
-      }))
+        })
+      )
 
       // Authentication
-      .get('/api/session', defineEventHandler((event) => {
+      .get(
+        '/api/session',
+        defineEventHandler((event) => {
           const requiresPassword = !!process.env.PASSWORD;
           const authenticated = requiresPassword
             ? !!(event.node.req.session && event.node.req.session.authenticated)
@@ -81,8 +98,11 @@ 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') {
@@ -105,7 +125,8 @@ module.exports = class Server {
           debug(`New Session: ${event.node.req.session.id}`);
 
           return { succcess: true };
-      }));
+        })
+      );
 
     // WireGuard
     app.use(
@@ -119,7 +140,12 @@ module.exports = class Server {
         }
 
         if (req.url.startsWith('/api/') && req.headers['authorization']) {
-          if (bcrypt.compareSync(req.headers['authorization'], bcrypt.hashSync(PASSWORD, 10))) {
+          if (
+            bcrypt.compareSync(
+              req.headers['authorization'],
+              bcrypt.hashSync(PASSWORD, 10)
+            )
+          ) {
             return next();
           }
           return res.status(401).json({
@@ -130,31 +156,42 @@ module.exports = class Server {
         return res.status(401).json({
           error: 'Not Logged In',
         });
-      }),
+      })
     );
 
     const router2 = createRouter();
     app.use(router2);
 
     router2
-      .delete('/api/session', defineEventHandler((event) => {
+      .delete(
+        '/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 });
@@ -163,54 +200,93 @@ module.exports = class Server {
             .replace(/(-{2,}|-$)/g, '-')
             .replace(/-$/, '')
             .substring(0, 32);
-        setHeader(event, 'Content-Disposition', `attachment; filename="${configName || clientId}.conf"`);
+          setHeader(
+            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 (clientId === '__proto__' || clientId === 'constructor' || clientId === 'prototype') {
+          if (
+            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 (clientId === '__proto__' || clientId === 'constructor' || clientId === 'prototype') {
+          if (
+            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 (clientId === '__proto__' || clientId === 'constructor' || clientId === 'prototype') {
+          if (
+            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 (clientId === '__proto__' || clientId === 'constructor' || clientId === 'prototype') {
+          if (
+            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';
@@ -225,11 +301,16 @@ module.exports = class Server {
               return;
             }
 
-            if (id.endsWith('.html')) setHeader(event, 'Content-Type', 'text/html');
+            if (id.endsWith('.html'))
-            if (id.endsWith('.js')) setHeader(event, 'Content-Type', 'application/javascript');
+              setHeader(event, 'Content-Type', 'text/html');
-            if (id.endsWith('.json')) setHeader(event, 'Content-Type', 'application/json');
+            if (id.endsWith('.js'))
-            if (id.endsWith('.css')) setHeader(event, 'Content-Type', 'text/css');
+              setHeader(event, 'Content-Type', 'application/javascript');
-            if (id.endsWith('.png')) setHeader(event, 'Content-Type', 'image/png');
+            if (id.endsWith('.json'))
+              setHeader(event, 'Content-Type', 'application/json');
+            if (id.endsWith('.css'))
+              setHeader(event, 'Content-Type', 'text/css');
+            if (id.endsWith('.png'))
+              setHeader(event, 'Content-Type', 'image/png');
 
             return {
               size: stats.size,
@@ -237,11 +318,10 @@ module.exports = class Server {
             };
           },
         });
-      }),
+      })
     );
 
     createServer(toNodeListener(app)).listen(PORT, WEBUI_HOST);
     debug(`Listening on http://${WEBUI_HOST}:${PORT}`);
   }
-
 };