Skip to content

Commit 012421f

Browse files
styflestyfle
authored
Merge pull request #43 from styfle/caching
Caching
2 parents 03868ef + 2573273 commit 012421f

File tree

6 files changed

+102
-30
lines changed

6 files changed

+102
-30
lines changed

‎src/cache-control.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
export function control(isProd: boolean, days: number): string {
2+
if (days === 0 || !isProd) {
3+
return 'public, no-cache, no-store, must-revalidate';
4+
}
5+
const sec = days * 24 * 60 * 60;
6+
return `public, max-age=${sec}`;
7+
}

‎src/file.ts‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎src/mime-types.ts‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import { extname } from 'path';
2+
3+
const data: { [ext: string]: string } = {
4+
'.js': 'application/javascript',
5+
'.map': 'application/javascript',
6+
'.json': 'application/json',
7+
'.css': 'text/css',
8+
'.html': 'text/html',
9+
'.txt': 'text/plain',
10+
};
11+
12+
export function lookup(path: string): string {
13+
const ext = extname(path);
14+
const mime = data[ext];
15+
if (!mime) {
16+
throw new Error(`No mime type for file: ${path}`);
17+
}
18+
return mime;
19+
}

‎src/server.tsx‎

Lines changed: 32 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
import { createServer, IncomingMessage, ServerResponse } from 'http';
22
import { createFactory } from 'react';
33
import { renderToNodeStream } from 'react-dom/server';
4+
import { createReadStream } from 'fs';
45
import App from './components/app';
56
import { fetchProps } from './props';
7+
import { lookup } from './mime-types';
8+
import { control } from './cache-control';
69
import {
710
faviconUrl,
811
stylesUrl,
@@ -13,7 +16,6 @@ import {
1316
propsUrl,
1417
containerId,
1518
} from './constants';
16-
import { readFileAsync } from './file';
1719

1820
console.log('Server booting...');
1921
const isProd = process.env.NODE_ENV === 'production';
@@ -23,11 +25,15 @@ const PORT = process.env.PORT || 3007;
2325
const suffix = isProd ? '.production.min.js' : '.development.js';
2426

2527
createServer(async (req, res) => {
26-
const { httpVersion, method, url } = req;
28+
let { httpVersion, method, url } = req;
2729
console.log(`${httpVersion} ${method} ${url}`);
30+
if (!url || url === '/') {
31+
url = 'index.html';
32+
}
2833
try {
29-
if (url === '/') {
30-
res.setHeader('Content-Type', 'text/html');
34+
if (url === 'index.html') {
35+
res.setHeader('Content-Type', lookup(url));
36+
res.setHeader('Cache-Control', control(isProd, 1));
3137
res.write(`<!DOCTYPE html>
3238
<html>
3339
<head>
@@ -50,34 +56,37 @@ createServer(async (req, res) => {
5056
</html>`);
5157
});
5258
} else if (url === propsUrl) {
53-
res.setHeader('Content-Type', 'application/json');
59+
res.setHeader('Content-Type', lookup(url));
60+
res.setHeader('Cache-Control', control(isProd, 0));
5461
res.end(JSON.stringify(fetchProps()));
55-
} else if (url === reactUrl) {
56-
res.setHeader('Content-Type', 'text/javascript');
57-
res.setHeader('Cache-Control', 'public, max-age=86400');
58-
const data = await readFileAsync(`./node_modules/react/umd/react${suffix}`);
59-
res.end(data);
60-
} else if (url === reactDomUrl) {
61-
res.setHeader('Content-Type', 'text/javascript');
62-
res.setHeader('Cache-Control', 'public, max-age=86400');
63-
const data = await readFileAsync(`./node_modules/react-dom/umd/react-dom${suffix}`);
64-
res.end(data);
62+
} else if (url === reactUrl || url === reactDomUrl) {
63+
res.setHeader('Content-Type', lookup(url));
64+
res.setHeader('Cache-Control', control(isProd, 7));
65+
const name = url.replace('.js', '');
66+
const file = `./node_modules${name}/umd${name}${suffix}`;
67+
createReadStream(file).pipe(res);
6568
} else if (url === stylesUrl) {
66-
res.setHeader('Content-Type', 'text/css');
67-
const data = await readFileAsync(`./src/${url}`);
68-
res.end(data);
69+
res.setHeader('Content-Type', lookup(url));
70+
res.setHeader('Cache-Control', control(isProd, 7));
71+
const file = `./src/${url}`;
72+
createReadStream(file).pipe(res);
6973
} else if (url === browserUrl || url === browserMapUrl) {
70-
res.setHeader('Content-Type', 'text/javascript');
71-
const data = await readFileAsync(`./dist${url}`);
72-
res.end(data);
74+
res.setHeader('Content-Type', lookup(url));
75+
res.setHeader('Cache-Control', control(isProd, 7));
76+
const file = `./dist${url}`;
77+
createReadStream(file).pipe(res);
7378
} else {
74-
res.setHeader('Content-Type', 'text/plain');
79+
url = 'notfound.txt';
80+
res.setHeader('Content-Type', lookup(url));
81+
res.setHeader('Cache-Control', control(isProd, 0));
7582
res.statusCode = 404;
7683
res.end('404 Not Found');
7784
}
7885
} catch (e) {
7986
console.error(e);
80-
res.setHeader('Content-Type', 'text/plain');
87+
url = 'notfound.txt';
88+
res.setHeader('Content-Type', lookup(url));
89+
res.setHeader('Cache-Control', control(isProd, 0));
8190
res.statusCode = 500;
8291
res.end('500 Internal Error');
8392
}

‎tests/mime-types-test.ts‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
import * as test from 'tape';
2+
import { lookup } from '../src/mime-types';
3+
4+
test('lookup .js', t => {
5+
t.plan(1);
6+
const mime = lookup('file.js');
7+
t.equal(mime, 'application/javascript');
8+
});
9+
10+
test('lookup .js.map', t => {
11+
t.plan(1);
12+
const mime = lookup('file.js.map');
13+
t.equal(mime, 'application/javascript');
14+
});
15+
16+
test('lookup .json', t => {
17+
t.plan(1);
18+
const mime = lookup('file.json');
19+
t.equal(mime, 'application/json');
20+
});
21+
22+
test('lookup .css', t => {
23+
t.plan(1);
24+
const mime = lookup('file.css');
25+
t.equal(mime, 'text/css');
26+
});
27+
28+
test('lookup .html', t => {
29+
t.plan(1);
30+
const mime = lookup('file.html');
31+
t.equal(mime, 'text/html');
32+
});
33+
34+
test('lookup .txt', t => {
35+
t.plan(1);
36+
const mime = lookup('/some/file.txt');
37+
t.equal(mime, 'text/plain');
38+
});

‎tsconfig.json‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
{
22
"compilerOptions": {
3+
"rootDir": ".",
34
"outDir": "./dist/",
45
"module": "commonjs",
56
"target": "ES2017",
67
"moduleResolution": "node",
7-
"strict": true,
8-
"rootDir": ".",
98
"jsx": "react",
10-
"sourceMap": true
9+
"sourceMap": true,
10+
"strict": true,
11+
"noFallthroughCasesInSwitch": true,
12+
"noImplicitReturns": true,
13+
"noEmitOnError": true
1114
},
1215
"exclude": [
1316
"node_modules"

0 commit comments

Comments
 (0)