Merge branch 'nakrovati-rebuild-server-on-fastify'

Author: krausest

server/.eslintrc.json

@@ -0,0 +1,11 @@
+{
+  "root": true,
+  "env": {
+    "node": true,
+    "es2024": true
+  },
+  "extends": "eslint:recommended",
+  "parserOptions": {
+    "sourceType": "module"
+  }
+}

server/.prettierignore

@@ -0,0 +1 @@
+package-lock.json

server/app.js

@@ -0,0 +1,29 @@
+import Fastify from "fastify";
+import frameworksRouter from "./src/frameworks/frameworksRouter.js";
+import cspRouter from "./src/csp/cspRouter.js";
+import staticRouter from "./src/static/staticRouter.js";
+
+/**
+ * Builds the server but does not start it. Need it for testing API
+ * @param {import("fastify").FastifyServerOptions} options
+ * @returns {import("fastify").FastifyInstance}
+ */
+function buildServer(options = {}) {
+  const fastify = Fastify(options);
+
+  fastify.addHook("onRequest", (request, reply, done) => {
+    if (request.url.endsWith("index.html")) {
+      reply.header("Cross-Origin-Embedder-Policy", "require-corp");
+      reply.header("Cross-Origin-Opener-Policy", "same-origin");
+    }
+    done();
+  });
+
+  fastify.register(staticRouter);
+  fastify.register(frameworksRouter);
+  fastify.register(cspRouter, { prefix: "/csp" });
+
+  return fastify;
+}
+
+export { buildServer };

server/csp/cspControllers.js

@@ -1,46 +1,13 @@
-import express from "express";
-import path from "path";
-import { cwd } from "process";
+import { buildServer } from "./app.js";
 
-import { addSiteIsolationForIndex } from "./middlewares/addSiteIsolationForIndex.js";
-import frameworksRouter from "./frameworks/frameworksRouter.js";
-import cspRouter from "./csp/cspRouter.js";
-import { isCSPEnabled } from "./csp/cspControllers.js";
-import { frameworksDirectory } from "./config/directories.js";
-
-const app = express();
 const PORT = 8080;
 
-const webDriverResultDirectory = path.join(cwd(), "..", "webdriver-ts-results");
-
-app.use(express.json());
-app.use(addSiteIsolationForIndex);
-
-app.use(
-  "/frameworks",
-  express.static(frameworksDirectory, {
-    setHeaders: (res, path) => {
-      if (isCSPEnabled && path.endsWith("index.html")) {
-        console.log("adding CSP to ", path);
-        res.setHeader(
-          "Content-Security-Policy",
-          "default-src 'self'; report-uri /csp"
-        );
-      }
-    },
-  })
-);
-app.use("/webdriver-ts-results", express.static(webDriverResultDirectory));
-app.use("/css", express.static(path.join(frameworksDirectory, "..", "css")));
-
-app.use(frameworksRouter);
-app.use(cspRouter);
-
-app.get("/index.html", (req, res) => {
-  const indexHTMLPath = path.join(cwd(), "..", "index.html");
-  res.sendFile(indexHTMLPath);
-});
+const server = buildServer();
 
-app.listen(PORT, () => {
+try {
+  await server.listen({ port: PORT });
   console.log(`Server running on port ${PORT}`);
-});
+} catch (error) {
+  server.log.error(error);
+  process.exit(1);
+}