fix
This commit is contained in:
@@ -19,6 +19,9 @@ npm run dev
|
|||||||
|
|
||||||
The development server runs on <http://localhost:3001>.
|
The development server runs on <http://localhost:3001>.
|
||||||
|
|
||||||
|
Set `comingsoon=TRUE` in `.env` to serve a temporary coming soon page instead
|
||||||
|
of the app. Omit it, or set any other value, to serve the regular site.
|
||||||
|
|
||||||
By default, `/api/*` and `/health` requests are proxied to `http://localhost:6000`. Override
|
By default, `/api/*` and `/health` requests are proxied to `http://localhost:6000`. Override
|
||||||
that with `VITE_API_TARGET`:
|
that with `VITE_API_TARGET`:
|
||||||
|
|
||||||
|
|||||||
+4
-2
@@ -1,15 +1,19 @@
|
|||||||
NODE_ENV=production
|
NODE_ENV=production
|
||||||
|
comingsoon=TRUE
|
||||||
|
|
||||||
PORT=3010
|
PORT=3010
|
||||||
API_UPSTREAM=http://127.0.0.1:6000
|
API_UPSTREAM=http://127.0.0.1:6000
|
||||||
PUBLIC_ORIGIN=https://example.com
|
PUBLIC_ORIGIN=https://example.com
|
||||||
|
|
||||||
UPTIME_STORAGE_DIR=~/tsswebstorage
|
UPTIME_STORAGE_DIR=~/tsswebstorage
|
||||||
UPTIME_DATABASE_FILE=uptime.sqlite
|
UPTIME_DATABASE_FILE=uptime.sqlite
|
||||||
UPTIME_SAMPLE_INTERVAL_MS=1800000
|
UPTIME_SAMPLE_INTERVAL_MS=1800000
|
||||||
UPTIME_HISTORY_LIMIT=336
|
UPTIME_HISTORY_LIMIT=336
|
||||||
|
|
||||||
ANALYTICS_DATABASE_FILE=viewers.sqlite
|
ANALYTICS_DATABASE_FILE=viewers.sqlite
|
||||||
ANALYTICS_RETENTION_DAYS=30
|
ANALYTICS_RETENTION_DAYS=30
|
||||||
ANALYTICS_ACTIVE_WINDOW_SECONDS=75
|
ANALYTICS_ACTIVE_WINDOW_SECONDS=75
|
||||||
|
|
||||||
API_CACHE_TTL_MS=15000
|
API_CACHE_TTL_MS=15000
|
||||||
API_RATE_LIMIT_WINDOW_MS=60000
|
API_RATE_LIMIT_WINDOW_MS=60000
|
||||||
API_RATE_LIMIT_MAX=120
|
API_RATE_LIMIT_MAX=120
|
||||||
@@ -29,11 +33,9 @@ GITHUB_WEBHOOK_REPOSITORY=
|
|||||||
PM2_RESTART_TARGETS=tssbot-web
|
PM2_RESTART_TARGETS=tssbot-web
|
||||||
DISCORD_WEBHOOK_URL=https://discord.com/api/webhooks/...
|
DISCORD_WEBHOOK_URL=https://discord.com/api/webhooks/...
|
||||||
# Set to "true" only if the Discord channel is private. Default omits the patch preview
|
# Set to "true" only if the Discord channel is private. Default omits the patch preview
|
||||||
# from Discord notifications to avoid leaking diffs (including any inline secrets).
|
|
||||||
DISCORD_INCLUDE_PATCH=true
|
DISCORD_INCLUDE_PATCH=true
|
||||||
|
|
||||||
# Cloudflare Turnstile. VITE_TURNSTILE_SITE_KEY is the public site key baked into the client bundle by Vite.
|
# Cloudflare Turnstile. VITE_TURNSTILE_SITE_KEY is the public site key baked into the client bundle by Vite.
|
||||||
# TURNSTILE_SECRET_KEY is the server-only secret used to call the Siteverify endpoint.
|
# TURNSTILE_SECRET_KEY is the server-only secret used to call the Siteverify endpoint.
|
||||||
# If left blank, the gated deletion endpoint is open (no challenge enforced). Set both to enforce.
|
|
||||||
VITE_TURNSTILE_SITE_KEY=
|
VITE_TURNSTILE_SITE_KEY=
|
||||||
TURNSTILE_SECRET_KEY=
|
TURNSTILE_SECRET_KEY=
|
||||||
|
|||||||
+35
@@ -50,6 +50,7 @@ const API_CACHE_TTL_MS = Number(process.env.API_CACHE_TTL_MS || 15000)
|
|||||||
const API_RATE_LIMIT_WINDOW_MS = Number(process.env.API_RATE_LIMIT_WINDOW_MS || 60000)
|
const API_RATE_LIMIT_WINDOW_MS = Number(process.env.API_RATE_LIMIT_WINDOW_MS || 60000)
|
||||||
const API_RATE_LIMIT_MAX = Number(process.env.API_RATE_LIMIT_MAX || 120)
|
const API_RATE_LIMIT_MAX = Number(process.env.API_RATE_LIMIT_MAX || 120)
|
||||||
const TURNSTILE_SECRET_KEY = process.env.TURNSTILE_SECRET_KEY || ''
|
const TURNSTILE_SECRET_KEY = process.env.TURNSTILE_SECRET_KEY || ''
|
||||||
|
const COMING_SOON = String(process.env.comingsoon || process.env.COMINGSOON || '').toLowerCase() === 'true'
|
||||||
const TURNSTILE_VERIFY_URL = 'https://challenges.cloudflare.com/turnstile/v0/siteverify'
|
const TURNSTILE_VERIFY_URL = 'https://challenges.cloudflare.com/turnstile/v0/siteverify'
|
||||||
const TURNSTILE_VERIFY_TIMEOUT_MS = Number(process.env.TURNSTILE_VERIFY_TIMEOUT_MS || 5000)
|
const TURNSTILE_VERIFY_TIMEOUT_MS = Number(process.env.TURNSTILE_VERIFY_TIMEOUT_MS || 5000)
|
||||||
const TURNSTILE_MAX_TOKEN_LENGTH = 2048
|
const TURNSTILE_MAX_TOKEN_LENGTH = 2048
|
||||||
@@ -1691,8 +1692,42 @@ function sendHtml(req, res, data, status = 200) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function comingSoonHtml() {
|
||||||
|
return `<!doctype html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<meta name="robots" content="noindex">
|
||||||
|
<meta name="theme-color" content="#fefde7">
|
||||||
|
<title>Toothless' TSS Bot | Coming soon</title>
|
||||||
|
</head>
|
||||||
|
<body style="margin:0;min-width:320px;min-height:100vh;background:#fefde7;color:#000;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Inter,Arial,sans-serif;">
|
||||||
|
<main style="min-height:100vh;display:grid;place-items:center;padding:32px;">
|
||||||
|
<section style="width:min(100%,720px);border-left:4px solid #e82517;padding:8px 0 8px 28px;">
|
||||||
|
<p style="margin:0 0 14px;color:#e82517;font-size:13px;font-weight:800;letter-spacing:.08em;text-transform:uppercase;">Toothless' TSS Bot</p>
|
||||||
|
<h1 style="margin:0;color:#000;font-size:clamp(48px,12vw,112px);line-height:.92;font-weight:900;letter-spacing:0;">Coming soon</h1>
|
||||||
|
<p style="margin:24px 0 0;max-width:520px;color:#555;font-size:18px;line-height:1.6;font-weight:600;">TSS analytics are getting tucked away for a little bit. Check back soon.</p>
|
||||||
|
</section>
|
||||||
|
</main>
|
||||||
|
</body>
|
||||||
|
</html>`
|
||||||
|
}
|
||||||
|
|
||||||
|
function sendComingSoonPage(req, res) {
|
||||||
|
send(res, 200, comingSoonHtml(), {
|
||||||
|
...securityHeaders(req, { html: true }),
|
||||||
|
'content-type': mimeTypes['.html'],
|
||||||
|
'cache-control': 'no-store',
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
function serveStatic(req, res) {
|
function serveStatic(req, res) {
|
||||||
const requestPath = decodeURIComponent(new URL(req.url, `http://localhost:${PORT}`).pathname)
|
const requestPath = decodeURIComponent(new URL(req.url, `http://localhost:${PORT}`).pathname)
|
||||||
|
if (COMING_SOON) {
|
||||||
|
return sendComingSoonPage(req, res)
|
||||||
|
}
|
||||||
|
|
||||||
const relativePath = requestPath === '/' ? '/index.html' : requestPath
|
const relativePath = requestPath === '/' ? '/index.html' : requestPath
|
||||||
const filePath = path.normalize(path.join(DIST_DIR, relativePath))
|
const filePath = path.normalize(path.join(DIST_DIR, relativePath))
|
||||||
|
|
||||||
|
|||||||
+59
-3
@@ -1,5 +1,5 @@
|
|||||||
import crypto from 'node:crypto'
|
import crypto from 'node:crypto'
|
||||||
import { defineConfig } from 'vite'
|
import { defineConfig, loadEnv } from 'vite'
|
||||||
import react from '@vitejs/plugin-react'
|
import react from '@vitejs/plugin-react'
|
||||||
import tailwindcss from '@tailwindcss/vite'
|
import tailwindcss from '@tailwindcss/vite'
|
||||||
import obfuscatorPlugin from 'rollup-plugin-obfuscator'
|
import obfuscatorPlugin from 'rollup-plugin-obfuscator'
|
||||||
@@ -142,8 +142,63 @@ function apiGuard() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export default defineConfig({
|
function comingSoonHtml() {
|
||||||
plugins: [apiGuard(), react(), tailwindcss(), obfuscate(), sri()],
|
return `<!doctype html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<meta name="robots" content="noindex">
|
||||||
|
<meta name="theme-color" content="#fefde7">
|
||||||
|
<title>Toothless' TSS Bot | Coming soon</title>
|
||||||
|
</head>
|
||||||
|
<body style="margin:0;min-width:320px;min-height:100vh;background:#fefde7;color:#000;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Inter,Arial,sans-serif;">
|
||||||
|
<main style="min-height:100vh;display:grid;place-items:center;padding:32px;">
|
||||||
|
<section style="width:min(100%,720px);border-left:4px solid #e82517;padding:8px 0 8px 28px;">
|
||||||
|
<p style="margin:0 0 14px;color:#e82517;font-size:13px;font-weight:800;letter-spacing:.08em;text-transform:uppercase;">Toothless' TSS Bot</p>
|
||||||
|
<h1 style="margin:0;color:#000;font-size:clamp(48px,12vw,112px);line-height:.92;font-weight:900;letter-spacing:0;">Coming soon</h1>
|
||||||
|
<p style="margin:24px 0 0;max-width:520px;color:#555;font-size:18px;line-height:1.6;font-weight:600;">TSS analytics are getting tucked away for a little bit. Check back soon.</p>
|
||||||
|
</section>
|
||||||
|
</main>
|
||||||
|
</body>
|
||||||
|
</html>`
|
||||||
|
}
|
||||||
|
|
||||||
|
function comingSoonDev(enabled) {
|
||||||
|
return {
|
||||||
|
name: 'coming-soon-dev',
|
||||||
|
configureServer(server) {
|
||||||
|
if (!enabled) return
|
||||||
|
|
||||||
|
server.middlewares.use((req, res, next) => {
|
||||||
|
if (req.url?.startsWith('/api/') || req.url === '/health') {
|
||||||
|
next()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
const acceptsHtml = String(req.headers.accept || '').includes('text/html')
|
||||||
|
if (!acceptsHtml && req.url !== '/') {
|
||||||
|
next()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
res.writeHead(200, {
|
||||||
|
'content-type': 'text/html; charset=utf-8',
|
||||||
|
'cache-control': 'no-store',
|
||||||
|
'x-content-type-options': 'nosniff',
|
||||||
|
})
|
||||||
|
res.end(comingSoonHtml())
|
||||||
|
})
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default defineConfig(({ mode }) => {
|
||||||
|
const env = loadEnv(mode, process.cwd(), '')
|
||||||
|
const comingSoon = String(env.comingsoon || env.COMINGSOON || '').toLowerCase() === 'true'
|
||||||
|
|
||||||
|
return {
|
||||||
|
plugins: [comingSoonDev(comingSoon), apiGuard(), react(), tailwindcss(), obfuscate(), sri()],
|
||||||
server: {
|
server: {
|
||||||
host: '0.0.0.0',
|
host: '0.0.0.0',
|
||||||
port: 3001,
|
port: 3001,
|
||||||
@@ -158,4 +213,5 @@ export default defineConfig({
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user