use fork of static-publisher; add caching

Author: NeilHanlon

compute-js/.npmrc

@@ -0,0 +1,2 @@
+# temporarily override until https://github.com/fastly/compute-js-static-publish/pull/13 is merged
+npm config set @fastly:registry https://git.resf.org/api/packages/sig_core/npm/

compute-js/package-lock.json

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

compute-js/package.json

@@ -15,57 +15,61 @@ addEventListener("fetch", (event) => event.respondWith(handleRequest(event)));
 async function handleRequest(event) {
   const originalRequest = event.request;
   const url = new URL(event.request.url);
-  const path = url.pathname;
+  let path = url.pathname;
 
   const logger = new Logger("JavaScriptLog");
 
   function doLog(msg) {
-    console.log("[" + path + "]" + msg);
-    logger.log("[" + path + "]" + msg);
+    console.log("[" + path + "] " + msg);
+    logger.log("[" + path + "] " + msg);
   }
 
+  let cacheOverride = new CacheOverride("override", {
+    swr: '600', // stale while revalidate
+    surrogateKey: 'docs',
+    ttl: 21600,
+  });
+
   // Check if the requested path has a locale slug (e.g., /fr/)
   const localeRegex = /\/(af|de|fr|es|id|it|ja|ko|zh|sv|tr|pl|pt|pt-BR|ru|uk)\//
   const hasLocaleSlug = localeRegex.test(path);
 
+  var beresp;
+
   // If there's a locale slug, try serving the translation
   if (hasLocaleSlug) {
     doLog("Attempting to serve localized page for " + path);
-    var response = await staticContentServer.serveRequest(event.request);
-    if (response == null || response.status > 400) {
-        doLog("Failed to serve localized page. Attempting to serve page from Vercel");
-        // let cacheOverride = new CacheOverride("override", { ttl: 60 });
-        response = await fetch(event.request, { backend: backendName });
-        doLog("[vercel] " +response.url+"|"+response.status);
-        if (response != null && response.status < 400) {
-          doLog("Fetched localized content from Vercel");
-          return response
+    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
         }
     }
   }
 
-  doLog("begin default route handling");
   // If no translation is found or there's no locale slug, serve the English version
-  const englishPath = path.replace(localeRegex, '/');
-  const englishRequest = new Request(url.origin + englishPath);
-  const englishResponse = await staticContentServer.serveRequest(englishRequest);
+  path = 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 (englishResponse != null && englishResponse.status < 400) {
-    doLog("fetched content from edge cache");
-    return englishResponse;
+  if (beresp != null && beresp.status < 400) {
+    doLog("Static content fetched from edge cache");
+    return beresp;
   }
 
-  doLog("failed to fetch content from edge cache; attempt to serve from vercel");
   // 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 });
-  response = await fetch(originalRequest, { backend: backendName });
+  beresp = await fetch(originalRequest, {backend: backendName, cacheOverride});
 
-  if (response != null && response.status < 400) {
-    doLog("fetched content from vercel");
-    return response
+  if (beresp != null && beresp.status < 400) {
+    doLog("content fetched from vercel (fallback)");
+    return beresp
   }
 
-  doLog("request failed. return 404");
   // If neither translation nor English version is found, return a 404 response
   return new Response('Not found', { status: 404 });
 }

compute-js/src/index.js

@@ -14,15 +14,15 @@ const config = {
   // excludeDotFiles: true,
   // includeWellKnown: true,
   // contentAssetInclusionTest: (filename) => true,
-  // contentCompression: [ 'br', 'gzip' ], // For this config value, default is [] if kvStoreName is null.
+  // contentCompression: [ 'br' ], // For this config value, default is [] if kvStoreName is null.
   // moduleAssetInclusionTest: (filename) => false,
   // contentTypes: [
   //   { test: /.custom$/, contentType: 'application/x-custom', text: false },
   // ],
   server: {
     publicDirPrefix: "",
-    staticItems: ["search/search_index.json"],
-    staticDir: "../build/minified/assets",
+    staticItems: ["/search/search_index.json"],
+    staticDir: "../build/minified/site/assets",
     // compression: [ 'br', 'gzip' ],
     spaFile: false,
     notFoundPageFile: "/404.html",

compute-js/static-publish.rc.js

@@ -24,6 +24,6 @@ fi
 pushd compute-js || exit $?
 npm install
 $FASTLY compute build || exit $?
-$FASTLY compute deploy -p pkg/resf-rocky-linux-docs.tar.gz
+$FASTLY compute deploy -p pkg/resf-rocky-linux-docs.tar.gz || exit $?
 
 popd || exit

deploy.sh

@@ -5,7 +5,9 @@
   "scripts": {
     "load-docs": "rm -rf docs; git clone https://github.com/rocky-linux/documentation docs",
     "dev": "mkdocs serve",
-    "build": "bash setup-deps.sh && bash build-all.sh && bash deploy.sh"
+    "prebuild": "bash setup-deps.sh",
+    "build": "bash build-all.sh",
+    "postbuild": "bash deploy.sh"
   },
   "dependencies": {
     "pngquant": "^4.2.0"