cloudcommerce 0.23.2 → 0.24.0

package/packages/ssr/cloudflare/swr-worker.js

@@ -3,7 +3,6 @@
 const HEADER_CACHE_CONTROL = 'Cache-Control';
 const HEADER_SSR_TOOK = 'X-Load-Took';
 const HEADER_STALE_AT = 'X-Edge-Stale-At';
-const HEADER_STYLE_LINK = 'X-Style-Link';
 const resolveCacheControl = (response) => {
   const cacheControl = response.headers.get(HEADER_CACHE_CONTROL);
   if (!cacheControl || !response.headers.get(HEADER_SSR_TOOK)) {
@@ -54,23 +53,92 @@ const toCacheRes = (response, cacheControl, staleAt) => {
     vary: null,
   });
 };
-const swr = async (event) => {
-  if (event.request.method !== 'GET') {
-    return fetch(event.request);
+const checkToKvCache = (newCacheRes) => {
+  return newCacheRes.status === 200
+        && newCacheRes.headers.get('Content-Type')?.includes('text/html');
+};
+const putKvCache = async (kv, kvKey, newCacheRes) => {
+  const newKvRes = new Response(newCacheRes.clone().body, { status: 200 });
+  const body = await newKvRes.text();
+  const headers = {};
+  newCacheRes.headers.forEach((value, key) => {
+    headers[key] = value;
+  });
+  const kvValue = JSON.stringify({ body, headers });
+  return kv.put(kvKey, kvValue, { expirationTtl: 3600 * 24 * 30 });
+};
+const swr = async (_request, env, ctx) => {
+  const url = new URL(_request.url);
+  const { hostname, pathname } = url;
+  const hostOverride = env[`OVERRIDE_${hostname}`];
+  if (hostOverride) {
+    url.hostname = hostOverride;
+  }
+  const bypassEarly = () => {
+    return !hostOverride
+      ? fetch(_request)
+      : fetch(new Request(url.href, _request));
+  };
+  if (_request.method !== 'GET') {
+    return bypassEarly();
   }
-  const { pathname } = new URL(event.request.url);
   if (pathname === '/_image'
         || pathname.startsWith('/~')
         || pathname.startsWith('/api/')
         || pathname.startsWith('/_feeds/')) {
-    return fetch(event.request);
+    return bypassEarly();
   }
-  const [uri] = event.request.url.split('?', 2);
-  const request = new Request(`${uri}?t=${Date.now()}`, event.request);
-  const cacheKey = new Request(`${uri}?v=29`, {
-    method: event.request.method,
+  const [uri] = url.href.split('?', 2);
+  const request = new Request(`${uri}?t=${Date.now()}`, _request);
+  const v = 38;
+  const cacheKey = new Request(`${uri}?v=${(v + 1)}`, {
+    method: _request.method,
   });
-  const cachedRes = await caches.default.match(cacheKey);
+  const kvKey = `${v}${uri.replace('https:/', '')}`;
+  const kv = env.PERMA_CACHE;
+  let cachedRes;
+  let edgeSource = '';
+  try {
+    const gettingCache = caches.default.match(cacheKey);
+    let kvStoredRes;
+    const gettingKv = kv
+      ? kv.get(kvKey, { type: 'json' }).then((value) => {
+        if (value) {
+          const { body, headers } = value;
+          kvStoredRes = new Response(body, { headers, status: 200 });
+          return kvStoredRes;
+        }
+        kvStoredRes = null;
+        return undefined;
+      })
+      : Promise.resolve(undefined);
+    cachedRes = await Promise.race([
+      new Promise((resolve) => {
+        gettingCache.then((fromCache) => {
+          if (fromCache) {
+            edgeSource = 'cache';
+            resolve(fromCache);
+          } else if (kvStoredRes !== undefined) {
+            resolve(kvStoredRes);
+          } else {
+            gettingKv.finally(() => resolve(kvStoredRes));
+          }
+        });
+      }),
+      new Promise((resolve) => {
+        gettingKv.then((fromKv) => {
+          if (fromKv) {
+            edgeSource = 'kv';
+            resolve(fromKv);
+          } else {
+            gettingCache.then((fromCache) => resolve(fromCache));
+          }
+        });
+      }),
+    ]);
+  } catch {
+    //
+  }
   let edgeState = 'miss';
   if (cachedRes) {
     const cachedStaleAt = Number(cachedRes.headers.get(HEADER_STALE_AT));
@@ -78,8 +146,11 @@ const swr = async (event) => {
       edgeState = 'bypass';
     } else if (Date.now() > cachedStaleAt) {
       edgeState = 'stale';
-      event.waitUntil((async () => {
+      ctx.waitUntil((async () => {
         const newCacheRes = toCacheRes(await fetch(request));
+        if (kv && checkToKvCache(newCacheRes)) {
+          ctx.waitUntil(putKvCache(kv, kvKey, newCacheRes));
+        }
         return caches.default.put(cacheKey, newCacheRes);
       })());
     } else {
@@ -90,21 +161,18 @@ const swr = async (event) => {
   const { cacheControl, staleAt } = resolveCacheControl(response);
   if (!cachedRes && response.ok) {
     const newCacheRes = toCacheRes(response, cacheControl, staleAt);
-    event.waitUntil(caches.default.put(cacheKey, newCacheRes));
+    ctx.waitUntil(caches.default.put(cacheKey, newCacheRes));
+    if (kv && checkToKvCache(newCacheRes)) {
+      ctx.waitUntil(putKvCache(kv, kvKey, newCacheRes));
+    }
   }
-  const headers = {
+  return addHeaders(response, {
     [HEADER_CACHE_CONTROL]: cacheControl,
     'x-edge-state': edgeState,
-  };
-  const styleLink = response.headers.get(HEADER_STYLE_LINK);
-  if (styleLink) {
-    // https://developers.cloudflare.com/workers/examples/103-early-hints/
-    headers.link = `</${styleLink}>; rel=preload; as=style`;
-    headers[HEADER_STYLE_LINK] = null;
-  }
-  return addHeaders(response, headers);
+    'x-edge-src': edgeSource,
+  });
+};
+
+export default {
+  fetch: swr,
 };
-// eslint-disable-next-line no-restricted-globals
-addEventListener('fetch', (event) => {
-  event.respondWith(swr(event));
-});

package/packages/ssr/lib/firebase/serve-storefront.js

@@ -6,22 +6,24 @@ const { STOREFRONT_BASE_DIR, SSR_PROXY_DEBUG, SSR_PROXY_TIMEOUT } = process.env;
 const baseDir = STOREFRONT_BASE_DIR || process.cwd();
 let imagesManifest;
 const builtImages = [];
-let cssFilename;
-const readingStylesManifest = new Promise((resolve) => {
-  readFile(joinPath(baseDir, 'dist/server/stylesheets.csv'), 'utf-8')
-    .then((stylesManifest) => {
-      const cssFiles = [];
-      stylesManifest.split(/\n/).forEach((line) => {
-        const [filename] = line.split(',');
-        if (filename) cssFiles.push(filename);
-      });
-      if (cssFiles.length === 1) {
-        [cssFilename] = cssFiles;
+let cssFilepath;
+readFile(joinPath(baseDir, 'dist/server/stylesheets.csv'), 'utf-8')
+  .then((stylesManifest) => {
+    const cssFiles = [];
+    stylesManifest.split(/\n/).forEach((line) => {
+      const [filename] = line.split(',');
+      if (filename) cssFiles.push(filename);
+    });
+    if (cssFiles.length === 1) {
+      cssFilepath = cssFiles[0]?.replace('./dist/client/', '/');
+      if (cssFilepath
+            && cssFilepath.charAt(0) !== '/'
+            && !cssFilepath.startsWith('https://')) {
+        cssFilepath = `/${cssFilepath}`;
       }
-    })
-    .catch(logger.warn)
-    .finally(() => resolve(null));
-});
+    }
+  })
+  .catch(logger.warn);
 const isProxyDebug = SSR_PROXY_DEBUG ? String(SSR_PROXY_DEBUG).toLowerCase() === 'true' : false;
 const proxyTimeout = SSR_PROXY_TIMEOUT ? Number(SSR_PROXY_TIMEOUT) : 3000;
 const proxy = async (req, res) => {
@@ -116,11 +118,11 @@ export default async (req, res) => {
       .set('Cache-Control', cacheControl);
   };
   const fallback = (err, status = 500) => {
-    if (url !== '/fallback' && (/\/[^/.]+$/.test(url) || /\.x?html$/.test(url))) {
+    if (url !== '/~fallback' && (/\/[^/.]+$/.test(url) || /\.x?html$/.test(url))) {
       setStatusAndCache(status, 'public, max-age=120')
         .send('<html><head>'
                 + '<meta http-equiv="refresh" content="0; '
-                + `url=/fallback?status=${status}&url=${encodeURIComponent(url)}"/>`
+                + `url=/~fallback?status=${status}&url=${encodeURIComponent(url)}"/>`
                 + `</head><body>${err.toString()}</body></html>`);
     } else {
       setStatusAndCache(status, 'public, max-age=120, s-maxage=600')
@@ -167,15 +169,6 @@ export default async (req, res) => {
     res.sendStatus(400);
     return;
   }
-  (async () => {
-    await readingStylesManifest;
-    if (cssFilename && !res.headersSent) {
-      // https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/103 :zap:
-      res.writeEarlyHints({
-        link: `</${cssFilename}>; rel=preload; as=style`,
-      });
-    }
-  })();
   /*
     Check Response methods used by Astro Node.js integration:
     https://github.com/withastro/astro/blob/main/packages/integrations/node/src/nodeMiddleware.ts
@@ -184,8 +177,9 @@ export default async (req, res) => {
   /* eslint-disable prefer-rest-params */
   // @ts-ignore
   res.writeHead = function writeHead(status, headers) {
-    if (status === 200 && headers && cssFilename) {
-      headers['X-Style-Link'] = cssFilename;
+    if (status === 200 && headers && cssFilepath) {
+      // https://community.cloudflare.com/t/early-hints-need-more-data-before-switching-over/342888/21
+      headers.Link = `<${cssFilepath}>; rel=preload; as=style`;
     }
     _writeHead.apply(res, [status, headers]);
   };

package/packages/ssr/lib/firebase/serve-storefront.js.map

@@ -1 +1 @@
-{"version":3,"file":"serve-storefront.js","sourceRoot":"","sources":["../../src/firebase/serve-storefront.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"serve-storefront.js","sourceRoot":"","sources":["../../src/firebase/serve-storefront.ts"],"names":[],"mappings":"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"}

package/packages/ssr/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/ssr",
   "type": "module",
-  "version": "0.23.2",
+  "version": "0.24.0",
   "description": "E-Com Plus Cloud Commerce storefront SSR",
   "main": "lib/index.js",
   "exports": {
@@ -24,21 +24,21 @@
     "build:workers": "npx tsc -p src/cloudflare --outDir cloudflare && npx eslint --ext .js cloudflare --fix"
   },
   "dependencies": {
-    "@astrojs/node": "5.3.2",
+    "@astrojs/node": "5.3.4",
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/firebase": "workspace:*",
     "@cloudcommerce/i18n": "workspace:*",
     "@ecomplus/utils": "1.5.0-rc.5",
     "@headlessui/vue": "^1.7.15",
     "@vueuse/core": "10.3.0",
-    "astro": "2.10.1",
+    "astro": "2.10.9",
     "firebase-admin": "^11.10.1",
     "firebase-functions": "^4.4.1",
     "vue": "^3.3.4"
   },
   "devDependencies": {
     "@cloudcommerce/types": "workspace:*",
-    "@cloudflare/workers-types": "^4.20230801.0",
+    "@cloudflare/workers-types": "^4.20230807.0",
     "@firebase/app-types": "^0.9.0"
   }
 }

package/packages/ssr/src/cloudflare/swr-worker.ts

@@ -4,7 +4,6 @@
 const HEADER_CACHE_CONTROL = 'Cache-Control';
 const HEADER_SSR_TOOK = 'X-Load-Took';
 const HEADER_STALE_AT = 'X-Edge-Stale-At';
-const HEADER_STYLE_LINK = 'X-Style-Link';
 
 interface ParsedCacheControl {
   'max-age'?: number;
@@ -69,25 +68,100 @@ const toCacheRes = (response: Response, cacheControl?: string | null, staleAt?:
   });
 };
 
-const swr = async (event: FetchEvent) => {
-  if (event.request.method !== 'GET') {
-    return fetch(event.request);
+const checkToKvCache = (newCacheRes: Response) => {
+  return newCacheRes.status === 200
+    && newCacheRes.headers.get('Content-Type')?.includes('text/html');
+};
+
+const putKvCache = async (kv: KVNamespace, kvKey: string, newCacheRes: Response) => {
+  const newKvRes = new Response(newCacheRes.clone().body, { status: 200 });
+  const body = await newKvRes.text();
+  const headers: Record<string, string> = {};
+  newCacheRes.headers.forEach((value, key) => {
+    headers[key] = value;
+  });
+  const kvValue = JSON.stringify({ body, headers });
+  return kv.put(kvKey, kvValue, { expirationTtl: 3600 * 24 * 30 });
+};
+
+export type Env = Record<`OVERRIDE_${string}`, string | undefined> & {
+  PERMA_CACHE: KVNamespace | undefined;
+};
+
+const swr = async (_request: Request, env: Env, ctx: ExecutionContext) => {
+  const url = new URL(_request.url);
+  const { hostname, pathname } = url;
+  const hostOverride = env[`OVERRIDE_${hostname}`];
+  if (hostOverride) {
+    url.hostname = hostOverride;
+  }
+  const bypassEarly = () => {
+    return !hostOverride
+      ? fetch(_request)
+      : fetch(new Request(url.href, _request));
+  };
+  if (_request.method !== 'GET') {
+    return bypassEarly();
   }
-  const { pathname } = new URL(event.request.url);
   if (
     pathname === '/_image'
     || pathname.startsWith('/~')
     || pathname.startsWith('/api/')
     || pathname.startsWith('/_feeds/')
   ) {
-    return fetch(event.request);
+    return bypassEarly();
   }
-  const [uri] = event.request.url.split('?', 2);
-  const request = new Request(`${uri}?t=${Date.now()}`, event.request);
-  const cacheKey = new Request(`${uri}?v=29`, {
-    method: event.request.method,
+  const [uri] = url.href.split('?', 2);
+  const request = new Request(`${uri}?t=${Date.now()}`, _request);
+  const v = 38;
+  const cacheKey = new Request(`${uri}?v=${(v + 1)}`, {
+    method: _request.method,
   });
-  const cachedRes = await caches.default.match(cacheKey);
+  const kvKey = `${v}${uri.replace('https:/', '')}`;
+  const kv = env.PERMA_CACHE;
+  let cachedRes: Response | null | undefined;
+  let edgeSource = '';
+  try {
+    const gettingCache = caches.default.match(cacheKey);
+    let kvStoredRes: typeof cachedRes;
+    const gettingKv = kv
+      ? kv.get(kvKey, { type: 'json' }).then((value: any) => {
+        if (value) {
+          const { body, headers } = value as { body: string, headers: Record<string, string> };
+          kvStoredRes = new Response(body, { headers, status: 200 });
+          return kvStoredRes;
+        }
+        kvStoredRes = null;
+        return undefined;
+      })
+      : Promise.resolve(undefined);
+    cachedRes = await Promise.race([
+      new Promise((resolve) => {
+        gettingCache.then((fromCache) => {
+          if (fromCache) {
+            edgeSource = 'cache';
+            resolve(fromCache);
+          } else if (kvStoredRes !== undefined) {
+            resolve(kvStoredRes);
+          } else {
+            gettingKv.finally(() => resolve(kvStoredRes));
+          }
+        });
+      }) as Promise<typeof cachedRes>,
+      new Promise((resolve) => {
+        gettingKv.then((fromKv) => {
+          if (fromKv) {
+            edgeSource = 'kv';
+            resolve(fromKv);
+          } else {
+            gettingCache.then((fromCache) => resolve(fromCache));
+          }
+        });
+      }) as Promise<typeof cachedRes>,
+    ]);
+  } catch {
+    //
+  }
   let edgeState = 'miss';
   if (cachedRes) {
     const cachedStaleAt = Number(cachedRes.headers.get(HEADER_STALE_AT));
@@ -95,8 +169,11 @@ const swr = async (event: FetchEvent) => {
       edgeState = 'bypass';
     } else if (Date.now() > cachedStaleAt) {
       edgeState = 'stale';
-      event.waitUntil((async () => {
+      ctx.waitUntil((async () => {
         const newCacheRes = toCacheRes(await fetch(request));
+        if (kv && checkToKvCache(newCacheRes)) {
+          ctx.waitUntil(putKvCache(kv, kvKey, newCacheRes));
+        }
         return caches.default.put(cacheKey, newCacheRes);
       })());
     } else {
@@ -107,22 +184,18 @@ const swr = async (event: FetchEvent) => {
   const { cacheControl, staleAt } = resolveCacheControl(response);
   if (!cachedRes && response.ok) {
     const newCacheRes = toCacheRes(response, cacheControl, staleAt);
-    event.waitUntil(caches.default.put(cacheKey, newCacheRes));
+    ctx.waitUntil(caches.default.put(cacheKey, newCacheRes));
+    if (kv && checkToKvCache(newCacheRes)) {
+      ctx.waitUntil(putKvCache(kv, kvKey, newCacheRes));
+    }
   }
-  const headers: Record<string, string | null> = {
+  return addHeaders(response, {
     [HEADER_CACHE_CONTROL]: cacheControl,
     'x-edge-state': edgeState,
-  };
-  const styleLink = response.headers.get(HEADER_STYLE_LINK);
-  if (styleLink) {
-    // https://developers.cloudflare.com/workers/examples/103-early-hints/
-    headers.link = `</${styleLink}>; rel=preload; as=style`;
-    headers[HEADER_STYLE_LINK] = null;
-  }
-  return addHeaders(response, headers);
+    'x-edge-src': edgeSource,
+  });
 };
 
-// eslint-disable-next-line no-restricted-globals
-addEventListener('fetch', (event) => {
-  event.respondWith(swr(event));
-});
+export default {
+  fetch: swr,
+};

package/packages/ssr/src/firebase/serve-storefront.ts

@@ -24,22 +24,26 @@ let imagesManifest: string;
 type BuiltImage = { filename: string, width: number, height: number };
 const builtImages: BuiltImage[] = [];
 
-let cssFilename: string | undefined;
-const readingStylesManifest = new Promise((resolve) => {
-  readFile(joinPath(baseDir, 'dist/server/stylesheets.csv'), 'utf-8')
-    .then((stylesManifest) => {
-      const cssFiles: string[] = [];
-      stylesManifest.split(/\n/).forEach((line) => {
-        const [filename] = line.split(',');
-        if (filename) cssFiles.push(filename);
-      });
-      if (cssFiles.length === 1) {
-        [cssFilename] = cssFiles;
+let cssFilepath: string | undefined;
+readFile(joinPath(baseDir, 'dist/server/stylesheets.csv'), 'utf-8')
+  .then((stylesManifest) => {
+    const cssFiles: string[] = [];
+    stylesManifest.split(/\n/).forEach((line) => {
+      const [filename] = line.split(',');
+      if (filename) cssFiles.push(filename);
+    });
+    if (cssFiles.length === 1) {
+      cssFilepath = cssFiles[0]?.replace('./dist/client/', '/');
+      if (
+        cssFilepath
+        && cssFilepath.charAt(0) !== '/'
+        && !cssFilepath.startsWith('https://')
+      ) {
+        cssFilepath = `/${cssFilepath}`;
       }
-    })
-    .catch(logger.warn)
-    .finally(() => resolve(null));
-});
+    }
+  })
+  .catch(logger.warn);
 
 const isProxyDebug = SSR_PROXY_DEBUG ? String(SSR_PROXY_DEBUG).toLowerCase() === 'true' : false;
 const proxyTimeout = SSR_PROXY_TIMEOUT ? Number(SSR_PROXY_TIMEOUT) : 3000;
@@ -139,11 +143,11 @@ export default async (req: Request, res: Response) => {
   };
 
   const fallback = (err: any, status = 500) => {
-    if (url !== '/fallback' && (/\/[^/.]+$/.test(url) || /\.x?html$/.test(url))) {
+    if (url !== '/~fallback' && (/\/[^/.]+$/.test(url) || /\.x?html$/.test(url))) {
       setStatusAndCache(status, 'public, max-age=120')
         .send('<html><head>'
           + '<meta http-equiv="refresh" content="0; '
-            + `url=/fallback?status=${status}&url=${encodeURIComponent(url)}"/>`
+            + `url=/~fallback?status=${status}&url=${encodeURIComponent(url)}"/>`
           + `</head><body>${err.toString()}</body></html>`);
     } else {
       setStatusAndCache(status, 'public, max-age=120, s-maxage=600')
@@ -192,15 +196,6 @@ export default async (req: Request, res: Response) => {
     return;
   }
 
-  (async () => {
-    await readingStylesManifest;
-    if (cssFilename && !res.headersSent) {
-      // https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/103 :zap:
-      res.writeEarlyHints({
-        link: `</${cssFilename}>; rel=preload; as=style`,
-      });
-    }
-  })();
   /*
   Check Response methods used by Astro Node.js integration:
   https://github.com/withastro/astro/blob/main/packages/integrations/node/src/nodeMiddleware.ts
@@ -209,8 +204,9 @@ export default async (req: Request, res: Response) => {
   /* eslint-disable prefer-rest-params */
   // @ts-ignore
   res.writeHead = function writeHead(status: number, headers: OutgoingHttpHeaders) {
-    if (status === 200 && headers && cssFilename) {
-      headers['X-Style-Link'] = cssFilename;
+    if (status === 200 && headers && cssFilepath) {
+      // https://community.cloudflare.com/t/early-hints-need-more-data-before-switching-over/342888/21
+      headers.Link = `<${cssFilepath}>; rel=preload; as=style`;
     }
     _writeHead.apply(res, [status, headers]);
   };