@tokenoftrust/storefront-runner 2.4.59 → 2.4.61

package/apps/storefront/src/lib/apps/orders/orderMapper.ts

@@ -111,7 +111,7 @@ export async function toContractOrder(order: FoxyOrder, ctx: ToContractOrderCont
 export const COMMERCE_COMMANDS = ["observe", "capture", "refund", "cancel"] as const;
 export type CommerceCommandName = (typeof COMMERCE_COMMANDS)[number];
 
-const PRIVATE_COMMERCE_KEYS = new Set([
+export const PRIVATE_COMMERCE_KEYS = new Set([
   "customer",
   "customerEmail",
   "customerName",

package/apps/storefront/src/lib/apps/orders/ordersStore.ts

@@ -237,7 +237,7 @@ export interface CommitCommerceInput {
 
 export type CommitCommerceResult =
   | { ok: true; duplicate: boolean; snapshot: CommerceSnapshot; outboxId: string }
-  | { ok: false; reason: "replay" };
+  | { ok: false; reason: "replay" | "conflict" };
 
 async function atomic(db: Queryable, statements: readonly QueryStatement[]): Promise<void> {
   if (typeof db.batch === "function") {
@@ -277,8 +277,9 @@ export class ScrappyOrderLedger {
       if (seen) return { ok: false, reason: "replay" };
     }
 
-    const existing = await this.db.first<{ outbox_id: string; payload: string }>(
-      `SELECT outbox_id, payload FROM scrappy_commerce_outbox
+    const digest = await sha256Hex(canonicalJson(event));
+    const existing = await this.db.first<{ outbox_id: string }>(
+      `SELECT outbox_id FROM scrappy_commerce_outbox
         WHERE tenant_id = ? AND stage = ? AND source = ? AND source_event_id = ?`,
       tenantId,
       stage,
@@ -286,6 +287,8 @@ export class ScrappyOrderLedger {
       event.sourceEventId,
     );
     if (existing) {
+      const storedDigest = await this.storedPayloadDigest(tenantId, stage, event.source, event.sourceEventId);
+      if (storedDigest !== null && storedDigest !== digest) return { ok: false, reason: "conflict" };
       if (input.replay) {
         try {
           await this.insertReplay(input);
@@ -313,7 +316,6 @@ export class ScrappyOrderLedger {
     const packed = packCommercePayload(event, snapshot);
     const key = idempotencyKey(tenantId, stage, event.source, event.sourceEventId);
     const outboxId = (await sha256Hex(key)).slice(0, 32);
-    const digest = await sha256Hex(canonicalJson(event));
     const statements: QueryStatement[] = [];
     if (input.replay) {
       statements.push({
@@ -398,6 +400,8 @@ export class ScrappyOrderLedger {
           event.sourceEventId,
         );
         if (raced) {
+          const storedDigest = await this.storedPayloadDigest(tenantId, stage, event.source, event.sourceEventId);
+          if (storedDigest !== null && storedDigest !== digest) return { ok: false, reason: "conflict" };
           const snapshotNow = await this.readSnapshot(tenantId, stage, event.orderId, event);
           return { ok: true, duplicate: true, snapshot: snapshotNow, outboxId: raced.outbox_id };
         }
@@ -479,6 +483,23 @@ export class ScrappyOrderLedger {
     );
   }
 
+  private async storedPayloadDigest(
+    tenantId: string,
+    stage: CommerceStage,
+    source: string,
+    sourceEventId: string,
+  ): Promise<string | null> {
+    const row = await this.db.first<{ payload_digest: string }>(
+      `SELECT payload_digest FROM scrappy_commerce_inbox
+        WHERE tenant_id = ? AND stage = ? AND source = ? AND source_event_id = ?`,
+      tenantId,
+      stage,
+      source,
+      sourceEventId,
+    );
+    return row?.payload_digest ?? null;
+  }
+
   private async insertReplay(input: CommitCommerceInput): Promise<void> {
     if (!input.replay) return;
     await atomic(this.db, [

package/apps/storefront/src/lib/webhooks/deliveryEngine.ts

@@ -29,6 +29,7 @@ import { computeBackoffDelaySeconds, MAX_DELIVERY_ATTEMPTS, type AttemptOutcome
 import { validateWebhookEndpoint } from "./endpointGuard.js";
 import { COMMERCE_SCHEDULER } from "@tot/public-runtime";
 import type { Queryable } from "../d1/catalog.js";
+import { PRIVATE_COMMERCE_KEYS } from "../apps/orders/orderMapper.js";
 
 /** Bounded per-attempt timeout — a hung receiver must not hold a dispatcher slot open indefinitely. */
 const DEFAULT_TIMEOUT_MS = 10_000;
@@ -280,28 +281,11 @@ async function postWithTimeout(
   }
 }
 
-const COMMERCE_PRIVATE_KEYS = new Set([
-  "customer",
-  "customerEmail",
-  "customerName",
-  "email",
-  "phone",
-  "line1",
-  "line2",
-  "postalCode",
-  "shippingAddress",
-  "billingAddress",
-  "address",
-  "firstName",
-  "lastName",
-  "name",
-]);
-
 function commercePayloadHasPrivateIdentity(value: unknown): boolean {
   if (value === null || typeof value !== "object") return false;
   if (Array.isArray(value)) return value.some((item) => commercePayloadHasPrivateIdentity(item));
   return Object.entries(value as Record<string, unknown>).some(
-    ([key, child]) => COMMERCE_PRIVATE_KEYS.has(key) || commercePayloadHasPrivateIdentity(child),
+    ([key, child]) => PRIVATE_COMMERCE_KEYS.has(key) || commercePayloadHasPrivateIdentity(child),
   );
 }
 

package/apps/storefront/src/lib/webhooks/getDispatcher.ts

@@ -60,8 +60,6 @@ export class CommerceAlarmDispatcher {
     private readonly scheduler: string,
   ) {}
 
-  async enqueue(): Promise<void> {}
-
   sweep(now: string, deliver?: CommerceDeliver): Promise<CommerceSweepResult> {
     return sweepDurableCommerce({ db: this.db, scheduler: this.scheduler, now, deliver });
   }

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

@@ -21,8 +21,7 @@ import ReviewSummary from "@/components/commerce/ReviewSummary.astro";
 import ReviewList from "@/components/commerce/ReviewList.astro";
 import { isOnSale, isNew, isAvailable, fromPrice } from "@/lib/tot/query";
 import {
-  buildVariantCartPayload,
-  priceForPurchaseOption,
+  buildMemberSignedCartPayload,
   workerCartApiPath,
   normalizePurchaseOptions,
   visiblePurchaseOptions,
@@ -243,18 +242,13 @@ if (commerce) {
           async (v) => {
             const payloads = await Promise.all(
               purchaseOptions.map(async (purchaseOption) => {
-                const effective = priceForPurchaseOption(
-                  v.price,
-                  purchaseOption,
-                  pricingCtx,
-                );
                 return [
                   purchaseOption.id,
-                  await buildVariantCartPayload(product, v, {
+                  await buildMemberSignedCartPayload(product, v, {
                     mode: commerce.mode,
                     secret: signing.secret,
                     purchaseOption,
-                    signedPrice: effective.price,
+                    pricing: pricingCtx,
                     autopilotEnabled,
                     tenantId: tenant.tenant_id,
                   }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokenoftrust/storefront-runner",
-  "version": "2.4.59",
+  "version": "2.4.61",
   "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/public-runtime/src/membership.ts

@@ -276,6 +276,8 @@ export interface MemberSignedCartPayloadOptions {
    * is off. Callers should still pre-filter with {@link visiblePurchaseOptions}.
    */
   autopilotEnabled: boolean;
+  /** Tenant id written onto the signed `tenant` field when present. */
+  tenantId?: string;
 }
 
 /**
@@ -309,6 +311,7 @@ export async function buildMemberSignedCartPayload(
     purchaseOption: opts.purchaseOption,
     signedPrice: effective.price,
     autopilotEnabled: opts.autopilotEnabled,
+    tenantId: opts.tenantId,
   });
 }