fix(sirv): ensure cached headers are not mutated (#75)

imtiazmangerah · lukeed · web-flow · commit b33bb153aa3e · 2020-07-31T10:16:20.000-07:00
* fix(sirv): a request with range headers appends Content-Length, Content-Range and Accept-Ranges for all subsequent requests. Fixes #55 * fix: only spread `headers` when needed * Added test case for range requests mutating subsequent request non range request headers * Cleaned up test for range request header mutation. First set of asserts are already covered by other tests * chore: add `dev` test variant * chore: bad copy-paste * sigh Co-authored-by: Luke Edwards <luke.edwards05@gmail.com>
diff --git a/packages/sirv/index.js b/packages/sirv/index.js
@@ -59,7 +59,7 @@ function send(req, res, file, stats, headers={}) {
 	let code=200, tmp, opts={}
 
 	if (tmp = res.getHeader('content-type')) {
-		headers['Content-Type'] = tmp;
+		headers = { ...headers, 'Content-Type': tmp };
 	}
 
 	if (req.headers.range) {
@@ -73,7 +73,8 @@ function send(req, res, file, stats, headers={}) {
 			res.statusCode = 416;
 			return res.end();
 		}
-
+		
+		if (!tmp) headers = { ...headers };
 		headers['Content-Range'] = `bytes ${start}-${end}/${stats.size}`;
 		headers['Content-Length'] = (end - start + 1);
 		headers['Accept-Ranges'] = 'bytes';
diff --git a/tests/sirv.js b/tests/sirv.js
@@ -979,6 +979,50 @@ ranges('should throw `416` when range cannot be met (overflow)', async () => {
 	}
 });
 
+ranges('should not mutate response headers on subsequent non-Range requests :: dev', async () => {
+	let server = utils.http({ dev: true });
+
+	try {
+		let file = await utils.lookup('bundle.67329.js', 'utf8');
+
+		let headers = { Range: 'bytes=0-10' };
+		let res1 = await server.send('GET', '/bundle.67329.js', { headers });
+		assert.ok(res1.headers['content-range']);
+		assert.ok(res1.headers['accept-ranges']);
+
+		let res2 = await server.send('GET', '/bundle.67329.js');
+		assert.is(res2.statusCode, 200);
+		assert.is(res2.headers['content-length'], `${file.size}`);
+		assert.not(res2.headers['content-range']);
+		assert.not(res2.headers['accept-ranges']);
+
+	} finally {
+		server.close();
+	}
+});
+
+ranges('should not mutate response headers on subsequent non-Range requests :: prod', async () => {
+	let server = utils.http({ dev: false });
+
+	try {
+		let file = await utils.lookup('bundle.67329.js', 'utf8');
+
+		let headers = { Range: 'bytes=0-10' };
+		let res1 = await server.send('GET', '/bundle.67329.js', { headers });
+		assert.ok(res1.headers['content-range']);
+		assert.ok(res1.headers['accept-ranges']);
+
+		let res2 = await server.send('GET', '/bundle.67329.js');
+		assert.is(res2.statusCode, 200);
+		assert.is(res2.headers['content-length'], `${file.size}`);
+		assert.not(res2.headers['content-range']);
+		assert.not(res2.headers['accept-ranges']);
+
+	} finally {
+		server.close();
+	}
+});
+
 ranges.run();
 
 // ---
