Refactor static file handling to no longer need express

Dockerfile

@@ -12,7 +12,6 @@ RUN npm i
 
 COPY . .
 RUN npm run build && npm prune --omit=dev
-RUN patch build/index.js < patch/index.js.patch
 
 FROM node:22-alpine AS production
 

package.json

@@ -16,11 +16,11 @@
     "@sveltejs/vite-plugin-svelte": "^5.0.3",
     "@types/bcrypt": "^5.0.2",
     "@types/eslint": "^9.6.0",
-    "@types/express": "^4.17.21",
     "@types/geojson": "^7946.0.14",
     "@types/intl": "^1.2.2",
     "@types/leaflet": "^1.9.8",
     "@types/markdown-it": "^14.1.2",
+    "@types/mime-types": "^2.1.4",
     "@types/node": "^22.1.0",
     "@types/node-cron": "^3.0.11",
     "@types/nodemailer": "^6.4.14",
@@ -47,7 +47,6 @@
     "bcrypt": "^5.1.1",
     "canvas": "^3.0.0-rc2",
     "classnames": "^2.5.1",
-    "express": "^4.21.0",
     "feiertagejs": "^1.4.0",
     "flowbite-svelte": "^0.46.15",
     "flowbite-svelte-icons": "^2.0.0-next.18",
@@ -55,6 +54,7 @@
     "intl": "^1.2.5",
     "leaflet": "^1.9.4",
     "markdown-it": "^14.1.0",
+    "mime-types": "^2.1.35",
     "modern-diacritics": "^2.3.1",
     "node-cron": "^3.0.3",
     "nodemailer": "^6.9.12",

patch/index.js.patch

-*** build/index.js	2024-09-05 12:32:33.848369925 +0000
---- build/index2.js	2024-10-21 19:39:27.731467477 +0000
-***************
-*** 1,0 ****
---- 1,2 ----
-+ import expressServer from 'express';
-+ import nodePath from 'path';
-***************
-*** 258,264 ****
-  /** @type {NodeJS.Timeout | void} */
-  let idle_timeout_id;
-  
-! const server = polka().use(handler);
-  
-  if (socket_activation) {
-  	server.listen({ fd: SD_LISTEN_FDS_START }, () => {
---- 260,271 ----
-  /** @type {NodeJS.Timeout | void} */
-  let idle_timeout_id;
-  
-! const staticFilesDir = nodePath.join(env('DATA_DIR', '/app/data'), 'public');
-! 
-! const server = polka()
-! 		.get('/healthcheck', (req, res) => res.send('OK'))
-! 		.use(expressServer.static(staticFilesDir, { dotfiles: "ignore" }))
-! 		.use(handler);
-  
-  if (socket_activation) {
-  	server.listen({ fd: SD_LISTEN_FDS_START }, () => {

src/hooks.server.ts

 import { locales, type Locale, defaultLocale } from '$lib/i18n/i18n';
 import { handle as handleAuthentication, handleAuthorization } from '$lib/server/auth';
 import { sendTrainingMails } from '$lib/server/mail';
-import type { Handle, RequestEvent } from '@sveltejs/kit';
+import { publicPath } from '$lib/server/paths';
+import { error, type Handle, type RequestEvent } from '@sveltejs/kit';
 import { sequence } from '@sveltejs/kit/hooks';
+import mime from "mime-types";
 import cron from "node-cron";
+import fs from "node:fs";
+import path from "node:path";
 
 cron.schedule("0 10 * * *", async ()=>{
 	await sendTrainingMails();
@@ -30,8 +34,29 @@ const handleLocale: Handle = ({event, resolve})=>{
 	return resolve(event, { transformPageChunk: ({html})=>html.replace("%lang%", locale) });
 }
 
+const staticDirs = await fs.promises.readdir(publicPath);
+const handleStaticFiles: Handle = async ({event, resolve})=>{
+	const reqPath = event.url.pathname.substring(1);
+	const firstDir = reqPath.substring(0, reqPath.indexOf("/"));
+	if(!staticDirs.includes(firstDir)) return resolve(event);
+	const filePath = path.join(publicPath, reqPath);
+	if(!filePath.startsWith(publicPath)) error(403, "Forbidden");
+	const pathParts = filePath.substring(publicPath.length).split("/");
+	if(pathParts.some(part => part.startsWith("."))) error(404, "Not Found"); // drop dotfiles
+	try {
+		const fileExists = await fs.promises.stat(filePath).then(stat => stat.isFile()).catch(()=>false);
+		if(!fileExists) error(404, "Not Found");
+		const file = fs.createReadStream(filePath);
+		const mimeType = mime.lookup(filePath) || "application/octet-stream";
+		return new Response(file as any, { status: 200, headers: { "Content-Type": mimeType } });
+	} catch(ex) {
+		error(404, "Not Found");
+	}
+};
+
 export const handle = sequence(
 	handleAuthentication,
+	handleStaticFiles,
 	handleAuthorization,
 	handleLocale,
 );

src/lib/server/paths.ts

@@ -3,11 +3,12 @@ import path from "path";
 import fs from "node:fs/promises";
 
 const basePath = env.DATA_DIR ?? "/app/data";
+export const publicPath = path.join(basePath, "public");
 export const scheduleFontsPath = path.join(basePath, "fonts");
-export const imagesPath = path.join(basePath, "public", "images");
-export const uploadsPath = path.join(basePath, "public", "uploads");
-export const flyersPath = path.join(basePath, "public", "flyer");
-export const schedulesPath = path.join(basePath, "public", "stundenplaene");
+export const imagesPath = path.join(publicPath, "images");
+export const uploadsPath = path.join(publicPath, "uploads");
+export const flyersPath = path.join(publicPath, "flyer");
+export const schedulesPath = path.join(publicPath, "stundenplaene");
 
 await Promise.all([scheduleFontsPath, imagesPath, uploadsPath, flyersPath, schedulesPath].map(path=>fs.mkdir(path, { recursive: true })));
 

vite.config.ts

 import { sveltekit } from '@sveltejs/kit/vite';
-import { defineConfig, type Plugin, type PreviewServer, type ViteDevServer } from 'vite';
-import express from 'express';
-import path from 'path';
-import dotenv from 'dotenv';
-
-dotenv.config(); // Load .env file in dev, vite does not populate process.env and $env is only available in SvelteKit
-const staticFiles = express.static(path.join(process.env.DATA_DIR ?? "/app/data", "/public"), { dotfiles: "ignore" });
-const configureServerForStaticFiles = (server: ViteDevServer|PreviewServer)=>{
-	server.middlewares.use(staticFiles as any);
-};
-const staticFilePlugin: ()=>Plugin = ()=>({
-	name: "static-file-server",
-	configureServer: configureServerForStaticFiles,
-	configurePreviewServer: configureServerForStaticFiles,
-});
+import { defineConfig } from 'vite';
 
 export default defineConfig({
 	plugins: [
 		sveltekit(),
-		staticFilePlugin(),
 	],
 });