backend & types

api/hooks/ssr/get_read.js

@@ -2,11 +2,10 @@
 
 const { ssrValidatePath } = require("../config")
 const { log } = require("../lib/utils")
-const { ssrRequest } = require("../lib/ssr-server")
+const { ssrRequest } = require("../lib/ssr-server.js")
 
 ;(function () {
     /** @type {HookResponse} */
-    // @ts-ignore
     let response = null
 
     const request = context.request()
@@ -15,9 +14,6 @@ const { ssrRequest } = require("../lib/ssr-server")
 
     // add sentry trace id to head
     const trace_id = context.debug.sentryTraceId()
-    /**
-     * @param {string} content
-     */
     function addSentryTrace(content) {
         return content.replace("</head>", '<meta name="sentry-trace" content="' + trace_id + '" /></head>')
     }
@@ -49,22 +45,12 @@ const { ssrRequest } = require("../lib/ssr-server")
                 },
             })
         if (cache && cache.length) {
-            const validUntil = cache[0].validUntil ? new Date(cache[0].validUntil.unixMilli()) : null
-            // context.debug.dump("cache validUntil", validUntil)
-            if (!validUntil || validUntil > new Date()) {
-                // context.debug.dump("using cache")
-                // use cache
-                context.response.header("X-SSR-Cache", "true")
-                throw {
-                    status: 200,
-                    log: false,
-                    html: addSentryTrace(cache[0].content),
-                }
-            } else {
-                // cache is invalid, delete it
-                context.response.header("X-SSR-Cache", "invalid")
-                // @ts-ignore
-                context.db.delete("ssr", cache[0].id)
+            // use cache
+            context.response.header("X-SSR-Cache", "true")
+            throw {
+                status: 200,
+                log: false,
+                html: addSentryTrace(cache[0].content),
             }
         }
 
@@ -128,7 +114,7 @@ const { ssrRequest } = require("../lib/ssr-server")
                 } else {
                     cacheIt = true
                 }
-            } catch (/** @type {any} */ e) {
+            } catch (e) {
                 // save error for later insert into html
                 log(e.message)
                 log(e.stack)
@@ -149,8 +135,6 @@ const { ssrRequest } = require("../lib/ssr-server")
                 // context.debug.dump("ssr", {
                 path: url,
                 content: tpl,
-                // @ts-ignore
-                validUntil: context.ssrCacheValidUntil,
             })
         }