@voyant-travel/finance 0.191.0 → 0.192.1

package/dist/card-payment.d.ts

@@ -41,6 +41,8 @@ export interface CardPaymentStartArgs {
     billing: CardPaymentBilling;
     description?: string;
     returnUrl?: string;
+    cancelUrl?: string;
+    shipping?: Record<string, unknown>;
     metadata?: Record<string, unknown>;
 }
 /** Result of a card-payment start: the hosted-payment URL to redirect to. */

package/dist/card-payment.js

@@ -1,66 +1,82 @@
-import { eq } from "drizzle-orm";
+import { and, eq, isNull, sql } from "drizzle-orm";
+import { applyPaymentAdapterInitiationResult } from "./payment-adapter-events.js";
 import { paymentSessions } from "./schema/payment-sessions.js";
-import { financePaymentSessionCompletionService } from "./service-payment-session-completion.js";
-import { financePaymentSessionService } from "./service-payment-sessions.js";
+const PAYMENT_ADAPTER_INITIATION_CLAIM_KEY = "paymentAdapterInitiationClaim";
+const PAYMENT_ADAPTER_INITIATION_STATE_KEY = "paymentAdapterInitiationState";
 /**
  * Start a payment through a selected adapter without requiring an HTTP
  * framework context. Package runtimes use this function; the Hono-oriented
  * starter below remains the checkout-surface convenience wrapper.
  */
 export async function startPaymentAdapterCardPayment(adapter, args, execution) {
-    const [session] = await args.db
+    const [initialSession] = await args.db
         .select()
         .from(paymentSessions)
         .where(eq(paymentSessions.id, args.sessionId))
         .limit(1);
-    if (!session)
+    if (!initialSession)
         return null;
-    const idempotencyKey = session.idempotencyKey ?? execution.idempotencyKey ?? `payment:${session.id}`;
+    const idempotencyKey = initialSession.idempotencyKey ?? execution.idempotencyKey ?? `payment:${initialSession.id}`;
+    const [session] = await args.db
+        .update(paymentSessions)
+        .set({
+        status: "processing",
+        idempotencyKey,
+        metadata: sql `coalesce(${paymentSessions.metadata}, '{}'::jsonb) || ${JSON.stringify({
+            [PAYMENT_ADAPTER_INITIATION_CLAIM_KEY]: idempotencyKey,
+            [PAYMENT_ADAPTER_INITIATION_STATE_KEY]: "in_flight",
+        })}::jsonb`,
+        updatedAt: new Date(),
+    })
+        .where(and(eq(paymentSessions.id, args.sessionId), eq(paymentSessions.status, "pending"), isNull(paymentSessions.providerConnectionId), isNull(paymentSessions.providerSessionId), isNull(paymentSessions.providerPaymentId)))
+        .returning();
+    if (!session) {
+        const [continuation] = await args.db
+            .select({ redirectUrl: paymentSessions.redirectUrl })
+            .from(paymentSessions)
+            .where(eq(paymentSessions.id, args.sessionId))
+            .limit(1);
+        return continuation ? { redirectUrl: continuation.redirectUrl } : null;
+    }
     const metadata = {
         ...(args.metadata ?? {}),
         billing: args.billing,
         ...(execution.notifyUrl ? { notifyUrl: execution.notifyUrl } : {}),
     };
-    const result = await adapter.initiate(execution.context, {
-        paymentSessionId: session.id,
-        money: { amountMinor: session.amountCents, currency: session.currency },
-        description: args.description ?? session.notes ?? undefined,
-        returnUrl: args.returnUrl ?? session.returnUrl ?? undefined,
-        idempotencyKey,
-        customer: {
-            email: args.billing.email,
-            phone: args.billing.phone ?? null,
-            firstName: args.billing.firstName,
-            lastName: args.billing.lastName ?? null,
-        },
-        metadata,
-    });
-    const providerData = {
-        providerSessionId: result.processorSessionId ?? undefined,
-        providerPaymentId: result.processorPaymentId ?? undefined,
-        providerPayload: result.raw === undefined ? undefined : { initiation: result.raw },
-        metadata: { paymentAdapterInitiationIdempotencyKey: result.idempotencyKey },
-    };
-    if (result.nextState === "paid" || result.nextState === "authorized") {
-        await financePaymentSessionService.updatePaymentSession(args.db, session.id, {
-            provider: adapter.id,
-            redirectUrl: result.checkout?.url ?? undefined,
+    let result;
+    try {
+        result = await adapter.initiate(execution.context, {
+            paymentSessionId: session.id,
+            money: { amountMinor: session.amountCents, currency: session.currency },
+            description: args.description ?? session.notes ?? undefined,
+            returnUrl: args.returnUrl ?? session.returnUrl ?? undefined,
+            cancelUrl: args.cancelUrl ?? session.cancelUrl ?? undefined,
             idempotencyKey,
+            customer: {
+                email: args.billing.email,
+                phone: args.billing.phone ?? null,
+                firstName: args.billing.firstName,
+                lastName: args.billing.lastName ?? null,
+            },
+            shipping: args.shipping,
+            metadata,
         });
-        await financePaymentSessionCompletionService.completePaymentSession(args.db, session.id, {
-            status: result.nextState,
-            captureMode: "automatic",
-            ...providerData,
-        }, execution.runtime);
+        await applyPaymentAdapterInitiationResult(args.db, session.id, adapter.id, result, { idempotencyKey, claimedAt: session.updatedAt }, execution.runtime);
     }
-    else {
-        await financePaymentSessionService.updatePaymentSession(args.db, session.id, {
-            provider: adapter.id,
-            status: result.nextState,
-            redirectUrl: result.checkout?.url ?? undefined,
-            idempotencyKey,
-            ...providerData,
-        });
+    catch (error) {
+        const retrySafe = adapter.capabilities.idempotencyKeys && adapter.capabilities.retrySafeInitiation;
+        await args.db
+            .update(paymentSessions)
+            .set({
+            status: retrySafe ? "pending" : "processing",
+            metadata: sql `coalesce(${paymentSessions.metadata}, '{}'::jsonb) || ${JSON.stringify({
+                [PAYMENT_ADAPTER_INITIATION_CLAIM_KEY]: retrySafe ? null : idempotencyKey,
+                [PAYMENT_ADAPTER_INITIATION_STATE_KEY]: retrySafe ? "retryable" : "uncertain",
+            })}::jsonb`,
+            updatedAt: new Date(),
+        })
+            .where(and(eq(paymentSessions.id, session.id), eq(paymentSessions.status, "processing"), eq(paymentSessions.idempotencyKey, idempotencyKey), eq(paymentSessions.updatedAt, session.updatedAt), isNull(paymentSessions.providerConnectionId), isNull(paymentSessions.providerSessionId), isNull(paymentSessions.providerPaymentId), sql `${paymentSessions.metadata}->>${PAYMENT_ADAPTER_INITIATION_CLAIM_KEY} = ${idempotencyKey}`));
+        throw error;
     }
     return { redirectUrl: result.checkout?.url ?? null };
 }

package/dist/checkout-routes.d.ts

@@ -281,6 +281,7 @@ export declare function createCheckoutRoutes(options?: CheckoutRoutesOptions): i
                         targetType: "other" | "booking" | "order" | "invoice" | "booking_payment_schedule" | "booking_guarantee" | "flight_order";
                         targetId: string | null;
                         paymentId: string | null;
+                        providerConnectionId: string | null;
                         providerSessionId: string | null;
                         providerPaymentId: string | null;
                         externalReference: string | null;
@@ -520,6 +521,7 @@ export declare function createCheckoutRoutes(options?: CheckoutRoutesOptions): i
                         targetType: "other" | "booking" | "order" | "invoice" | "booking_payment_schedule" | "booking_guarantee" | "flight_order";
                         targetId: string | null;
                         paymentId: string | null;
+                        providerConnectionId: string | null;
                         providerSessionId: string | null;
                         providerPaymentId: string | null;
                         externalReference: string | null;
@@ -853,6 +855,7 @@ export declare function createCheckoutAdminRoutes(options?: CheckoutRoutesOption
                         targetType: "other" | "booking" | "order" | "invoice" | "booking_payment_schedule" | "booking_guarantee" | "flight_order";
                         targetId: string | null;
                         paymentId: string | null;
+                        providerConnectionId: string | null;
                         providerSessionId: string | null;
                         providerPaymentId: string | null;
                         externalReference: string | null;
@@ -1092,6 +1095,7 @@ export declare function createCheckoutAdminRoutes(options?: CheckoutRoutesOption
                         targetType: "other" | "booking" | "order" | "invoice" | "booking_payment_schedule" | "booking_guarantee" | "flight_order";
                         targetId: string | null;
                         paymentId: string | null;
+                        providerConnectionId: string | null;
                         providerSessionId: string | null;
                         providerPaymentId: string | null;
                         externalReference: string | null;

package/dist/checkout-routes.js

@@ -121,6 +121,12 @@ function resolveCheckoutRouteRuntime(bindings, options, container) {
     return buildCheckoutRouteRuntime(bindings, options);
 }
 function assertCheckoutRuntimeSupportsCollection(runtime, input) {
+    if (input.method === "card" && input.startProvider && !input.startProvider.provider) {
+        if (!runtime.selectedPaymentStarter) {
+            throw new CheckoutRouteRuntimeNotConfiguredError();
+        }
+        return;
+    }
     if (input.method === "card" &&
         !runtime.selectedPaymentStarter &&
         Object.keys(runtime.paymentStarters).length === 0) {

package/dist/checkout-service.js

@@ -190,6 +190,27 @@ async function createCollectionInvoice(db, context, plan, notes) {
     return invoice;
 }
 export async function initiateCheckoutCollection(db, bookingId, input, options = {}, runtime = {}) {
+    let providerStarter = null;
+    if (input.startProvider) {
+        if (input.method !== "card") {
+            throw new Error("Provider start is only available for card collections");
+        }
+        // Resolve deployment-owned processor readiness before any checkout read
+        // that may materialize a default payment plan. The selected PaymentAdapter
+        // wins over legacy provider hints; keyed starters remain only for explicit
+        // self-hosted provider requests. A missing adapter is a zero-mutation
+        // failure.
+        const requestedProvider = input.startProvider.provider;
+        providerStarter =
+            runtime.selectedPaymentStarter ??
+                (requestedProvider ? runtime.paymentStarters?.[requestedProvider] : undefined) ??
+                null;
+        if (!providerStarter) {
+            throw new Error(requestedProvider
+                ? `Payment provider "${requestedProvider}" is not configured`
+                : "No payment adapter is selected for card collection");
+        }
+    }
     const context = await loadBookingContext(db, bookingId);
     if (!context)
         return null;
@@ -250,24 +271,13 @@ export async function initiateCheckoutCollection(db, bookingId, input, options =
         }
     }
     if (input.startProvider) {
-        if (input.method !== "card") {
-            throw new Error("Provider start is only available for card collections");
-        }
         if (!paymentSession) {
             throw new Error("No payment session available for provider start");
         }
-        // Processor selection belongs to the deployment. A selected PaymentAdapter
-        // therefore wins even when an older client still sends a provider hint.
-        // Keyed starters remain as a compatibility path for self-hosted plugins.
-        const requestedProvider = input.startProvider.provider;
-        const starter = runtime.selectedPaymentStarter ??
-            (requestedProvider ? runtime.paymentStarters?.[requestedProvider] : undefined);
-        if (!starter) {
-            throw new Error(requestedProvider
-                ? `Payment provider "${requestedProvider}" is not configured`
-                : "No payment adapter is selected for card collection");
+        if (!providerStarter) {
+            throw new Error("No payment adapter is selected for card collection");
         }
-        providerStart = await starter({
+        providerStart = await providerStarter({
             db,
             bookingId,
             plan,

package/dist/checkout-validation.d.ts

@@ -249,6 +249,7 @@ export declare const initiateCheckoutCollectionSchema: z.ZodObject<{
             idempotencyKey: z.ZodNullable<z.ZodOptional<z.ZodString>>;
         }, z.core.$strip>>;
         provider: z.ZodNullable<z.ZodOptional<z.ZodString>>;
+        providerConnectionId: z.ZodNullable<z.ZodOptional<z.ZodString>>;
         paymentMethod: z.ZodNullable<z.ZodOptional<z.ZodEnum<{
             bank_transfer: "bank_transfer";
             credit_card: "credit_card";
@@ -322,6 +323,7 @@ export declare const initiateCheckoutCollectionSchema: z.ZodObject<{
             idempotencyKey: z.ZodNullable<z.ZodOptional<z.ZodString>>;
         }, z.core.$strip>>;
         provider: z.ZodNullable<z.ZodOptional<z.ZodString>>;
+        providerConnectionId: z.ZodNullable<z.ZodOptional<z.ZodString>>;
         paymentMethod: z.ZodNullable<z.ZodOptional<z.ZodEnum<{
             bank_transfer: "bank_transfer";
             credit_card: "credit_card";
@@ -501,6 +503,7 @@ export declare const bootstrapCheckoutCollectionSchema: z.ZodObject<{
             idempotencyKey: z.ZodNullable<z.ZodOptional<z.ZodString>>;
         }, z.core.$strip>>;
         provider: z.ZodNullable<z.ZodOptional<z.ZodString>>;
+        providerConnectionId: z.ZodNullable<z.ZodOptional<z.ZodString>>;
         paymentMethod: z.ZodNullable<z.ZodOptional<z.ZodEnum<{
             bank_transfer: "bank_transfer";
             credit_card: "credit_card";
@@ -574,6 +577,7 @@ export declare const bootstrapCheckoutCollectionSchema: z.ZodObject<{
             idempotencyKey: z.ZodNullable<z.ZodOptional<z.ZodString>>;
         }, z.core.$strip>>;
         provider: z.ZodNullable<z.ZodOptional<z.ZodString>>;
+        providerConnectionId: z.ZodNullable<z.ZodOptional<z.ZodString>>;
         paymentMethod: z.ZodNullable<z.ZodOptional<z.ZodEnum<{
             bank_transfer: "bank_transfer";
             credit_card: "credit_card";
@@ -954,6 +958,7 @@ export declare const initiatedCheckoutCollectionSchema: z.ZodObject<{
             expired: "expired";
         }>;
         provider: z.ZodNullable<z.ZodString>;
+        providerConnectionId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
         providerSessionId: z.ZodNullable<z.ZodString>;
         providerPaymentId: z.ZodNullable<z.ZodString>;
         externalReference: z.ZodNullable<z.ZodString>;
@@ -983,6 +988,7 @@ export declare const initiatedCheckoutCollectionSchema: z.ZodObject<{
         notes: z.ZodNullable<z.ZodString>;
     }, z.core.$strip>, z.ZodTransform<{
         legacyOrderId: string | null;
+        providerConnectionId: string | null;
         target: {
             type: "booking";
             bookingId: string;
@@ -1113,6 +1119,7 @@ export declare const initiatedCheckoutCollectionSchema: z.ZodObject<{
             idempotencyKey?: string | null | undefined;
         } | null | undefined;
         legacyOrderId?: string | null | undefined;
+        providerConnectionId?: string | null | undefined;
     }>>>;
     invoiceNotification: z.ZodNullable<z.ZodObject<{
         id: z.ZodString;
@@ -1331,6 +1338,7 @@ export declare const bootstrappedCheckoutCollectionSchema: z.ZodObject<{
             expired: "expired";
         }>;
         provider: z.ZodNullable<z.ZodString>;
+        providerConnectionId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
         providerSessionId: z.ZodNullable<z.ZodString>;
         providerPaymentId: z.ZodNullable<z.ZodString>;
         externalReference: z.ZodNullable<z.ZodString>;
@@ -1360,6 +1368,7 @@ export declare const bootstrappedCheckoutCollectionSchema: z.ZodObject<{
         notes: z.ZodNullable<z.ZodString>;
     }, z.core.$strip>, z.ZodTransform<{
         legacyOrderId: string | null;
+        providerConnectionId: string | null;
         target: {
             type: "booking";
             bookingId: string;
@@ -1490,6 +1499,7 @@ export declare const bootstrappedCheckoutCollectionSchema: z.ZodObject<{
             idempotencyKey?: string | null | undefined;
         } | null | undefined;
         legacyOrderId?: string | null | undefined;
+        providerConnectionId?: string | null | undefined;
     }>>>;
     invoiceNotification: z.ZodNullable<z.ZodObject<{
         id: z.ZodString;

package/dist/index.d.ts

@@ -33,7 +33,8 @@ export { createPaymentAdapterCardPaymentStarter, startPaymentAdapterCardPayment,
 export { type DocumentDownloadEnvelope, type DocumentDownloadResolution, type DocumentDownloadResolver, resolveStoredDocumentDownload, type StoredDocumentReference, } from "./document-download.js";
 export { createInvoiceFxApiExtension, createInvoiceFxRoutes, createVoyantDataFxExchangeRateResolver, type InvoiceExchangeRateResolution, type InvoiceFxContext, type InvoiceFxOptions, type InvoiceFxRouteOptions, type InvoiceFxSettings, mountInvoiceFxRoutes, type ResolvedInvoiceFxSettings, type ResolveInvoiceExchangeRate, type ResolveInvoiceExchangeRateInput, type ResolveInvoiceFxSettings, resolveInvoiceFxContext, resolveInvoiceFxSettingsOrDefault, type UpdateInvoiceFxSettings, type VoyantDataFxResolverOptions, } from "./invoice-fx.js";
 export { type CreateOrderPaymentSessionsOptions, createOrderPaymentSessions, type EnsureOrderSessionParams, type OrderPaymentSessionSummary, type OrderPaymentSessions, type OrderPaymentSessionTargetType, type StartOrderPaymentProvider, } from "./order-payment-sessions.js";
-export { applyPaymentAdapterCallbackEvent } from "./payment-adapter-events.js";
+export { applyPaymentAdapterCallbackEvent, applyPaymentAdapterInitiationResult, applyPaymentAdapterStatusResult, } from "./payment-adapter-events.js";
+export { type PaymentAdapterStatusRefreshExecution, refreshPaymentAdapterStatus, } from "./payment-adapter-status.js";
 export type { ComputedScheduleEntry, ComputeScheduleInput, DepositKind, DepositRule, PaymentPolicy, PaymentPolicyCascadeLayers, PaymentPolicySource, PaymentScheduleEntryType, ResolvedPaymentPolicy, } from "./payment-policy.js";
 export { computePaymentSchedule, isPaymentPolicyEmpty, noDepositPolicy, normalizePaymentPolicy, policyShouldRequireFullPayment, resolveEffectivePaymentPolicy, } from "./payment-policy.js";
 export { createPaymentPolicyCascade, type PaymentPolicyCascade, type PaymentPolicyCascadeOptions, type PaymentPolicyCascadeReaders, readPolicySourceFromInternalNotes, stampPolicySourceOnBooking, } from "./payment-policy-cascade.js";

package/dist/index.js

@@ -98,7 +98,8 @@ export { createPaymentAdapterCardPaymentStarter, startPaymentAdapterCardPayment,
 export { resolveStoredDocumentDownload, } from "./document-download.js";
 export { createInvoiceFxApiExtension, createInvoiceFxRoutes, createVoyantDataFxExchangeRateResolver, mountInvoiceFxRoutes, resolveInvoiceFxContext, resolveInvoiceFxSettingsOrDefault, } from "./invoice-fx.js";
 export { createOrderPaymentSessions, } from "./order-payment-sessions.js";
-export { applyPaymentAdapterCallbackEvent } from "./payment-adapter-events.js";
+export { applyPaymentAdapterCallbackEvent, applyPaymentAdapterInitiationResult, applyPaymentAdapterStatusResult, } from "./payment-adapter-events.js";
+export { refreshPaymentAdapterStatus, } from "./payment-adapter-status.js";
 export { computePaymentSchedule, isPaymentPolicyEmpty, noDepositPolicy, normalizePaymentPolicy, policyShouldRequireFullPayment, resolveEffectivePaymentPolicy, } from "./payment-policy.js";
 export { createPaymentPolicyCascade, readPolicySourceFromInternalNotes, stampPolicySourceOnBooking, } from "./payment-policy-cascade.js";
 export { createBookingScheduleAdminRoutes, createBookingScheduleApiExtension, createBookingScheduleVoyantRuntime, createPaymentPolicyPublicRoutes, generatePaymentScheduleForBooking, } from "./payment-schedule/routes.js";

package/dist/payment-adapter-events.d.ts

@@ -1,6 +1,54 @@
-import type { PaymentCallbackEvent } from "@voyant-travel/payments";
+import type { PaymentCallbackEvent, PaymentInitiationResult, PaymentStatusResult } from "@voyant-travel/payments";
 import type { PostgresJsDatabase } from "drizzle-orm/postgres-js";
-import type { FinanceServiceRuntime } from "./service-shared.js";
+import { type FinanceServiceRuntime } from "./service-shared.js";
+export declare function applyPaymentAdapterInitiationResult(db: PostgresJsDatabase, paymentSessionId: string, adapterId: string, result: PaymentInitiationResult, claim: {
+    idempotencyKey: string;
+    claimedAt: Date;
+}, runtime?: FinanceServiceRuntime): Promise<{
+    id: string;
+    targetType: "other" | "booking" | "order" | "invoice" | "booking_payment_schedule" | "booking_guarantee" | "flight_order";
+    targetId: string | null;
+    bookingId: string | null;
+    orderId: string | null;
+    invoiceId: string | null;
+    bookingPaymentScheduleId: string | null;
+    bookingGuaranteeId: string | null;
+    paymentInstrumentId: string | null;
+    paymentAuthorizationId: string | null;
+    paymentCaptureId: string | null;
+    paymentId: string | null;
+    status: "paid" | "pending" | "failed" | "requires_redirect" | "processing" | "authorized" | "cancelled" | "expired";
+    provider: string | null;
+    providerConnectionId: string | null;
+    providerSessionId: string | null;
+    providerPaymentId: string | null;
+    externalReference: string | null;
+    idempotencyKey: string | null;
+    clientReference: string | null;
+    currency: string;
+    amountCents: number;
+    paymentMethod: "bank_transfer" | "credit_card" | "debit_card" | "cash" | "cheque" | "wallet" | "direct_bill" | "travel_credit" | "other" | null;
+    payerPersonId: string | null;
+    payerOrganizationId: string | null;
+    payerEmail: string | null;
+    payerName: string | null;
+    redirectUrl: string | null;
+    returnUrl: string | null;
+    cancelUrl: string | null;
+    callbackUrl: string | null;
+    expiresAt: Date | null;
+    completedAt: Date | null;
+    failedAt: Date | null;
+    cancelledAt: Date | null;
+    expiredAt: Date | null;
+    failureCode: string | null;
+    failureMessage: string | null;
+    notes: string | null;
+    providerPayload: Record<string, unknown> | null;
+    metadata: Record<string, unknown> | null;
+    createdAt: Date;
+    updatedAt: Date;
+} | null>;
 export declare function applyPaymentAdapterCallbackEvent(db: PostgresJsDatabase, event: PaymentCallbackEvent, runtime?: FinanceServiceRuntime): Promise<{
     id: string;
     targetType: "other" | "booking" | "order" | "invoice" | "booking_payment_schedule" | "booking_guarantee" | "flight_order";
@@ -16,6 +64,52 @@ export declare function applyPaymentAdapterCallbackEvent(db: PostgresJsDatabase,
     paymentId: string | null;
     status: "paid" | "pending" | "failed" | "requires_redirect" | "processing" | "authorized" | "cancelled" | "expired";
     provider: string | null;
+    providerConnectionId: string | null;
+    providerSessionId: string | null;
+    providerPaymentId: string | null;
+    externalReference: string | null;
+    idempotencyKey: string | null;
+    clientReference: string | null;
+    currency: string;
+    amountCents: number;
+    paymentMethod: "bank_transfer" | "credit_card" | "debit_card" | "cash" | "cheque" | "wallet" | "direct_bill" | "travel_credit" | "other" | null;
+    payerPersonId: string | null;
+    payerOrganizationId: string | null;
+    payerEmail: string | null;
+    payerName: string | null;
+    redirectUrl: string | null;
+    returnUrl: string | null;
+    cancelUrl: string | null;
+    callbackUrl: string | null;
+    expiresAt: Date | null;
+    completedAt: Date | null;
+    failedAt: Date | null;
+    cancelledAt: Date | null;
+    expiredAt: Date | null;
+    failureCode: string | null;
+    failureMessage: string | null;
+    notes: string | null;
+    providerPayload: Record<string, unknown> | null;
+    metadata: Record<string, unknown> | null;
+    createdAt: Date;
+    updatedAt: Date;
+} | null>;
+export declare function applyPaymentAdapterStatusResult(db: PostgresJsDatabase, paymentSessionId: string, result: PaymentStatusResult, statusLeaseToken: string, runtime?: FinanceServiceRuntime, checkedAt?: Date): Promise<{
+    id: string;
+    targetType: "other" | "booking" | "order" | "invoice" | "booking_payment_schedule" | "booking_guarantee" | "flight_order";
+    targetId: string | null;
+    bookingId: string | null;
+    orderId: string | null;
+    invoiceId: string | null;
+    bookingPaymentScheduleId: string | null;
+    bookingGuaranteeId: string | null;
+    paymentInstrumentId: string | null;
+    paymentAuthorizationId: string | null;
+    paymentCaptureId: string | null;
+    paymentId: string | null;
+    status: "paid" | "pending" | "failed" | "requires_redirect" | "processing" | "authorized" | "cancelled" | "expired";
+    provider: string | null;
+    providerConnectionId: string | null;
     providerSessionId: string | null;
     providerPaymentId: string | null;
     externalReference: string | null;

package/dist/payment-adapter-events.js

@@ -1,34 +1,160 @@
+import { eq } from "drizzle-orm";
+import { assertPaymentAdapterProcessorIdentityForLockedSession, assertPaymentAdapterProcessorReferencesForLockedSession, canApplyPaymentAdapterStateTransition, PAYMENT_ADAPTER_STATUS_LEASE_TOKEN_KEY, } from "./payment-adapter-session-guard.js";
+import { paymentSessions } from "./schema/payment-sessions.js";
 import { financePaymentSessionCompletionService } from "./service-payment-session-completion.js";
-import { financePaymentSessionService } from "./service-payment-sessions.js";
+import { PaymentValidationError, sql, toTimestamp, touchLinkedBookingUpdatedAt, } from "./service-shared.js";
+function mergeJsonbColumn(column, value) {
+    if (value === undefined)
+        return undefined;
+    if (value === null)
+        return null;
+    return sql `coalesce(${column}, '{}'::jsonb) || ${JSON.stringify(value)}::jsonb`;
+}
+const PAYMENT_ADAPTER_INITIATION_CLAIM_KEY = "paymentAdapterInitiationClaim";
+async function applyLockedNonCompletionStateUpdate(db, update, providerData) {
+    return db.transaction(async (tx) => {
+        const [session] = await tx
+            .select()
+            .from(paymentSessions)
+            .where(eq(paymentSessions.id, update.paymentSessionId))
+            .for("update")
+            .limit(1);
+        if (!session)
+            return null;
+        if (update.source === "status" &&
+            session.metadata?.[PAYMENT_ADAPTER_STATUS_LEASE_TOKEN_KEY] !== update.statusLeaseToken) {
+            return null;
+        }
+        const adoptedIdentity = assertPaymentAdapterProcessorIdentityForLockedSession(session, update.processorIdentity);
+        const pinnedReferences = assertPaymentAdapterProcessorReferencesForLockedSession(session, {
+            processorSessionId: update.processorSessionId,
+            processorPaymentId: update.processorPaymentId,
+        });
+        const provider = adoptedIdentity.provider ?? session.provider ?? providerData.provider;
+        const providerConnectionId = adoptedIdentity.providerConnectionId ?? providerData.providerConnectionId;
+        const nextState = update.nextState;
+        const mayFinalizeUncontestedInitiationClaim = update.source === "initiation" &&
+            session.status === "processing" &&
+            (nextState === "pending" || nextState === "requires_redirect") &&
+            session.metadata?.[PAYMENT_ADAPTER_INITIATION_CLAIM_KEY] === update.idempotencyKey &&
+            session.updatedAt.getTime() === update.initiationClaimedAt?.getTime() &&
+            !session.providerConnectionId &&
+            !session.providerSessionId &&
+            !session.providerPaymentId;
+        const shouldTransition = mayFinalizeUncontestedInitiationClaim ||
+            canApplyPaymentAdapterStateTransition(session.status, nextState);
+        const failedAt = shouldTransition && nextState === "failed" ? new Date() : undefined;
+        const cancelledAt = shouldTransition && nextState === "cancelled" ? new Date() : undefined;
+        const expiredAt = shouldTransition && nextState === "expired" ? new Date() : undefined;
+        const [updated] = await tx
+            .update(paymentSessions)
+            .set({
+            status: shouldTransition ? nextState : undefined,
+            provider,
+            providerConnectionId,
+            providerSessionId: pinnedReferences.providerSessionId,
+            providerPaymentId: pinnedReferences.providerPaymentId,
+            providerPayload: mergeJsonbColumn(paymentSessions.providerPayload, providerData.providerPayload),
+            metadata: mergeJsonbColumn(paymentSessions.metadata, providerData.metadata),
+            redirectUrl: update.redirectUrl,
+            idempotencyKey: update.idempotencyKey,
+            failedAt,
+            cancelledAt,
+            expiredAt,
+            failureCode: shouldTransition && nextState === "failed"
+                ? `payment_adapter_${update.source}`
+                : undefined,
+            failureMessage: shouldTransition && nextState === "failed"
+                ? `Payment adapter ${update.source} mapped this session to failed.`
+                : undefined,
+            completedAt: shouldTransition && nextState === "paid" ? new Date() : undefined,
+            expiresAt: shouldTransition && nextState === "expired" ? toTimestamp(update.occurredAt) : undefined,
+            updatedAt: new Date(),
+        })
+            .where(eq(paymentSessions.id, update.paymentSessionId))
+            .returning();
+        await touchLinkedBookingUpdatedAt(tx, updated?.bookingId);
+        return updated ?? null;
+    });
+}
+async function applyPaymentAdapterStateUpdate(db, update, providerData, runtime) {
+    if (update.nextState === "paid" || update.nextState === "authorized") {
+        return financePaymentSessionCompletionService.completePaymentSession(db, update.paymentSessionId, {
+            status: update.nextState,
+            captureMode: "automatic",
+            ...providerData,
+        }, runtime, {
+            requireProcessorIdentityWhenConnectionPinned: true,
+            expectedPaymentAdapterStatusLeaseToken: update.statusLeaseToken,
+            sessionUpdate: {
+                redirectUrl: update.redirectUrl,
+                idempotencyKey: update.idempotencyKey,
+            },
+        });
+    }
+    return applyLockedNonCompletionStateUpdate(db, update, providerData);
+}
+export async function applyPaymentAdapterInitiationResult(db, paymentSessionId, adapterId, result, claim, runtime = {}) {
+    if (result.idempotencyKey !== claim.idempotencyKey) {
+        throw new PaymentValidationError("Payment adapter initiation returned a different idempotency key", { paymentSessionId, expectedIdempotencyKey: claim.idempotencyKey }, { status: 409, code: "payment_adapter_idempotency_mismatch" });
+    }
+    return applyPaymentAdapterStateUpdate(db, {
+        source: "initiation",
+        paymentSessionId,
+        nextState: result.nextState,
+        occurredAt: new Date().toISOString(),
+        processorIdentity: result.processorIdentity,
+        processorSessionId: result.processorSessionId,
+        processorPaymentId: result.processorPaymentId,
+        redirectUrl: result.checkout?.url ?? null,
+        idempotencyKey: result.idempotencyKey,
+        initiationClaimedAt: claim.claimedAt,
+    }, {
+        provider: result.processorIdentity?.providerId ?? adapterId,
+        providerConnectionId: result.processorIdentity?.connectionId,
+        providerSessionId: result.processorSessionId ?? undefined,
+        providerPaymentId: result.processorPaymentId ?? undefined,
+        providerPayload: result.raw === undefined ? undefined : { initiation: result.raw },
+        metadata: {
+            paymentAdapterInitiationClaim: null,
+            paymentAdapterInitiationIdempotencyKey: result.idempotencyKey,
+            paymentAdapterInitiationState: "complete",
+        },
+    }, runtime);
+}
 export async function applyPaymentAdapterCallbackEvent(db, event, runtime = {}) {
+    const update = { ...event, source: "callback" };
     const providerData = {
+        provider: event.processorIdentity?.providerId,
+        providerConnectionId: event.processorIdentity?.connectionId,
         providerSessionId: event.processorSessionId ?? undefined,
         providerPaymentId: event.processorPaymentId ?? undefined,
         providerPayload: event.raw === undefined ? undefined : { callback: event.raw },
         metadata: { paymentAdapterEventId: event.eventId, paymentAdapterOccurredAt: event.occurredAt },
     };
-    if (event.nextState === "paid" || event.nextState === "authorized") {
-        return financePaymentSessionCompletionService.completePaymentSession(db, event.paymentSessionId, {
-            status: event.nextState,
-            captureMode: "automatic",
-            ...providerData,
-        }, runtime);
-    }
-    if (event.nextState === "failed") {
-        return financePaymentSessionService.failPaymentSession(db, event.paymentSessionId, {
-            ...providerData,
-            failureCode: "payment_adapter_callback",
-            failureMessage: "Payment adapter callback mapped this session to failed.",
-        }, runtime);
-    }
-    if (event.nextState === "cancelled") {
-        return financePaymentSessionService.cancelPaymentSession(db, event.paymentSessionId, providerData, runtime);
-    }
-    if (event.nextState === "expired") {
-        return financePaymentSessionService.expirePaymentSession(db, event.paymentSessionId, providerData, runtime);
-    }
-    return financePaymentSessionService.updatePaymentSession(db, event.paymentSessionId, {
-        status: event.nextState,
-        ...providerData,
+    return applyPaymentAdapterStateUpdate(db, update, providerData, runtime);
+}
+export async function applyPaymentAdapterStatusResult(db, paymentSessionId, result, statusLeaseToken, runtime = {}, checkedAt = new Date()) {
+    const occurredAt = checkedAt.toISOString();
+    return applyPaymentAdapterStateUpdate(db, {
+        source: "status",
+        paymentSessionId,
+        nextState: result.nextState,
+        occurredAt,
+        processorIdentity: result.processorIdentity,
+        processorSessionId: result.processorSessionId,
+        processorPaymentId: result.processorPaymentId,
+        statusLeaseToken,
+    }, {
+        provider: result.processorIdentity?.providerId,
+        providerConnectionId: result.processorIdentity?.connectionId,
+        providerSessionId: result.processorSessionId ?? undefined,
+        providerPaymentId: result.processorPaymentId ?? undefined,
+        providerPayload: result.raw === undefined ? undefined : { status: result.raw },
+        metadata: {
+            paymentAdapterStatusCheckedAt: occurredAt,
+            paymentAdapterStatusRefreshAfter: checkedAt.getTime() + 30_000,
+            [PAYMENT_ADAPTER_STATUS_LEASE_TOKEN_KEY]: null,
+        },
     }, runtime);
 }