@tokenoftrust/storefront-runner 2.4.63 → 2.4.65

package/apps/storefront/src/lib/admin/services/mock/index.ts

@@ -1,7 +1,6 @@
 export { getOrdersViewModel } from "./orders";
 export { getProductsViewModel } from "./products";
 export { getCustomersViewModel } from "./customers";
-export { getFulfillmentViewModel } from "./fulfillment";
 export { getReportingViewModel } from "./reporting";
 export { getSettingsViewModel } from "./settings";
 export { getCheckoutSettingsViewModel } from "./checkoutSettings";

package/apps/storefront/src/lib/admin/viewmodels/fulfillment.ts

@@ -1,8 +1,7 @@
 /**
  * Daily batch desk. Queues, evidence, and commands are a pure projection of the
- * commerce contract. The test adapter is not a carrier and does not buy postage.
- * Print payload and tracking links are owner-only. Public events and the desk
- * log never carry a destination.
+ * commerce contract. Print payload and tracking links are owner-only. Public
+ * events and the desk log never carry a destination.
  */
 import {
   actorMayCommand,
@@ -224,25 +223,6 @@ export interface WorkspaceCommand {
   quantityInvalid: boolean;
   lineId: boolean;
   exception: string | null;
-  accountConfigured: boolean | null;
-}
-
-export interface WorkspaceHttpRequest {
-  method: string;
-  url: string;
-  body: string | null;
-}
-
-export interface WorkspaceHttpResponse {
-  status: number;
-  contentType: string;
-  body: string;
-}
-
-export interface TestFulfillmentAdapter {
-  readonly livePurchase: false;
-  state(): WorkspaceState;
-  handle(request: WorkspaceHttpRequest): WorkspaceHttpResponse;
 }
 
 export function defaultWorkspaceQuery(): WorkspaceQuery {
@@ -842,17 +822,6 @@ export function applyWorkspaceCommand(input: WorkspaceState, command: WorkspaceC
       ids.map((orderId) => blankResult(command.command, orderId, "refused", "partial-shipment")),
     );
   }
-  if (command.command === "set-carrier-account") {
-    const carrierReason = explicitCarrierReason(command.carrier);
-    if (carrierReason) return finishCommand(state, command.actorName, [blankResult(command.command, "", "refused", carrierReason)]);
-    if (command.accountConfigured === null) {
-      return finishCommand(state, command.actorName, [blankResult(command.command, "", "refused", "carrier-account")]);
-    }
-    state.carrierAccountConfigured = command.accountConfigured;
-    return finishCommand(state, command.actorName, [
-      blankResult(command.command, "", "admitted", command.accountConfigured ? "configured" : "missing"),
-    ]);
-  }
   if (command.orderIds.length === 0) {
     return finishCommand(state, command.actorName, [blankResult(command.command, "", "refused", "empty-batch")]);
   }
@@ -883,7 +852,6 @@ const COMMANDS = new Set([
   "pick-batch",
   "packing-slip",
   "record-exception",
-  "set-carrier-account",
   "refund",
   "return",
 ]);
@@ -922,8 +890,6 @@ export function parseWorkspaceCommand(params: URLSearchParams): { ok: true; comm
       else quantity = Number(raw);
     }
   }
-  const configuredRaw = params.get("configured");
-  const accountConfigured = configuredRaw === "1" ? true : configuredRaw === "0" ? false : null;
   const carrierRaw = params.get("carrier");
   const purchaseRaw = params.get("purchaseKey");
   return {
@@ -938,66 +904,6 @@ export function parseWorkspaceCommand(params: URLSearchParams): { ok: true; comm
       quantityInvalid,
       lineId: params.has("lineId"),
       exception: params.get("exception"),
-      accountConfigured,
-    },
-  };
-}
-
-export function handleWorkspaceRequest(
-  state: WorkspaceState,
-  request: WorkspaceHttpRequest,
-): { state: WorkspaceState; response: WorkspaceHttpResponse } {
-  let url: URL;
-  try {
-    url = new URL(request.url, "http://127.0.0.1");
-  } catch {
-    return { state, response: { status: 400, contentType: "text/plain; charset=utf-8", body: "bad url" } };
-  }
-  if (url.pathname !== SCRAPPY_FULFILLMENT_PATH) {
-    return { state, response: { status: 404, contentType: "text/plain; charset=utf-8", body: "not found" } };
-  }
-  const method = request.method.toUpperCase();
-  if (method === "GET") {
-    const view = projectWorkspace(state, parseWorkspaceQuery(url.searchParams));
-    return {
-      state,
-      response: { status: 200, contentType: "text/html; charset=utf-8", body: renderFulfillmentDocument(view) },
-    };
-  }
-  if (method === "POST") {
-    const params = new URLSearchParams(request.body ?? "");
-    const parsed = parseWorkspaceCommand(params);
-    if (!parsed.ok) {
-      return {
-        state,
-        response: {
-          status: 400,
-          contentType: "text/html; charset=utf-8",
-          body: `<!doctype html><p data-command-error="${esc(parsed.error)}">Unknown command.</p>`,
-        },
-      };
-    }
-    const next = applyWorkspaceCommand(state, parsed.command);
-    const query = parseWorkspaceQuery(params);
-    query.cursor = null;
-    const view = projectWorkspace(next, query);
-    return {
-      state: next,
-      response: { status: 200, contentType: "text/html; charset=utf-8", body: renderFulfillmentDocument(view) },
-    };
-  }
-  return { state, response: { status: 405, contentType: "text/plain; charset=utf-8", body: "method" } };
-}
-
-export function createTestFulfillmentAdapter(tenantId = "synthetic-tenant", stage: CommerceStage = "preview"): TestFulfillmentAdapter {
-  let state = initialWorkspaceState(tenantId, stage);
-  return {
-    livePurchase: false,
-    state: () => state,
-    handle(request) {
-      const outcome = handleWorkspaceRequest(state, request);
-      state = outcome.state;
-      return outcome.response;
     },
   };
 }
@@ -1041,10 +947,6 @@ function hiddenFields(view: FulfillmentViewModel, command: string, extras: Array
     .join("");
 }
 
-function resultItem(result: WorkspaceResult): string {
-  return `<li data-result-order="${esc(result.orderId)}" data-result-command="${esc(result.command)}" data-result-status="${result.status}" data-result-reason="${esc(result.reason)}" data-cost-minor="${result.costMinor ?? ""}" data-purchase-id="${esc(result.purchaseId ?? "")}" data-live-purchase="false" data-release-reservation="${result.releaseReservation ? "true" : "false"}" data-restock="false" data-blind-repurchase="false">${esc(result.command)} ${esc(result.orderId)} ${result.status} ${esc(result.reason)}</li>`;
-}
-
 function orderActions(view: FulfillmentViewModel, order: WorkspaceOrderView, action: string): string {
   const purchaseExtras: Array<[string, string]> = [["orderId", order.id]];
   if (order.purchaseKey !== null) purchaseExtras.push(["purchaseKey", order.purchaseKey]);
@@ -1075,10 +977,6 @@ export function renderFulfillmentWorkspace(view: FulfillmentViewModel): string {
       return `<a data-queue-link="${queue}" href="${esc(href(view, { queue, cursor: null }))}">${esc(label)}${count}</a>`;
     })
     .join("");
-  const actorLinks = ACTOR_SPECS.map(
-    (spec) =>
-      `<a data-actor-link="${spec.name}" href="${esc(href(view, { actorName: spec.name, cursor: null }))}">${esc(spec.name)}</a>`,
-  ).join("");
   const action = esc(href(view, { cursor: null }));
   const rows = view.orders
     .map((order) => {
@@ -1134,12 +1032,11 @@ export function renderFulfillmentWorkspace(view: FulfillmentViewModel): string {
     ? `<a data-page-next href="${esc(href(view, { cursor: view.nextCursor }))}">Next page</a>`
     : "";
   const account = view.carrierAccountConfigured ? "configured" : "missing";
-  return `<div data-scrappy-batch data-target-tenant="${esc(view.targetTenant)}" data-test-adapter="1" data-live-purchase="false" data-carrier-account="${account}" data-prohibited-carrier="USPS" data-adult-signature-required="true" data-partial-shipment="unavailable" data-returns="unavailable" data-blind-repurchase="false" data-actor="${esc(view.actorName)}" data-actor-role="${esc(view.actorRole)}" data-storewide-ready="${view.storewide.ready}" data-storewide-held="${view.storewide.held}" data-storewide-in-progress="${view.storewide.in_progress}" data-storewide-shipped="${view.storewide.shipped}" data-filter-count="${view.filterCount}" data-page-count="${view.pageCount}" data-queue="${esc(view.queue)}">
+  return `<div data-scrappy-batch data-target-tenant="${esc(view.targetTenant)}" data-live-purchase="false" data-carrier-account="${account}" data-prohibited-carrier="USPS" data-adult-signature-required="true" data-partial-shipment="unavailable" data-returns="unavailable" data-blind-repurchase="false" data-actor="${esc(view.actorName)}" data-actor-role="${esc(view.actorRole)}" data-storewide-ready="${view.storewide.ready}" data-storewide-held="${view.storewide.held}" data-storewide-in-progress="${view.storewide.in_progress}" data-storewide-shipped="${view.storewide.shipped}" data-filter-count="${view.filterCount}" data-page-count="${view.pageCount}" data-queue="${esc(view.queue)}">
     <h2 id="fulfillment-title">Daily batch</h2>
-    <p>This desk reads the test adapter. Not a live label purchase. Carrier account is configuration. USPS is prohibited. Adult signature is required. Shipment is the whole order. Partial shipment is not available. Returns are not automated.</p>
+    <p>Not a live label purchase. Carrier account is configuration. USPS is prohibited. Adult signature is required. Shipment is the whole order. Partial shipment is not available. Returns are not automated.</p>
     <p data-carrier-account-text>${view.carrierAccountConfigured ? "Carrier account: configured." : "Carrier account: not configured. Do not choose a carrier."}</p>
     <p><a data-refresh href="${esc(href(view))}">Refresh</a></p>
-    <nav data-actor-switch>${actorLinks}</nav>
     <nav data-queue-switch>${queueLinks}</nav>
     <form method="get" action="${SCRAPPY_FULFILLMENT_PATH}">
       <input type="hidden" name="actor" value="${esc(view.actorName)}">
@@ -1164,12 +1061,5 @@ export function renderFulfillmentWorkspace(view: FulfillmentViewModel): string {
     ${next}
     <section data-pick-list><h3>Pick list</h3><ul>${pickItems}</ul></section>
     ${details}
-    <ol data-last-results>${view.lastResults.map(resultItem).join("")}</ol>
-    <section data-public-events>${view.events.map((event) => `<pre>${esc(JSON.stringify(event))}</pre>`).join("")}</section>
-    <pre data-adapter-log>${esc(view.log.join("\n"))}</pre>
   </div>`;
 }
-
-export function renderFulfillmentDocument(view: FulfillmentViewModel): string {
-  return `<!doctype html><html lang="en"><head><meta charset="utf-8"><title>Daily batch</title></head><body><section id="fulfillment" data-admin-panel data-agent-scope="fulfillment">${renderFulfillmentWorkspace(view)}</section></body></html>`;
-}

package/apps/storefront/src/lib/checkoutCommerce.ts

@@ -87,10 +87,30 @@ export async function readCartSecret(
  *     but the secret is missing, so NO cart may be built. The caller must render
  *     no buy form (never a tamperable / broken one).
  */
+/** Shopper copy when checkout cannot be signed. No operator setup detail. */
+export const CHECKOUT_UNAVAILABLE_SHOPPER_MESSAGE = "Checkout is unavailable.";
+
+/** Product-page alert. The cart signing env var name stays in the server log. */
+export function shopperCheckoutUnavailableHtml(): string {
+  return (
+    `<p class="mb-3 text-sm text-[var(--color-text)]" role="alert" data-cart-operator-error>` +
+    `${CHECKOUT_UNAVAILABLE_SHOPPER_MESSAGE}</p>`
+  );
+}
+
+/**
+ * Message safe to put in an HTTP body. `signing-unavailable` carries operator
+ * setup text from the cart runtime; shoppers get the neutral message instead.
+ */
+export function shopperCartDenialMessage(code: string, message: string): string {
+  if (code === "signing-unavailable") return CHECKOUT_UNAVAILABLE_SHOPPER_MESSAGE;
+  return message;
+}
+
 export interface CartSigningResolution {
   enabled: boolean;
   secret?: string;
-  /** Set when signed mode has no secret. Actionable for the operator. No secret value. */
+  /** Operator setup detail. Do not write this into shopper HTML or an HTTP body. */
   operatorError?: string;
 }
 

package/apps/storefront/src/pages/api/commerce/checkout-handoff.ts

@@ -26,7 +26,7 @@ import {
   type CartDenialCode,
 } from "@tot/public-runtime";
 import { resolveCheckoutHandoffCorrelation } from "@/lib/commerce/checkoutHandoffCorrelation";
-import { resolveCartSigning } from "@/lib/checkoutCommerce";
+import { resolveCartSigning, shopperCartDenialMessage } from "@/lib/checkoutCommerce";
 
 export const prerender = false;
 
@@ -88,7 +88,11 @@ async function cartFormPost(context: APIContext): Promise<Response> {
   }
   const signing = await resolveCartSigning(commerce);
   if (!signing.enabled) {
-    return cartDenial("signing-unavailable", signing.operatorError ?? "Signed checkout is unavailable.", 503);
+    return cartDenial(
+      "signing-unavailable",
+      shopperCartDenialMessage("signing-unavailable", signing.operatorError ?? ""),
+      503,
+    );
   }
   const form = await context.request.formData();
   const entries: Array<[string, string]> = [];
@@ -103,7 +107,7 @@ async function cartFormPost(context: APIContext): Promise<Response> {
   });
   if (!result.ok) {
     const status = result.code === "signing-unavailable" ? 503 : 422;
-    return cartDenial(result.code, result.message, status);
+    return cartDenial(result.code, shopperCartDenialMessage(result.code, result.message), status);
   }
   return new Response(null, {
     status: 303,

package/apps/storefront/src/pages/products/[handle].astro

@@ -37,7 +37,7 @@ import type {
   MembershipStackingPolicy,
   PurchaseOptionPricingContext,
 } from "@tot/public-runtime";
-import { resolveCartSigning } from "@/lib/checkoutCommerce";
+import { resolveCartSigning, shopperCheckoutUnavailableHtml } from "@/lib/checkoutCommerce";
 import { isRegulatedTenant } from "@/lib/compliance/enforcement";
 import { resolveMemberContext } from "@/lib/membership/eligibility";
 import { truncate } from "@/lib/format";
@@ -223,14 +223,14 @@ let checkoutCart:
       byVariantId: Record<string, Record<string, VariantCartPayload>>;
     }
   | undefined;
-let cartOperatorError: string | undefined;
+let checkoutUnavailable = false;
 if (commerce) {
   // Fail closed for production signed checkout: a signed tenant with no
   // cart-validation secret builds NO cart (never a tamperable form). See
   // resolveCartSigning — it also logs the misconfiguration loudly.
   const signing = await resolveCartSigning(commerce);
   if (!signing.enabled) {
-    cartOperatorError = signing.operatorError;
+    checkoutUnavailable = true;
   } else {
     try {
       const purchaseOptions = visiblePurchaseOptions(
@@ -265,10 +265,9 @@ if (commerce) {
         byVariantId: Object.fromEntries(entries),
       };
     } catch (err) {
-      cartOperatorError =
-        err instanceof Error && err.name === "CartSigningUnavailableError"
-          ? err.message
-          : undefined;
+      if (err instanceof Error && err.name === "CartSigningUnavailableError") {
+        checkoutUnavailable = true;
+      }
       console.warn(
         `[storefront] Invalid checkout purchase options for ${product.handle}; cart disabled for this product.`,
       );
@@ -386,11 +385,7 @@ const jsonLd = [productJsonLd, breadcrumbLd(crumbs, canonicalBase)];
           The form action is the worker cart route, so a native submit reaches
           the server check. A clear browser preflight is not payment authority. */}
       <div class="mt-7" data-payment-authority="none">
-        {cartOperatorError && (
-          <p class="mb-3 text-sm text-[var(--color-text)]" role="alert" data-cart-operator-error>
-            {cartOperatorError}
-          </p>
-        )}
+        {checkoutUnavailable && <Fragment set:html={shopperCheckoutUnavailableHtml()} />}
         <VariantSelector
           client:load
           variants={publicSelectorVariants(product.variants)}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokenoftrust/storefront-runner",
-  "version": "2.4.63",
+  "version": "2.4.65",
   "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/apps/storefront/src/lib/admin/services/mock/fulfillment.ts

@@ -1,19 +0,0 @@
-import type { AdminTenantEnvelope } from "../../envelope";
-import { memoizeByEnvelope } from "../../memoizeByEnvelope";
-import {
-  defaultWorkspaceQuery,
-  initialWorkspaceState,
-  projectWorkspace,
-  type FulfillmentViewModel,
-} from "../../viewmodels/fulfillment";
-
-/** Initial test-adapter snapshot. Not a seeded queue and not a live order feed. */
-export function readTestAdapterSnapshot(targetTenant: string): FulfillmentViewModel {
-  return projectWorkspace(initialWorkspaceState(targetTenant), defaultWorkspaceQuery());
-}
-
-function computeFulfillmentViewModel(envelope: AdminTenantEnvelope): FulfillmentViewModel {
-  return readTestAdapterSnapshot(envelope.targetTenant);
-}
-
-export const getFulfillmentViewModel = memoizeByEnvelope(computeFulfillmentViewModel);