@akinon/next 2.0.79-beta.1 → 2.0.79-rc.0

package/utils/pz-segments.ts

@@ -40,44 +40,15 @@ export function encodePzValue(
     .join(config.separator);
 }
 
-/**
- * Inverse of `encodePzValue`.
- *
- * The `url` segment is `encodeURIComponent(fullUrl)`, and that leaves `-`
- * alone — so a pathname containing the separator (`/collections/summer--sale`)
- * splits into extra parts. Only `url` can do that (locale, currency and the
- * custom segments are validated slugs), so the segments before it are read
- * from the front, the ones after it from the back, and whatever is left in
- * the middle is the url re-joined. A purely positional read would hand the
- * url's tail to the segment after it — with a preview segment present that
- * meant rendering the wrong preview (or live) with a misleading banner.
- */
 export function decodePzValue(
   pzValue: string,
   config: PzSegmentsConfig
 ): Record<string, string> {
   const parts = pzValue.split(config.separator);
   const result: Record<string, string> = {};
-  const urlIndex = config.segments.findIndex((seg) => seg.name === 'url');
 
-  if (urlIndex === -1 || parts.length <= config.segments.length) {
-    config.segments.forEach((seg, index) => {
-      result[seg.name] = parts[index] ?? '';
-    });
-    return result;
-  }
-
-  const trailing = config.segments.length - urlIndex - 1;
   config.segments.forEach((seg, index) => {
-    if (index < urlIndex) {
-      result[seg.name] = parts[index] ?? '';
-    } else if (index === urlIndex) {
-      result[seg.name] = parts
-        .slice(urlIndex, parts.length - trailing)
-        .join(config.separator);
-    } else {
-      result[seg.name] = parts[parts.length - trailing + (index - urlIndex - 1)] ?? '';
-    }
+    result[seg.name] = parts[index] ?? '';
   });
 
   return result;

package/utils/server-variables.ts

@@ -6,12 +6,5 @@ const { locales, defaultLocaleValue, defaultCurrencyCode } =
 export const ServerVariables = {
   locale: locales.find((l) => l.value === defaultLocaleValue)?.value ?? '',
   currency: defaultCurrencyCode,
-  globalHeaders: {},
-  /**
-   * Which named widget preview the current render belongs to, decoded from
-   * the pz route segment by withSegmentDefaults. Empty for ordinary traffic.
-   * Only ever acted on together with draft mode, so a value left behind by a
-   * concurrent request cannot leak preview content to a normal visitor.
-   */
-  previewId: ''
+  globalHeaders: {}
 };

package/with-pz-config.js

@@ -30,6 +30,10 @@ const defaultConfig = {
       {
         protocol: 'https',
         hostname: '**.akinoncdn.com'
+      },
+      {
+        protocol: 'https',
+        hostname: '**.akinoncloudcdn.com'
       }
     ]
   },
@@ -74,7 +78,8 @@ const defaultConfig = {
         acc[`@akinon/${plugin}`] = false;
         return acc;
       }, {}),
-      translations: false
+      translations: false,
+      '@opentelemetry/exporter-jaeger': false
     };
     // Ensure webpack can resolve deps from the app's node_modules when
     // compiling transpiled packages (e.g. @akinon/next) whose imports

package/utils/preview-token.ts

@@ -1,111 +0,0 @@
-import { isValidPreviewId } from './preview';
-
-/**
- * Signed, expiring preview entry tokens.
- *
- * The storefront never hands out its PREVIEW_SECRET: the editor asks
- * `/api/preview/link` (proving it is an editor user with its Omnitron token)
- * and receives a token that names ONE preview and dies at `expiresAt`. A leaked
- * link therefore exposes nothing lasting, and rotating the secret invalidates
- * every outstanding link at once.
- *
- * Format: `v1.<previewId>.<expiresAt unix seconds>.<base64url HMAC-SHA256>`.
- * Web Crypto only, so the same code runs in Node route handlers and on the
- * edge.
- */
-export const PREVIEW_TOKEN_VERSION = 'v1';
-
-/** How long an editor-issued preview link stays valid unless configured. */
-export const DEFAULT_PREVIEW_LINK_TTL_SECONDS = 24 * 60 * 60;
-
-export interface PreviewTokenClaims {
-  previewId: string;
-  /** Unix time in SECONDS. */
-  expiresAt: number;
-}
-
-export type PreviewTokenVerdict =
-  | { ok: true; claims: PreviewTokenClaims }
-  | { ok: false; reason: 'malformed' | 'expired' | 'invalid-signature' };
-
-// Created per call: the module is also imported where TextEncoder only shows
-// up after a polyfill (jsdom), and the cost is negligible.
-const encode = (value: string) => new TextEncoder().encode(value);
-
-const base64url = (bytes: ArrayBuffer): string => {
-  const view = new Uint8Array(bytes);
-  let binary = '';
-  for (let i = 0; i < view.length; i++) {
-    binary += String.fromCharCode(view[i]);
-  }
-  return btoa(binary).replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '');
-};
-
-const hmac = async (secret: string, payload: string): Promise<string> => {
-  const key = await crypto.subtle.importKey(
-    'raw',
-    encode(secret),
-    { name: 'HMAC', hash: 'SHA-256' },
-    false,
-    ['sign']
-  );
-  return base64url(await crypto.subtle.sign('HMAC', key, encode(payload)));
-};
-
-/** Constant-time string equality — a signature check must not leak by timing. */
-const timingSafeEqual = (a: string, b: string): boolean => {
-  if (a.length !== b.length) return false;
-  let diff = 0;
-  for (let i = 0; i < a.length; i++) {
-    diff |= a.charCodeAt(i) ^ b.charCodeAt(i);
-  }
-  return diff === 0;
-};
-
-const payloadOf = ({ previewId, expiresAt }: PreviewTokenClaims): string =>
-  `${PREVIEW_TOKEN_VERSION}.${previewId}.${expiresAt}`;
-
-export const signPreviewToken = async (
-  claims: PreviewTokenClaims,
-  secret: string
-): Promise<string> => {
-  if (!isValidPreviewId(claims.previewId)) {
-    throw new Error('signPreviewToken: invalid preview id');
-  }
-  if (!Number.isInteger(claims.expiresAt) || claims.expiresAt <= 0) {
-    throw new Error('signPreviewToken: invalid expiry');
-  }
-  const payload = payloadOf(claims);
-  return `${payload}.${await hmac(secret, payload)}`;
-};
-
-export const verifyPreviewToken = async (
-  token: string,
-  secret: string,
-  nowMs: number = Date.now()
-): Promise<PreviewTokenVerdict> => {
-  const parts = typeof token === 'string' ? token.split('.') : [];
-  if (parts.length !== 4 || parts[0] !== PREVIEW_TOKEN_VERSION) {
-    return { ok: false, reason: 'malformed' };
-  }
-  const [, previewId, expiresAtRaw, signature] = parts;
-  const expiresAt = Number(expiresAtRaw);
-  if (
-    !isValidPreviewId(previewId) ||
-    !/^\d+$/.test(expiresAtRaw) ||
-    !Number.isSafeInteger(expiresAt) ||
-    !signature
-  ) {
-    return { ok: false, reason: 'malformed' };
-  }
-  // Signature before expiry: an attacker must not learn which expired tokens
-  // were once valid.
-  const expected = await hmac(secret, payloadOf({ previewId, expiresAt }));
-  if (!timingSafeEqual(signature, expected)) {
-    return { ok: false, reason: 'invalid-signature' };
-  }
-  if (expiresAt * 1000 <= nowMs) {
-    return { ok: false, reason: 'expired' };
-  }
-  return { ok: true, claims: { previewId, expiresAt } };
-};

package/utils/preview.ts

@@ -1,83 +0,0 @@
-/**
- * Widget preview contract — shared by the middleware/route handler that
- * enters preview, the pz segment that carries which preview is being viewed,
- * and the widget fetch layer that resolves the preview copies.
- *
- * The theme editor writes the other half of this contract: it creates named
- * previews and stores each one's pages under `<slug>-preview-<id>`. The two
- * sides must never drift.
- */
-
-/** Suffix before the preview id — hyphenated because Omnitron slugifies. */
-export const PREVIEW_SLUG_SUFFIX = '-preview';
-
-/** Remembers which named preview this browser is viewing. */
-export const PREVIEW_ID_COOKIE = 'pz-preview-id';
-
-/** Next.js's own draft-mode cookie — set by `draftMode().enable()`. */
-export const DRAFT_MODE_COOKIE = '__prerender_bypass';
-
-/** Query key on the editor's link, consumed by the /api/preview handler. */
-export const PREVIEW_ID_QUERY_PARAM = 'preview_id';
-
-/**
- * The pz segment carrying the preview id into the render.
- *
- * A cookie cannot be used directly: the pages that render widgets are
- * `dynamic = 'force-static'`, and Next.js blanks `cookies()`/`headers()`
- * under that config (draftMode is the exception). Route params always
- * survive, so the middleware resolves the cookie into this segment and the
- * server components read it from there. See settings.js `pzSegments`.
- */
-export const PREVIEW_PZ_SEGMENT = 'preview';
-
-/**
- * Ids come from a cookie, so they are validated everywhere they are used:
- * lowercase slug words joined by single hyphens, bounded length — exactly
- * what the editor produces (see slugifyPreviewId there). No `--` anywhere:
- * that is the pz segment separator, and an id containing it would make the
- * segment undecodable.
- */
-export const isValidPreviewId = (id: unknown): id is string =>
-  typeof id === 'string' &&
-  id.length <= 32 &&
-  /^[a-z0-9]+(?:-[a-z0-9]+)*$/.test(id);
-
-/** The slug a widget's copy lives under inside one named preview. */
-export const previewSlug = (slug: string, previewId: string): string =>
-  `${slug}${PREVIEW_SLUG_SUFFIX}-${previewId}`;
-
-/**
- * True for slugs shaped like a preview copy of something. A HEURISTIC — a
- * live slug can legitimately end this way (a custom page named
- * `summer-preview-2026`), so the fetch layer does not use it to decide
- * whether to overlay; see `isPreviewCopySlug`.
- */
-export const isPreviewSlug = (slug: string): boolean =>
-  /-preview-[a-z0-9-]+$/.test(slug);
-
-/**
- * True when `slug` is already the copy of something inside THIS preview —
- * the exact check the fetch layer needs so preview slugs are never nested,
- * without misreading live slugs that merely look like one.
- */
-export const isPreviewCopySlug = (slug: string, previewId: string): boolean =>
-  previewId !== '' && slug.endsWith(previewSlug('', previewId));
-
-/**
- * Resolves the pz segment value from the request — used by settings.js.
- * An invalid or absent cookie yields '' (no preview), which the fetch layer
- * treats as "render live".
- *
- * The id only counts alongside Next's draft-mode cookie: without it the
- * request renders live anyway, and folding an unauthenticated cookie value
- * into the route segment would let any visitor mint a fresh ISR/Redis cache
- * key per request.
- */
-export const resolvePreviewSegment = (req: {
-  cookies: { get: (name: string) => { value: string } | undefined };
-}): string => {
-  if (!req.cookies.get(DRAFT_MODE_COOKIE)?.value) return '';
-  const value = req.cookies.get(PREVIEW_ID_COOKIE)?.value ?? '';
-  return isValidPreviewId(value) ? value : '';
-};