From c899e6c4b1ab714347f49006b96615ad54fdb387 Mon Sep 17 00:00:00 2001
From: Ruben Verborgh <ruben@verborgh.org>
Date: Thu, 28 Jan 2021 23:02:32 +0100
Subject: [PATCH] fix: Do not re-encode static assets. (#566)

Fix serving binary static assets.
---
 src/server/middleware/StaticAssetHandler.ts        |  2 +-
 .../server/middleware/StaticAssetHandler.test.ts   | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/server/middleware/StaticAssetHandler.ts b/src/server/middleware/StaticAssetHandler.ts
index fb73a55e8..c6293c5e7 100644
--- a/src/server/middleware/StaticAssetHandler.ts
+++ b/src/server/middleware/StaticAssetHandler.ts
@@ -79,7 +79,7 @@ export class StaticAssetHandler extends HttpHandler {
     this.logger.debug(`Serving ${request.url} via static asset ${filePath}`);
 
     // Resolve when asset loading succeeds
-    const asset = createReadStream(filePath, 'utf8');
+    const asset = createReadStream(filePath);
     return new Promise((resolve, reject): void => {
       // Write a 200 response when the asset becomes readable
       asset.once('readable', (): void => {
diff --git a/test/unit/server/middleware/StaticAssetHandler.test.ts b/test/unit/server/middleware/StaticAssetHandler.test.ts
index 2bb08bee1..7b8ca071c 100644
--- a/test/unit/server/middleware/StaticAssetHandler.test.ts
+++ b/test/unit/server/middleware/StaticAssetHandler.test.ts
@@ -51,7 +51,7 @@ describe('a StaticAssetHandler', (): void => {
 
     await responseEnd;
     expect(createReadStream).toHaveBeenCalledTimes(1);
-    expect(createReadStream).toHaveBeenCalledWith('/assets/styles/bar.css', 'utf8');
+    expect(createReadStream).toHaveBeenCalledWith('/assets/styles/bar.css');
     expect(response._getData()).toBe('file contents');
   });
 
@@ -77,7 +77,7 @@ describe('a StaticAssetHandler', (): void => {
     expect(response.getHeaders()).toHaveProperty('content-type', 'text/css');
 
     expect(createReadStream).toHaveBeenCalledTimes(1);
-    expect(createReadStream).toHaveBeenCalledWith('/assets/styles/bar.css', 'utf8');
+    expect(createReadStream).toHaveBeenCalledWith('/assets/styles/bar.css');
   });
 
   it('handles a request for an asset with an unknown content type.', async(): Promise<void> => {
@@ -89,7 +89,7 @@ describe('a StaticAssetHandler', (): void => {
     expect(response.getHeaders()).toHaveProperty('content-type', 'application/octet-stream');
 
     expect(createReadStream).toHaveBeenCalledTimes(1);
-    expect(createReadStream).toHaveBeenCalledWith('/assets/bar.unknown', 'utf8');
+    expect(createReadStream).toHaveBeenCalledWith('/assets/bar.unknown');
   });
 
   it('throws a 404 when the asset does not exist.', async(): Promise<void> => {
@@ -142,7 +142,7 @@ describe('a StaticAssetHandler', (): void => {
     expect(response.getHeaders()).toHaveProperty('content-type', 'text/css');
 
     expect(createReadStream).toHaveBeenCalledTimes(1);
-    expect(createReadStream).toHaveBeenCalledWith('/assets/folders/1/abc/def.css', 'utf8');
+    expect(createReadStream).toHaveBeenCalledWith('/assets/folders/1/abc/def.css');
   });
 
   it('handles a request to a known folder URL defined with slash.', async(): Promise<void> => {
@@ -154,7 +154,7 @@ describe('a StaticAssetHandler', (): void => {
     expect(response.getHeaders()).toHaveProperty('content-type', 'text/css');
 
     expect(createReadStream).toHaveBeenCalledTimes(1);
-    expect(createReadStream).toHaveBeenCalledWith('/assets/folders/2/abc/def.css', 'utf8');
+    expect(createReadStream).toHaveBeenCalledWith('/assets/folders/2/abc/def.css');
   });
 
   it('prefers the longest path handler.', async(): Promise<void> => {
@@ -166,7 +166,7 @@ describe('a StaticAssetHandler', (): void => {
     expect(response.getHeaders()).toHaveProperty('content-type', 'text/css');
 
     expect(createReadStream).toHaveBeenCalledTimes(1);
-    expect(createReadStream).toHaveBeenCalledWith('/assets/folders/3/abc/def.css', 'utf8');
+    expect(createReadStream).toHaveBeenCalledWith('/assets/folders/3/abc/def.css');
   });
 
   it('handles a request to a known folder URL with spaces.', async(): Promise<void> => {
@@ -178,7 +178,7 @@ describe('a StaticAssetHandler', (): void => {
     expect(response.getHeaders()).toHaveProperty('content-type', 'text/css');
 
     expect(createReadStream).toHaveBeenCalledTimes(1);
-    expect(createReadStream).toHaveBeenCalledWith('/assets/folders/2/a b c/def.css', 'utf8');
+    expect(createReadStream).toHaveBeenCalledWith('/assets/folders/2/a b c/def.css');
   });
 
   it('does not handle a request to a known folder URL with parent path segments.', async(): Promise<void> => {