@siglume/direct-request-payment 0.4.23 → 0.4.25

package/templates/express/siglume-order-store.sql.ts

@@ -1,5 +1,5 @@
 import { AsyncLocalStorage } from "node:async_hooks";
-import { createHash } from "node:crypto";
+import { createHash, randomUUID } from "node:crypto";
 import type { Request } from "express";
 
 import type { SiglumeCheckoutAttempt, SiglumeSdrpOrderStore } from "./siglume-sdrp-routes.js";
@@ -60,6 +60,17 @@ interface SqlParts {
   readonly qReviews: string;
 }
 
+interface TypeOrmQueryRunner {
+  connect?: () => Promise<void>;
+  query?: (statement: string, params?: readonly unknown[], useStructuredResult?: boolean) => Promise<unknown>;
+  release?: () => Promise<void>;
+}
+
+const CHECKOUT_CREATION_LEASE_MS = 30_000;
+const CHECKOUT_CREATION_WAIT_MS = 10_000;
+const CHECKOUT_CREATION_POLL_MS = 100;
+const WEBHOOK_PROCESSING_STALE_MS = 10 * 60 * 1000;
+
 export function createSqlSiglumeOrderStore(options: SiglumeSqlOrderStoreOptions): SiglumeSdrpOrderStore {
   return new SqlSiglumeOrderStore(normalizeOptions(options));
 }
@@ -134,22 +145,32 @@ CREATE TABLE IF NOT EXISTS ${parts.qOrders} (
 
   statements.push(`
 CREATE TABLE IF NOT EXISTS ${parts.qAttempts} (
-  order_id ${text} PRIMARY KEY,
-  attempt_id ${text} NOT NULL UNIQUE,
+  attempt_id ${text} PRIMARY KEY,
+  order_id ${text} NOT NULL,
+  attempt_number INTEGER NOT NULL,
   stable_nonce ${text} NOT NULL UNIQUE,
+  active_key ${text} UNIQUE,
   status ${text} NOT NULL DEFAULT 'created',
   challenge_hash ${text} UNIQUE,
   checkout_session_id ${text},
   checkout_url ${text},
+  expires_at ${timestamp},
+  cancelled_at ${timestamp},
+  failed_at ${timestamp},
+  creation_owner_id ${text},
+  creation_lease_expires_at ${timestamp},
+  error_message ${text},
   requirement_id ${text},
   chain_receipt_id ${text},
   pricing_band ${text},
   paid_at ${timestamp},
   fulfilled_unsettled_at ${timestamp},
   created_at ${timestamp} NOT NULL DEFAULT ${now},
-  updated_at ${timestamp} NOT NULL DEFAULT ${now}
+  updated_at ${timestamp} NOT NULL DEFAULT ${now},
+  UNIQUE (order_id, attempt_number)
 )`.trim());
   if (normalized.dialect !== "mysql") {
+    statements.push(`CREATE INDEX IF NOT EXISTS ${quoteIdentifier("idx_siglume_checkout_attempts_order", normalized.dialect)} ON ${parts.qAttempts} (order_id)`);
     statements.push(`CREATE INDEX IF NOT EXISTS ${quoteIdentifier("idx_siglume_checkout_attempts_challenge", normalized.dialect)} ON ${parts.qAttempts} (challenge_hash)`);
   }
 
@@ -201,6 +222,8 @@ export function createPrismaSiglumeSqlExecutor(prisma: unknown): SiglumeSqlExecu
 export function createTypeOrmSiglumeSqlExecutor(dataSource: unknown): SiglumeSqlExecutor {
   const source = dataSource as {
     query?: (statement: string, params?: readonly unknown[]) => Promise<unknown>;
+    queryRunner?: TypeOrmQueryRunner | null;
+    createQueryRunner?: () => TypeOrmQueryRunner;
     transaction?: <T>(handler: (manager: { query: (statement: string, params?: readonly unknown[]) => Promise<unknown> }) => Promise<T>) => Promise<T>;
   };
   return {
@@ -208,6 +231,15 @@ export function createTypeOrmSiglumeSqlExecutor(dataSource: unknown): SiglumeSql
       return normalizeRows(await source.query?.(statement, params)) as T[];
     },
     async execute(statement, params = []) {
+      const runner = source.queryRunner ?? source.createQueryRunner?.();
+      if (runner?.query) {
+        try {
+          if (!source.queryRunner) await runner.connect?.();
+          return normalizeTypeOrmExecuteResult(await runner.query(statement, params, true));
+        } finally {
+          if (!source.queryRunner) await runner.release?.();
+        }
+      }
       return source.query?.(statement, params);
     },
     async transaction(handler) {
@@ -278,30 +310,69 @@ class SqlSiglumeOrderStore implements SiglumeSdrpOrderStore {
 
   async beginCheckoutAttempt(orderId: string, req: Request): Promise<SiglumeCheckoutAttempt | null> {
     const cleanOrderId = requireText(orderId, "order_id");
-    return this.withTransaction(async () => {
-      const order = await this.findProductOrder(cleanOrderId);
-      if (!order) return null;
-      if (this.options.authorize_order && !(await this.options.authorize_order(order, req))) return null;
-
-      const parts = sqlParts(this.options);
-      const attempt = stableAttempt(cleanOrderId);
-      await this.insertAttemptIfMissing(cleanOrderId, attempt.attempt_id, attempt.stable_nonce);
-      const rows = await this.executor().query<Record<string, unknown>>(
-        `SELECT attempt_id, stable_nonce, checkout_session_id, checkout_url FROM ${parts.qAttempts} WHERE order_id = ${this.p(1)} LIMIT 1`,
-        [cleanOrderId],
-      );
-      const state = rows[0] ?? {};
-      return {
-        id: String(order.id),
-        order_id: String(order.id),
-        amount_minor: Number(order.amount_minor),
-        currency: String(order.currency),
-        attempt_id: String(state.attempt_id || attempt.attempt_id),
-        stable_nonce: String(state.stable_nonce || attempt.stable_nonce),
-        checkout_session_id: textOrUndefined(state.checkout_session_id),
-        checkout_url: textOrUndefined(state.checkout_url),
-      };
-    });
+    const waitUntil = Date.now() + CHECKOUT_CREATION_WAIT_MS;
+    for (;;) {
+      const result = await this.withTransaction(async (executor) => {
+        const order = await this.findProductOrder(cleanOrderId);
+        if (!order) return { done: true, attempt: null as SiglumeCheckoutAttempt | null };
+        if (this.options.authorize_order && !(await this.options.authorize_order(order, req))) {
+          return { done: true, attempt: null as SiglumeCheckoutAttempt | null };
+        }
+
+        const active = await this.findActiveCheckoutAttempt(executor, cleanOrderId);
+        if (active && isReusableCheckoutAttempt(active)) {
+          return { done: true, attempt: this.toCheckoutAttempt(order, active) };
+        }
+        if (active && isCreatingCheckoutAttempt(active) && !timestampHasPassed(active.creation_lease_expires_at)) {
+          return { done: false, attempt: this.toCheckoutAttempt(order, active, true) };
+        }
+        if (active) {
+          await this.releaseInactiveAttempt(executor, active, active.status === "pending" ? "expired" : "failed");
+        }
+
+        const attemptNumber = await this.nextAttemptNumber(executor, cleanOrderId);
+        const attempt = stableAttempt(cleanOrderId, attemptNumber);
+        const inserted = await this.executeChangedWith(
+          executor,
+          insertAttemptSql(this.options),
+          [
+            cleanOrderId,
+            attemptNumber,
+            attempt.attempt_id,
+            attempt.stable_nonce,
+            cleanOrderId,
+            "creating",
+            `sdrp_create_${randomUUID()}`,
+            sqlTimestamp(Date.now() + CHECKOUT_CREATION_LEASE_MS),
+          ],
+        );
+        if (inserted === 0) {
+          return { done: false, attempt: this.toCheckoutAttempt(order, {
+            order_id: cleanOrderId,
+            attempt_number: attemptNumber,
+            attempt_id: attempt.attempt_id,
+            stable_nonce: attempt.stable_nonce,
+            status: "creating",
+          }, true) };
+        }
+        return {
+          done: true,
+          attempt: {
+            id: String(order.id),
+            order_id: String(order.id),
+            amount_minor: Number(order.amount_minor),
+            currency: String(order.currency),
+            attempt_number: attemptNumber,
+            attempt_id: attempt.attempt_id,
+            stable_nonce: attempt.stable_nonce,
+            status: "creating",
+          },
+        };
+      });
+      if (result.done) return result.attempt;
+      if (Date.now() >= waitUntil) return result.attempt;
+      await sleep(CHECKOUT_CREATION_POLL_MS);
+    }
   }
 
   async markCheckoutPending(input: {
@@ -311,14 +382,33 @@ class SqlSiglumeOrderStore implements SiglumeSdrpOrderStore {
     challenge_hash: string;
     checkout_session_id: string;
     checkout_url: string;
+    expires_at?: string | null;
   }): Promise<void> {
     const parts = sqlParts(this.options);
     await this.executor().execute(
       `UPDATE ${parts.qAttempts}
-       SET status = ${this.p(1)}, attempt_id = ${this.p(2)}, stable_nonce = ${this.p(3)}, challenge_hash = ${this.p(4)},
-           checkout_session_id = ${this.p(5)}, checkout_url = ${this.p(6)}, updated_at = CURRENT_TIMESTAMP
-       WHERE order_id = ${this.p(7)}`,
-      ["pending", input.attempt_id, input.stable_nonce, input.challenge_hash, input.checkout_session_id, input.checkout_url, input.order_id],
+       SET status = ${this.p(1)}, stable_nonce = ${this.p(2)}, challenge_hash = ${this.p(3)},
+           checkout_session_id = ${this.p(4)}, checkout_url = ${this.p(5)}, expires_at = ${timestampPlaceholder(6, this.options)},
+           creation_owner_id = NULL, creation_lease_expires_at = NULL, error_message = NULL,
+           updated_at = CURRENT_TIMESTAMP
+       WHERE order_id = ${this.p(7)} AND attempt_id = ${this.p(8)} AND status = ${this.p(9)}`,
+      ["pending", input.stable_nonce, input.challenge_hash, input.checkout_session_id, input.checkout_url, sqlTimestampOrNull(input.expires_at), input.order_id, input.attempt_id, "creating"],
+    );
+  }
+
+  async markCheckoutFailed(input: {
+    order_id: string;
+    attempt_id: string;
+    error_message?: string;
+  }): Promise<void> {
+    const parts = sqlParts(this.options);
+    await this.executor().execute(
+      `UPDATE ${parts.qAttempts}
+       SET status = ${this.p(1)}, active_key = NULL, failed_at = CURRENT_TIMESTAMP,
+           creation_owner_id = NULL, creation_lease_expires_at = NULL,
+           error_message = ${this.p(2)}, updated_at = CURRENT_TIMESTAMP
+       WHERE order_id = ${this.p(3)} AND attempt_id = ${this.p(4)} AND status = ${this.p(5)}`,
+      ["failed", textOrNull(input.error_message), input.order_id, input.attempt_id, "creating"],
     );
   }
 
@@ -329,13 +419,14 @@ class SqlSiglumeOrderStore implements SiglumeSdrpOrderStore {
     }
     return this.withTransaction(async (executor) => {
       const parts = sqlParts(this.options);
-      const existing = await executor.query<{ status?: unknown }>(
-        `SELECT status FROM ${parts.qEvents} WHERE event_id = ${this.p(1)} LIMIT 1`,
+      const existing = await executor.query<{ status?: unknown; created_at?: unknown }>(
+        `SELECT status, created_at FROM ${parts.qEvents} WHERE event_id = ${this.p(1)} LIMIT 1`,
         [cleanEventId],
       );
       const existingStatus = existing.length ? String(existing[0]?.status || "") : "";
-      if (existingStatus === "processed" || existingStatus === "processing") return "duplicate";
-      if (existingStatus === "failed") {
+      if (existingStatus === "processed") return "duplicate";
+      if (existingStatus === "processing" && !webhookProcessingIsStale(existing[0]?.created_at)) return "duplicate";
+      if (existingStatus === "failed" || existingStatus === "processing") {
         await executor.execute(
           `UPDATE ${parts.qEvents} SET status = ${this.p(1)}, error_message = NULL, processed_at = NULL WHERE event_id = ${this.p(2)}`,
           ["processing", cleanEventId],
@@ -367,13 +458,14 @@ class SqlSiglumeOrderStore implements SiglumeSdrpOrderStore {
     handler: () => Promise<void>,
   ): Promise<"processed" | "duplicate"> {
     const parts = sqlParts(this.options);
-    const existing = await this.options.executor.query<{ status?: unknown }>(
-      `SELECT status FROM ${parts.qEvents} WHERE event_id = ${this.p(1)} LIMIT 1`,
+    const existing = await this.options.executor.query<{ status?: unknown; created_at?: unknown }>(
+      `SELECT status, created_at FROM ${parts.qEvents} WHERE event_id = ${this.p(1)} LIMIT 1`,
       [cleanEventId],
     );
     const existingStatus = existing.length ? String(existing[0]?.status || "") : "";
-    if (existingStatus === "processed" || existingStatus === "processing") return "duplicate";
-    if (existingStatus === "failed") {
+    if (existingStatus === "processed") return "duplicate";
+    if (existingStatus === "processing" && !webhookProcessingIsStale(existing[0]?.created_at)) return "duplicate";
+    if (existingStatus === "failed" || existingStatus === "processing") {
       await this.options.executor.execute(
         `UPDATE ${parts.qEvents} SET status = ${this.p(1)}, error_message = NULL, processed_at = NULL WHERE event_id = ${this.p(2)}`,
         ["processing", cleanEventId],
@@ -407,9 +499,9 @@ class SqlSiglumeOrderStore implements SiglumeSdrpOrderStore {
     const parts = sqlParts(this.options);
     const changed = await this.executeChanged(
       `UPDATE ${parts.qAttempts}
-       SET status = ${this.p(1)}, requirement_id = ${this.p(2)}, chain_receipt_id = ${this.p(3)}, paid_at = CURRENT_TIMESTAMP, updated_at = CURRENT_TIMESTAMP
-       WHERE order_id = ${this.p(4)} AND status <> ${this.p(5)}`,
-      ["paid", input.requirement_id, input.chain_receipt_id, input.order_id, "paid"],
+       SET status = ${this.p(1)}, active_key = NULL, requirement_id = ${this.p(2)}, chain_receipt_id = ${this.p(3)}, paid_at = CURRENT_TIMESTAMP, updated_at = CURRENT_TIMESTAMP
+       WHERE order_id = ${this.p(4)} AND status NOT IN (${this.p(5)}, ${this.p(6)}, ${this.p(7)}, ${this.p(8)})`,
+      ["paid", input.requirement_id, input.chain_receipt_id, input.order_id, "paid", "expired", "cancelled", "failed"],
     );
     if (changed && parts.qOrderStatus) {
       const updatedAt = parts.qOrderUpdatedAt ? `, ${parts.qOrderUpdatedAt} = CURRENT_TIMESTAMP` : "";
@@ -428,9 +520,9 @@ class SqlSiglumeOrderStore implements SiglumeSdrpOrderStore {
     const parts = sqlParts(this.options);
     const changed = await this.executeChanged(
       `UPDATE ${parts.qAttempts}
-       SET status = ${this.p(1)}, requirement_id = ${this.p(2)}, pricing_band = ${this.p(3)}, fulfilled_unsettled_at = CURRENT_TIMESTAMP, updated_at = CURRENT_TIMESTAMP
-       WHERE order_id = ${this.p(4)} AND status NOT IN (${this.p(5)}, ${this.p(6)})`,
-      ["fulfilled_unsettled", input.requirement_id, input.pricing_band, input.order_id, "fulfilled_unsettled", "paid"],
+       SET status = ${this.p(1)}, active_key = NULL, requirement_id = ${this.p(2)}, pricing_band = ${this.p(3)}, fulfilled_unsettled_at = CURRENT_TIMESTAMP, updated_at = CURRENT_TIMESTAMP
+       WHERE order_id = ${this.p(4)} AND status NOT IN (${this.p(5)}, ${this.p(6)}, ${this.p(7)}, ${this.p(8)}, ${this.p(9)})`,
+      ["fulfilled_unsettled", input.requirement_id, input.pricing_band, input.order_id, "fulfilled_unsettled", "paid", "expired", "cancelled", "failed"],
     );
     if (changed && parts.qOrderStatus) {
       const updatedAt = parts.qOrderUpdatedAt ? `, ${parts.qOrderUpdatedAt} = CURRENT_TIMESTAMP` : "";
@@ -467,8 +559,61 @@ class SqlSiglumeOrderStore implements SiglumeSdrpOrderStore {
     return rows[0] ?? null;
   }
 
-  private async insertAttemptIfMissing(orderId: string, attemptId: string, stableNonce: string): Promise<void> {
-    await this.executor().execute(insertAttemptSql(this.options), [orderId, attemptId, stableNonce, "created"]);
+  private async findActiveCheckoutAttempt(executor: SiglumeSqlExecutor, orderId: string): Promise<Record<string, unknown> | null> {
+    const parts = sqlParts(this.options);
+    const rows = await executor.query<Record<string, unknown>>(
+      `SELECT order_id, attempt_number, attempt_id, stable_nonce, status, checkout_session_id, checkout_url, expires_at,
+              creation_lease_expires_at
+       FROM ${parts.qAttempts}
+       WHERE active_key = ${this.p(1)}
+       LIMIT 1`,
+      [orderId],
+    );
+    return rows[0] ?? null;
+  }
+
+  private async nextAttemptNumber(executor: SiglumeSqlExecutor, orderId: string): Promise<number> {
+    const parts = sqlParts(this.options);
+    const rows = await executor.query<Record<string, unknown>>(
+      `SELECT MAX(attempt_number) AS max_attempt_number FROM ${parts.qAttempts} WHERE order_id = ${this.p(1)}`,
+      [orderId],
+    );
+    const current = Number(rows[0]?.max_attempt_number || 0);
+    return Number.isSafeInteger(current) && current > 0 ? current + 1 : 1;
+  }
+
+  private async releaseInactiveAttempt(executor: SiglumeSqlExecutor, attempt: Record<string, unknown>, status: "expired" | "failed"): Promise<void> {
+    const parts = sqlParts(this.options);
+    const timestampColumn = status === "expired" ? "expires_at" : "failed_at";
+    await executor.execute(
+      `UPDATE ${parts.qAttempts}
+       SET status = ${this.p(1)}, active_key = NULL, ${quoteIdentifier(timestampColumn, this.options.dialect)} = COALESCE(${quoteIdentifier(timestampColumn, this.options.dialect)}, CURRENT_TIMESTAMP),
+           creation_owner_id = NULL, creation_lease_expires_at = NULL, updated_at = CURRENT_TIMESTAMP
+       WHERE attempt_id = ${this.p(2)}`,
+      [status, attempt.attempt_id],
+    );
+  }
+
+  private toCheckoutAttempt(order: Record<string, unknown>, state: Record<string, unknown>, pending = false): SiglumeCheckoutAttempt {
+    return {
+      id: String(order.id),
+      order_id: String(order.id),
+      amount_minor: Number(order.amount_minor),
+      currency: String(order.currency),
+      attempt_number: Number(state.attempt_number || 1),
+      attempt_id: String(state.attempt_id),
+      stable_nonce: String(state.stable_nonce),
+      status: String(state.status || ""),
+      checkout_session_id: textOrUndefined(state.checkout_session_id),
+      checkout_url: textOrUndefined(state.checkout_url),
+      expires_at: timestampTextOrNull(state.expires_at),
+      checkout_creation_pending: pending,
+    };
+  }
+
+  private async executeChangedWith(executor: SiglumeSqlExecutor, statement: string, params: readonly unknown[]): Promise<number | null> {
+    const result = await executor.execute(statement, params);
+    return affectedRows(result);
   }
 
   private async executeChanged(statement: string, params: readonly unknown[]): Promise<number | null> {
@@ -528,9 +673,12 @@ function sqlParts(options: NormalizedOptions): SqlParts {
 function insertAttemptSql(options: NormalizedOptions): string {
   const parts = sqlParts(options);
   if (options.dialect === "mysql") {
-    return `INSERT IGNORE INTO ${parts.qAttempts} (order_id, attempt_id, stable_nonce, status) VALUES (${placeholder(1, options)}, ${placeholder(2, options)}, ${placeholder(3, options)}, ${placeholder(4, options)})`;
+    return `INSERT IGNORE INTO ${parts.qAttempts} (order_id, attempt_number, attempt_id, stable_nonce, active_key, status, creation_owner_id, creation_lease_expires_at)
+      VALUES (${placeholder(1, options)}, ${placeholder(2, options)}, ${placeholder(3, options)}, ${placeholder(4, options)}, ${placeholder(5, options)}, ${placeholder(6, options)}, ${placeholder(7, options)}, ${placeholder(8, options)})`;
   }
-  return `INSERT INTO ${parts.qAttempts} (order_id, attempt_id, stable_nonce, status) VALUES (${placeholder(1, options)}, ${placeholder(2, options)}, ${placeholder(3, options)}, ${placeholder(4, options)}) ON CONFLICT (order_id) DO NOTHING`;
+  return `INSERT INTO ${parts.qAttempts} (order_id, attempt_number, attempt_id, stable_nonce, active_key, status, creation_owner_id, creation_lease_expires_at)
+    VALUES (${placeholder(1, options)}, ${placeholder(2, options)}, ${placeholder(3, options)}, ${placeholder(4, options)}, ${placeholder(5, options)}, ${placeholder(6, options)}, ${placeholder(7, options)}, ${timestampPlaceholder(8, options)})
+    ON CONFLICT (active_key) DO NOTHING`;
 }
 
 function insertWebhookEventSql(options: NormalizedOptions, _eventId: string): string {
@@ -545,6 +693,11 @@ function placeholder(index: number, options: NormalizedOptions): string {
   return options.param_style === "numbered" ? `$${index}` : "?";
 }
 
+function timestampPlaceholder(index: number, options: NormalizedOptions): string {
+  const value = placeholder(index, options);
+  return options.dialect === "postgres" ? `CAST(${value} AS TIMESTAMPTZ)` : value;
+}
+
 function quoteIdentifier(identifier: string, dialect: SiglumeSqlDialect): string {
   const quote = dialect === "mysql" ? "`" : "\"";
   return identifier.split(".").map((part) => {
@@ -555,8 +708,8 @@ function quoteIdentifier(identifier: string, dialect: SiglumeSqlDialect): string
   }).join(".");
 }
 
-function stableAttempt(orderId: string): { attempt_id: string; stable_nonce: string } {
-  const digest = hash(orderId).slice(0, 32);
+function stableAttempt(orderId: string, attemptNumber: number): { attempt_id: string; stable_nonce: string } {
+  const digest = hash(`${orderId}:${attemptNumber}`).slice(0, 32);
   return {
     attempt_id: `sdrp_attempt_${digest}`,
     stable_nonce: `sdrp-${digest}`,
@@ -586,8 +739,57 @@ function errorMessage(error: unknown): string {
   return String(error || "webhook handler failed").slice(0, 1000);
 }
 
+function webhookProcessingIsStale(value: unknown): boolean {
+  if (!value) return false;
+  const timestamp = Date.parse(String(value));
+  return Number.isFinite(timestamp) && Date.now() - timestamp > WEBHOOK_PROCESSING_STALE_MS;
+}
+
+function isReusableCheckoutAttempt(state: Record<string, unknown>): boolean {
+  return String(state.status || "") === "pending"
+    && Boolean(textOrUndefined(state.checkout_session_id))
+    && Boolean(textOrUndefined(state.checkout_url))
+    && !timestampHasPassed(state.expires_at);
+}
+
+function isCreatingCheckoutAttempt(state: Record<string, unknown>): boolean {
+  return String(state.status || "") === "creating";
+}
+
+function timestampHasPassed(value: unknown): boolean {
+  if (!value) return false;
+  const timestamp = Date.parse(String(value));
+  return Number.isFinite(timestamp) && timestamp <= Date.now();
+}
+
+function sqlTimestamp(value: number | string | Date): string {
+  const date = value instanceof Date ? value : new Date(value);
+  const pad = (item: number) => String(item).padStart(2, "0");
+  return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`;
+}
+
+function sqlTimestampOrNull(value: unknown): string | null {
+  if (!value) return null;
+  const timestamp = Date.parse(String(value));
+  if (!Number.isFinite(timestamp)) return null;
+  return sqlTimestamp(timestamp);
+}
+
+function timestampTextOrNull(value: unknown): string | null {
+  if (!value) return null;
+  if (value instanceof Date) return value.toISOString();
+  return String(value);
+}
+
+function sleep(ms: number): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
 function normalizeRows(value: unknown): Record<string, unknown>[] {
-  if (Array.isArray(value)) return value as Record<string, unknown>[];
+  if (Array.isArray(value)) {
+    if (Array.isArray(value[0])) return value[0] as Record<string, unknown>[];
+    return value as Record<string, unknown>[];
+  }
   if (value && typeof value === "object" && Array.isArray((value as { rows?: unknown[] }).rows)) {
     return (value as { rows: Record<string, unknown>[] }).rows;
   }
@@ -596,14 +798,30 @@ function normalizeRows(value: unknown): Record<string, unknown>[] {
 
 function affectedRows(value: unknown): number | null {
   if (typeof value === "number") return value;
+  if (Array.isArray(value)) {
+    for (const item of value) {
+      const changed = affectedRows(item);
+      if (changed !== null) return changed;
+    }
+    return null;
+  }
   if (!value || typeof value !== "object") return null;
   const record = value as Record<string, unknown>;
-  for (const key of ["rowCount", "affectedRows", "changes"]) {
+  for (const key of ["rowCount", "affectedRows", "changes", "affected"]) {
     if (typeof record[key] === "number") return record[key] as number;
   }
   return null;
 }
 
+function normalizeTypeOrmExecuteResult(value: unknown): unknown {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return value;
+  const record = value as Record<string, unknown>;
+  if (typeof record.affected === "number" && typeof record.rowCount !== "number") {
+    return { ...record, rowCount: record.affected };
+  }
+  return value;
+}
+
 function toDrizzleStatement(
   sqlTag: {
     (strings: TemplateStringsArray, ...params: unknown[]): unknown;

package/templates/express/siglume-sdrp-routes.ts

@@ -15,10 +15,14 @@ export interface SiglumeCheckoutOrder {
 
 export interface SiglumeCheckoutAttempt extends SiglumeCheckoutOrder {
   order_id: string;
+  attempt_number?: number;
   attempt_id: string;
   stable_nonce: string;
+  status?: string;
   checkout_url?: string;
   checkout_session_id?: string;
+  expires_at?: string | null;
+  checkout_creation_pending?: boolean;
 }
 
 export interface SiglumeSdrpOrderStore {
@@ -30,6 +34,12 @@ export interface SiglumeSdrpOrderStore {
     challenge_hash: string;
     checkout_session_id: string;
     checkout_url: string;
+    expires_at?: string | null;
+  }): Promise<void>;
+  markCheckoutFailed?(input: {
+    order_id: string;
+    attempt_id: string;
+    error_message?: string;
   }): Promise<void>;
   processWebhookEventOnce(
     eventId: string,
@@ -78,20 +88,35 @@ export function createSiglumeSdrpCheckoutRouter(options: SiglumeSdrpRouterOption
         return;
       }
 
+      if (attempt.checkout_creation_pending) {
+        res.status(202).json({ status: "creating", retry_after_ms: 250 });
+        return;
+      }
+
       if (attempt.checkout_url && attempt.checkout_session_id) {
         res.json({ checkout_url: attempt.checkout_url, session_id: attempt.checkout_session_id });
         return;
       }
 
-      const session = await merchant.createCheckoutSession({
-        merchant: options.merchant,
-        amount_minor: attempt.amount_minor,
-        currency: attempt.currency,
-        nonce: attempt.stable_nonce,
-        success_url: `${options.shop_public_origin}/checkout/siglume/success`,
-        cancel_url: `${options.shop_public_origin}/checkout/siglume/cancel`,
-        metadata: { order_id: attempt.order_id, attempt_id: attempt.attempt_id },
-      });
+      let session;
+      try {
+        session = await merchant.createCheckoutSession({
+          merchant: options.merchant,
+          amount_minor: attempt.amount_minor,
+          currency: attempt.currency,
+          nonce: attempt.stable_nonce,
+          success_url: `${options.shop_public_origin}/checkout/siglume/success`,
+          cancel_url: `${options.shop_public_origin}/checkout/siglume/cancel`,
+          metadata: { order_id: attempt.order_id, attempt_id: attempt.attempt_id },
+        });
+      } catch (error) {
+        await options.order_store.markCheckoutFailed?.({
+          order_id: attempt.order_id,
+          attempt_id: attempt.attempt_id,
+          error_message: error instanceof Error ? error.message : "checkout session creation failed",
+        });
+        throw error;
+      }
 
       await options.order_store.markCheckoutPending({
         order_id: attempt.order_id,
@@ -100,6 +125,7 @@ export function createSiglumeSdrpCheckoutRouter(options: SiglumeSdrpRouterOption
         challenge_hash: session.challenge_hash,
         checkout_session_id: session.session_id,
         checkout_url: session.checkout_url,
+        expires_at: session.expires_at ?? null,
       });
 
       res.json({ checkout_url: session.checkout_url, session_id: session.session_id });
@@ -161,6 +187,9 @@ async function processSiglumeWebhookEvent(
   if (event.type !== "direct_payment.confirmed") {
     return;
   }
+  if (isReadinessProbeEvent(event)) {
+    return;
+  }
 
   const confirmation = classifyDirectPaymentConfirmation(event);
 
@@ -222,6 +251,11 @@ async function processSiglumeWebhookEvent(
   });
 }
 
+function isReadinessProbeEvent(event: Awaited<ReturnType<typeof verifyDirectRequestPaymentWebhook>>["event"]): boolean {
+  const data = event.data as Record<string, unknown> | undefined;
+  return data?.readiness_probe === true || data?.mode === "readiness_probe";
+}
+
 function isStandardCheckoutAmount(currency: string, amountMinor: number): boolean {
   if (!Number.isSafeInteger(amountMinor)) return false;
   const normalizedCurrency = String(currency || "").toUpperCase();

package/templates/fastapi/README.md

@@ -19,7 +19,15 @@ app = FastAPI()
 engine = create_sqlalchemy_engine(os.environ["DATABASE_URL"])
 create_sqlalchemy_siglume_schema(engine)
 SessionLocal = sessionmaker(engine, future=True)
-siglume_order_store = SQLAlchemySiglumeOrderStore(SessionLocal)
+siglume_order_store = SQLAlchemySiglumeOrderStore(
+    SessionLocal,
+    # Optional: connect to an existing product orders table/columns.
+    # orders_table=product_orders,
+    # order_id_column="order_id",
+    # amount_minor_column="total_cents",
+    # currency_column="iso_currency",
+    # order_status_column="payment_status",
+)
 
 app.include_router(
     create_siglume_sdrp_router(siglume_order_store, allow_metered_payments=False),
@@ -28,8 +36,29 @@ app.include_router(
 ```
 
 Use `siglume_order_store_sqlalchemy.py` for a durable SQLAlchemy adapter. It
-creates the required checkout attempt, webhook event, and payment review tables
-and keeps webhook processing transactional.
+creates only the SDRP checkout attempt, webhook event, and payment review
+tables by default and keeps webhook processing transactional. Pass
+`include_orders_table=True` to `create_sqlalchemy_siglume_schema()` only for the
+sample `orders` table; existing products should use their own order table.
+
+For async SQLAlchemy projects, use `siglume_order_store_sqlalchemy_async.py`
+instead:
+
+```py
+from sqlalchemy.ext.asyncio import async_sessionmaker
+
+from .siglume.siglume_order_store_sqlalchemy_async import (
+    AsyncSQLAlchemySiglumeOrderStore,
+    create_async_sqlalchemy_engine,
+    create_async_sqlalchemy_siglume_schema,
+)
+
+engine = create_async_sqlalchemy_engine(os.environ["DATABASE_URL"])
+# Run this during your FastAPI startup/lifespan initialization.
+await create_async_sqlalchemy_siglume_schema(engine)
+SessionLocal = async_sessionmaker(engine, expire_on_commit=False)
+siglume_order_store = AsyncSQLAlchemySiglumeOrderStore(SessionLocal)
+```
 
 Keep `process_webhook_event_once()` transactional: record the webhook event as
 processed only after the order update or review write succeeds. The generated

package/templates/fastapi/siglume_order_store_example.py

@@ -33,6 +33,7 @@ class ExampleSiglumeOrderStore:
         challenge_hash: str,
         checkout_session_id: str,
         checkout_url: str,
+        expires_at: str | None = None,
     ) -> None:
         order = _orders.get(order_id)
         if not order:
@@ -43,6 +44,20 @@ class ExampleSiglumeOrderStore:
         order["challenge_hash"] = challenge_hash
         order["checkout_session_id"] = checkout_session_id
         order["checkout_url"] = checkout_url
+        order["expires_at"] = expires_at
+
+    async def mark_checkout_failed(
+        self,
+        *,
+        order_id: str,
+        attempt_id: str,
+        error_message: str | None = None,
+    ) -> None:
+        order = _orders.get(order_id)
+        if not order or order.get("attempt_id") != attempt_id:
+            return
+        order["status"] = "failed"
+        order["checkout_error"] = error_message or "checkout session creation failed"
 
     async def process_webhook_event_once(self, event_id: str, handler) -> str:
         if event_id in _processed_events: