extern/web-check
1
0
Fork 0
mirror of https://github.com/Lissy93/web-check.git synced 2025-06-20 03:37:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix catch-all when GUI is disabled

Browse Source
This commit is contained in:
Alicia Sykes 2024-05-20 22:43:53 +01:00
parent 97fd19492e
commit 34ca09fc20
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
server.js
View File

@ -1,10 +1,11 @@
import express from 'express';
import fs from 'fs'; import fs from 'fs';
import path from 'path'; import path from 'path';
import cors from 'cors'; import cors from 'cors';
import dotenv from 'dotenv';
import express from 'express';
import rateLimit from 'express-rate-limit'; import rateLimit from 'express-rate-limit';
import historyApiFallback from 'connect-history-api-fallback'; import historyApiFallback from 'connect-history-api-fallback';
import dotenv from 'dotenv';
import { handler as ssrHandler } from './dist/server/entry.mjs'; import { handler as ssrHandler } from './dist/server/entry.mjs';
@ -55,7 +56,7 @@ const limiters = limits.map(limit => rateLimit({
// If rate-limiting enabled, then apply the limiters to the /api endpoint // If rate-limiting enabled, then apply the limiters to the /api endpoint
if (process.env.API_ENABLE_RATE_LIMIT === 'true') { if (process.env.API_ENABLE_RATE_LIMIT === 'true') {
app.use('/api', limiters); app.use(API_DIR, limiters);
} }
// Read and register each API function as an Express routes // Read and register each API function as an Express routes
@ -80,7 +81,7 @@ fs.readdirSync(dirPath, { withFileTypes: true })
}); });
// Create a single API endpoint to execute all lambda functions // Create a single API endpoint to execute all lambda functions
app.get('/api', async (req, res) => { app.get(API_DIR, async (req, res) => {
const results = {}; const results = {};
const { url } = req.query; const { url } = req.query;
const maxExecutionTime = process.env.API_TIMEOUT_LIMIT || 20000; const maxExecutionTime = process.env.API_TIMEOUT_LIMIT || 20000;
@ -129,7 +130,7 @@ app.get('/api', async (req, res) => {
// Skip the marketing homepage, for self-hosted users // Skip the marketing homepage, for self-hosted users
app.use((req, res, next) => { app.use((req, res, next) => {
if (req.path === '/' && process.env.BOSS_SERVER !== 'true') { if (req.path === '/' && process.env.BOSS_SERVER !== 'true' && !process.env.DISABLE_GUI) {
req.url = '/check'; req.url = '/check';
} }
next(); next();
@ -137,17 +138,17 @@ app.use((req, res, next) => {
// Serve up the GUI - if build dir exists, and GUI feature enabled // Serve up the GUI - if build dir exists, and GUI feature enabled
if (process.env.DISABLE_GUI && process.env.DISABLE_GUI !== 'false') { if (process.env.DISABLE_GUI && process.env.DISABLE_GUI !== 'false') {
app.get('*', async (req, res) => { app.get('/', async (req, res) => {
const placeholderContent = await fs.promises.readFile(placeholderFilePath, 'utf-8'); const placeholderContent = await fs.promises.readFile(placeholderFilePath, 'utf-8');
const htmlContent = placeholderContent.replace( const htmlContent = placeholderContent.replace(
'<!-- CONTENT -->', '<!-- CONTENT -->',
'Web-Check API is up and running!<br />Access the endpoints at ' 'Web-Check API is up and running!<br />Access the endpoints at '
+'<a href="/api"><code>/api</code></a>' +`<a href="${API_DIR}"><code>${API_DIR}</code></a>`
); );
res.status(500).send(htmlContent); res.status(500).send(htmlContent);
}); });
} else if (!fs.existsSync(guiPath)) { } else if (!fs.existsSync(guiPath)) {
app.get('*', async (req, res) => { app.get('/', async (req, res) => {
const placeholderContent = await fs.promises.readFile(placeholderFilePath, 'utf-8'); const placeholderContent = await fs.promises.readFile(placeholderFilePath, 'utf-8');
const htmlContent = placeholderContent.replace( const htmlContent = placeholderContent.replace(
'<!-- CONTENT -->', '<!-- CONTENT -->',
@ -159,24 +160,21 @@ if (process.env.DISABLE_GUI && process.env.DISABLE_GUI !== 'false') {
} else { // GUI enabled, and build files present, let's go!! } else { // GUI enabled, and build files present, let's go!!
app.use(express.static('dist/client/')); app.use(express.static('dist/client/'));
app.use((req, res, next) => { app.use((req, res, next) => {
const locals = { ssrHandler(req, res, next);
title: 'New title',
};
ssrHandler(req, res, next, locals);
}); });
} }
// Handle SPA routing // Handle SPA routing
app.use(historyApiFallback({ app.use(historyApiFallback({
rewrites: [ rewrites: [
{ from: /^\/api\/.*$/, to: (context) => context.parsedUrl.path }, { from: new RegExp(`^${API_DIR}/.*$`), to: (context) => context.parsedUrl.path },
{ from: /^.*$/, to: '/index.html' } { from: /^.*$/, to: '/index.html' }
] ]
})); }));
// Anything left unhandled (which isn't an API endpoint), return a 404 // Anything left unhandled (which isn't an API endpoint), return a 404
app.use((req, res, next) => { app.use((req, res, next) => {
if (!req.path.startsWith('/api/')) { if (!req.path.startsWith(`${API_DIR}/`)) {
res.status(404).sendFile(path.join(__dirname, 'public', 'error.html')); res.status(404).sendFile(path.join(__dirname, 'public', 'error.html'));
} else { } else {
next(); next();