s4d 0.1.1 → 0.1.2

package/dist/DevServer.d.ts

@@ -7,6 +7,11 @@ export interface DevServerOptions {
     host?: string;
     spa?: boolean;
 }
+interface FileCacheEntry {
+    contents: string | Buffer;
+    contentType: string;
+    version: string;
+}
 export declare class DevServer {
     protected webroot: string;
     protected port: number;
@@ -15,7 +20,7 @@ export declare class DevServer {
     protected server: http.Server;
     protected webSocketServer: WebSocketServer;
     protected fileWatcher?: fs.FSWatcher;
-    protected fileCache: Map<any, any>;
+    protected fileCache: Map<string, Promise<FileCacheEntry>>;
     protected webSockets: Set<WebSocket>;
     constructor(options: DevServerOptions);
     static cli(argv: string[]): Promise<1 | undefined>;
@@ -28,7 +33,7 @@ export declare class DevServer {
     broadcast(message: Record<string, unknown>): void;
     transformFileContents(file: string, contents: string | Buffer): Promise<string | Buffer>;
     getClientScript(): string;
-    resolveFileCached(file: string): Promise<any>;
+    resolveFileCached(file: string): Promise<FileCacheEntry>;
     resolveFile(file: string): Promise<{
         contents: string | Buffer;
         contentType: string;
@@ -37,3 +42,4 @@ export declare class DevServer {
     invalidateFile(file: string): void;
     close(): Promise<void>;
 }
+export {};

package/dist/DevServer.js

@@ -128,7 +128,12 @@ export class DevServer {
         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);
+            const { contents, contentType, version } = await this.resolveFileCached(file).catch((err) => {
+                if (this.spa && err.code === 'ENOENT') {
+                    return this.resolveFileCached(path.join(this.webroot, 'index.html'));
+                }
+                throw err;
+            });
             if (req.headers['if-none-match'] === version) {
                 res.writeHead(304);
                 res.end();
@@ -286,32 +291,20 @@ export class DevServer {
                 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;
-            }
+        const stat = await fs.promises.lstat(file);
+        if (stat.isDirectory()) {
+            file = path.join(file, 'index.html');
         }
-        contents = await this.transformFileContents(file, contents);
+        const buffer = await fs.promises.readFile(file);
+        const contents = await this.transformFileContents(file, buffer);
         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$/, ''));
+        this.fileCache.delete(file.replace(/index\.html$/, ''));
+        this.fileCache.delete(file.replace(/\/index\.html$/, ''));
     }
     async close() {
         this.server.close();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "s4d",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Minimal web development server with live reload",
   "keywords": [
     "local",