s4d 0.1.1 → 0.2.0

package/dist/DevServer.d.ts

@@ -15,7 +15,6 @@ export declare class DevServer {
     protected server: http.Server;
     protected webSocketServer: WebSocketServer;
     protected fileWatcher?: fs.FSWatcher;
-    protected fileCache: Map<any, any>;
     protected webSockets: Set<WebSocket>;
     constructor(options: DevServerOptions);
     static cli(argv: string[]): Promise<1 | undefined>;
@@ -26,14 +25,7 @@ export declare class DevServer {
     handleRequest(req: http.IncomingMessage, res: http.ServerResponse): Promise<void>;
     startWatching(): Promise<void>;
     broadcast(message: Record<string, unknown>): void;
-    transformFileContents(file: string, contents: string | Buffer): Promise<string | Buffer>;
     getClientScript(): string;
-    resolveFileCached(file: string): Promise<any>;
-    resolveFile(file: string): Promise<{
-        contents: string | Buffer;
-        contentType: string;
-        version: string;
-    }>;
-    invalidateFile(file: string): void;
+    stat(file: string): Promise<fs.Stats | null>;
     close(): Promise<void>;
 }

package/dist/DevServer.js

@@ -1,4 +1,3 @@
-import * as crypto from 'crypto';
 import * as fs from 'fs';
 import * as http from 'http';
 import mime from 'mime';
@@ -12,7 +11,6 @@ export class DevServer {
     server;
     webSocketServer;
     fileWatcher;
-    fileCache = new Map();
     webSockets = new Set();
     constructor(options) {
         this.webroot = options.webroot;
@@ -53,6 +51,7 @@ export class DevServer {
                             throw new Error('--host requires an argument');
                         }
                         host = argv[++i];
+                        break;
                     case '--spa':
                         spa = true;
                         break;
@@ -126,43 +125,67 @@ export class DevServer {
             return;
         }
         const url = new URL(req.url ?? '/', this.getBaseURL());
-        try {
-            const file = path.join(this.webroot, path.resolve('.', url.pathname));
-            const { contents, contentType, version } = await this.resolveFileCached(file);
-            if (req.headers['if-none-match'] === version) {
+        let file = path.join(this.webroot, path.resolve('.', url.pathname));
+        if (file.match(/__DEV__\.js$/)) {
+            const clientScript = this.getClientScript();
+            const etag = `W/${clientScript.length.toString(16)}`;
+            if (req.headers['if-none-match'] === etag) {
                 res.writeHead(304);
                 res.end();
                 return;
             }
-            res.setHeader('content-type', contentType);
-            res.setHeader('etag', version);
+            res.setHeader('content-type', 'application/javascript');
+            res.setHeader('etag', etag);
             res.writeHead(200);
-            if (req.method === 'HEAD') {
-                res.end();
-            }
-            else {
-                res.end(contents);
-            }
+            res.end(this.getClientScript());
+            return;
         }
-        catch (err) {
-            if (err.code === 'ENOENT') {
-                res.setHeader('content-type', 'text/plain');
-                res.writeHead(404);
-                res.end('Not found');
-            }
-            else {
-                console.error(err);
-                res.setHeader('content-type', 'text/plain');
-                res.writeHead(500);
-                res.end(`Internal server error: ${err.message}`);
-            }
+        let stats = await this.stat(file);
+        if (stats?.isDirectory()) {
+            file = path.join(file, 'index.html');
+            stats = await this.stat(file);
+        }
+        if (!stats && this.spa && !url.pathname.includes('.')) {
+            file = path.join(this.webroot, 'index.html');
+            stats = await this.stat(file);
+        }
+        if (!stats) {
+            res.setHeader('content-type', 'text/plain');
+            res.writeHead(404);
+            res.end('Not found');
+            return;
+        }
+        const etag = `W/"${stats.size.toString(16)}-${stats.mtimeMs.toString(16)}"`;
+        if (req.headers['if-none-match'] === etag) {
+            res.writeHead(304);
+            res.end();
+            return;
+        }
+        const contentType = mime.getType(file) ?? 'application/octet-stream';
+        res.setHeader('content-type', contentType);
+        res.setHeader('etag', etag);
+        res.writeHead(200);
+        if (req.method === 'HEAD') {
+            res.end();
+        }
+        else {
+            const out = fs.createReadStream(file);
+            const ext = path.extname(file);
+            out.on('end', () => {
+                if (ext === '.html') {
+                    res.end('<script type="module" src="__DEV__.js"></script>');
+                }
+                else {
+                    res.end();
+                }
+            });
+            out.pipe(res, { end: false });
         }
     }
     async startWatching() {
         this.fileWatcher = fs.watch(this.webroot, { recursive: true });
         this.fileWatcher.on('change', (_, filename) => {
             if (typeof filename === 'string') {
-                this.invalidateFile(path.join(this.webroot, filename));
                 this.broadcast({ type: 'change', url: filename });
             }
         });
@@ -178,13 +201,6 @@ export class DevServer {
             }
         }
     }
-    async transformFileContents(file, contents) {
-        const ext = path.extname(file);
-        if (ext === '.html') {
-            return `${contents}<script type="module" src="__DEV__.js"></script>`;
-        }
-        return contents;
-    }
     getClientScript() {
         return `if (!navigator.webdriver) {
       const wsProtocol = location.protocol === 'http:' ? 'ws://' : 'wss://';
@@ -270,48 +286,8 @@ export class DevServer {
       return candidate.match(target.replace(/^\\.?\\//, ''));
     }`;
     }
-    async resolveFileCached(file) {
-        const cached = this.fileCache.get(file);
-        if (cached)
-            return cached;
-        const promise = this.resolveFile(file);
-        this.fileCache.set(file, promise);
-        return promise;
-    }
-    async resolveFile(file) {
-        if (file.match(/__DEV__\.js$/)) {
-            return {
-                contents: this.getClientScript(),
-                contentType: 'application/javascript',
-                version: '1',
-            };
-        }
-        let contents;
-        try {
-            const stat = await fs.promises.lstat(file);
-            if (stat.isDirectory()) {
-                file = path.join(file, 'index.html');
-            }
-            contents = await fs.promises.readFile(file);
-        }
-        catch (err) {
-            if (this.spa && err.code === 'ENOENT') {
-                file = path.join(this.webroot, 'index.html');
-                contents = await fs.promises.readFile(file);
-            }
-            else {
-                throw err;
-            }
-        }
-        contents = await this.transformFileContents(file, contents);
-        const contentType = mime.getType(file) ?? 'application/octet-stream';
-        const version = crypto.createHash('sha1').update(contents).digest('base64');
-        return { contents, contentType, version };
-    }
-    invalidateFile(file) {
-        this.fileCache.delete(file);
-        this.fileCache.delete(file.replace(/index.html$/, ''));
-        this.fileCache.delete(file.replace(/\/index.html$/, ''));
+    async stat(file) {
+        return fs.promises.stat(file).catch(() => null);
     }
     async close() {
         this.server.close();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "s4d",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "Minimal web development server with live reload",
   "keywords": [
     "local",
@@ -41,13 +41,14 @@
     "ws": "^8.16.0"
   },
   "devDependencies": {
+    "@eslint/js": "^9.9.0",
     "@playwright/test": "^1.44.1",
+    "@types/eslint__js": "^8.42.3",
     "@types/node": "^20.11.30",
     "@types/ws": "^8.5.10",
-    "@typescript-eslint/eslint-plugin": "^7.7.1",
-    "@typescript-eslint/parser": "^7.7.1",
-    "eslint": "^8.57.0",
+    "eslint": "^9.9.0",
     "prettier": "^3.3.1",
-    "typescript": "^5.4.5"
+    "typescript": "^5.4.5",
+    "typescript-eslint": "^8.2.0"
   }
 }