@elytracms/next 0.0.93 → 0.0.95

package/dist/index.js

@@ -1,15 +1,17 @@
 import { registerComponents, createRenderContext, renderDocumentBodyItems, documentBodyItems, serializeListingQuery, documentBodyRichTextValues, documentBodyCompositionNodes, richTextEmbedsInValue, collectReferencedAssetIds, collectRichTextRefsInValue, collectReferencedRelations, collectReferencedListings, collectReferencedRichTextLinks, listingRequestOf } from '@elytracms/core/runtime-renderer';
 import { isBlockSequenceValueShape } from '@elytracms/core/rich-text';
-import { jsx, Fragment } from 'react/jsx-runtime';
-import { cacheTags, isDocumentHistory, resolvedAsset, parseDeliveredDocuments, createContentClient, createContentContext } from '@elytracms/core/content';
-import { DEFAULT_SEO_FIELD, parseLocaleConfig, documentKey, liveRedirectRecords, SEO_SUBFIELDS, splitLocalePath, DRAFT_PERSPECTIVE, splitPath, localeUrlPath, variantOf, DRAFT_VARIANT, createRouter, presentationBodyFields, redirectRecordSchema } from '@elytracms/core/cms-core';
+import { jsx, Fragment, jsxs } from 'react/jsx-runtime';
+import { cacheTags, isDocumentHistory, assetWithoutUrlIssue, resolvedAsset, parseDeliveredDocuments, parseDeliveredRedirects, createContentClient, createContentContext } from '@elytracms/core/content';
+import { DEFAULT_SEO_FIELD, parseLocaleConfig, documentKey, readLiveRedirects, SEO_SUBFIELDS, splitLocalePath, DRAFT_PERSPECTIVE, splitPath, localeUrlPath, variantOf, DRAFT_VARIANT, createRouter, presentationBodyFields } from '@elytracms/core/cms-core';
 export { DRAFT_PERSPECTIVE, documentSchema, localeConfigSchema, localeUrlPath, parseLocaleConfig, redirectRecordSchema, resolveLocale, routeRecordSchema, splitLocalePath, textDirection, variantOf } from '@elytracms/core/cms-core';
+import { assetReadLocale, redirectRecordKind } from '@elytracms/core/persistence';
 import { revalidateTag, cacheTag } from 'next/cache';
 import { draftMode } from 'next/headers';
 import { redirect, notFound, permanentRedirect } from 'next/navigation';
 import { COMPOSITE_KEY_SEPARATOR } from '@elytracms/core/project-graph';
 import { verifyRevalidationSignature, readRevalidationBody, REVALIDATE_SIGNATURE_HEADER } from '@elytracms/core/revalidation';
 export { REVALIDATE_SIGNATURE_HEADER, revalidationEventSchema, signRevalidationBody, signedRevalidationRequest } from '@elytracms/core/revalidation';
+import { INGEST_MAX_BODY_BYTES, readIngestPayload, INGEST_RECEIVER_PATH, signedIngestRequest, convexSiteUrl } from '@elytracms/core/ingest';
 import NextImage from 'next/image';
 import { normalizeImageSource } from '@elytracms/components';
 import { projectFrontendUrl, resolveProject } from '@elytracms/core/studio-core';
@@ -120,7 +122,7 @@ function createStaticContentSource(data) {
   const locales = parseLocaleConfig(data.locales);
   const routes = data.routes ?? [];
   const redirects = data.redirects ?? [];
-  const assetUrl = data.assetUrl ?? ((asset) => `asset://unresolved/${asset.storageKey}`);
+  const assetUrl = (asset) => asset.url ?? data.assetUrl?.(asset);
   const collections = /* @__PURE__ */ new Map();
   for (const collection of data.collections ?? []) collections.set(collection.id, collection);
   const documents = /* @__PURE__ */ new Map();
@@ -134,12 +136,16 @@ function createStaticContentSource(data) {
   }
   const assets = /* @__PURE__ */ new Map();
   for (const record2 of data.assets ?? []) assets.set(record2.id, record2);
+  const sourceIssues = [
+    ...data.sourceIssues ?? [],
+    ...[...assets.values()].filter((record2) => !assetUrl(record2)).map((record2) => assetWithoutUrlIssue(record2.id))
+  ];
   const lookupFor = (_perspective) => ({
     collection: (id) => collections.get(id),
     document: (ref) => documents.get(documentKey(ref)),
     documents: (collectionId) => byCollection.get(collectionId) ?? [],
     asset: (id) => assets.get(id),
-    assetUrl: (asset) => asset.url ?? assetUrl(asset)
+    assetUrl
   });
   const client = (init) => createContentClient({
     lookup: lookupFor(init.perspective),
@@ -150,7 +156,7 @@ function createStaticContentSource(data) {
     }),
     routes,
     redirects,
-    ...data.sourceIssues ? { sourceIssues: data.sourceIssues } : {}
+    ...sourceIssues.length > 0 ? { sourceIssues } : {}
   });
   return {
     projectId: data.projectId,
@@ -161,7 +167,14 @@ function createStaticContentSource(data) {
     // `asset`-typed Image prop (an asset id) to a usable url + intrinsic
     // dimensions. Baked into the (serializable) render outcome by the route
     // helper, so a cached page keeps its images during a backend outage.
-    assets: () => [...assets.values()].map((record2) => resolvedAsset(record2, record2.url ?? assetUrl(record2))),
+    // EC-632: in the requested locale (the route helper passes the request's), so a
+    // localized alt is baked in the locale the page renders in.
+    // EC-633: a record with no URL is no resolved asset — not baked, so the page renders
+    // the empty state the canvas renders for it (and `sourceIssues` names it).
+    assets: (locale) => [...assets.values()].flatMap((record2) => {
+      const asset = resolvedAsset(record2, assetUrl(record2), assetReadLocale(locales, locale));
+      return asset ? [asset] : [];
+    }),
     // EC-499: the schema the route helper reads a collection's declared
     // `presentation` from (which field is the delivery body, which component
     // wraps it). Already prefetched for the lookup above — exposing it costs
@@ -173,8 +186,16 @@ async function createContentSnapshot(adapter, projectId, options) {
   const documentRecords = await adapter.cms.listDocuments(projectId);
   const versionRecords = await adapter.cms.listAllDocumentVersions(projectId);
   const assetRecords = await adapter.assets.listAssets(projectId);
-  const redirectRecords = await adapter.redirects.listRedirects(projectId);
-  const redirects = liveRedirectRecords(redirectRecords);
+  const blobs = adapter.blobs;
+  const servedUrls = /* @__PURE__ */ new Map();
+  await Promise.all(
+    assetRecords.filter((record2) => !record2.url).map(async (record2) => {
+      const url = blobs.resolveUrl ? await blobs.resolveUrl(record2.storageKey).catch(() => void 0) : blobs.url(record2.storageKey);
+      servedUrls.set(record2.id, url || void 0);
+    })
+  );
+  const redirectRecords = await adapter.records(redirectRecordKind).list(projectId);
+  const { redirects, issues: redirectIssues } = readLiveRedirects(redirectRecords);
   const versionsByKey = /* @__PURE__ */ new Map();
   for (const record2 of versionRecords) {
     const key = `${record2.collection}:${record2.docId}`;
@@ -192,13 +213,15 @@ async function createContentSnapshot(adapter, projectId, options) {
   });
   return createStaticContentSource({
     projectId,
+    // EC-628: only for the stored redirects this source serves (an explicit override replaces them).
+    ...options.redirects === void 0 && redirectIssues.length > 0 ? { sourceIssues: redirectIssues } : {},
     locales: options.locales,
     ...options.routes ? { routes: options.routes } : {},
     redirects: options.redirects ? [...options.redirects] : redirects,
     collections: options.collections,
     documents,
     assets: assetRecords,
-    assetUrl: (asset) => adapter.blobs.url(asset.storageKey)
+    assetUrl: (asset) => servedUrls.get(asset.id)
   });
 }
 function seoContextOf(result, assets = []) {
@@ -283,6 +306,15 @@ function canvasWrapContext(result, info) {
     result
   };
 }
+function canvasBeaconProps(result, info) {
+  const document = result.document;
+  return {
+    path: info.url,
+    status: 200,
+    locale: result.tags.locale,
+    ...document ? { collection: document.collection, documentId: document.id } : {}
+  };
+}
 function pathFromSlug(slug) {
   return "/" + (slug ?? []).join("/");
 }
@@ -399,7 +431,7 @@ async function resolveCanvasPage(source, url, perspective, options = {}) {
   }
   const presentation = presentationFor(source, result);
   const body = pageBodyOf(result, presentation);
-  const allAssets = source.assets?.() ?? [];
+  const allAssets = source.assets?.(locale) ?? [];
   const bakedAssets = options.registry ? scopeAssetsToPage(
     allAssets,
     options.registry,
@@ -590,8 +622,13 @@ function createCanvasRoute(options) {
             presentation: outcome.presentation
           }
         );
-        if (!options.wrap) return rendered;
-        return options.wrap(rendered, canvasWrapContext(outcome.result, { url, perspective }));
+        const page = options.wrap ? options.wrap(rendered, canvasWrapContext(outcome.result, { url, perspective })) : rendered;
+        const Beacon = options.analytics;
+        if (!Beacon || perspective !== "published") return page;
+        return /* @__PURE__ */ jsxs(Fragment, { children: [
+          page,
+          /* @__PURE__ */ jsx(Beacon, { ...canvasBeaconProps(outcome.result, { url}) })
+        ] });
       }
     }
   };
@@ -758,6 +795,177 @@ function createRevalidateRoute(options) {
     }
   };
 }
+function createFixedWindowLimiter(options) {
+  const windowMs = options.windowMs ?? 6e4;
+  const now = options.now ?? Date.now;
+  const windows = /* @__PURE__ */ new Map();
+  return {
+    hit(key) {
+      const at = now();
+      for (const [held, window2] of windows) if (at - window2.windowStart >= windowMs) windows.delete(held);
+      const window = windows.get(key);
+      if (!window) {
+        windows.set(key, { windowStart: at, count: 1 });
+        return { allowed: true };
+      }
+      if (window.count >= options.limit) {
+        return { allowed: false, retryAfterSeconds: Math.max(1, Math.ceil((window.windowStart + windowMs - at) / 1e3)) };
+      }
+      window.count += 1;
+      return { allowed: true };
+    },
+    size: () => windows.size
+  };
+}
+function defaultIngestClientKey(request) {
+  const forwarded = request.headers.get("x-forwarded-for")?.split(",")[0]?.trim();
+  if (forwarded) return forwarded;
+  const real = request.headers.get("x-real-ip")?.trim();
+  return real || "unknown";
+}
+function isCrossOrigin(request) {
+  const site = request.headers.get("sec-fetch-site");
+  if (site && site !== "same-origin" && site !== "none") return true;
+  const origin = request.headers.get("origin");
+  if (!origin) return false;
+  try {
+    return new URL(origin).origin !== new URL(request.url).origin;
+  } catch {
+    return true;
+  }
+}
+async function evaluateIngestRequest(input) {
+  const { request } = input;
+  if (request.method !== "POST") {
+    return { ok: false, status: 405, body: { error: "Only POST is accepted." }, headers: { allow: "POST" } };
+  }
+  if (!input.configured) {
+    return { ok: false, status: 503, body: { error: "Ingest is not configured on this site." } };
+  }
+  if (isCrossOrigin(request)) {
+    return { ok: false, status: 403, body: { error: "Cross-origin requests are not accepted." } };
+  }
+  const limited = input.limiter.hit(input.clientKey(request));
+  if (!limited.allowed) {
+    return {
+      ok: false,
+      status: 429,
+      body: { error: "Too many requests \u2014 try again shortly." },
+      headers: { "retry-after": String(limited.retryAfterSeconds) }
+    };
+  }
+  if (input.rawBody === void 0) {
+    return { ok: false, status: 413, body: { error: "The payload is too large." } };
+  }
+  const read = readIngestPayload(input.rawBody);
+  if (!read.ok) {
+    return { ok: false, status: 400, body: { error: read.message, ...read.issues ? { issues: read.issues } : {} } };
+  }
+  if (input.botGate) {
+    const verdict = await input.botGate({ request, payload: read.value });
+    if (!verdict.allow) {
+      return { ok: false, status: 403, body: { error: "Refused by the bot gate.", gate: "bot", reason: verdict.reason } };
+    }
+  }
+  if (!input.enrich) return { ok: true, payload: read.value };
+  return enrichPayload(input.enrich, request, read.value);
+}
+async function enrichPayload(enrich, request, payload) {
+  let enriched;
+  try {
+    enriched = await enrich({ request, payload });
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    return { ok: false, status: 500, body: { error: `The site's ingest enrichment failed: ${message}` } };
+  }
+  const body = JSON.stringify(enriched ?? null);
+  const reread = readIngestPayload(body);
+  if (!reread.ok) {
+    return {
+      ok: false,
+      status: 500,
+      body: { error: "The site's ingest enrichment returned an invalid payload.", ...reread.issues ? { issues: reread.issues } : {} }
+    };
+  }
+  if (new TextEncoder().encode(body).byteLength > INGEST_MAX_BODY_BYTES) {
+    return { ok: false, status: 500, body: { error: "The site's ingest enrichment grew the payload past the receiver's cap." } };
+  }
+  return { ok: true, payload: reread.value };
+}
+async function readCappedBody(request, maxBytes = INGEST_MAX_BODY_BYTES) {
+  const declared = Number(request.headers.get("content-length"));
+  if (Number.isFinite(declared) && declared > maxBytes) return void 0;
+  if (!request.body) return "";
+  const reader = request.body.getReader();
+  const chunks = [];
+  let total = 0;
+  for (; ; ) {
+    const { done, value } = await reader.read();
+    if (done) break;
+    total += value.byteLength;
+    if (total > maxBytes) {
+      await reader.cancel().catch(() => void 0);
+      return void 0;
+    }
+    chunks.push(value);
+  }
+  const bytes = new Uint8Array(total);
+  let offset = 0;
+  for (const chunk of chunks) {
+    bytes.set(chunk, offset);
+    offset += chunk.byteLength;
+  }
+  return new TextDecoder().decode(bytes);
+}
+var NO_STORE = { "cache-control": "no-store" };
+function createIngestRoute(options) {
+  const maxBodyBytes = options.maxBodyBytes ?? INGEST_MAX_BODY_BYTES;
+  if (maxBodyBytes > INGEST_MAX_BODY_BYTES || maxBodyBytes <= 0) {
+    throw new Error(`createIngestRoute: maxBodyBytes must be between 1 and ${INGEST_MAX_BODY_BYTES} (the receiver's cap).`);
+  }
+  const limiter = createFixedWindowLimiter({
+    limit: options.maxRequestsPerMinute ?? 30,
+    ...options.now ? { now: options.now } : {}
+  });
+  const clientKey = options.clientKey ?? defaultIngestClientKey;
+  const receiver = options.siteUrl ? `${options.siteUrl.replace(/\/+$/, "")}${INGEST_RECEIVER_PATH}` : void 0;
+  const fetchImpl = options.fetchImpl ?? fetch;
+  return {
+    async POST(request) {
+      const rawBody = request.method === "POST" ? await readCappedBody(request, maxBodyBytes) : "";
+      const evaluation = await evaluateIngestRequest({
+        request,
+        rawBody,
+        configured: options.secret !== void 0 && options.secret.length > 0 && receiver !== void 0,
+        limiter,
+        clientKey,
+        ...options.botGate ? { botGate: options.botGate } : {},
+        ...options.enrich ? { enrich: options.enrich } : {}
+      });
+      if (!evaluation.ok) {
+        return Response.json(evaluation.body, { status: evaluation.status, headers: { ...NO_STORE, ...evaluation.headers } });
+      }
+      const signed = await signedIngestRequest(evaluation.payload, options.secret);
+      let answer;
+      try {
+        answer = await fetchImpl(receiver, { method: "POST", headers: signed.headers, body: signed.body });
+      } catch {
+        return Response.json({ error: "The ingest receiver could not be reached." }, { status: 502, headers: NO_STORE });
+      }
+      if (answer.status === 401) {
+        return Response.json(
+          { error: "The ingest receiver refused this site's signature \u2014 INGEST_SECRET must equal the deployment's ELYTRA_INGEST_SECRET." },
+          { status: 502, headers: NO_STORE }
+        );
+      }
+      const text = await answer.text();
+      return new Response(text, {
+        status: answer.status,
+        headers: { ...NO_STORE, "content-type": answer.headers.get("content-type") ?? "application/json" }
+      });
+    }
+  };
+}
 var LQIP_MAX_EDGE = 24;
 function fitLqipLongEdge(width, height) {
   const scale = Math.min(1, LQIP_MAX_EDGE / Math.max(width, height));
@@ -866,7 +1074,8 @@ var ELYTRA_HOST_ENV_KEYS = {
   convexUrl: "ELYTRA_CONVEX_URL",
   projectId: "ELYTRA_PROJECT_ID",
   draftToken: "DRAFT_PREVIEW_TOKEN",
-  revalidateSecret: "REVALIDATE_SECRET"
+  revalidateSecret: "REVALIDATE_SECRET",
+  ingestSecret: "INGEST_SECRET"
 };
 function cleaned(value) {
   const trimmed = value?.trim();
@@ -895,17 +1104,11 @@ async function runConvexQuery(fetchImpl, convexUrl, path, args) {
   }
   return body.value;
 }
-function parseRedirects(rows) {
-  const redirects = [];
-  for (const row of rows) {
-    const parsed = redirectRecordSchema.safeParse(row);
-    if (parsed.success) redirects.push(parsed.data);
-  }
-  return redirects;
-}
 function assembleLiveSource(payload, options, perspective) {
   const locales = options.locales;
-  const { documents, issues: sourceIssues } = parseDeliveredDocuments(payload.documents);
+  const { documents, issues: documentIssues } = parseDeliveredDocuments(payload.documents);
+  const delivered = parseDeliveredRedirects(payload.redirects ?? [], payload.redirectIssues ?? []);
+  const sourceIssues = [...documentIssues, ...delivered.issues];
   const routes = [...options.routes];
   const documentSources = perspective === "published" ? documents.map((doc) => ({ draft: doc, published: doc, versions: [] })) : documents;
   return createStaticContentSource({
@@ -915,7 +1118,7 @@ function assembleLiveSource(payload, options, perspective) {
     // Redirects are editorial DATA (EC-303): the ENABLED ones ship in the
     // snapshot, so they change dynamically (no redeploy). Native next.config
     // redirects run before this.
-    redirects: parseRedirects(payload.redirects ?? []),
+    redirects: delivered.redirects,
     collections: [...options.collections],
     documents: documentSources,
     assets: payload.assets,
@@ -971,7 +1174,7 @@ function resolveGlobals(source, options = {}) {
   const navigationCollection = conventions.navigationCollection ?? "navigation";
   const itemsFields = conventions.navigationItemsFields ?? DEFAULT_ITEMS_FIELDS;
   const client = source.client({ perspective, ...options.locale ? { locale: options.locale } : {} });
-  const assets = source.assets?.() ?? [];
+  const assets = source.assets?.(options.locale) ?? [];
   const assetById = new Map(assets.map((asset) => [asset.id, asset]));
   const listDocs = (collection) => {
     const result = client.listDocuments(collection);
@@ -1136,8 +1339,6 @@ function createPreviewDisableRoute() {
     }
   };
 }
-
-// src/host-kit.ts
 function resolveHostProject(entry) {
   const result = resolveProject(entry);
   if (result.ok) return result.project;
@@ -1238,6 +1439,11 @@ function createElytraHost(options) {
   });
   const previewRoute = () => createPreviewRoute({ token: env.draftToken });
   const previewDisableRoute = () => createPreviewDisableRoute();
+  const ingestRoute = (overrides = {}) => createIngestRoute({
+    ...overrides,
+    secret: env.ingestSecret,
+    siteUrl: "siteUrl" in overrides ? overrides.siteUrl : convexSiteUrl(env.convexUrl)
+  });
   const pageOpensFullBleed = async (slug) => {
     const perspective = await requestPerspective();
     const source = await loadContent({ perspective });
@@ -1263,11 +1469,12 @@ function createElytraHost(options) {
     revalidateRoute,
     previewRoute,
     previewDisableRoute,
+    ingestRoute,
     pageOpensFullBleed
   };
 }
 var PACKAGE = "@elytracms/next";
 
-export { CANVAS_VALIDATION_SLUG, CanvasRenderer, ELYTRA_HOST_ENV_KEYS, ElytraImage, PACKAGE, assembleLiveSource, bodyItemsOf, canvasSitemapEntries, collectionCacheTag, createAssetImageLoader, createCanvasRoute, createCanvasSitemap, createContentSnapshot, createElytraHost, createPreviewDisableRoute, createPreviewRoute, createRevalidateRoute, createStaticContentSource, defineHostComponents, docCacheTag, elytraHostImage, evaluatePreviewRequest, evaluateRevalidateRequest, firstBlockFullBleed, loadLiveContent, mergeCacheTags, mergeMetadataOverParent, nextCacheTags, openGraphLocale, pathFromSlug, projectSweepTag, requestPerspective, resolveCanvasPage, resolveGlobals, resolveHostEnv, revalidationTags, routeCacheTag, safeRedirectTarget, scopeCacheTag, seoContextOf, seoMetadata, seoObjectOf, withNextImage };
+export { CANVAS_VALIDATION_SLUG, CanvasRenderer, ELYTRA_HOST_ENV_KEYS, ElytraImage, PACKAGE, assembleLiveSource, bodyItemsOf, canvasBeaconProps, canvasSitemapEntries, collectionCacheTag, createAssetImageLoader, createCanvasRoute, createCanvasSitemap, createContentSnapshot, createElytraHost, createFixedWindowLimiter, createIngestRoute, createPreviewDisableRoute, createPreviewRoute, createRevalidateRoute, createStaticContentSource, defaultIngestClientKey, defineHostComponents, docCacheTag, elytraHostImage, evaluateIngestRequest, evaluatePreviewRequest, evaluateRevalidateRequest, firstBlockFullBleed, isCrossOrigin, loadLiveContent, mergeCacheTags, mergeMetadataOverParent, nextCacheTags, openGraphLocale, pathFromSlug, projectSweepTag, readCappedBody, requestPerspective, resolveCanvasPage, resolveGlobals, resolveHostEnv, revalidationTags, routeCacheTag, safeRedirectTarget, scopeCacheTag, seoContextOf, seoMetadata, seoObjectOf, withNextImage };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map