@profullstack/footer 0.2.2 → 0.2.4

package/README.md

@@ -6,8 +6,8 @@ One footer for every Profullstack site: your links, the copyright line, and the
 **Publish once, every site updates.** The markup and CSS ship as data
 (`template.json`). At render time each site fetches
 `https://cdn.jsdelivr.net/npm/@profullstack/footer@latest/template.json`
-(1 h cache, 1.5 s timeout, the bundled copy as the fallback), so a release reaches
-every site within the hour with no bump, rebuild or redeploy. Install it as
+(15 min cache, 1.5 s timeout, the bundled copy as the fallback), so a release reaches
+every site within about an hour (sooner on sites without a page cache) with no bump, rebuild or redeploy. Install it as
 `"@profullstack/footer": "latest"` too, so the render code follows on the next install.
 
 It renders on the server: the ring's verifier reads your HTML and never runs

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@profullstack/footer",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "type": "module",
   "description": "One footer for every Profullstack site: links, copyright and the << Profullstack >> webring nav with Random. Sites render the @latest template from the CDN at runtime, so a release updates every site without a redeploy.",
   "keywords": ["footer", "webring", "openwebring", "copyright", "react", "nextjs", "hono", "ssr"],

package/src/index.js

@@ -23,7 +23,10 @@ export { bundled as bundledTemplate };
 
 export const TEMPLATE_URL = 'https://cdn.jsdelivr.net/npm/@profullstack/footer@latest/template.json';
 
-const DEFAULT_TTL_MS = 60 * 60 * 1000;
+// 15 min: a page cache (ISR, 1 h) and Next's fetch cache both sit in front of
+// this one and each serves one stale copy before refreshing, so the layers add up.
+const DEFAULT_TTL_MS = 15 * 60 * 1000;
+const NEXT_REVALIDATE_S = 300;
 const FAILURE_TTL_MS = 5 * 60 * 1000;
 
 /** @type {{ template: any, until: number, pending: Promise<any> | null }} */
@@ -51,6 +54,11 @@ export async function latestTemplate(opts = {}) {
   const env = typeof process !== 'undefined' ? process.env ?? {} : {};
   if (env.PROFULLSTACK_FOOTER_OFFLINE === '1') return bundled;
   const now = (opts.now ?? Date.now)();
+  // Under Next.js, always go through fetch: Next caches it (revalidate 300 s)
+  // AND marks the route as revalidating. Answering from memory instead left
+  // every page rendered after the first at build time fully static
+  // (s-maxage=31536000), so it never saw a template release.
+  if (!opts.fetch && underNext()) return fetchFresh(opts, env, now);
   if (cache.template && now < cache.until) return cache.template;
   // Stale while revalidating: hand back what we have, refresh once.
   if (cache.template && cache.pending) return cache.template;
@@ -65,7 +73,7 @@ export async function latestTemplate(opts = {}) {
       const ctrl = typeof AbortController === 'function' ? new AbortController() : null;
       const timer = ctrl ? setTimeout(() => ctrl.abort(), opts.timeoutMs ?? 1500) : null;
       /** @type {RequestInit & { next?: { revalidate: number } }} */
-      const init = { signal: ctrl?.signal, headers: { accept: 'application/json' }, next: { revalidate: Math.round(ttl / 1000) } };
+      const init = { signal: ctrl?.signal, headers: { accept: 'application/json' }, next: { revalidate: NEXT_REVALIDATE_S } };
       const res = await doFetch(url, init).finally(() => timer && clearTimeout(timer));
       if (!res.ok) throw new Error(`HTTP ${res.status}`);
       const t = await res.json();
@@ -84,6 +92,38 @@ export async function latestTemplate(opts = {}) {
   return cache.template ?? cache.pending;
 }
 
+/** Next.js patches fetch (and marks it) and sets NEXT_RUNTIME in its servers. */
+function underNext() {
+  // @ts-ignore Next's marker on its patched fetch
+  if (globalThis.fetch && globalThis.fetch.__nextPatched) return true;
+  // Written out literally so Next's compile-time define can replace it.
+  return typeof process !== 'undefined' && !!process.env.NEXT_RUNTIME;
+}
+
+/** One uncached-by-us fetch, for runtimes (Next) that cache fetch themselves. */
+async function fetchFresh(opts, env, now) {
+  try {
+    const ctrl = typeof AbortController === 'function' ? new AbortController() : null;
+    const timer = ctrl ? setTimeout(() => ctrl.abort(), opts.timeoutMs ?? 1500) : null;
+    const res = await globalThis
+      .fetch(opts.url ?? env.PROFULLSTACK_FOOTER_TEMPLATE_URL ?? TEMPLATE_URL, {
+        signal: ctrl?.signal,
+        headers: { accept: 'application/json' },
+        // @ts-ignore Next's fetch extension
+        next: { revalidate: NEXT_REVALIDATE_S },
+      })
+      .finally(() => timer && clearTimeout(timer));
+    if (!res.ok) throw new Error(`HTTP ${res.status}`);
+    const t = await res.json();
+    if (!usable(t)) throw new Error('template not usable by this renderer');
+    cache.template = t;
+    cache.until = now + (opts.ttlMs ?? DEFAULT_TTL_MS);
+    return t;
+  } catch {
+    return cache.template ?? bundled;
+  }
+}
+
 /** Forget the cached template (tests, or a manual refresh hook). */
 export function resetTemplateCache() {
   cache.template = null;

package/src/template.js

@@ -9,7 +9,7 @@
 // render.js does not fill; older installs then keep their bundled template.
 
 export default {
-  version: '0.2.2',
+  version: '0.2.4',
   renderer: 1,
   css: [
     '.pfs-footer{--pfs-footer-muted:color-mix(in srgb,currentColor 62%,transparent);--pfs-footer-gap:.5rem 1.25rem;--pfs-footer-size:.875rem;',

package/template.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.2.2",
+  "version": "0.2.4",
   "renderer": 1,
   "css": ".pfs-footer{--pfs-footer-muted:color-mix(in srgb,currentColor 62%,transparent);--pfs-footer-gap:.5rem 1.25rem;--pfs-footer-size:.875rem;border-top:1px solid color-mix(in srgb,currentColor 14%,transparent);font-size:var(--pfs-footer-size);line-height:1.5;color:inherit}.pfs-footer__inner{max-width:72rem;margin:0 auto;padding:1.5rem 1rem;display:flex;flex-direction:column;align-items:center;gap:.75rem;text-align:center}.pfs-footer a{color:var(--pfs-footer-muted);text-decoration:none}.pfs-footer a:hover,.pfs-footer a:focus-visible{color:inherit;text-decoration:underline}.pfs-footer__links{display:flex;flex-wrap:wrap;justify-content:center;gap:var(--pfs-footer-gap)}.pfs-footer__ring{display:flex;flex-wrap:wrap;justify-content:center;align-items:center;gap:.6rem}.pfs-footer__copy{margin:0;color:var(--pfs-footer-muted)}.pfs-footer__copy a{color:inherit}",
   "link": "<a href=\"{{href}}\"{{#rel}} rel=\"{{rel}}\"{{/rel}}>{{label}}</a>",