Fix dev server not correctly handling binary files

bikeshaving · Mar 23, 2023 · 8bac709 · 8bac709
1 parent 3050057
commit 8bac709
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/website/src/app.ts b/website/src/app.ts
@@ -1,4 +1,5 @@
 import * as Path from "path";
+import {Blob} from "buffer";
 import * as MimeTypes from "mime-types";
 
 import {jsx} from "@b9g/crank/standalone";
@@ -24,12 +25,17 @@ export default {
 			const mimeType = MimeTypes.lookup(path) || "application/octet-stream";
 			const charset = MimeTypes.charset(mimeType) || "binary";
 			if (source) {
-				return new Response(source, {
+				const blob = new Blob([source], {
+					type: `${mimeType}; charset=${charset}`,
+				});
+				return new Response(blob, {
 					status: 200,
 					headers: {
 						"Content-Type": `${mimeType}; charset=${charset}`,
 					},
 				});
+			} else {
+				return new Response("Not found", {status: 404});
 			}
 		}
 
@@ -56,21 +62,18 @@ export default {
 	},
 
 	async *staticPaths(outDir) {
-		yield *["/", "/blog", "/playground"];
+		yield* ["/", "/blog", "/playground"];
 		const blogDocs = await collectDocuments(
 			Path.join(__dirname, "../documents/blog"),
 			Path.join(__dirname, "../documents"),
 		);
-		yield *blogDocs.map((doc) => doc.url);
+		yield* blogDocs.map((doc) => doc.url);
 
 		const guideDocs = await collectDocuments(
 			Path.join(__dirname, "../documents/guides"),
 			Path.join(__dirname, "../documents"),
 		);
-		yield *guideDocs.map((doc) => doc.url);
-
-		console.log(`Writing static files to ${outDir}`);
+		yield* guideDocs.map((doc) => doc.url);
 		await storage.write(Path.join(outDir, storage.publicPath));
 	},
 };
-
diff --git a/website/src/components/esbuild.ts b/website/src/components/esbuild.ts
@@ -143,7 +143,7 @@ export class Storage {
 		);
 	}
 
-	async serve(inputPath: string): Promise<Uint8Array | string | null> {
+	async serve(inputPath: string): Promise<Uint8Array | null> {
 		inputPath = inputPath.replace(new RegExp("^" + this.publicPath), "");
 		const outputs: Array<OutputFile> = [];
 		for (const ctx of this.cache.values()) {
@@ -162,10 +162,7 @@ export class Storage {
 			try {
 				const mimeType = mime.lookup(inputPath) || "application/octet-stream";
 				const charset = mime.charset(mimeType) || "binary";
-				return await FS.readFile(
-					Path.join(staticPath, inputPath),
-					charset as any,
-				);
+				return await FS.readFile(Path.join(staticPath, inputPath));
 			} catch (err: any) {
 				if (err.code !== "ENOENT") {
 					throw err;