Improve caching behavior

SplittyDev · SplittyDev · commit acb54ea33f19 · 2023-06-04T23:03:59.000+02:00
diff --git a/badgers-web/src/app/badge/[...params]/route.ts b/badgers-web/src/app/badge/[...params]/route.ts
@@ -1,6 +1,6 @@
 import { NextRequest } from "next/server"
 
-import { Badge } from '@/utils'
+import Badge from '@/utils/Badge'
 
 export async function GET(request: NextRequest) {
     return await Badge.passThrough(request)
diff --git a/badgers-web/src/app/crates/downloads/[crate]/latest/route.ts b/badgers-web/src/app/crates/downloads/[crate]/latest/route.ts
@@ -1,6 +1,7 @@
 import { NextRequest } from "next/server"
 
-import { Badge, Crates } from '@/utils'
+import Badge from '@/utils/Badge'
+import Crates from '@/utils/Crates'
 
 interface Params {
     params: {
diff --git a/badgers-web/src/app/crates/downloads/[crate]/route.ts b/badgers-web/src/app/crates/downloads/[crate]/route.ts
@@ -1,6 +1,7 @@
 import { NextRequest } from "next/server"
 
-import { Badge, Crates } from '@/utils'
+import Badge from '@/utils/Badge'
+import Crates from '@/utils/Crates'
 
 interface Params {
     params: {
diff --git a/badgers-web/src/app/crates/info/[crate]/route.ts b/badgers-web/src/app/crates/info/[crate]/route.ts
@@ -1,6 +1,7 @@
 import { NextRequest } from "next/server"
 
-import { Badge, Crates } from '@/utils'
+import Badge from '@/utils/Badge'
+import Crates from '@/utils/Crates'
 
 interface Params {
     params: {
diff --git a/badgers-web/src/app/crates/name/[crate]/route.ts b/badgers-web/src/app/crates/name/[crate]/route.ts
@@ -1,6 +1,7 @@
 import { NextRequest } from "next/server"
 
-import { Badge, Crates } from '@/utils'
+import Badge from '@/utils/Badge'
+import Crates from '@/utils/Crates'
 
 interface Params {
     params: {
diff --git a/badgers-web/src/app/crates/version/[crate]/route.ts b/badgers-web/src/app/crates/version/[crate]/route.ts
@@ -1,6 +1,7 @@
 import { NextRequest } from "next/server"
 
-import { Badge, Crates } from '@/utils'
+import Badge from '@/utils/Badge'
+import Crates from '@/utils/Crates'
 
 interface Params {
     params: {
diff --git a/badgers-web/src/app/github/checks/[owner]/[repo]/[branch]/[check]/route.ts b/badgers-web/src/app/github/checks/[owner]/[repo]/[branch]/[check]/route.ts
@@ -1,6 +1,7 @@
 import { NextRequest } from "next/server"
 
-import { Badge, GitHub } from '@/utils'
+import Badge from '@/utils/Badge'
+import GitHub from '@/utils/GitHub'
 
 interface Params {
     params: {
diff --git a/badgers-web/src/app/github/checks/[owner]/[repo]/[branch]/route.ts b/badgers-web/src/app/github/checks/[owner]/[repo]/[branch]/route.ts
@@ -1,6 +1,7 @@
 import { NextRequest } from "next/server"
 
-import { Badge, GitHub } from '@/utils'
+import Badge from '@/utils/Badge'
+import GitHub from '@/utils/GitHub'
 
 interface Params {
     params: {
diff --git a/badgers-web/src/app/github/checks/[owner]/[repo]/route.ts b/badgers-web/src/app/github/checks/[owner]/[repo]/route.ts
@@ -1,6 +1,7 @@
 import { NextRequest } from "next/server"
 
-import { Badge, GitHub } from '@/utils'
+import Badge from '@/utils/Badge'
+import GitHub from '@/utils/GitHub'
 
 interface Params {
     params: {
diff --git a/badgers-web/src/app/github/closed-issues/[owner]/[repo]/route.ts b/badgers-web/src/app/github/closed-issues/[owner]/[repo]/route.ts
@@ -1,6 +1,7 @@
 import { NextRequest } from "next/server"
 
-import { Badge, GitHub } from '@/utils'
+import Badge from '@/utils/Badge'
+import GitHub from '@/utils/GitHub'
 
 interface Params {
     params: {
diff --git a/badgers-web/src/app/github/contributors/[owner]/[repo]/route.ts b/badgers-web/src/app/github/contributors/[owner]/[repo]/route.ts
@@ -1,6 +1,7 @@
 import { NextRequest } from "next/server"
 
-import { Badge, GitHub } from '@/utils'
+import Badge from '@/utils/Badge'
+import GitHub from '@/utils/GitHub'
 
 interface Params {
     params: {
diff --git a/badgers-web/src/app/github/issues/[owner]/[repo]/route.ts b/badgers-web/src/app/github/issues/[owner]/[repo]/route.ts
@@ -1,6 +1,7 @@
 import { NextRequest } from "next/server"
 
-import { Badge, GitHub } from '@/utils'
+import Badge from '@/utils/Badge'
+import GitHub from '@/utils/GitHub'
 
 interface Params {
     params: {
diff --git a/badgers-web/src/app/github/license/[owner]/[repo]/route.ts b/badgers-web/src/app/github/license/[owner]/[repo]/route.ts
@@ -1,6 +1,7 @@
 import { NextRequest } from "next/server"
 
-import { Badge, GitHub } from '@/utils'
+import Badge from '@/utils/Badge'
+import GitHub from '@/utils/GitHub'
 
 interface Params {
     params: {
diff --git a/badgers-web/src/app/github/open-issues/[owner]/[repo]/route.ts b/badgers-web/src/app/github/open-issues/[owner]/[repo]/route.ts
@@ -1,6 +1,7 @@
 import { NextRequest } from "next/server"
 
-import { Badge, GitHub } from '@/utils'
+import Badge from '@/utils/Badge'
+import GitHub from '@/utils/GitHub'
 
 interface Params {
     params: {
diff --git a/badgers-web/src/app/github/release/[owner]/[repo]/route.ts b/badgers-web/src/app/github/release/[owner]/[repo]/route.ts
@@ -1,6 +1,7 @@
 import { NextRequest } from "next/server"
 
-import { Badge, GitHub } from '@/utils'
+import Badge from '@/utils/Badge'
+import GitHub from '@/utils/GitHub'
 
 interface Params {
     params: {
diff --git a/badgers-web/src/app/npm/version/[org_or_pkg]/[pkg]/route.ts b/badgers-web/src/app/npm/version/[org_or_pkg]/[pkg]/route.ts
@@ -1,6 +1,7 @@
 import { NextRequest } from "next/server"
 
-import { Badge, Npm } from '@/utils'
+import Badge from '@/utils/Badge'
+import Npm from '@/utils/Npm'
 
 interface Params {
     params: {
diff --git a/badgers-web/src/app/npm/version/[org_or_pkg]/route.ts b/badgers-web/src/app/npm/version/[org_or_pkg]/route.ts
@@ -1,6 +1,7 @@
 import { NextRequest } from "next/server"
 
-import { Badge, Npm } from '@/utils'
+import Badge from '@/utils/Badge'
+import Npm from '@/utils/Npm'
 
 interface Params {
     params: {
diff --git a/badgers-web/src/utils/Badge.ts b/badgers-web/src/utils/Badge.ts
@@ -52,7 +52,11 @@ export default class Badge {
             .join('&')
 
         // Fetch the badge from the worker
-        const resp = await fetch(`${api.proto}://${api.host}/badge/${pathParams.label}/${pathParams.status}?${queryParams}`)
+        const resp = await fetch(`${api.proto}://${api.host}/badge/${pathParams.label}/${pathParams.status}?${queryParams}`, {
+            next: {
+                revalidate: 300, // 5m
+            }
+        })
         const data = await resp.arrayBuffer()
 
         // Build response headers
@@ -84,7 +88,7 @@ export default class Badge {
         const urlPath = request.nextUrl.pathname.replace(/^[/]+/gm, '')
         const urlQuery = request.nextUrl.search.replace(/^\?+/gm, '')
         const url = `${api.proto}://${api.host}/${urlPath}?${urlQuery}`
-        const resp = await fetch(url)
+        const resp = await fetch(url, { next: { revalidate: 300 } })
         const data = await resp.arrayBuffer()
         const headers = {
             'content-type': 'image/svg+xml',
diff --git a/badgers-web/src/utils/Crates.ts b/badgers-web/src/utils/Crates.ts
@@ -15,3 +15,8 @@ export default class Crates {
         }
     }
 }
+
+// Disable Vercel data cache for all requests.
+// This is a temporary solution. Once we can serve all routes via fetch,
+// we can remove this and use the next revalidate feature.
+export const fetchCache = 'force-no-store'
diff --git a/badgers-web/src/utils/GitHub.ts b/badgers-web/src/utils/GitHub.ts
@@ -70,3 +70,8 @@ export default class GitHub {
         )
     }
 }
+
+// Disable Vercel data cache for all requests.
+// This is a temporary solution. Once we can serve all routes via fetch,
+// we can remove this and use the next revalidate feature.
+export const fetchCache = 'force-no-store'
diff --git a/badgers-web/src/utils/Npm.ts b/badgers-web/src/utils/Npm.ts
@@ -29,6 +29,12 @@ type Package = {
     keywords: string[]
 }
 
+const fetchOptions = {
+    next: {
+        revalidate: 300, // 5m
+    }
+}
+
 export default class Npm {
     /**
      * Use `getPackageVersion` whenever possible.
@@ -38,7 +44,7 @@ export default class Npm {
      */
     static async getPackage(packageName: string): Promise<Package | null> {
         const url = `${BASE_URL}/${packageName}`
-        const response = await fetch(url)
+        const response = await fetch(url, fetchOptions)
 
         if (response.status === 404) {
             return null
@@ -64,7 +70,7 @@ export default class Npm {
         const url = `${BASE_URL}/${packageName}/${version}`
 
         try {
-            const response = await fetch(url)
+            const response = await fetch(url, fetchOptions)
 
             if (response.status === 404) {
                 return null
diff --git a/badgers-web/src/utils/index.ts b/badgers-web/src/utils/index.ts
