From 8327ded909e8eba42eb0607147e2bbf8d97e99f7 Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Wed, 28 May 2025 09:17:55 +0200
Subject: Move middlewares out of start.js

---
 src/api/start.js | 36 +++++-------------------------------
 1 file changed, 5 insertions(+), 31 deletions(-)

(limited to 'src/api/start.js')

diff --git a/src/api/start.js b/src/api/start.js
index caf7a7c..3540253 100644
--- a/src/api/start.js
+++ b/src/api/start.js
@@ -1,44 +1,18 @@
 import express from "express";
-import morgan from "morgan";
 import { registerRoutes } from "./routes.js";
+import { useCors, useLogging } from "./middlewares/index.js";
 
 const app = express();
-const PORT = process.env.PORT || 3000;
+const PORT = process.env.PORT ?? 3000;
+const logRequests = process.env["LOG_REQUESTS"] ?? "-";
 
 // Configure Express
 app.use(express.json());
+app.use(useCors);
 app.disable("x-powered-by");
-app.use((req, res, next) => {
-  res.set("Access-Control-Allow-Origin", "*");
-  res.set(
-    "Content-security-policy",
-    "default-src *  data: blob: filesystem: about: ws: wss: 'unsafe-inline' 'unsafe-eval'; script-src * data: blob: 'unsafe-inline' 'unsafe-eval'; connect-src * data: blob: 'unsafe-inline'; img-src * data: blob: 'unsafe-inline'; frame-src * data: blob: ; style-src * data: blob: 'unsafe-inline'; font-src * data: blob: 'unsafe-inline';",
-  );
-  res.set(
-    "Access-Control-Allow-Headers",
-    req.header("Access-Control-Request-Headers") || "*",
-  );
-  res.set(
-    "Access-Control-Allow-Methods",
-    req.header("Access-Control-Request-Methods") || "*",
-  );
-
-  next();
-});
 
-const logRequests = process.env["LOG_REQUESTS"] ?? "-";
-const requestLogFormat =
-  ':remote-addr - :remote-user [:date[clf]] ":method :url HTTP/:http-version" :status :res[content-length] ":referrer" ":user-agent" ":response-time ms"';
 if (logRequests) {
-  app.use(
-    morgan(requestLogFormat, {
-      skip: (req, res) => {
-        let skip = !logRequests.includes(res.statusCode);
-        if (logRequests.startsWith("-")) skip = !skip;
-        return skip;
-      },
-    }),
-  );
+  app.use(useLogging(logRequests));
 }
 
 registerRoutes(app);
-- 
cgit 1.5.1