ssr

api/hooks/ssr/get_read.js

@@ -1,16 +1,19 @@
-const { ssrValidatePath, ssrAllowedAPIEndpoints } = require("../config")
+// TODO: add query string functionality to cache
+
+const { ssrValidatePath } = require("../config")
+const { log } = require("../lib/utils")
+const { ssrRequest } = require("../lib/ssr-server.js")
 
-const { obj2str, log } = require("../lib/utils")
 ;(function () {
     /** @type {HookResponse} */
-    var response = null
-    console.log("SSR GET READ")
-    var request = context.request()
-    var url = request.query("url")
-    var noCache = request.query("noCache")
+    let response = null
+
+    const request = context.request()
+    let url = request.query("url")
+    const noCache = request.query("noCache")
 
     // add sentry trace id to head
-    var trace_id = context.debug.sentryTraceId()
+    const trace_id = context.debug.sentryTraceId()
     function addSentryTrace(content) {
         return content.replace("</head>", '<meta name="sentry-trace" content="' + trace_id + '" /></head>')
     }
@@ -18,7 +21,9 @@ const { obj2str, log } = require("../lib/utils")
 
     if (url) {
         // comment will be printed to html later
-        var comment = ""
+        let comment = ""
+        /** @type {Date} */ // @ts-ignore
+        context.ssrCacheValidUntil = null
 
         url = url.split("?")[0]
         comment += "url: " + url
@@ -31,7 +36,8 @@ const { obj2str, log } = require("../lib/utils")
         }
 
         // check if url is in cache
-        var cache =
+        /** @type {Ssr[]} */ // @ts-ignore
+        const cache =
             !noCache &&
             context.db.find("ssr", {
                 filter: {
@@ -40,6 +46,7 @@ const { obj2str, log } = require("../lib/utils")
             })
         if (cache && cache.length) {
             // use cache
+            context.response.header("X-SSR-Cache", "true")
             throw {
                 status: 200,
                 log: false,
@@ -48,85 +55,50 @@ const { obj2str, log } = require("../lib/utils")
         }
 
         // validate url
-        var status = 200
+        let status = 200
 
-        var pNorender = false
-        var pNotfound = false
+        let pNorender = false
+        let pNotfound = false
 
-        var pR = ssrValidatePath(url)
+        const pR = ssrValidatePath(url)
         if (pR < 0) {
             pNotfound = true
         } else if (!pR) {
             pNorender = true
         }
 
-        var head = ""
-        var html = ""
-        var error = ""
+        let head = ""
+        let html = ""
+        let error = ""
 
         comment += ", path: " + url
 
-        var cacheIt = false
+        let cacheIt = false
         if (pNorender) {
             html = "<!-- NO SSR RENDERING -->"
         } else if (pNotfound) {
             status = 404
-            console.log("IS 404")
             html = "404 NOT FOUND"
         } else {
+            // @ts-ignore
+            context.ssrCache = {}
+            // @ts-ignore
+            context.ssrRequest = ssrRequest
+
             // try rendering, if error output plain html
             try {
-                // @ts-ignore
-                context.ssrCache = {}
-                // @ts-ignore
-                context.ssrFetch = function (endpoint, options) {
-                    var data
-                    if (ssrAllowedAPIEndpoints.indexOf(endpoint) > -1) {
-                        var _options = Object.assign({}, options)
-
-                        if (_options.sort) _options.sort = [_options.sort]
-
-                        try {
-                            /*console.log(
-                                "SSR",
-                                endpoint,
-                                JSON.stringify(_options)
-                            )*/
-                            var goSlice = context.db.find(endpoint, _options || {})
-                            // need to deep copy, so shift and delete on pure js is possible
-                            data = JSON.parse(JSON.stringify(goSlice))
-                        } catch (e) {
-                            console.log("ERROR", JSON.stringify(e))
-                            data = []
-                        }
-                    } else {
-                        console.log("SSR forbidden", endpoint)
-                        data = []
-                    }
-
-                    var count = (data && data.length) || 0
-                    if (options && count == options.limit) {
-                        // read count from db
-                        count = context.db.count(endpoint, _options || {})
-                    }
-                    var r = { data: data, count: count }
-
-                    // @ts-ignore
-                    context.ssrCache[obj2str({ endpoint: endpoint, options: options })] = r
-
-                    return r
-                }
-
                 // include App.svelte and render it
                 // @ts-ignore
-                var app = require("../lib/app.server")
-                var rendered = app.default.render({
+
+                // 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
+                // add ssrCache to head, cache is built in ssr.js/apiRequest
                 head +=
                     "\n\n" +
                     "<script>window.__SSR_CACHE__ = " +
@@ -137,8 +109,8 @@ const { obj2str, log } = require("../lib/utils")
                 // status from webapp
                 // @ts-ignore
                 if (context.is404) {
+                    // console.log("########## 404")
                     status = 404
-                    console.log("IS 404")
                 } else {
                     cacheIt = true
                 }
@@ -151,15 +123,16 @@ const { obj2str, log } = require("../lib/utils")
         }
 
         // read html template and replace placeholders
-        var tpl = context.fs.readFile("templates/spa.html")
+        let 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 + "-->" : "")
-        console.log("CACHE", cacheIt, noCache)
+
         // save cache if adviced
         if (cacheIt && !noCache) {
             context.db.create("ssr", {
+                // context.debug.dump("ssr", {
                 path: url,
                 content: tpl,
             })
@@ -173,7 +146,7 @@ const { obj2str, log } = require("../lib/utils")
         }
     } else {
         // only admins are allowed to get without url parameter
-        var auth = context.user.auth()
+        const auth = context.user.auth()
         if (!auth || auth.role !== 0) {
             throw {
                 status: 403,