creevey 0.10.0-beta.44 → 0.10.0-beta.45

package/dist/server/master/server.js

@@ -4,101 +4,213 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.start = start;
+const fs_1 = __importDefault(require("fs"));
+const url_1 = __importDefault(require("url"));
 const path_1 = __importDefault(require("path"));
-const hyper_express_1 = __importDefault(require("hyper-express"));
-const url_1 = require("url");
+const http_1 = require("http");
+const ws_1 = require("ws");
+const url_2 = require("url");
+const utils_js_1 = require("../utils.js");
 const messages_js_1 = require("../messages.js");
 const types_js_1 = require("../../types.js");
 const logger_js_1 = require("../logger.js");
 const index_js_1 = require("./handlers/index.js");
-const importMetaUrl = (0, url_1.pathToFileURL)(__filename).href;
+function json(handler, defaultValue) {
+    return (request, response) => {
+        const chunks = [];
+        request.on('data', (chunk) => {
+            chunks.push(chunk);
+        });
+        request.on('end', () => {
+            try {
+                const body = Buffer.concat(chunks);
+                const value = body.length === 0 ? defaultValue : JSON.parse(body.toString('utf-8'));
+                handler(value);
+                response.end();
+            }
+            catch (error) {
+                (0, logger_js_1.logger)().error('Failed to parse JSON', error);
+                const errorMessage = error instanceof Error ? error.message : String(error);
+                response.statusCode = 500;
+                response.setHeader('Content-Type', 'text/plain');
+                response.end(`Failed to parse JSON: ${errorMessage}`);
+            }
+        });
+        request.on('error', (error) => {
+            (0, logger_js_1.logger)().error('Failed to parse JSON', error);
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            response.statusCode = 500;
+            response.setHeader('Content-Type', 'text/plain');
+            response.end(`Failed to parse JSON: ${errorMessage}`);
+        });
+    };
+}
+function file(handler) {
+    return (request, response) => {
+        const parsedUrl = url_1.default.parse(request.url ?? '/', true);
+        const requestedPath = parsedUrl.pathname ?? '/';
+        try {
+            const filePath = handler(requestedPath);
+            if (filePath) {
+                const stat = fs_1.default.statSync(filePath);
+                // Set appropriate MIME type
+                const ext = path_1.default.extname(filePath).toLowerCase();
+                const mimeTypes = {
+                    '.html': 'text/html',
+                    '.js': 'application/javascript',
+                    '.css': 'text/css',
+                    '.json': 'application/json',
+                    '.png': 'image/png',
+                    '.jpg': 'image/jpeg',
+                    '.jpeg': 'image/jpeg',
+                    '.gif': 'image/gif',
+                    '.svg': 'image/svg+xml',
+                    '.ico': 'image/x-icon',
+                };
+                const contentType = mimeTypes[ext] || 'application/octet-stream';
+                response.statusCode = 200;
+                response.setHeader('Content-Type', contentType);
+                response.setHeader('Content-Length', stat.size);
+                // Stream the file
+                const stream = fs_1.default.createReadStream(filePath);
+                stream.pipe(response);
+                stream.on('error', (error) => {
+                    (0, logger_js_1.logger)().error('Error streaming file', error);
+                    if (!response.headersSent) {
+                        const errorMessage = error instanceof Error ? error.message : String(error);
+                        response.statusCode = 500;
+                        response.setHeader('Content-Type', 'text/plain');
+                        response.end(`Internal server error: ${errorMessage}`);
+                    }
+                });
+            }
+            else {
+                (0, logger_js_1.logger)().error('File not found', requestedPath);
+                response.statusCode = 404;
+                response.setHeader('Content-Type', 'text/plain');
+                response.end('File not found');
+            }
+        }
+        catch (error) {
+            (0, logger_js_1.logger)().error('Failed to serve file', error);
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            response.statusCode = 500;
+            response.setHeader('Content-Type', 'text/plain');
+            response.end(`Failed to serve file: ${errorMessage}`);
+        }
+    };
+}
+const importMetaUrl = (0, url_2.pathToFileURL)(__filename).href;
 function start(reportDir, port, ui) {
+    let wss = null;
+    let creeveyApi = null;
     let resolveApi = types_js_1.noop;
-    const creeveyApi = new Promise((resolve) => (resolveApi = resolve));
-    // Create HyperExpress server instance
-    const server = new hyper_express_1.default.Server();
-    // Store active WebSocket connections
-    const activeConnections = new Set();
-    // Enable CORS for all routes
-    server.use((request, response, next) => {
-        response.header('Access-Control-Allow-Origin', '*');
-        response.header('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS');
-        response.header('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept');
+    const webDir = path_1.default.join(path_1.default.dirname((0, url_2.fileURLToPath)(importMetaUrl)), '../../client/web');
+    const server = (0, http_1.createServer)();
+    const routes = [
+        {
+            path: '/ping',
+            method: 'GET',
+            handler: index_js_1.pingHandler,
+        },
+        {
+            path: '/stories',
+            method: 'POST',
+            handler: json(index_js_1.storiesHandler, { stories: [] }),
+        },
+        {
+            path: '/capture',
+            method: 'POST',
+            handler: json(index_js_1.captureHandler, { workerId: 0, options: undefined }),
+        },
+        {
+            path: '/report/',
+            method: 'GET',
+            handler: file((0, index_js_1.staticHandler)(reportDir, '/report/')),
+        },
+        {
+            path: '/',
+            method: 'GET',
+            handler: file((0, index_js_1.staticHandler)(webDir)),
+        },
+    ];
+    const router = (request, response) => {
+        const parsedUrl = url_1.default.parse(request.url ?? '/', true);
+        const path = parsedUrl.pathname ?? '/';
+        const method = request.method ?? 'GET';
+        try {
+            const route = routes.find((route) => path.startsWith(route.path) && route.method === method);
+            if (route) {
+                route.handler(request, response);
+            }
+            else {
+                response.statusCode = 404;
+                response.setHeader('Content-Type', 'text/plain');
+                response.end('Not Found');
+            }
+        }
+        catch (error) {
+            (0, logger_js_1.logger)().error('Request handling error', error);
+            response.statusCode = 500;
+            response.setHeader('Content-Type', 'text/plain');
+            response.end('Internal Server Error');
+        }
+    };
+    server.on('request', (request, response) => {
+        response.setHeader('Access-Control-Allow-Origin', '*');
+        response.setHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS');
+        response.setHeader('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept');
         if (request.method === 'OPTIONS') {
-            return response.status(200).send();
+            response.statusCode = 200;
+            response.end();
+            return;
         }
-        next();
+        router(request, response);
     });
-    // Health check endpoint
-    server.get('/ping', index_js_1.pingHandler);
-    // Stories endpoint
-    server.post('/stories', (0, index_js_1.createStoriesHandler)());
-    // Capture endpoint
-    server.post('/capture', index_js_1.captureHandler);
-    // Serve report files
-    server.get('/report/*', (0, index_js_1.createStaticFileHandler)(reportDir, '/report/'));
-    // Serve static files
-    const webDir = path_1.default.join(path_1.default.dirname((0, url_1.fileURLToPath)(importMetaUrl)), '../../client/web');
-    server.get('/*', (0, index_js_1.createStaticFileHandler)(webDir));
-    // If UI mode, wait for CreeveyApi to be resolved
     if (ui) {
-        // Create a custom broadcast function that works with our connections
-        const broadcast = (message) => {
-            for (const connection of activeConnections) {
-                connection.send(message);
-            }
-        };
-        // Create a custom WebSocket server that simulates the standard behavior
-        const customWsServer = {
-            clients: activeConnections,
-            publish: broadcast,
-        };
-        let api = null;
-        server.use(async (request, _response, next) => {
-            if (!api && request.path === '/') {
-                api = await creeveyApi;
-                api.subscribe(customWsServer);
-            }
-            next();
-        });
-        // Create WebSocket listener
-        server.ws('/', (ws) => {
-            // Add connection to the set of active connections
-            activeConnections.add(ws);
-            // Handle message events
-            ws.on('message', (message) => {
-                api?.handleMessage(ws, message);
+        wss = new ws_1.WebSocketServer({ server });
+        wss.on('connection', (ws) => {
+            ws.on('message', (message, isBinary) => {
+                if (creeveyApi) {
+                    // NOTE Text messages are passed as Buffer https://github.com/websockets/ws/releases/tag/8.0.0
+                    // eslint-disable-next-line @typescript-eslint/no-base-to-string
+                    creeveyApi.handleMessage(ws, isBinary ? message : message.toString('utf-8'));
+                    return;
+                }
             });
-            // Handle close events to clean up connections
-            ws.on('close', () => {
-                activeConnections.delete(ws);
+            ws.on('error', (error) => {
+                (0, logger_js_1.logger)().error('WebSocket error', error);
             });
         });
+        wss.on('error', (error) => {
+            (0, logger_js_1.logger)().error('WebSocket error', error);
+        });
     }
-    // Shutdown handling
     (0, messages_js_1.subscribeOn)('shutdown', () => {
-        // Close all WebSocket connections
-        for (const connection of activeConnections) {
-            try {
-                connection.close();
-            }
-            catch (error) {
-                (0, logger_js_1.logger)().error('Error closing WebSocket connection', error);
-            }
+        if (wss) {
+            wss.clients.forEach((ws) => {
+                ws.close();
+            });
+            wss.close();
         }
-        // Close the server
         server.close();
     });
-    // Start server
     server
-        .listen(port)
-        .then(() => {
+        .listen(port, () => {
         (0, logger_js_1.logger)().info(`Server starting on port ${port}`);
     })
-        .catch((error) => {
+        .on('error', (error) => {
         (0, logger_js_1.logger)().error('Failed to start server', error);
         process.exit(1);
     });
+    void new Promise((resolve) => (resolveApi = resolve))
+        .then((api) => {
+        creeveyApi = api;
+        if (wss) {
+            creeveyApi.subscribe(wss);
+        }
+    })
+        .catch(utils_js_1.shutdownOnException);
     // Return the function to resolve the API
     return resolveApi;
 }

package/dist/server/master/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/server/master/server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/server/master/server.ts"],"names":[],"mappings":"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"}

package/dist/server/playwright/docker-file.js

@@ -7,14 +7,14 @@ exports.playwrightDockerFile = playwrightDockerFile;
 const promises_1 = require("fs/promises");
 const url_1 = require("url");
 const semver_1 = __importDefault(require("semver"));
-const shelljs_1 = require("shelljs");
+const shelljs_1 = __importDefault(require("shelljs"));
 const importMetaUrl = (0, url_1.pathToFileURL)(__filename).href;
 // TODO Support custom docker images
 async function playwrightDockerFile(browser, version) {
     const sv = semver_1.default.coerce(version);
     let npmRegistry;
     try {
-        npmRegistry = (0, shelljs_1.exec)('npm config get registry', { silent: true }).stdout.trim();
+        npmRegistry = shelljs_1.default.exec('npm config get registry', { silent: true }).stdout.trim();
     }
     catch {
         /* noop */

package/dist/server/playwright/docker-file.js.map

@@ -1 +1 @@
-{"version":3,"file":"docker-file.js","sourceRoot":"","sources":["../../../src/server/playwright/docker-file.ts"],"names":[],"mappings":";;;;;AAQA,oDAqCC;AA7CD,0CAAuC;AACvC,6BAAoC;AACpC,oDAA4B;AAC5B,qCAA+B;AAE/B,MAAM,aAAa,GAAG,IAAA,mBAAa,EAAC,UAAU,CAAC,CAAC,IAAI,CAAC;AAErD,oCAAoC;AAC7B,KAAK,UAAU,oBAAoB,CAAC,OAAe,EAAE,OAAe;IACzE,MAAM,EAAE,GAAG,gBAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAElC,IAAI,WAAW,CAAC;IAChB,IAAI,CAAC;QACH,WAAW,GAAG,IAAA,cAAI,EAAC,yBAAyB,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IAChF,CAAC;IAAC,MAAM,CAAC;QACP,UAAU;IACZ,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,IAAA,mBAAQ,EAAC,IAAI,GAAG,CAAC,oBAAoB,EAAE,aAAa,CAAC,EAAE,OAAO,CAAC,CAAC;IAEtF,MAAM,UAAU,GAAG;;;;;;EAMnB,OAAO;SACN,KAAK,CAAC,IAAI,CAAC;SACX,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,qBAAqB,CAAC;SAC1E,IAAI,CAAC,IAAI,CAAC;MAEP,WAAW;QACT,CAAC,CAAC;qBACW,WAAW,kBAAkB;QAC1C,CAAC,CAAC,EACN;2BACuB,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE;uBAC/B,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,wBAAwB,OAAO;;;;;CAKhF,CAAC;IAEA,OAAO,UAAU,CAAC,OAAO,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;AACrD,CAAC"}
+{"version":3,"file":"docker-file.js","sourceRoot":"","sources":["../../../src/server/playwright/docker-file.ts"],"names":[],"mappings":";;;;;AAQA,oDAqCC;AA7CD,0CAAuC;AACvC,6BAAoC;AACpC,oDAA4B;AAC5B,sDAAyB;AAEzB,MAAM,aAAa,GAAG,IAAA,mBAAa,EAAC,UAAU,CAAC,CAAC,IAAI,CAAC;AAErD,oCAAoC;AAC7B,KAAK,UAAU,oBAAoB,CAAC,OAAe,EAAE,OAAe;IACzE,MAAM,EAAE,GAAG,gBAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAElC,IAAI,WAAW,CAAC;IAChB,IAAI,CAAC;QACH,WAAW,GAAG,iBAAE,CAAC,IAAI,CAAC,yBAAyB,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IACnF,CAAC;IAAC,MAAM,CAAC;QACP,UAAU;IACZ,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,IAAA,mBAAQ,EAAC,IAAI,GAAG,CAAC,oBAAoB,EAAE,aAAa,CAAC,EAAE,OAAO,CAAC,CAAC;IAEtF,MAAM,UAAU,GAAG;;;;;;EAMnB,OAAO;SACN,KAAK,CAAC,IAAI,CAAC;SACX,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,qBAAqB,CAAC;SAC1E,IAAI,CAAC,IAAI,CAAC;MAEP,WAAW;QACT,CAAC,CAAC;qBACW,WAAW,kBAAkB;QAC1C,CAAC,CAAC,EACN;2BACuB,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE;uBAC/B,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,wBAAwB,OAAO;;;;;CAKhF,CAAC;IAEA,OAAO,UAAU,CAAC,OAAO,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;AACrD,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "creevey",
   "description": "Cross-browser screenshot testing tool for Storybook with fancy UI Runner",
-  "version": "0.10.0-beta.44",
+  "version": "0.10.0-beta.45",
   "type": "commonjs",
   "bin": "dist/cli.js",
   "main": "./dist/index.js",
@@ -52,7 +52,8 @@
     "lint:tsc": "tsc --noEmit",
     "lint:eslint": "eslint",
     "lint:prettier": "prettier --check .",
-    "test": "vitest",
+    "test": "vitest run",
+    "test:watch": "vitest",
     "start": "concurrently \"yarn start:client\" \"yarn start:storybook\" \"yarn start:creevey\"",
     "start:client": "vite",
     "start:storybook": "storybook dev --ci -p 6006",
@@ -111,7 +112,6 @@
     "dockerode": "^4.0.5",
     "find-cache-dir": "^5.0.0",
     "get-port": "^7.1.0",
-    "hyper-express": "^6.17.3",
     "lodash": "^4.17.21",
     "loglevel": "^1.9.2",
     "loglevel-plugin-prefix": "^0.8.4",

package/src/server/index.ts

@@ -1,6 +1,6 @@
 import cluster from 'cluster';
 import path from 'path';
-import { exec } from 'shelljs';
+import sh from 'shelljs';
 import { getUserAgent } from 'package-manager-detector/detect';
 import { resolveCommand } from 'package-manager-detector/commands';
 import { readConfig, defaultBrowser } from './config.js';
@@ -121,7 +121,7 @@ export default async function (options: Options): Promise<void> {
       if (remoteUrl && localUrl != remoteUrl) logger().info(`On your network - ${remoteUrl}`);
       logger().info('Waiting Storybook...');
 
-      const storybook = exec(storybookCommand, { async: true });
+      const storybook = sh.exec(storybookCommand, { async: true });
       subscribeOn('shutdown', () => {
         if (storybook.pid) void killTree(storybook.pid);
       });

package/src/server/master/api.ts

@@ -1,25 +1,28 @@
-import Runner from './runner.js';
-import { Request, Response, CreeveyUpdate } from '../../types.js';
+import { Data, WebSocket, WebSocketServer } from 'ws';
+import type { Request, Response, CreeveyUpdate } from '../../types.js';
+import type { TestsManager } from './testsManager.js';
+import type Runner from './runner.js';
 import { logger } from '../logger.js';
-import { TestsManager } from './testsManager.js';
-import HyperExpress from 'hyper-express';
 
-interface CustomWSServer {
-  clients: Set<HyperExpress.Websocket>;
-  publish: (message: string) => void;
+function broadcast(wss: WebSocketServer, message: Response): void {
+  wss.clients.forEach((ws) => {
+    if (ws.readyState === WebSocket.OPEN) {
+      ws.send(JSON.stringify(message));
+    }
+  });
 }
 
-// Helper function for HyperExpress WebSocket broadcasting
-function broadcastHyperExpress(wss: CustomWSServer, message: Response): void {
-  const serializedMessage = JSON.stringify(message);
-  wss.publish(serializedMessage);
+function send(ws: WebSocket, message: Response): void {
+  if (ws.readyState === WebSocket.OPEN) {
+    ws.send(JSON.stringify(message));
+  }
 }
 
-// The class-based implementation of CreeveyApi
+// The class-based implementation of CreeveyApi for native WebSockets
 export class CreeveyApi {
   private runner: Runner | null = null;
   private testsManager: TestsManager;
-  private wss: CustomWSServer | null = null;
+  private wss: WebSocketServer | null = null;
 
   constructor(testsManager: TestsManager, runner?: Runner) {
     this.testsManager = testsManager;
@@ -30,7 +33,7 @@ export class CreeveyApi {
     }
   }
 
-  subscribe(wss: CustomWSServer): void {
+  subscribe(wss: WebSocketServer): void {
     this.wss = wss;
 
     // If we have a runner, subscribe to its updates
@@ -46,26 +49,20 @@ export class CreeveyApi {
     }
   }
 
-  handleMessage(ws: HyperExpress.Websocket, message: string | Buffer): void {
+  handleMessage(ws: WebSocket, message: Data): void {
     if (typeof message != 'string') {
-      if (Buffer.isBuffer(message)) {
-        message = message.toString('utf-8');
-      } else {
-        logger().info('unhandled message', message);
-        return;
-      }
+      logger().info('unhandled message', message);
+      return;
     }
 
     const command = JSON.parse(message) as Request;
-    const sendResponse = (response: Response) => {
-      ws.send(JSON.stringify(response));
-    };
 
     if (this.runner) {
       // Normal mode handling with runner
       switch (command.type) {
         case 'status': {
-          sendResponse({ type: 'status', payload: this.runner.status });
+          const status = this.runner.status;
+          send(ws, { type: 'status', payload: status });
           return;
         }
         case 'start': {
@@ -98,7 +95,7 @@ export class CreeveyApi {
         }
         case 'status': {
           // In update mode, respond with static status including tests data
-          sendResponse({
+          send(ws, {
             type: 'status',
             payload: {
               isRunning: false,
@@ -123,6 +120,6 @@ export class CreeveyApi {
 
     const message: Response = { type: 'update', payload };
 
-    broadcastHyperExpress(this.wss, message);
+    broadcast(this.wss, message);
   }
 }

package/src/server/master/handlers/capture-handler.ts

@@ -1,39 +1,20 @@
-import { Request, Response } from 'hyper-express';
 import cluster from 'cluster';
 import { subscribeOnWorker, sendStoriesMessage } from '../../messages.js';
 import { CaptureOptions, isDefined } from '../../../types.js';
 
-export async function captureHandler(request: Request, response: Response): Promise<void> {
-  const { workerId, options } = await request.json<
-    { workerId: number; options?: CaptureOptions },
-    {
-      workerId: number;
-      options?: CaptureOptions;
-    }
-  >({
-    workerId: 0,
-    options: undefined,
-  });
-
+export function captureHandler({ workerId, options }: { workerId: number; options?: CaptureOptions }): void {
   const worker = Object.values(cluster.workers ?? {})
     .filter(isDefined)
     .find((worker) => worker.process.pid == workerId);
 
   // NOTE: Hypothetical case when someone send to us capture req and we don't have a worker with browser session for it
   if (!worker) {
-    response.send();
     return;
   }
 
-  await new Promise<void>((resolve) => {
-    const unsubscribe = subscribeOnWorker(worker, 'stories', (message) => {
-      if (message.type != 'capture') return;
-      unsubscribe();
-      resolve();
-    });
-    sendStoriesMessage(worker, { type: 'capture', payload: options });
+  const unsubscribe = subscribeOnWorker(worker, 'stories', (message) => {
+    if (message.type != 'capture') return;
+    unsubscribe();
   });
-
-  // TODO Pass screenshot result to show it in inspector
-  response.send('Ok');
+  sendStoriesMessage(worker, { type: 'capture', payload: options });
 }

package/src/server/master/handlers/ping-handler.ts

@@ -1,5 +1,6 @@
-import { Request, Response } from 'hyper-express';
+import { IncomingMessage, ServerResponse } from 'http';
 
-export function pingHandler(_request: Request, response: Response): void {
-  response.send('pong');
+export function pingHandler(_request: IncomingMessage, response: ServerResponse): void {
+  response.setHeader('Content-Type', 'text/plain');
+  response.end('pong');
 }

package/src/server/master/handlers/static-handler.ts

@@ -1,29 +1,18 @@
-import { Request, Response } from 'hyper-express';
 import path from 'path';
 import fs from 'fs';
-import { logger } from '../../logger.js';
 
-export function createStaticFileHandler(baseDir: string, pathPrefix?: string) {
-  return (request: Request, response: Response): void => {
-    try {
-      const decodedPath = decodeURIComponent(request.path);
-      const relativePath = pathPrefix ? decodedPath.replace(pathPrefix, '') : decodedPath;
-      let filePath = path.join(baseDir, relativePath || 'index.html');
+export function staticHandler(baseDir: string, pathPrefix?: string) {
+  return (requestedPath: string): string | undefined => {
+    const relativePath = pathPrefix ? requestedPath.replace(pathPrefix, '') : requestedPath;
+    let filePath = path.join(baseDir, relativePath || 'index.html');
 
-      // If the path points to a directory, append index.html
-      if (fs.existsSync(filePath) && fs.statSync(filePath).isDirectory()) {
-        filePath = path.join(filePath, 'index.html');
-      }
-
-      if (!fs.existsSync(filePath)) {
-        response.status(404).send('File not found');
-        return;
-      }
+    // If the path points to a directory, append index.html
+    if (fs.existsSync(filePath) && fs.statSync(filePath).isDirectory()) {
+      filePath = path.join(filePath, 'index.html');
+    }
 
-      response.sendFile(filePath);
-    } catch (error) {
-      logger().error('Error serving file', error);
-      response.status(500).send('Internal server error');
+    if (!fs.existsSync(filePath)) {
+      return undefined;
     }
   };
 }