Branch was updated using the 'autoupdate branch' Actions workflow.

Author: Octomerger

middleware/rate-limit.js

@@ -5,15 +5,22 @@ const Redis = require('ioredis')
 const isProduction = process.env.NODE_ENV === 'production'
 const { REDIS_URL } = process.env
 const rateLimitDatabaseNumber = 0
+const EXPIRES_IN_AS_SECONDS = 60
 
 module.exports = rateLimit({
   // 1 minute (or practically unlimited outside of production)
-  windowMs: isProduction ? (60 * 1000) : 1,
+  windowMs: isProduction ? (EXPIRES_IN_AS_SECONDS * 1000) : 1, // Non-Redis configuration in `ms`. Used as a fallback when Redis is not working or active.
   // limit each IP to X requests per windowMs
   max: 250,
   // Don't rate limit requests for 200s and redirects
   // Or anything with a status code less than 400
   skipSuccessfulRequests: true,
   // When available, use Redis
-  store: REDIS_URL && new RedisStore({ client: new Redis(REDIS_URL, { db: rateLimitDatabaseNumber }) })
+  store: REDIS_URL && new RedisStore({
+    client: new Redis(REDIS_URL, {
+      db: rateLimitDatabaseNumber
+    }),
+    // 1 minute (or practically unlimited outside of production)
+    expiry: isProduction ? EXPIRES_IN_AS_SECONDS : 1 // Redis configuration in `s`
+  })
 })

middleware/render-page.js

@@ -20,12 +20,17 @@ const pageCache = new RedisAccessor({
 
 module.exports = async function renderPage (req, res, next) {
   const page = req.context.page
-  const originalUrl = req.originalUrl
+
+  // Remove any query string (?...) and/or fragment identifier (#...)
+  const originalUrl = new URL(req.originalUrl, 'https://docs.github.com').pathname
 
   // Serve from the cache if possible (skip during tests)
   const isCacheable = !process.env.CI && process.env.NODE_ENV !== 'test' && req.method === 'GET'
 
-  if (isCacheable) {
+  // Is the request for JSON debugging info?
+  const isRequestingJsonForDebugging = 'json' in req.query && process.env.NODE_ENV !== 'production'
+
+  if (isCacheable && !isRequestingJsonForDebugging) {
     const cachedHtml = await pageCache.get(originalUrl)
     if (cachedHtml) {
       console.log(`Serving from cached version of ${originalUrl}`)
@@ -76,7 +81,7 @@ module.exports = async function renderPage (req, res, next) {
   }
 
   // `?json` query param for debugging request context
-  if ('json' in req.query && process.env.NODE_ENV !== 'production') {
+  if (isRequestingJsonForDebugging) {
     if (req.query.json.length > 1) {
       // deep reference: ?json=page.permalinks
       return res.json(get(context, req.query.json))