Add caching to requests in the website

v1rtl · v1rtl · commit 5dceb0c5b3a2 · 2020-09-16T10:38:32.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ coverage
 examples/*/.env
 pnpm-lock.yaml
 .next
+.cache
diff --git a/site/package.json b/site/package.json
@@ -8,8 +8,8 @@
     "@tinyhttp/markdown": "workspace:*",
     "@tinyhttp/static": "workspace:*",
     "highlight.js": "^10.1.2",
-    "isomorphic-unfetch": "^3.0.0",
     "marked": "^1.1.1",
+    "node-fetch-cache": "^1.0.4",
     "sirv": "^1.0.6"
   },
   "scripts": {
diff --git a/site/server.ts b/site/server.ts
@@ -4,9 +4,11 @@ import { markdownStaticHandler as md } from '../packages/markdown/src'
 import { logger } from '../packages/logger/src'
 import { createReadStream } from 'fs'
 import { transformMWPageStream, transformPageIndexStream } from './streams'
-import unfetch from 'isomorphic-unfetch'
+import fetchCache from 'node-fetch-cache'
 import hljs from 'highlight.js'
 
+const fetch = fetchCache(`${__dirname}/.cache`)
+
 const app = new App({
   settings: {
     networkExtensions: true,
@@ -15,7 +17,7 @@ const app = new App({
 
 const HTML_PATH = `${process.cwd()}/pages/html`
 
-const NON_MW_PKGS: string[] = ['app', 'etag', 'cookie', 'cookie-signature', 'dotenv']
+const NON_MW_PKGS: string[] = ['app', 'etag', 'cookie', 'cookie-signature', 'dotenv', 'send', 'router', 'req', 'res']
 
 app
   .use(
@@ -29,21 +31,11 @@ app
     })
   )
   .get('/mw', async (req, res, next) => {
-    let json: any, status: number, msg: string
-
     try {
-      const res = await unfetch('https://api.github.com/repos/talentlessguy/tinyhttp/contents/packages')
+      const request = await fetch('https://api.github.com/repos/talentlessguy/tinyhttp/contents/packages')
 
-      status = res.status
-      msg = res.statusText
-      json = await res.json()
-    } catch (e) {
-      next(e)
-    }
+      const json = await request.json()
 
-    if (status !== 200) {
-      next(msg)
-    } else {
       const readStream = createReadStream(`${HTML_PATH}/search.html`)
 
       let transformer = transformPageIndexStream(json.filter((e) => !NON_MW_PKGS.includes(e.name)))
@@ -58,6 +50,8 @@ app
       }
 
       readStream.pipe(transformer).pipe(res)
+    } catch (e) {
+      next(e)
     }
   })
   .get('/mw/:mw', async (req, res, next) => {
@@ -67,17 +61,16 @@ app
       let json: any, status: number
 
       try {
-        const res = await unfetch(`https://registry.npmjs.org/@tinyhttp/${req.params.mw}`)
+        const res = await fetch(`https://registry.npmjs.org/@tinyhttp/${req.params.mw}`)
 
         status = res.status
         json = await res.json()
       } catch (e) {
         next(e)
       }
 
-      if (status === 404) {
-        res.sendStatus(status)
-      } else {
+      if (status === 404) res.sendStatus(status)
+      else {
         const readStream = createReadStream(`${HTML_PATH}/mw.html`)
 
         readStream.pipe(transformMWPageStream(json)).pipe(res)
@@ -93,7 +86,7 @@ app
         },
       ],
       markedOptions: {
-        highlight: function (code, lang) {
+        highlight: (code, lang) => {
           if (!lang) lang = 'txt'
 
           return hljs.highlight(lang, code).value
