ssr via fetch

api/hooks/ssr/get_read.js

@@ -1,29 +1,38 @@
-// TODO: add query string functionality to cache
+const utils = require("../lib/utils")
+
+const { release } = require("../config-client")
 
 const { ssrValidatePath } = require("../config")
-const { log } = require("../lib/utils")
-const { ssrRequest } = require("../lib/ssr-server.js")
-
+const { ssrRequest } = require("../lib/ssr-server")
 ;(function () {
-    /** @type {HookResponse} */
-    let response = null
+    var request = context.request()
 
-    const request = context.request()
-    let url = request.query("url")
+    var trackingCall = request.header("x-ssr-skip")
+    if (trackingCall) {
+        // skip tracking
+        throw {
+            status: parseInt(trackingCall),
+            html: "",
+            log: false,
+        }
+    }
+
+    let url = request.query("url") || request.header("x-ssr-url") || "/"
     const noCache = request.query("noCache")
 
-    // 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>')
     }
-    context.response.header("sentry-trace", trace_id)
 
-    if (url) {
-        // comment will be printed to html later
-        let comment = ""
-        /** @type {Date} */ // @ts-ignore
-        context.ssrCacheValidUntil = null
+    context.response.header("sentry-trace", trace_id)
+    const auth = context.user.auth()
+    if (auth && auth.role == 0) {
+    } else if (url) {
+        var comment = ""
 
         url = url.split("?")[0]
         comment += "url: " + url
@@ -31,40 +40,55 @@ const { ssrRequest } = require("../lib/ssr-server.js")
         if (url && url.length > 1) {
             url = url.replace(/\/$/, "")
         }
-        if (url == "/noindex" || !url) {
+        if (url == "/index" || !url) {
             url = "/" // see .htaccess
         }
 
-        // check if url is in cache
-        /** @type {Ssr[]} */ // @ts-ignore
-        const cache =
-            !noCache &&
-            context.db.find("ssr", {
-                filter: {
-                    path: url,
-                },
-            })
-        if (cache && cache.length) {
-            // use cache
-            context.response.header("X-SSR-Cache", "true")
-            throw {
-                status: 200,
-                log: false,
-                html: addSentryTrace(cache[0].content),
+        function useCache(/** @type {string} */ _url) {
+            var cache =
+                !noCache &&
+                context.db.find("ssr", {
+                    filter: {
+                        path: _url,
+                    },
+                })
+
+            if (cache && cache.length) {
+                // use cache
+                context.response.header("X-SSR-Cache", "true")
+                throw {
+                    status: 200,
+                    log: false,
+                    html: addSentryTrace(cache[0].content),
+                }
             }
         }
 
         // validate url
-        let status = 200
+        var status = 200
 
-        let pNorender = false
-        let pNotfound = false
+        var pNorender = false
+        var pNotfound = false
 
         const pR = ssrValidatePath(url)
-        if (pR < 0) {
+        if (pR === -1) {
             pNotfound = true
+            comment += ", notFound"
         } else if (!pR) {
             pNorender = true
+            comment += ", noRender"
+        } else if (typeof pR === "string") {
+            url = pR
+            comment += ", cache url: " + url
+        }
+
+        if (noCache) {
+            comment += ", noCache"
+        }
+
+        if (!pNorender && !pNotfound) {
+            // check if we have a cache
+            useCache(url)
         }
 
         let head = ""
@@ -73,7 +97,7 @@ const { ssrRequest } = require("../lib/ssr-server.js")
 
         comment += ", path: " + url
 
-        let cacheIt = false
+        var cacheIt = false
         if (pNorender) {
             html = "<!-- NO SSR RENDERING -->"
         } else if (pNotfound) {
@@ -85,20 +109,17 @@ const { ssrRequest } = require("../lib/ssr-server.js")
             // @ts-ignore
             context.ssrRequest = ssrRequest
 
-            // try rendering, if error output plain html
             try {
-                // include App.svelte and render it
+                // if error, output plain html without prerendering
                 // @ts-ignore
-
-                // console.log("####### RENDERING ", url)
                 const app = require("../lib/app.server")
+
                 const rendered = app.default.render({
                     url: url,
                 })
                 head = rendered.head
                 html = rendered.html
 
-                // add ssrCache to head, cache is built in ssr.js/apiRequest
                 head +=
                     "\n\n" +
                     "<script>window.__SSR_CACHE__ = " +
@@ -109,50 +130,49 @@ const { ssrRequest } = require("../lib/ssr-server.js")
                 // status from webapp
                 // @ts-ignore
                 if (context.is404) {
-                    // console.log("########## 404")
                     status = 404
                 } else {
                     cacheIt = true
                 }
-            } catch (e) {
-                // save error for later insert into html
-                log(e.message)
-                log(e.stack)
+            } catch (/** @type {any} */ e) {
+                utils.log(e.message)
+                utils.log(e.stack)
                 error = "error: " + e.message + "\n\n" + e.stack
+
+                // utils.log(e)
+                // for (var property in e) {
+                //     utils.log(property + ": " + e[property])
+                // }
+                // error = JSON.stringify(e)
             }
         }
 
-        // read html template and replace placeholders
-        let tpl = context.fs.readFile("templates/spa.html")
+        var tpl = context.fs.readFile("templates/spa.html")
         tpl = tpl.replace("<!--HEAD-->", head)
         tpl = tpl.replace("<!--HTML-->", html)
         tpl = tpl.replace("<!--SSR.ERROR-->", error ? "<!--" + error + "-->" : "")
         tpl = tpl.replace("<!--SSR.COMMENT-->", comment ? "<!--" + comment + "-->" : "")
 
-        // save cache if adviced
         if (cacheIt && !noCache) {
+            // save cache
             context.db.create("ssr", {
-                // context.debug.dump("ssr", {
                 path: url,
                 content: tpl,
             })
         }
 
-        // return html
         throw {
             status: status,
             log: false,
             html: addSentryTrace(tpl),
         }
     } else {
-        // only admins are allowed to get without url parameter
-        const auth = context.user.auth()
-        if (!auth || auth.role !== 0) {
-            throw {
-                status: 403,
-                message: "invalid auth",
-                auth: auth,
-            }
+        // only admins are allowed
+        throw {
+            status: 403,
+            message: "invalid auth",
+            auth: auth,
+            release: release,
         }
     }
 })()

api/hooks/ssr/post_bind.js

@@ -1,16 +1,25 @@
-const utils = require("../lib/utils")
+const { release } = require("../config-client")
+var utils = require("../lib/utils")
 
 ;(function () {
     if (context.request().query("clear")) {
-        utils.clearSSRCache()
-        throw {
+        console.log("CLEARING SSR CACHE")
+        var removed = utils.clearSSRCache()
+        var stats = {
             status: 200,
-            message: "cache cleared",
+            message: "ok",
+            removed: removed,
+            release: release,
         }
+
+        utils.log(stats)
+
+        throw stats
     }
 
     throw {
         status: 500,
         message: "ssr is only a dummy collection",
+        release: release,
     }
 })()