source: Klonkt/src/server.js@ b08b5bc

main
Last change on this file since b08b5bc was b08b5bc, checked in by roboburr <roboburr@…>, 3 months ago

SW: intercept navigations only — fix broken images after refresh

The service-worker fetch handler intercepted ALL GET requests with
fetch().catch(() => caches.match(request)). If the network fetch failed
briefly (e.g. during the daily SW version swap with skipWaiting+clients.claim),
caches.match for an uncached image returned undefined →
respondWith(undefined) → broken image on a normal refresh. Hard reload
bypasses the SW and therefore worked.

Now the SW only intercepts navigate requests (HTML) for an offline
fallback to the cached '/'; images/CSS/JS/media pass through natively.
CACHE_VERSION → v11 forces activation + cleanup of old caches.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@…>

  • Property mode set to 100644
File size: 18.5 KB
Line 
1/**
2 * Klonkt Beta — server bootstrap
3 *
4 * Persoonlijk multi-site platform — Node + SQLite + htmx.
5 * Stack: Express + better-sqlite3 + EJS + htmx + ws.
6 */
7
8import 'dotenv/config';
9import express from 'express';
10import helmet from 'helmet';
11import session from 'express-session';
12import bodyParser from 'body-parser';
13import path from 'path';
14import fs from 'fs';
15import { fileURLToPath } from 'url';
16import http from 'http';
17import db, { initializeDatabase } from './config/database.js';
18import { SqliteSessionStore } from './services/SqliteSessionStore.js';
19import { ensurePrimarySite } from './services/ensurePrimarySite.js';
20import PrutterService from './services/PrutterService.js';
21import { WebSocketServer } from 'ws';
22
23import { resolveSite, loadAudioTracks, loadTheme } from './middleware/site.js';
24import { isViewer } from './middleware/auth.js';
25import { renderPage } from './middleware/render.js';
26import authRoutes from './routes/auth.js';
27import accountRoutes from './routes/account.js';
28import adminRoutes from './routes/admin.js';
29import adminAudioRoutes from './routes/admin-audio.js';
30import adminPlaylistsRoutes from './routes/admin-playlists.js';
31import adminSitesRoutes from './routes/admin-sites.js';
32import adminUsersRoutes from './routes/admin-users.js';
33import adminCommentsRoutes from './routes/admin-comments.js';
34import adminSettingsRoutes from './routes/admin-settings.js';
35import adminSeoRoutes from './routes/admin-seo.js';
36import prutterRoutes from './routes/prutter.js';
37import audioRoutes from './routes/audio.js';
38import searchRoutes from './routes/search.js';
39import commentsRoutes from './routes/comments.js';
40import tagsRoutes from './routes/tags.js';
41import typesRoutes from './routes/types.js';
42import usersRoutes from './routes/users.js';
43import feedRoutes from './routes/feed.js';
44import hubRoutes from './routes/hub.js';
45import artistsRoutes from './routes/artists.js';
46import postsRoutes from './routes/posts.js';
47import federationRoutes from './routes/federation.js';
48import { startCircleSyncLoop } from './services/CircleService.js';
49import adminCircleRoutes from './routes/admin-circle.js';
50import adminUpdatesRoutes from './routes/admin-updates.js';
51import adminPatreonRoutes from './routes/admin-patreon.js';
52import adminStatsRoutes from './routes/admin-stats.js';
53import circleRoutes from './routes/circle.js';
54
55if (!process.env.SESSION_SECRET) {
56 console.error('❌ FATAL: SESSION_SECRET is required');
57 process.exit(1);
58}
59
60if (process.env.NODE_ENV === 'production' && process.env.SESSION_SECRET.length < 32) {
61 console.error('❌ FATAL: SESSION_SECRET too weak for production');
62 process.exit(1);
63}
64
65const __dirname = path.dirname(fileURLToPath(import.meta.url));
66const PORT = process.env.PORT || 3000;
67const isDev = process.env.NODE_ENV !== 'production';
68
69const app = express();
70const server = http.createServer(app);
71
72app.use(helmet({
73 contentSecurityPolicy: {
74 directives: {
75 defaultSrc: ["'self'"],
76 scriptSrc: [
77 "'self'",
78 "'unsafe-inline'",
79 // Eigen custom-embeds (embed-player.js) laden de OFFICIELE player-API's
80 // van deze hosts. Zonder deze whitelist blokkeert de CSP ze stil (alleen
81 // een console-fout) en faalt de embed-speler.
82 "https://www.youtube.com", // YouTube IFrame Player API (+ www-widgetapi.js)
83 "https://s.ytimg.com", // YouTube player-assets
84 "https://w.soundcloud.com", // SoundCloud Widget API (api.js)
85 "https://open.spotify.com", // Spotify iFrame API
86 ],
87 // Helmet's default zet script-src-attr op 'none', wat ALLE inline event-
88 // handlers (onchange/onclick/onsubmit) blokkeert — daardoor deed o.a. de
89 // avatar-upload (<input onchange="this.form.submit()">) en de rol-dropdown
90 // niets. We staan inline handlers expliciet toe, consistent met de al
91 // toegestane inline <script> hierboven.
92 scriptSrcAttr: ["'unsafe-inline'"],
93 styleSrc: ["'self'", "'unsafe-inline'"],
94 imgSrc: ["'self'", "data:", "https:"],
95 connectSrc: ["'self'", "wss:", "ws:"],
96 // blob: is required for the audio player — it fetch()es track bytes and
97 // plays from a blob: object URL (Spotify-style). Without blob: here the
98 // CSP silently blocks <audio>.src = blob:… → the player fires 'error' and
99 // auto-skips every track. 'self'/https: do NOT imply blob:.
100 mediaSrc: ["'self'", "https:", "blob:"],
101 fontSrc: ["'self'"],
102 frameSrc: [
103 "'self'",
104 "https://open.spotify.com",
105 "https://w.soundcloud.com",
106 "https://bandcamp.com",
107 "https://embed.music.apple.com",
108 "https://www.youtube-nocookie.com",
109 "https://www.youtube.com", // YouTube IFrame API maakt soms een www.youtube.com-iframe
110 "https://player.vimeo.com",
111 ],
112 },
113 },
114 hsts: { maxAge: 31536000, includeSubDomains: true, preload: true },
115 frameguard: { action: 'sameorigin' },
116 referrerPolicy: { policy: 'no-referrer-when-downgrade' },
117}));
118
119app.set('view engine', 'ejs');
120app.set('views', path.join(__dirname, 'views'));
121
122app.use(bodyParser.urlencoded({ extended: true, limit: '10mb' }));
123app.use(bodyParser.json({ limit: '10mb' }));
124
125// Trust one upstream proxy in production. NPM (or Caddy / nginx) terminates
126// HTTPS and forwards to us over plain HTTP, setting X-Forwarded-Proto: https.
127// Without this, Express sees req.protocol === 'http' and won't issue secure
128// cookies — sessions never persist past the redirect after login.
129if (!isDev) app.set('trust proxy', 1);
130
131// Schema aanmaken/bijwerken VÓÓR iets de DB aanraakt: de session-store doet
132// bij constructie al een query op de `sessions`-tabel, dus bij een verse
133// install moeten de tabellen eerst bestaan (anders: "no such table: sessions"
134// → crash-loop op de allereerste boot).
135initializeDatabase();
136
137// Vangnet: garandeer dat er altijd een primaire site is (solo/hub/circle).
138// Idempotent — doet niets als er al een site is of nog geen beheerder.
139ensurePrimarySite();
140
141// Session middleware extracted into a variable so the WebSocket upgrade
142// handler can reuse it (it needs req.session to authenticate sockets).
143const sessionMiddleware = session({
144 store: new SqliteSessionStore(),
145 secret: process.env.SESSION_SECRET,
146 resave: false,
147 saveUninitialized: false,
148 name: 'pcms.sid',
149 cookie: {
150 httpOnly: true,
151 secure: !isDev,
152 sameSite: 'lax',
153 maxAge: 30 * 24 * 60 * 60 * 1000,
154 },
155});
156app.use(sessionMiddleware);
157
158app.use('/assets', express.static(path.join(__dirname, 'assets'), { maxAge: isDev ? 0 : '1y' }));
159app.use('/media', express.static(process.env.MEDIA_PATH || './storage/media', {
160 // Publieke media (post-covers, avatars) moet door andere Klonkt-sites in hun
161 // CIRKEL cross-origin embedbaar zijn. Helmet zet standaard CORP=same-origin,
162 // wat die afbeeldingen in de browser blokkeert (bestand komt wél binnen, maar
163 // de browser weigert 'm te tonen). Voor /media dus expliciet cross-origin.
164 setHeaders: (res) => res.setHeader('Cross-Origin-Resource-Policy', 'cross-origin'),
165}));
166
167// (Verwijderd) TWA / digital-asset-links — alleen nodig voor de APK/TWA-variant.
168// Klonkt is PWA-only; geen assetlinks.json meer.
169
170// Cirkels: periodieke achtergrond-sync van remote instances (no-op tenzij tenancy='circle').
171startCircleSyncLoop();
172
173// Bundle HTMX: copy from node_modules into our own assets dir so we can serve
174// it locally (no third-party CDN). Idempotent — only copies if size differs.
175(function ensureLocalHtmx() {
176 const src = path.join(__dirname, '..', 'node_modules', 'htmx.org', 'dist', 'htmx.min.js');
177 const dest = path.join(__dirname, 'assets', 'js', 'htmx.min.js');
178 try {
179 const srcStat = fs.statSync(src);
180 const destStat = fs.existsSync(dest) ? fs.statSync(dest) : null;
181 if (!destStat || destStat.size !== srcStat.size) {
182 fs.copyFileSync(src, dest);
183 console.log(`📦 HTMX bundled locally: ${srcStat.size} bytes`);
184 }
185 } catch (e) {
186 console.warn('⚠️ Could not bundle HTMX:', e.message, '— run `npm install`');
187 }
188})();
189
190// Singleton PrutterService — routes get it via req.app.locals.prutter.
191const prutter = new PrutterService(db);
192app.locals.prutter = prutter;
193
194// Cirkels-federatie: publieke, site-agnostische endpoints (/.klonkt/*).
195// Vóór resolveSite/theme — ze hebben geen site-context nodig.
196app.use(federationRoutes);
197
198app.use(resolveSite);
199app.use(loadAudioTracks);
200app.use(loadTheme);
201
202// Lichtgewicht CSRF-defense: weiger cross-origin state-wijzigende requests.
203// Same-origin forms + HTMX sturen een matchende Origin; ontbreekt Origin dan
204// laten we door (non-browser clients). sameSite:'lax' op de sessiecookie is de
205// tweede laag. (Geldt niet voor GET/HEAD/OPTIONS.)
206app.use((req, res, next) => {
207 if (req.method === 'GET' || req.method === 'HEAD' || req.method === 'OPTIONS') return next();
208 const origin = req.get('origin');
209 if (!origin) return next(); // geen Origin -> geen browser-CSRF-vector
210 let originHost;
211 try { originHost = new URL(origin).host; } catch { return res.status(403).send('Ongeldige origin'); }
212 if (originHost !== req.get('host')) return res.status(403).send('Cross-origin request geweigerd');
213 next();
214});
215
216// Kijker-accounts: alles bekijken mag (incl. Beheer), niets wijzigen. Dit is de
217// ENIGE schrijf-blokkade — fail-closed, vóór alle route-handlers. Elke state-
218// wijzigende methode wordt geweigerd (de login-POST zet de sessie pas ná deze
219// guard, dus die valt er niet onder). I.p.v. rauwe 403-tekst tonen we een nette
220// pagina (of, bij HTMX, een ingeswapte melding).
221app.use((req, res, next) => {
222 const mutating = req.method !== 'GET' && req.method !== 'HEAD' && req.method !== 'OPTIONS';
223 if (mutating && isViewer(req.session?.user)) {
224 if (req.headers['hx-request'] === 'true') {
225 // htmx swapt niet op 4xx; stuur 200 + retarget zodat de melding in #pcms-main verschijnt.
226 res.setHeader('HX-Retarget', '#pcms-main');
227 res.setHeader('HX-Reswap', 'innerHTML');
228 res.status(200);
229 } else {
230 res.status(403);
231 }
232 return renderPage(req, res, 'pages/viewer-blocked', {
233 pageTitle: 'Kijker-modus',
234 bodyClass: 'on-special',
235 });
236 }
237 next();
238});
239
240app.use('/auth', authRoutes);
241app.use('/account', accountRoutes);
242app.use('/admin/audio', adminAudioRoutes);
243app.use('/admin/playlists', adminPlaylistsRoutes);
244app.use('/admin/sites', adminSitesRoutes);
245app.use('/admin/users', adminUsersRoutes);
246app.use('/admin/comments', adminCommentsRoutes);
247app.use('/admin/settings', adminSettingsRoutes);
248app.use('/admin/seo', adminSeoRoutes);
249app.use('/admin/circle', adminCircleRoutes);
250app.use('/admin/updates', adminUpdatesRoutes);
251app.use('/admin/patreon', adminPatreonRoutes);
252app.use('/admin/stats', adminStatsRoutes);
253app.use('/admin', adminRoutes);
254app.use('/prutter', prutterRoutes);
255app.use('/audio', audioRoutes);
256app.use('/search', searchRoutes);
257app.use('/comments', commentsRoutes);
258app.use('/tag', tagsRoutes);
259app.use('/type', typesRoutes);
260app.use('/users', usersRoutes);
261// Feed/sitemap routes are mounted at root because they're at well-known paths
262app.use('/', feedRoutes);
263app.use('/leden', artistsRoutes); // doorzoekbare leden-directory (alleen hub; solo: next())
264app.get('/artiesten', (req, res) => res.redirect(301, req.originalUrl.replace(/^\/artiesten/, '/leden'))); // oude URL -> /leden
265app.use('/', hubRoutes); // hub-overview op '/' (solo: next() -> postsRoutes)
266app.use('/', circleRoutes); // /cirkel-feed (solo/hub: next() -> postsRoutes)
267app.use('/', postsRoutes);
268
269app.get('/manifest.webmanifest', (req, res) => {
270 const site = res.locals.site;
271
272 // PWA scope: confines installed apps to ONE site. If a user is in the
273 // bedrijf1 PWA and clicks a link to /sites/bedrijf2/..., the browser will
274 // open it in a regular tab (out-of-scope) instead of within the PWA.
275 // Same applies to APK packaging — the WebView is locked to this scope.
276 //
277 // For path-mounted sites: scope = /sites/<slug>/
278 // For root/subdomain sites: scope = /
279 const base = res.locals.siteUrlBase || ''; // '' or '/sites/<slug>'
280 const scope = (base || '') + '/';
281 const startUrl = (base || '') + '/?source=pwa';
282
283 // A stable identity per site so installs don't collide (Chromium uses `id`).
284 // NB: een id-wissel orphant bestaande PWA-installs (er is geen migratie die een
285 // install over een id-verandering heen tilt) — wie een site al als PWA had,
286 // moet 'm één keer opnieuw installeren. Data blijft server-side, dus niets kwijt.
287 const idBase = site?.slug ? `klonkt-${site.slug}` : 'klonkt';
288
289 res.set('Cache-Control', 'no-cache');
290 res.json({
291 id: idBase,
292 name: site?.title || 'Klonkt',
293 short_name: (site?.title || 'Klonkt').slice(0, 12),
294 description: site?.description || site?.tagline || '',
295 scope,
296 start_url: startUrl,
297 display: 'standalone',
298 display_override: ['standalone', 'minimal-ui'],
299 orientation: 'any',
300 background_color: '#1a1a17',
301 theme_color: site?.accent || '#c2410c',
302 lang: site?.language || 'nl',
303 icons: [
304 { src: '/favicon.svg', sizes: 'any', type: 'image/svg+xml' },
305 { src: '/favicon.ico', sizes: '64x64', type: 'image/x-icon' },
306 ],
307 // Hint to capable browsers: capture all in-scope links inside the PWA
308 capture_links: 'existing-client-navigate',
309 });
310});
311
312// Favicon — served as SVG so it picks up the site's accent color dynamically.
313// Browsers also request /favicon.ico by convention; we serve the same SVG
314// content there with a forgiving content-type since modern browsers accept it.
315function _renderFavicon(res, accent) {
316 const safeAccent = /^#[0-9a-fA-F]{3,8}$/.test(accent) ? accent : '#c2410c';
317 // Site mark: rounded square in the site accent + bold white 'K' (Klonkt)
318 const svg = `<?xml version="1.0" encoding="UTF-8"?>
319<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
320 <rect width="64" height="64" rx="14" fill="${safeAccent}"/>
321 <text x="50%" y="50%" dy="0.35em" text-anchor="middle"
322 font-family="Arial, Helvetica, sans-serif"
323 font-size="42" font-weight="800" fill="#fff">K</text>
324</svg>`;
325 res.set('Content-Type', 'image/svg+xml');
326 res.set('Cache-Control', 'public, max-age=86400');
327 res.send(svg);
328}
329
330app.get('/favicon.svg', (req, res) => {
331 _renderFavicon(res, res.locals.site?.accent);
332});
333app.get('/favicon.ico', (req, res) => {
334 // Browsers requesting .ico will accept SVG content; chrome/firefox both fine.
335 // Keeping the route prevents 404 spam in the console.
336 _renderFavicon(res, res.locals.site?.accent);
337});
338
339app.get('/sw.js', (req, res) => {
340 res.set('Content-Type', 'application/javascript');
341 res.set('Cache-Control', 'no-cache');
342 res.send(`
343const CACHE_VERSION = 'pcms-v11-' + new Date().toISOString().split('T')[0];
344self.addEventListener('install', e => {
345 e.waitUntil(caches.open(CACHE_VERSION).then(c => c.addAll(['/'])));
346 self.skipWaiting();
347});
348self.addEventListener('activate', e => {
349 e.waitUntil(caches.keys().then(keys => Promise.all(
350 keys.filter(k => k !== CACHE_VERSION).map(k => caches.delete(k))
351 )));
352 self.clients.claim();
353});
354// ALLEEN navigaties (HTML-pagina's) onderscheppen, voor een offline-fallback.
355// Afbeeldingen, CSS, JS en /media NIET aanraken — laat de browser die native
356// afhandelen. Anders kon een mislukte netwerk-fetch terugvallen op een lege
357// cache-match (undefined) en zo een afbeelding "kapot" maken bij een gewone
358// refresh (hard reload omzeilt de SW en werkte daarom wél).
359self.addEventListener('fetch', e => {
360 if (e.request.method !== 'GET') return;
361 if (e.request.mode !== 'navigate') return; // alleen page-loads
362 e.respondWith(
363 fetch(e.request).catch(() => caches.match('/').then(r => r || Response.error()))
364 );
365});
366 `);
367});
368
369process.on('unhandledRejection', (reason) => {
370 console.error('⚠️ Unhandled Rejection:', reason);
371});
372
373app.use((err, req, res, next) => {
374 console.error('❌ Error:', err);
375 res.status(err.status || 500).send(
376 isDev ? `<pre>${err.stack || err.message}</pre>` : 'Internal Server Error'
377 );
378});
379
380app.use((req, res) => {
381 res.status(404).send(`
382 <div style="font-family:system-ui;max-width:500px;margin:4rem auto;text-align:center;padding:2rem;">
383 <h1 style="font-size:5rem;margin:0;color:#c33;">404</h1>
384 <p>Not found</p>
385 <a href="/" style="color:#c2410c;">← Home</a>
386 </div>
387 `);
388});
389
390// ==================== WebSocket: Prutter real-time ====================
391// Authenticate via the existing session cookie. We reuse sessionMiddleware
392// during the HTTP upgrade so req.session is populated; if no user, abort.
393const wss = new WebSocketServer({ noServer: true });
394
395server.on('upgrade', (req, socket, head) => {
396 if (req.url !== '/ws/prutter') {
397 socket.destroy();
398 return;
399 }
400 // Run session middleware on the upgrade request.
401 // (Express's middleware accepts (req, res, next); we pass a stub res.)
402 const stubRes = { setHeader: () => {}, getHeader: () => undefined, on: () => {}, end: () => {} };
403 sessionMiddleware(req, stubRes, () => {
404 if (!req.session?.user) {
405 socket.write('HTTP/1.1 401 Unauthorized\r\n\r\n');
406 socket.destroy();
407 return;
408 }
409 // Kijker-accounts zijn alleen-lezen: weiger de WS-upgrade. De HTTP-guard
410 // dekt geen WS, dus dit is de plek om schrijven via een (toekomstige)
411 // message-handler te voorkomen.
412 if (isViewer(req.session.user)) {
413 socket.write('HTTP/1.1 403 Forbidden\r\n\r\n');
414 socket.destroy();
415 return;
416 }
417 wss.handleUpgrade(req, socket, head, (ws) => {
418 ws.userId = req.session.user.id;
419 wss.emit('connection', ws, req);
420 });
421 });
422});
423
424wss.on('connection', (ws) => {
425 prutter.addConnection(ws.userId, ws);
426 ws.on('close', () => prutter.removeConnection(ws.userId, ws));
427 ws.on('error', () => prutter.removeConnection(ws.userId, ws));
428 // Optional: ping every 30s to keep connections alive through proxies
429 ws.isAlive = true;
430 ws.on('pong', () => { ws.isAlive = true; });
431});
432const wsPing = setInterval(() => {
433 for (const ws of wss.clients) {
434 if (ws.isAlive === false) { ws.terminate(); continue; }
435 ws.isAlive = false;
436 try { ws.ping(); } catch {}
437 }
438}, 30000);
439if (wsPing.unref) wsPing.unref();
440
441server.listen(PORT, () => {
442 console.log('');
443 console.log('🪶 Klonkt Beta');
444 console.log(` http://localhost:${PORT}`);
445 console.log('');
446 console.log(` ✓ Security: Helmet, CSP, secure sessions`);
447 console.log(` ✓ Privacy: Self-hosted fonts, no third-party requests`);
448 console.log(` ✓ Layout: v9 editorial feel (top nav, profile header)`);
449 console.log(` ✓ Auth: wachtwoord (beheer) + Google (luisteraars) / logout`);
450 console.log(` ✓ Posts: create / edit / view / archive`);
451 console.log(` ✓ Realtime: WebSocket server ready (Prutter)`);
452 console.log('');
453 console.log(` Mode: ${isDev ? 'development' : 'PRODUCTION'}`);
454 console.log('');
455});
456
457export default app;
Note: See TracBrowser for help on using the repository browser.