ssr via fetch

api/hooks/lib/ssr-server.js

@@ -1,4 +1,4 @@
-const { apiSsrBaseURL, ssrPublishCheckCollections } = require("../config")
+const { apiSsrBaseURL } = require("../config")
 
 /**
  * api request via server, cache result in context.ssrCache
@@ -6,21 +6,24 @@ const { apiSsrBaseURL, ssrPublishCheckCollections } = require("../config")
  *
  * @param {string} cacheKey
  * @param {string} endpoint
+ * @param {string} query
  * @param {ApiOptions} options
- * @returns {ApiResult}
+ * @returns {ApiResult<any>}
  */
 function ssrRequest(cacheKey, endpoint, query, options) {
     let url = endpoint + (query ? "?" + query : "")
 
     // console.log("############ FETCHING ", apiSsrBaseURL + url)
 
-    const response = context.http.fetch(apiSsrBaseURL + "/" + url, {
+    const response = context.http.fetch(apiSsrBaseURL + url, {
         method: options.method,
         headers: options.headers,
     })
 
+    // console.log(JSON.stringify(response.headers, null, 2))
+
     const json = response.body.json()
-    const count = parseInt(response.headers["x-results-count"] || "0")
+    const count = parseInt(response.headers["X-Results-Count"] || "0")
 
     // json is go data structure and incompatible with js, so we need to convert it
     const r = { data: JSON.parse(JSON.stringify(json)), count: count }

api/hooks/lib/ssr.js

@@ -3,6 +3,7 @@ const { apiClientBaseURL } = require("../config-client")
 /**
  * convert object to string
  * @param {any} obj object
+ * @returns {string} string
  */
 function obj2str(obj) {
     if (Array.isArray(obj)) {
@@ -32,70 +33,6 @@ function obj2str(obj) {
     if (obj) return obj
 }
 
-// fetch polyfill
-// [MIT License](LICENSE.md) © [Jason Miller](https://jasonformat.com/)
-const _f = function (
-    /** @type {string | URL} */ url,
-    /** @type {{ method?: any; credentials?: any; headers?: any; body?: any; }} */ options
-) {
-    if (typeof XMLHttpRequest === "undefined") {
-        return Promise.resolve(null)
-    }
-
-    options = options || {}
-    return new Promise((resolve, reject) => {
-        const request = new XMLHttpRequest()
-        const keys = []
-        const all = []
-        const headers = {}
-
-        const response = () => ({
-            ok: ((request.status / 100) | 0) == 2, // 200-299
-            statusText: request.statusText,
-            status: request.status,
-            url: request.responseURL,
-            text: () => Promise.resolve(request.responseText),
-            json: () => Promise.resolve(request.responseText).then(JSON.parse),
-            blob: () => Promise.resolve(new Blob([request.response])),
-            clone: response,
-            headers: {
-                // @ts-ignore
-                keys: () => keys,
-                // @ts-ignore
-                entries: () => all,
-                get: (n) => headers[n.toLowerCase()],
-                has: (n) => n.toLowerCase() in headers,
-            },
-        })
-
-        request.open(options.method || "get", url, true)
-
-        request.onload = () => {
-            request
-                .getAllResponseHeaders()
-                // @ts-ignore
-                .replace(/^(.*?):[^\S\n]*([\s\S]*?)$/gm, (m, key, value) => {
-                    keys.push((key = key.toLowerCase()))
-                    all.push([key, value])
-                    headers[key] = headers[key] ? `${headers[key]},${value}` : value
-                })
-            resolve(response())
-        }
-
-        request.onerror = reject
-
-        request.withCredentials = options.credentials == "include"
-
-        for (const i in options.headers) {
-            request.setRequestHeader(i, options.headers[i])
-        }
-
-        request.send(options.body || null)
-    })
-}
-
-const _fetch = typeof fetch === "undefined" ? (typeof window === "undefined" ? _f : window.fetch || _f) : fetch
-
 /**
  * api request via client or server
  * server function ssrRequest is called via context.ssrRequest, binded in ssr hook
@@ -103,27 +40,29 @@ const _fetch = typeof fetch === "undefined" ? (typeof window === "undefined" ? _
  * @param {string} endpoint
  * @param {ApiOptions} options
  * @param {any} body
+ * @param {import("../../../frontend/src/sentry")} sentry
+ * @param {typeof fetch} _fetch
  * @returns {Promise<ApiResult<any>>}
  */
-function apiRequest(endpoint, options, body) {
+function apiRequest(endpoint, options, body, sentry, _fetch) {
     // TODO cache only for GET
 
     // first check cache if on client
     const cacheKey = obj2str({ endpoint: endpoint, options: options })
-    options.method = options?.method || "GET"
+    console.log("SSR CHECK", cacheKey)
+
+    let method = options?.method || "GET"
 
     // @ts-ignore
-    if (typeof window !== "undefined" && window.__SSR_CACHE__ && options?.method === "GET") {
+    if (typeof window !== "undefined" && window.__SSR_CACHE__ && method === "GET") {
         // @ts-ignore
         const cache = window.__SSR_CACHE__[cacheKey]
-        console.log("SSR:", cacheKey, cache)
+        console.log("SSR HIT:", cacheKey, cache)
         if (cache) {
             return Promise.resolve(cache)
         }
     }
 
-    let method = options?.method || "GET"
-
     let query = "&count=1"
     if (options?.filter) query += "&filter=" + encodeURIComponent(JSON.stringify(options.filter))
     if (options?.sort) query += "&sort=" + options.sort + "&sort=_id"
@@ -138,6 +77,7 @@ function apiRequest(endpoint, options, body) {
         })
     }
 
+    /** @type {{[key: string]: string}} */
     let headers = {
         "Content-Type": "application/json",
     }
@@ -153,8 +93,19 @@ function apiRequest(endpoint, options, body) {
         return d
     } else {
         // client
-        let url = endpoint + (query ? "?" + query : "")
-        console.log("URL:", url)
+        let url = apiClientBaseURL + endpoint + (query ? "?" + query : "")
+
+        const span = sentry.currentTransaction()?.startChild({
+            op: "fetch",
+            description: method + " " + url,
+            data: Object.assign({}, options, { url }),
+        })
+        const trace_id = span?.toTraceparent()
+        if (trace_id) {
+            headers["sentry-trace"] = trace_id
+        }
+
+        /** @type {{[key: string]: any}} */
         const requestOptions = {
             method,
             mode: "cors",
@@ -165,7 +116,7 @@ function apiRequest(endpoint, options, body) {
             requestOptions.body = JSON.stringify(body)
         }
 
-        return _fetch(apiClientBaseURL + url, requestOptions).then((response) => {
+        const response = _fetch(url, requestOptions).then((response) => {
             return response?.json().then((json) => {
                 if (response?.status < 200 || response?.status >= 400) {
                     return Promise.reject({ response, data: json })
@@ -173,6 +124,11 @@ function apiRequest(endpoint, options, body) {
                 return Promise.resolve({ data: json || null, count: response.headers?.get("x-results-count") || 0 })
             })
         })
+
+        span?.end()
+
+        // @ts-ignore
+        return response
     }
 }
 

api/hooks/lib/utils.js

@@ -41,10 +41,12 @@ var { LIGHTHOUSE_TOKEN } = require("../config")
 
 /**
  * clear SSR cache
+ * @returns {number}
  */
 function clearSSRCache() {
     var info = context.db.deleteMany("ssr", {})
     context.response.header("X-SSR-Cleared", info.removed)
+    return info.removed
 }
 
 function calculateAverageDynamically(dbObjs) {