@tokenoftrust/storefront-runner 4.7.6 → 4.7.7

package/apps/storefront/src/pages/_sitemap.ts

@@ -169,9 +169,18 @@ export async function sitemapIndexResponse(context: APIContext): Promise<Respons
   return new Response(renderSitemapIndexV1(context.locals.canonicalBase, children), { headers: XML_HEADERS });
 }
 
+/**
+ * The child path a request names: the last segment of the URL path. Read from the URL, never from
+ * `context.params`: a path-routed request (`/<domain>/sitemap-pages-1.xml`) reaches this endpoint
+ * through the middleware's rewrite, which leaves the catch-all's params on the context.
+ */
+export function sitemapChildPathOf(context: APIContext): string {
+  return `/${context.url.pathname.split("/").pop() ?? ""}`;
+}
+
 /** `/sitemap-<group>-<page>.xml`: one child's `<urlset>`, or 404 when the index names no such child. */
-export async function sitemapChildResponse(context: APIContext, childPath: string): Promise<Response> {
-  const named = parseSitemapChildPathV1(childPath);
+export async function sitemapChildResponse(context: APIContext): Promise<Response> {
+  const named = parseSitemapChildPathV1(sitemapChildPathOf(context));
   if (!named) return new Response("Not found", { status: 404, headers: { "content-type": "text/plain; charset=utf-8" } });
   const children = await tenantSitemapChildren(context.locals);
   const child = children.find((c) => c.group === named.group && c.page === named.page);

package/apps/storefront/src/pages/sitemap-[child].xml.ts

@@ -6,5 +6,5 @@ import type { APIContext } from "astro";
 import { sitemapChildResponse } from "./_sitemap.js";
 
 export function GET(context: APIContext): Promise<Response> {
-  return sitemapChildResponse(context, `/sitemap-${String(context.params.child ?? "")}.xml`);
+  return sitemapChildResponse(context);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokenoftrust/storefront-runner",
-  "version": "4.7.6",
+  "version": "4.7.7",
   "license": "SEE LICENSE IN LICENSE",
   "description": "World-shareable storefront runner: multi-tenant renderer on Astro/Cloudflare. No control plane.",
   "packageManager": "pnpm@11.9.0",

package/packages/cli/src/publication-spaces.mjs

@@ -17,6 +17,7 @@
  */
 import { existsSync, mkdirSync, readFileSync, writeFileSync, appendFileSync } from "node:fs";
 import { dirname, join } from "node:path";
+import { parseSitemapChildPathV1 } from "./sitemap-index.mjs";
 
 /** Where `tot clone` puts each mounted space, relative to the root checkout: `spaces/<spaceId>/`. */
 export const SPACES_DIR = "spaces";
@@ -26,7 +27,9 @@ export const TOPOLOGY_VERSION = 1;
 
 /**
  * Platform-owned paths no space serves (packages/public-runtime PUBLICATION_SPACE_RESERVED_MOUNTS;
- * the ownership parity test holds the two equal).
+ * the ownership parity test holds the two equal). Child sitemaps (`/sitemap-<group>-<page>.xml`) are
+ * platform-owned too, recognized by `parseSitemapChildPathV1` (a byte-identical copy of
+ * packages/public-runtime/src/sitemap-index.mjs, pinned by test/sitemap-index-copy.test.mjs).
  */
 export const PLATFORM_PATHS = Object.freeze([
   "/.well-known", "/__evidence", "/__preview", "/_a", "/_astro", "/_style-guide", "/admin", "/api",
@@ -167,7 +170,9 @@ export function owningSpace(topology, urlPath) {
   const path = normalizeRequestPath(urlPath);
   if (path === null) return null;
   const folded = path.toLowerCase();
-  if (PLATFORM_PATHS.some((reserved) => mountMatchesPath(reserved, folded))) return { space: null, via: "platform" };
+  if (PLATFORM_PATHS.some((reserved) => mountMatchesPath(reserved, folded)) || parseSitemapChildPathV1(folded) !== null) {
+    return { space: null, via: "platform" };
+  }
   /** @type {{ space: TopologySpace, via: "mount"|"alias", mount: string } | null} */
   let best = null;
   for (const space of topology.spaces) {

package/packages/public-runtime/src/sitemap-index.mjs

@@ -44,8 +44,9 @@ export function sitemapChildPathV1(group, page) {
 export function parseSitemapChildPathV1(path) {
   if (typeof path !== "string") return null;
   const match = CHILD_PATH.exec(path);
-  if (!match || !SITEMAP_GROUPS_V1.includes(match[1])) return null;
-  return { group: match[1], page: Number(match[2]) };
+  const group = match?.[1];
+  if (!match || group === undefined || !SITEMAP_GROUPS_V1.includes(group)) return null;
+  return { group, page: Number(match[2]) };
 }
 
 /** True for `/sitemap.xml` and for every well-formed child sitemap path. @param {string} path */
@@ -139,7 +140,7 @@ export function isSitemapIndexXmlV1(xml) {
  */
 export function sitemapIndexLocsV1(xml) {
   if (!isSitemapIndexXmlV1(xml)) return [];
-  return [...xml.matchAll(/<sitemap>\s*<loc>([^<]*)<\/loc>/g)].map((match) => match[1].trim());
+  return [...xml.matchAll(/<sitemap>\s*<loc>([^<]*)<\/loc>/g)].map((match) => (match[1] ?? "").trim());
 }
 
 /**