@open-mercato/core 0.6.6 → 0.6.7-develop.6553.1.2ec7246e04

package/src/modules/integrations/backend/integrations/[id]/page.tsx

@@ -1199,84 +1199,41 @@ export default function IntegrationDetailPage({ params }: IntegrationDetailPageP
           </section>
         ) : null}
 
-        <Tabs value={activeTab} onValueChange={handleTabChange} className="space-y-5">
-          <TabsList className="h-auto w-full justify-start overflow-x-auto rounded-none border-b border-border bg-transparent p-0">
+        <Tabs value={activeTab} onValueChange={handleTabChange} variant="underline" className="space-y-5">
+          <TabsList className="w-full overflow-x-auto">
             {showCredentialsTab ? (
-              <TabsTrigger
-                value="credentials"
-                className="mr-8 h-auto rounded-none border-b-2 border-transparent bg-transparent px-0 py-2.5 text-sm font-medium text-muted-foreground shadow-none transition-colors hover:bg-transparent hover:text-foreground aria-selected:border-accent-indigo aria-selected:bg-transparent aria-selected:text-foreground aria-selected:shadow-none last:mr-0"
-              >
-                <span className="inline-flex items-center gap-2">
-                  <Key className="h-4 w-4" />
-                  <span>{t('integrations.detail.tabs.credentials')}</span>
-                </span>
+              <TabsTrigger value="credentials" leading={<Key className="h-4 w-4" />}>
+                {t('integrations.detail.tabs.credentials')}
               </TabsTrigger>
             ) : null}
             {leadingInjectedTab ? (
-              <TabsTrigger
-                value={leadingInjectedTab.id}
-                className="mr-8 h-auto rounded-none border-b-2 border-transparent bg-transparent px-0 py-2.5 text-sm font-medium text-muted-foreground shadow-none transition-colors hover:bg-transparent hover:text-foreground aria-selected:border-accent-indigo aria-selected:bg-transparent aria-selected:text-foreground aria-selected:shadow-none last:mr-0"
-              >
-                <span className="inline-flex items-center gap-2">
-                  <Settings className="h-4 w-4" />
-                  <span>{leadingInjectedTab.label}</span>
-                </span>
+              <TabsTrigger value={leadingInjectedTab.id} leading={<Settings className="h-4 w-4" />}>
+                {leadingInjectedTab.label}
               </TabsTrigger>
             ) : null}
             {showVersionTab ? (
-              <TabsTrigger
-                value="version"
-                className="mr-8 h-auto rounded-none border-b-2 border-transparent bg-transparent px-0 py-2.5 text-sm font-medium text-muted-foreground shadow-none transition-colors hover:bg-transparent hover:text-foreground aria-selected:border-accent-indigo aria-selected:bg-transparent aria-selected:text-foreground aria-selected:shadow-none last:mr-0"
-              >
-                <span className="inline-flex items-center gap-2">
-                  <RefreshCw className="h-4 w-4" />
-                  <span>{t('integrations.detail.tabs.version')}</span>
-                </span>
+              <TabsTrigger value="version" leading={<RefreshCw className="h-4 w-4" />}>
+                {t('integrations.detail.tabs.version')}
               </TabsTrigger>
             ) : null}
             {showDataSyncScheduleTab ? (
-              <TabsTrigger
-                value="data-sync-schedule"
-                className="mr-8 h-auto rounded-none border-b-2 border-transparent bg-transparent px-0 py-2.5 text-sm font-medium text-muted-foreground shadow-none transition-colors hover:bg-transparent hover:text-foreground aria-selected:border-accent-indigo aria-selected:bg-transparent aria-selected:text-foreground aria-selected:shadow-none last:mr-0"
-              >
-                <span className="inline-flex items-center gap-2">
-                  <Calendar className="h-4 w-4" />
-                  <span>{t('data_sync.integrationTab.title', 'Sync schedules')}</span>
-                </span>
+              <TabsTrigger value="data-sync-schedule" leading={<Calendar className="h-4 w-4" />}>
+                {t('data_sync.integrationTab.title', 'Sync schedules')}
               </TabsTrigger>
             ) : null}
             {showHealthTab ? (
-              <TabsTrigger
-                value="health"
-                className="mr-8 h-auto rounded-none border-b-2 border-transparent bg-transparent px-0 py-2.5 text-sm font-medium text-muted-foreground shadow-none transition-colors hover:bg-transparent hover:text-foreground aria-selected:border-accent-indigo aria-selected:bg-transparent aria-selected:text-foreground aria-selected:shadow-none last:mr-0"
-              >
-                <span className="inline-flex items-center gap-2">
-                  <Activity className="h-4 w-4" />
-                  <span>{t('integrations.detail.tabs.health')}</span>
-                </span>
+              <TabsTrigger value="health" leading={<Activity className="h-4 w-4" />}>
+                {t('integrations.detail.tabs.health')}
               </TabsTrigger>
             ) : null}
             {showLogsTab ? (
-              <TabsTrigger
-                value="logs"
-                className="mr-8 h-auto rounded-none border-b-2 border-transparent bg-transparent px-0 py-2.5 text-sm font-medium text-muted-foreground shadow-none transition-colors hover:bg-transparent hover:text-foreground aria-selected:border-accent-indigo aria-selected:bg-transparent aria-selected:text-foreground aria-selected:shadow-none last:mr-0"
-              >
-                <span className="inline-flex items-center gap-2">
-                  <FileText className="h-4 w-4" />
-                  <span>{t('integrations.detail.tabs.logs')}</span>
-                </span>
+              <TabsTrigger value="logs" leading={<FileText className="h-4 w-4" />}>
+                {t('integrations.detail.tabs.logs')}
               </TabsTrigger>
             ) : null}
             {trailingInjectedTabs.map((tab) => (
-              <TabsTrigger
-                key={tab.id}
-                value={tab.id}
-                className="mr-8 h-auto rounded-none border-b-2 border-transparent bg-transparent px-0 py-2.5 text-sm font-medium text-muted-foreground shadow-none transition-colors hover:bg-transparent hover:text-foreground aria-selected:border-accent-indigo aria-selected:bg-transparent aria-selected:text-foreground aria-selected:shadow-none last:mr-0"
-              >
-                <span className="inline-flex items-center gap-2">
-                  <Settings className="h-4 w-4" />
-                  <span>{tab.label}</span>
-                </span>
+              <TabsTrigger key={tab.id} value={tab.id} leading={<Settings className="h-4 w-4" />}>
+                {tab.label}
               </TabsTrigger>
             ))}
           </TabsList>

package/src/modules/payment_gateways/data/entities.ts

@@ -75,6 +75,45 @@ export class GatewayTransaction {
   deletedAt?: Date | null
 }
 
+@Entity({ tableName: 'gateway_session_initializations' })
+@Unique({
+  name: 'gateway_session_initializations_scope_operation_unique',
+  properties: ['operationKey', 'providerKey', 'organizationId', 'tenantId'],
+})
+export class GatewaySessionInitialization {
+  [OptionalProps]?: 'claimToken' | 'claimedAt' | 'gatewayTransactionId' | 'createdAt' | 'updatedAt'
+
+  @PrimaryKey({ type: 'uuid', defaultRaw: 'gen_random_uuid()' })
+  id!: string
+
+  @Property({ name: 'operation_key', type: 'text' })
+  operationKey!: string
+
+  @Property({ name: 'provider_key', type: 'text' })
+  providerKey!: string
+
+  @Property({ name: 'claim_token', type: 'uuid', nullable: true })
+  claimToken?: string | null
+
+  @Property({ name: 'claimed_at', type: Date, nullable: true })
+  claimedAt?: Date | null
+
+  @Property({ name: 'gateway_transaction_id', type: 'uuid', nullable: true })
+  gatewayTransactionId?: string | null
+
+  @Property({ name: 'organization_id', type: 'uuid' })
+  organizationId!: string
+
+  @Property({ name: 'tenant_id', type: 'uuid' })
+  tenantId!: string
+
+  @Property({ name: 'created_at', type: Date, onCreate: () => new Date() })
+  createdAt: Date = new Date()
+
+  @Property({ name: 'updated_at', type: Date, onCreate: () => new Date(), onUpdate: () => new Date() })
+  updatedAt: Date = new Date()
+}
+
 @Entity({ tableName: 'gateway_webhook_events' })
 @Unique({
   name: 'gateway_webhook_events_idempotency_unique',

package/src/modules/payment_gateways/lib/gateway-service.ts

@@ -1,3 +1,4 @@
+import { randomUUID } from 'node:crypto'
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { findOneWithDecryption, findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import {
@@ -15,10 +16,21 @@ import type { CredentialsService } from '../../integrations/lib/credentials-serv
 import type { IntegrationStateService } from '../../integrations/lib/state-service'
 import type { IntegrationLogService } from '../../integrations/lib/log-service'
 import { conflict } from '@open-mercato/shared/lib/crud/errors'
-import { GatewayTransaction } from '../data/entities'
+import { GatewaySessionInitialization, GatewayTransaction } from '../data/entities'
 import { canApplyManualAction, isValidTransition, type ManualGatewayAction } from './status-machine'
 import { emitPaymentGatewayEvent } from '../events'
 import { readGatewayMetadata, readWebhookLog } from './transaction-fields'
+import {
+  buildPaymentSessionOperationKey,
+  claimPaymentSessionInitialization,
+  findPaymentSessionInitialization,
+  reclaimPaymentSessionInitialization,
+  refreshPaymentSessionInitialization,
+  releasePaymentSessionInitialization,
+} from './session-idempotency'
+
+const PAYMENT_SESSION_CLAIM_STALE_MS = 30_000
+const PAYMENT_SESSION_WAIT_INTERVAL_MS = 25
 
 function assertManualActionAllowed(action: ManualGatewayAction, transaction: GatewayTransaction): void {
   const current = transaction.unifiedStatus as UnifiedPaymentStatus
@@ -48,11 +60,17 @@ export interface PaymentGatewayServiceDeps {
   integrationCredentialsService: CredentialsService
   integrationStateService?: IntegrationStateService
   integrationLogService?: IntegrationLogService
+  sessionClaimOptions?: {
+    staleAfterMs?: number
+    heartbeatIntervalMs?: number
+    pollIntervalMs?: number
+  }
 }
 
 export interface CreatePaymentSessionInput {
   providerKey: string
   paymentId: string
+  idempotencyKey?: string
   orderId?: string
   amount: number
   currencyCode: string
@@ -69,6 +87,12 @@ export interface CreatePaymentSessionInput {
 
 export function createPaymentGatewayService(deps: PaymentGatewayServiceDeps) {
   const { em, integrationCredentialsService, integrationLogService } = deps
+  const claimStaleAfterMs = Math.max(1, deps.sessionClaimOptions?.staleAfterMs ?? PAYMENT_SESSION_CLAIM_STALE_MS)
+  const claimHeartbeatIntervalMs = Math.max(
+    1,
+    deps.sessionClaimOptions?.heartbeatIntervalMs ?? Math.floor(claimStaleAfterMs / 3),
+  )
+  const claimPollIntervalMs = Math.max(1, deps.sessionClaimOptions?.pollIntervalMs ?? PAYMENT_SESSION_WAIT_INTERVAL_MS)
 
   async function findTransactionOrThrow(
     transactionId: string,
@@ -152,6 +176,109 @@ export function createPaymentGatewayService(deps: PaymentGatewayServiceDeps) {
     return { adapter, credentials }
   }
 
+  function createGatewayTransaction(
+    manager: EntityManager,
+    input: CreatePaymentSessionInput,
+    session: CreateSessionResult,
+    id?: string,
+  ): GatewayTransaction {
+    const data = {
+      paymentId: input.paymentId,
+      providerKey: input.providerKey,
+      providerSessionId: session.sessionId,
+      unifiedStatus: session.status,
+      redirectUrl: session.redirectUrl
+        ?? (session.clientSession?.type === 'redirect' ? session.clientSession.redirectUrl : null),
+      clientSecret: session.clientSecret ?? null,
+      amount: String(input.amount),
+      currencyCode: input.currencyCode,
+      gatewayMetadata: {
+        ...(session.providerData ?? {}),
+        ...(session.clientSession ? { clientSession: session.clientSession } : {}),
+      },
+      organizationId: input.organizationId,
+      tenantId: input.tenantId,
+      deletedAt: null,
+    }
+    return id
+      ? manager.create(GatewayTransaction, { id, ...data })
+      : manager.create(GatewayTransaction, data)
+  }
+
+  function restoreSession(transaction: GatewayTransaction): CreateSessionResult {
+    const metadata = readGatewayMetadata(transaction.gatewayMetadata)
+    const { clientSession, ...providerData } = metadata
+    return {
+      sessionId: readProviderSessionId(transaction),
+      status: transaction.unifiedStatus as UnifiedPaymentStatus,
+      ...(transaction.clientSecret ? { clientSecret: transaction.clientSecret } : {}),
+      ...(transaction.redirectUrl ? { redirectUrl: transaction.redirectUrl } : {}),
+      ...(Object.keys(providerData).length > 0 ? { providerData } : {}),
+      ...(clientSession && typeof clientSession === 'object'
+        ? { clientSession: clientSession as CreateSessionResult['clientSession'] }
+        : {}),
+    }
+  }
+
+  async function recordCreatedSession(
+    transaction: GatewayTransaction,
+    input: CreatePaymentSessionInput,
+    scope: { organizationId: string; tenantId: string },
+  ): Promise<void> {
+    await emitPaymentGatewayEvent('payment_gateways.session.created', {
+      transactionId: transaction.id,
+      paymentId: transaction.paymentId,
+      providerKey: transaction.providerKey,
+      status: transaction.unifiedStatus,
+      organizationId: transaction.organizationId,
+      tenantId: transaction.tenantId,
+    })
+    await writeTransactionLog(
+      transaction.providerKey,
+      scope,
+      transaction.id,
+      'info',
+      'Payment session created',
+      {
+        paymentId: transaction.paymentId,
+        providerSessionId: transaction.providerSessionId,
+        status: transaction.unifiedStatus,
+        amount: input.amount,
+        currencyCode: input.currencyCode,
+      },
+    )
+  }
+
+  function startClaimHeartbeat(
+    ownership: { id: string; claimToken: string },
+    scope: { organizationId: string; tenantId: string },
+  ): () => Promise<void> {
+    let stopped = false
+    let timer: ReturnType<typeof setTimeout> | null = null
+    let pendingRefresh = Promise.resolve()
+
+    const schedule = () => {
+      timer = setTimeout(() => {
+        pendingRefresh = refreshPaymentSessionInitialization(em, ownership, scope, new Date())
+          .then(
+            (refreshed) => {
+              if (refreshed && !stopped) schedule()
+            },
+            () => {
+              if (!stopped) schedule()
+            },
+          )
+      }, claimHeartbeatIntervalMs)
+    }
+    schedule()
+
+    return async () => {
+      stopped = true
+      if (timer) clearTimeout(timer)
+      await pendingRefresh
+    }
+  }
+
   return {
     async createPaymentSession(input: CreatePaymentSessionInput): Promise<{ transaction: GatewayTransaction; session: CreateSessionResult }> {
       const scope = { organizationId: input.organizationId, tenantId: input.tenantId }
@@ -160,6 +287,7 @@ export function createPaymentGatewayService(deps: PaymentGatewayServiceDeps) {
       const sessionInput: CreateSessionInput = {
         paymentId: input.paymentId,
         orderId: input.orderId,
+        idempotencyKey: input.idempotencyKey,
         tenantId: input.tenantId,
         organizationId: input.organizationId,
         amount: input.amount,
@@ -174,50 +302,93 @@ export function createPaymentGatewayService(deps: PaymentGatewayServiceDeps) {
         credentials,
       }
 
-      const session = await adapter.createSession(sessionInput)
+      if (!input.idempotencyKey) {
+        const session = await adapter.createSession(sessionInput)
+        const transaction = createGatewayTransaction(em, input, session)
+        await em.persist(transaction).flush()
+        await recordCreatedSession(transaction, input, scope)
+        return { transaction, session }
+      }
 
-      const transaction = em.create(GatewayTransaction, {
+      const operationKey = buildPaymentSessionOperationKey({
+        idempotencyKey: input.idempotencyKey,
         paymentId: input.paymentId,
         providerKey: input.providerKey,
-        providerSessionId: session.sessionId,
-        unifiedStatus: session.status,
-        redirectUrl: session.redirectUrl
-          ?? (session.clientSession?.type === 'redirect' ? session.clientSession.redirectUrl : null),
-        clientSecret: session.clientSecret ?? null,
-        amount: String(input.amount),
-        currencyCode: input.currencyCode,
-        gatewayMetadata: {
-          ...(session.providerData ?? {}),
-          ...(session.clientSession ? { clientSession: session.clientSession } : {}),
-        },
-        organizationId: input.organizationId,
-        tenantId: input.tenantId,
-      })
-      await em.persist(transaction).flush()
-      await emitPaymentGatewayEvent('payment_gateways.session.created', {
-        transactionId: transaction.id,
-        paymentId: transaction.paymentId,
-        providerKey: transaction.providerKey,
-        status: transaction.unifiedStatus,
-        organizationId: transaction.organizationId,
-        tenantId: transaction.tenantId,
-      })
-      await writeTransactionLog(
-        transaction.providerKey,
         scope,
-        transaction.id,
-        'info',
-        'Payment session created',
-        {
-          paymentId: transaction.paymentId,
-          providerSessionId: transaction.providerSessionId,
-          status: transaction.unifiedStatus,
-          amount: input.amount,
-          currencyCode: input.currencyCode,
-        },
-      )
+      })
+      while (true) {
+        const existing = await findPaymentSessionInitialization(em, operationKey, input.providerKey, scope)
+        if (existing?.gatewayTransactionId) {
+          const transaction = await findOneWithDecryption(
+            em.fork(),
+            GatewayTransaction,
+            {
+              id: existing.gatewayTransactionId,
+              organizationId: scope.organizationId,
+              tenantId: scope.tenantId,
+              deletedAt: null,
+            },
+            undefined,
+            scope,
+          )
+          if (!transaction) {
+            throw new Error('Completed payment session is missing its gateway transaction')
+          }
+          return { transaction, session: restoreSession(transaction) }
+        }
+
+        const claimedAt = new Date()
+        const staleBefore = new Date(claimedAt.getTime() - claimStaleAfterMs)
+        const ownership = existing
+          ? await reclaimPaymentSessionInitialization(em, existing, scope, claimedAt, staleBefore)
+          : await claimPaymentSessionInitialization(em, operationKey, input.providerKey, scope, claimedAt)
+
+        if (!ownership) {
+          await new Promise((resolve) => setTimeout(resolve, claimPollIntervalMs))
+          continue
+        }
+
+        let session: CreateSessionResult
+        const stopHeartbeat = startClaimHeartbeat(ownership, scope)
+        try {
+          session = await adapter.createSession({ ...sessionInput, idempotencyKey: operationKey })
+        } catch (error) {
+          await releasePaymentSessionInitialization(em, ownership, scope).catch(() => undefined)
+          throw error
+        } finally {
+          await stopHeartbeat()
+        }
+
+        const transactionId = randomUUID()
+        const transaction = await em.fork().transactional(async (transactionEm) => {
+          const finalizedRows = await transactionEm.nativeUpdate(
+            GatewaySessionInitialization,
+            {
+              id: ownership.id,
+              claimToken: ownership.claimToken,
+              gatewayTransactionId: null,
+              organizationId: scope.organizationId,
+              tenantId: scope.tenantId,
+            },
+            {
+              gatewayTransactionId: transactionId,
+              claimToken: null,
+              claimedAt: null,
+              updatedAt: new Date(),
+            },
+          )
+          if (finalizedRows === 0) return null
+          const created = createGatewayTransaction(transactionEm, input, session, transactionId)
+          await transactionEm.persist(created).flush()
+          return created
+        })
 
-      return { transaction, session }
+        if (!transaction) {
+          continue
+        }
+        await recordCreatedSession(transaction, input, scope)
+        return { transaction, session }
+      }
     },
 
     async capturePayment(transactionId: string, amount: number | undefined, scope: { organizationId: string; tenantId: string }): Promise<CaptureResult> {

package/src/modules/payment_gateways/lib/session-idempotency.ts

@@ -0,0 +1,142 @@
+import { createHash, randomUUID } from 'node:crypto'
+import { UniqueConstraintViolationException } from '@mikro-orm/core'
+import type { EntityManager } from '@mikro-orm/postgresql'
+import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
+import { GatewaySessionInitialization } from '../data/entities'
+
+type Scope = { organizationId: string; tenantId: string }
+
+export type OwnedPaymentSessionInitialization = {
+  id: string
+  claimToken: string
+}
+
+export function buildPaymentSessionOperationKey(input: {
+  idempotencyKey: string
+  paymentId: string
+  providerKey: string
+  scope: Scope
+}): string {
+  const digest = createHash('sha256')
+    .update(JSON.stringify([
+      input.scope.tenantId,
+      input.scope.organizationId,
+      input.providerKey,
+      input.paymentId,
+      input.idempotencyKey,
+    ]))
+    .digest('hex')
+  return `om-payment-session:${digest}`
+}
+
+export async function findPaymentSessionInitialization(
+  em: EntityManager,
+  operationKey: string,
+  providerKey: string,
+  scope: Scope,
+): Promise<GatewaySessionInitialization | null> {
+  return findOneWithDecryption(
+    em.fork(),
+    GatewaySessionInitialization,
+    {
+      operationKey,
+      providerKey,
+      organizationId: scope.organizationId,
+      tenantId: scope.tenantId,
+    },
+    undefined,
+    scope,
+  )
+}
+
+export async function claimPaymentSessionInitialization(
+  em: EntityManager,
+  operationKey: string,
+  providerKey: string,
+  scope: Scope,
+  claimedAt: Date,
+): Promise<OwnedPaymentSessionInitialization | null> {
+  const claimEm = em.fork()
+  const claimToken = randomUUID()
+  const record = claimEm.create(GatewaySessionInitialization, {
+    operationKey,
+    providerKey,
+    claimToken,
+    claimedAt,
+    gatewayTransactionId: null,
+    organizationId: scope.organizationId,
+    tenantId: scope.tenantId,
+  })
+  try {
+    await claimEm.persist(record).flush()
+    return { id: record.id, claimToken }
+  } catch (error: unknown) {
+    if (error instanceof UniqueConstraintViolationException) return null
+    throw error
+  }
+}
+
+export async function reclaimPaymentSessionInitialization(
+  em: EntityManager,
+  claim: GatewaySessionInitialization,
+  scope: Scope,
+  claimedAt: Date,
+  staleBefore: Date,
+): Promise<OwnedPaymentSessionInitialization | null> {
+  const claimToken = randomUUID()
+  const claimedRows = await em.fork().nativeUpdate(
+    GatewaySessionInitialization,
+    {
+      id: claim.id,
+      operationKey: claim.operationKey,
+      providerKey: claim.providerKey,
+      organizationId: scope.organizationId,
+      tenantId: scope.tenantId,
+      gatewayTransactionId: null,
+      $or: [
+        { claimToken: null },
+        { claimedAt: { $lt: staleBefore } },
+      ],
+    },
+    { claimToken, claimedAt, updatedAt: claimedAt },
+  )
+  return claimedRows > 0 ? { id: claim.id, claimToken } : null
+}
+
+export async function releasePaymentSessionInitialization(
+  em: EntityManager,
+  ownership: OwnedPaymentSessionInitialization,
+  scope: Scope,
+): Promise<void> {
+  await em.fork().nativeUpdate(
+    GatewaySessionInitialization,
+    {
+      id: ownership.id,
+      claimToken: ownership.claimToken,
+      organizationId: scope.organizationId,
+      tenantId: scope.tenantId,
+      gatewayTransactionId: null,
+    },
+    { claimToken: null, claimedAt: null, updatedAt: new Date() },
+  )
+}
+
+export async function refreshPaymentSessionInitialization(
+  em: EntityManager,
+  ownership: OwnedPaymentSessionInitialization,
+  scope: Scope,
+  claimedAt: Date,
+): Promise<boolean> {
+  const refreshedRows = await em.fork().nativeUpdate(
+    GatewaySessionInitialization,
+    {
+      id: ownership.id,
+      claimToken: ownership.claimToken,
+      organizationId: scope.organizationId,
+      tenantId: scope.tenantId,
+      gatewayTransactionId: null,
+    },
+    { claimedAt, updatedAt: claimedAt },
+  )
+  return refreshedRows > 0
+}