use kv store instead of embedding in wasm

Author: NeilHanlon

.gitignore

@@ -11,3 +11,5 @@ docs/
 
 # dev envrc
 .envrc.local
+
+node_modules/

compute-js/fastly.toml

@@ -7,7 +7,7 @@ language = "javascript"
 manifest_version = 2
 name = "@resf/rocky-linux-docs"
 service_id = "lACFUzQjUGLnZsvoHgcnx6"
-# kv_store_name = "mkdocs"
+kv_store_name = "docs.rockylinux.org"
 
 [scripts]
   build = "npm run build"
@@ -17,3 +17,5 @@ service_id = "lACFUzQjUGLnZsvoHgcnx6"
     [local_server.backends.docs-vercel]
       url = "https://cname.vercel-dns.com/"
       override_host = "docs.rockylinux.org"
+  [local_server.kv_stores]
+    [[local_server.kv_stores."docs.rockylinux.org"]]

compute-js/package-lock.json

@@ -5,7 +5,7 @@
   "author": "neil@resf.org",
   "type": "module",
   "devDependencies": {
-    "@fastly/compute-js-static-publish": "^6.0.1"
+    "@fastly/compute-js-static-publish": "^6.0.3"
   },
   "dependencies": {
     "@fastly/js-compute": "^3.0.0"

compute-js/package.json

@@ -1,27 +1,32 @@
 /// <reference types="@fastly/js-compute" />
 import { getServer } from '../static-publisher/statics.js';
 import { CacheOverride } from "fastly:cache-override";
-// import { allowDynamicBackends } from "fastly:experimental";
-//
-// allowDynamicBackends(true);
+// import { SimpleCache } from 'fastly:cache';
+
 const staticContentServer = getServer();
 
 const backendName = "docs-vercel";
 
 import { Logger } from "fastly:logger";
+import { env } from "fastly:env";
 
 // eslint-disable-next-line no-restricted-globals
 addEventListener("fetch", (event) => event.respondWith(handleRequest(event)));
 async function handleRequest(event) {
   const originalRequest = event.request;
-  const url = new URL(event.request.url);
-  let path = url.pathname;
+  const url = new URL(originalRequest.url);
+  const path = url.pathname;
 
   const logger = new Logger("JavaScriptLog");
 
-  function doLog(msg) {
-    console.log("[" + path + "] " + msg);
-    logger.log("[" + path + "] " + msg);
+  const region = env("FASTLY_REGION");
+  const devMode = region === "Somewhere" ? true : false;
+
+  async function debugLog(msg) {
+    if (devMode) {
+      console.log("[" + path + "] " + msg);
+      logger.log("[" + path + "] " + msg);
+    }
   }
 
   let cacheOverride = new CacheOverride("override", {
@@ -38,36 +43,35 @@ async function handleRequest(event) {
 
   // If there's a locale slug, try serving the translation
   if (hasLocaleSlug) {
-    doLog("Attempting to serve localized page for " + path);
+    debugLog("Attempting to serve localized page for " + path);
     beresp = await staticContentServer.serveRequest(event.request, 'public, max-age=21600, stale-while-revalidate=600');
     if (beresp == null || beresp.status > 400) {
         // doLog("Failed to serve localized page. Attempting to serve page from Vercel");
         beresp = await fetch(event.request, {backend: backendName, cacheOverride});
         // doLog("[vercel] " +beresp.url+"|"+beresp.status);
         if (beresp != null && beresp.status < 400) {
-          doLog("Localized content fetched from Vercel");
-          return beresp
+          debugLog("Localized content fetched from Vercel");
+          return beresp;
         }
     }
   }
 
   // If no translation is found or there's no locale slug, serve the English version
-  path = hasLocaleSlug ? path.replace(localeRegex, '/') : path;
+  fallbackPath = hasLocaleSlug ? path.replace(localeRegex, '/') : path;
   const bereq = new Request(url.origin + path);
-  beresp = await staticContentServer.serveRequest(bereq, 'public, max-age=21600, stale-while-revalidate=600');
-
-  if (beresp != null && beresp.status < 400) {
-    doLog("Static content fetched from edge cache");
+  beresp = await staticContentServer.serveRequest(bereq, 'public, max-age=21600, stale-while-revalidate=600')
+  if (beresp != null && beresp.ok) {
+    debugLog("Static content fetched from edge cache");
     return beresp;
   }
 
+
   // If we **still** can't find the artifact, try to find it on docs.r.o for the user, I guess
-  // let cacheOverride = new CacheOverride("override", { ttl: 60 });
   beresp = await fetch(originalRequest, {backend: backendName, cacheOverride});
 
   if (beresp != null && beresp.status < 400) {
-    doLog("content fetched from vercel (fallback)");
-    return beresp
+    debugLog("content fetched from vercel (fallback)");
+    return beresp;
   }
 
   // If neither translation nor English version is found, return a 404 response

compute-js/src/index.js

@@ -9,12 +9,12 @@
 const config = {
   rootDir: "../build/minified/site",
   staticContentRootDir: "./static-publisher",
-  // kvStoreName: "mkdocs",
+  kvStoreName: "docs.rockylinux.org",
   // excludeDirs: [ './node_modules' ],
   // excludeDotFiles: true,
   // includeWellKnown: true,
   // contentAssetInclusionTest: (filename) => true,
-  // contentCompression: [ 'br' ], // For this config value, default is [] if kvStoreName is null.
+  contentCompression: [ 'br', 'gzip' ], // For this config value, default is [] if kvStoreName is null.
   // moduleAssetInclusionTest: (filename) => false,
   // contentTypes: [
   //   { test: /.custom$/, contentType: 'application/x-custom', text: false },