cabloy 5.1.131 → 5.1.133

package/vona/src/suite/cabloy-basic/modules/basic-siteweb/src/config/locale/en-us.ts

@@ -1,3 +1,4 @@
 export default {
   Home: 'Home',
+  SiteTitle: 'Web',
 };

package/vona/src/suite/cabloy-basic/modules/basic-siteweb/src/config/locale/zh-cn.ts

@@ -1,3 +1,4 @@
 export default {
   Home: '首页',
+  SiteTitle: '网站',
 };

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/cli/ssrSite/boilerplate/{{sceneName}}.{{beanName}}.ts_

@@ -21,6 +21,7 @@ export interface ISsrSiteOptions<%=argv.beanNameCapitalize%> extends IDecoratorS
 
 @SsrSite<ISsrSiteOptions<%=argv.beanNameCapitalize%>>({
   siteId: 'some',
+  title: 'Some Site',
   publicPath: 'some',
   bundlePath: 'front-bundle-path',
 })

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-ssr",
-  "version": "5.1.27",
+  "version": "5.1.28",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/src/types/env.ts

@@ -18,9 +18,7 @@ export interface ZovaConfigEnv {
   API_BASE_URL: string | undefined;
   API_PREFIX: string | undefined;
   API_JWT: string | undefined;
-  SSR_COOKIE_THEMENAME: string | undefined;
-  SSR_COOKIE_THEMEDARK: string | undefined;
   SSR_COOKIE_THEMEDARK_DEFAULT: string | undefined;
-  SSR_BODYREADYOBSERVER: string | undefined;
   SSR_WITH_VONA: string | undefined;
+  SSR_PROFILE: 'public' | 'session' | undefined;
 }

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/src/types/ssrSite.ts

@@ -1,5 +1,5 @@
 import type http from 'node:http';
-import type { IInstanceRecord, OmitNever } from 'vona';
+import type { IInstanceRecord, ILocaleMagic, OmitNever } from 'vona';
 import type {
   IOnionOptionsEnable,
   IOnionOptionsMatch,
@@ -70,6 +70,7 @@ export interface IDecoratorSsrSiteOptions<
     IOnionOptionsEnable,
     IOnionOptionsMatch<TypeOnionOptionsMatchRule<keyof IInstanceRecord>> {
   siteId: keyof ISsrSiteIdRecord;
+  title: string | ILocaleMagic;
   publicPath: keyof ISsrSitePublicPathRecord;
   bundlePath: string;
   diagnostics?: ISsrSiteDiagnosticsOptions;

package/vona/src/suite-vendor/a-cabloy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-cabloy",
-  "version": "5.1.42",
+  "version": "5.1.43",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",

package/vona/src/suite-vendor/a-pay/modules/a-pay/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-pay",
-  "version": "5.0.4",
+  "version": "5.0.5",
   "description": "",
   "keywords": [
     "Vona Module"

package/vona/src/suite-vendor/a-pay/modules/a-pay/src/.metadata/index.ts

@@ -7,12 +7,14 @@ export * from '../entity/outboxEvent.tsx';
 export * from '../entity/paymentAudit.tsx';
 export * from '../entity/paymentSession.tsx';
 export * from '../entity/providerOperation.tsx';
+export * from '../entity/providerOperationRecoveryAudit.tsx';
 export * from '../entity/refundOperation.tsx';
 export * from '../entity/webhookInbox.tsx';
 import type { IEntityOptionsOutboxEvent } from '../entity/outboxEvent.tsx';
 import type { IEntityOptionsPaymentAudit } from '../entity/paymentAudit.tsx';
 import type { IEntityOptionsPaymentSession } from '../entity/paymentSession.tsx';
 import type { IEntityOptionsProviderOperation } from '../entity/providerOperation.tsx';
+import type { IEntityOptionsProviderOperationRecoveryAudit } from '../entity/providerOperationRecoveryAudit.tsx';
 import type { IEntityOptionsRefundOperation } from '../entity/refundOperation.tsx';
 import type { IEntityOptionsWebhookInbox } from '../entity/webhookInbox.tsx';
 import 'vona-module-a-orm';
@@ -23,6 +25,7 @@ declare module 'vona-module-a-orm' {
 'a-pay:paymentAudit': IEntityOptionsPaymentAudit;
 'a-pay:paymentSession': IEntityOptionsPaymentSession;
 'a-pay:providerOperation': IEntityOptionsProviderOperation;
+'a-pay:providerOperationRecoveryAudit': IEntityOptionsProviderOperationRecoveryAudit;
 'a-pay:refundOperation': IEntityOptionsRefundOperation;
 'a-pay:webhookInbox': IEntityOptionsWebhookInbox;
     }
@@ -38,6 +41,7 @@ import type { EntityOutboxEvent } from '../entity/outboxEvent.tsx';
 import type { EntityPaymentAudit } from '../entity/paymentAudit.tsx';
 import type { EntityPaymentSession } from '../entity/paymentSession.tsx';
 import type { EntityProviderOperation } from '../entity/providerOperation.tsx';
+import type { EntityProviderOperationRecoveryAudit } from '../entity/providerOperationRecoveryAudit.tsx';
 import type { EntityRefundOperation } from '../entity/refundOperation.tsx';
 import type { EntityWebhookInbox } from '../entity/webhookInbox.tsx';
 export interface IModuleEntity {
@@ -45,6 +49,7 @@ export interface IModuleEntity {
 'paymentAudit': EntityPaymentAuditMeta;
 'paymentSession': EntityPaymentSessionMeta;
 'providerOperation': EntityProviderOperationMeta;
+'providerOperationRecoveryAudit': EntityProviderOperationRecoveryAuditMeta;
 'refundOperation': EntityRefundOperationMeta;
 'webhookInbox': EntityWebhookInboxMeta;
 }
@@ -54,12 +59,14 @@ export type EntityOutboxEventTableName = 'payOutboxEvent';
 export type EntityPaymentAuditTableName = 'payPaymentAudit';
 export type EntityPaymentSessionTableName = 'payPaymentSession';
 export type EntityProviderOperationTableName = 'payProviderOperation';
+export type EntityProviderOperationRecoveryAuditTableName = 'payProviderOperationRecoveryAudit';
 export type EntityRefundOperationTableName = 'payRefundOperation';
 export type EntityWebhookInboxTableName = 'payWebhookInbox';
 export type EntityOutboxEventMeta=TypeEntityMeta<EntityOutboxEvent,EntityOutboxEventTableName>;
 export type EntityPaymentAuditMeta=TypeEntityMeta<EntityPaymentAudit,EntityPaymentAuditTableName>;
 export type EntityPaymentSessionMeta=TypeEntityMeta<EntityPaymentSession,EntityPaymentSessionTableName>;
 export type EntityProviderOperationMeta=TypeEntityMeta<EntityProviderOperation,EntityProviderOperationTableName>;
+export type EntityProviderOperationRecoveryAuditMeta=TypeEntityMeta<EntityProviderOperationRecoveryAudit,EntityProviderOperationRecoveryAuditTableName>;
 export type EntityRefundOperationMeta=TypeEntityMeta<EntityRefundOperation,EntityRefundOperationTableName>;
 export type EntityWebhookInboxMeta=TypeEntityMeta<EntityWebhookInbox,EntityWebhookInboxTableName>;
 declare module 'vona-module-a-orm' {
@@ -68,6 +75,7 @@ declare module 'vona-module-a-orm' {
 'payPaymentAudit': EntityPaymentAuditMeta;
 'payPaymentSession': EntityPaymentSessionMeta;
 'payProviderOperation': EntityProviderOperationMeta;
+'payProviderOperationRecoveryAudit': EntityProviderOperationRecoveryAuditMeta;
 'payRefundOperation': EntityRefundOperationMeta;
 'payWebhookInbox': EntityWebhookInboxMeta;
   }
@@ -90,6 +98,10 @@ declare module 'vona-module-a-pay' {
       fields?: TypeEntityOptionsFields<EntityProviderOperation, IEntityOptionsProviderOperation[TypeSymbolKeyFieldsMore]>;
     }
 
+    export interface IEntityOptionsProviderOperationRecoveryAudit {
+      fields?: TypeEntityOptionsFields<EntityProviderOperationRecoveryAudit, IEntityOptionsProviderOperationRecoveryAudit[TypeSymbolKeyFieldsMore]>;
+    }
+
     export interface IEntityOptionsRefundOperation {
       fields?: TypeEntityOptionsFields<EntityRefundOperation, IEntityOptionsRefundOperation[TypeSymbolKeyFieldsMore]>;
     }
@@ -104,12 +116,14 @@ export * from '../model/outboxEvent.ts';
 export * from '../model/paymentAudit.ts';
 export * from '../model/paymentSession.ts';
 export * from '../model/providerOperation.ts';
+export * from '../model/providerOperationRecoveryAudit.ts';
 export * from '../model/refundOperation.ts';
 export * from '../model/webhookInbox.ts';
 import type { IModelOptionsOutboxEvent } from '../model/outboxEvent.ts';
 import type { IModelOptionsPaymentAudit } from '../model/paymentAudit.ts';
 import type { IModelOptionsPaymentSession } from '../model/paymentSession.ts';
 import type { IModelOptionsProviderOperation } from '../model/providerOperation.ts';
+import type { IModelOptionsProviderOperationRecoveryAudit } from '../model/providerOperationRecoveryAudit.ts';
 import type { IModelOptionsRefundOperation } from '../model/refundOperation.ts';
 import type { IModelOptionsWebhookInbox } from '../model/webhookInbox.ts';
 import 'vona-module-a-orm';
@@ -120,6 +134,7 @@ declare module 'vona-module-a-orm' {
 'a-pay:paymentAudit': IModelOptionsPaymentAudit;
 'a-pay:paymentSession': IModelOptionsPaymentSession;
 'a-pay:providerOperation': IModelOptionsProviderOperation;
+'a-pay:providerOperationRecoveryAudit': IModelOptionsProviderOperationRecoveryAudit;
 'a-pay:refundOperation': IModelOptionsRefundOperation;
 'a-pay:webhookInbox': IModelOptionsWebhookInbox;
     }
@@ -172,6 +187,17 @@ declare module 'vona-module-a-pay' {
             get $onionOptions(): IModelOptionsProviderOperation;
           }
 
+        export interface ModelProviderOperationRecoveryAudit {
+          /** @internal */
+          get scope(): ScopeModuleAPay;
+        }
+
+          export interface ModelProviderOperationRecoveryAudit {
+            get $beanFullName(): 'a-pay.model.providerOperationRecoveryAudit';
+            get $onionName(): 'a-pay:providerOperationRecoveryAudit';
+            get $onionOptions(): IModelOptionsProviderOperationRecoveryAudit;
+          }
+
         export interface ModelRefundOperation {
           /** @internal */
           get scope(): ScopeModuleAPay;
@@ -200,6 +226,7 @@ import type { ModelOutboxEvent } from '../model/outboxEvent.ts';
 import type { ModelPaymentAudit } from '../model/paymentAudit.ts';
 import type { ModelPaymentSession } from '../model/paymentSession.ts';
 import type { ModelProviderOperation } from '../model/providerOperation.ts';
+import type { ModelProviderOperationRecoveryAudit } from '../model/providerOperationRecoveryAudit.ts';
 import type { ModelRefundOperation } from '../model/refundOperation.ts';
 import type { ModelWebhookInbox } from '../model/webhookInbox.ts';
 export interface IModuleModel {
@@ -207,6 +234,7 @@ export interface IModuleModel {
 'paymentAudit': ModelPaymentAudit;
 'paymentSession': ModelPaymentSession;
 'providerOperation': ModelProviderOperation;
+'providerOperationRecoveryAudit': ModelProviderOperationRecoveryAudit;
 'refundOperation': ModelRefundOperation;
 'webhookInbox': ModelWebhookInbox;
 }
@@ -220,6 +248,7 @@ declare module 'vona' {
 'a-pay.model.paymentAudit': ModelPaymentAudit;
 'a-pay.model.paymentSession': ModelPaymentSession;
 'a-pay.model.providerOperation': ModelProviderOperation;
+'a-pay.model.providerOperationRecoveryAudit': ModelProviderOperationRecoveryAudit;
 'a-pay.model.refundOperation': ModelRefundOperation;
 'a-pay.model.webhookInbox': ModelWebhookInbox;
   }
@@ -378,6 +407,43 @@ export interface ModelProviderOperation {
 updateById<T extends IModelUpdateOptions<EntityProviderOperation,ModelProviderOperation>>(id: TableIdentity, data: TypeModelMutateRelationData<EntityProviderOperation,ModelProviderOperation, T>, options?: T): Promise<TypeModelMutateRelationData<EntityProviderOperation,ModelProviderOperation, T>>;
 deleteById<T extends IModelDeleteOptions<EntityProviderOperation,ModelProviderOperation>>(id: TableIdentity, options?: T): Promise<void>;
     }
+export interface ModelProviderOperationRecoveryAudit {
+      [SymbolKeyEntity]: EntityProviderOperationRecoveryAudit;
+      [SymbolKeyEntityMeta]: EntityProviderOperationRecoveryAuditMeta;
+      [SymbolKeyModelOptions]: IModelOptionsProviderOperationRecoveryAudit;
+      get<T extends IModelGetOptions<EntityProviderOperationRecoveryAudit,ModelProviderOperationRecoveryAudit>>(where: TypeModelWhere<EntityProviderOperationRecoveryAudit>, options?: T): Promise<TypeModelRelationResult<EntityProviderOperationRecoveryAudit, ModelProviderOperationRecoveryAudit, T> | undefined>;
+      /**
+       * Retrieves one matching primary row with a pessimistic FOR UPDATE lock.
+       * Requires an active transaction. The lock is released when that transaction completes.
+       * Entity and query caches are bypassed.
+       */
+      getForUpdate<T extends IModelGetOptions<EntityProviderOperationRecoveryAudit,ModelProviderOperationRecoveryAudit>>(where: TypeModelWhere<EntityProviderOperationRecoveryAudit>, options?: T): Promise<TypeModelRelationResult<EntityProviderOperationRecoveryAudit, ModelProviderOperationRecoveryAudit, T> | undefined>;
+      /**
+       * Retrieves a primary row by ID with the same pessimistic FOR UPDATE lock semantics.
+       * Requires an active transaction. The lock is released when that transaction completes.
+       * Entity and query caches are bypassed.
+       */
+      getByIdForUpdate<T extends IModelGetOptions<EntityProviderOperationRecoveryAudit,ModelProviderOperationRecoveryAudit>>(id: TableIdentity, options?: T): Promise<TypeModelRelationResult<EntityProviderOperationRecoveryAudit, ModelProviderOperationRecoveryAudit, T> | undefined>;
+      mget<T extends IModelGetOptions<EntityProviderOperationRecoveryAudit,ModelProviderOperationRecoveryAudit>>(ids: TableIdentity[], options?: T): Promise<TypeModelRelationResult<EntityProviderOperationRecoveryAudit, ModelProviderOperationRecoveryAudit, T>[]>;
+      selectAndCount<T extends IModelSelectParams<EntityProviderOperationRecoveryAudit,ModelProviderOperationRecoveryAudit,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelSelectAndCount<EntityProviderOperationRecoveryAudit, ModelProviderOperationRecoveryAudit, T>>;
+      select<T extends IModelSelectParams<EntityProviderOperationRecoveryAudit,ModelProviderOperationRecoveryAudit,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelRelationResult<EntityProviderOperationRecoveryAudit, ModelProviderOperationRecoveryAudit, T>[]>;
+      insert<T extends IModelInsertOptions<EntityProviderOperationRecoveryAudit,ModelProviderOperationRecoveryAudit>>(data?: TypeModelMutateRelationData<EntityProviderOperationRecoveryAudit,ModelProviderOperationRecoveryAudit, T>, options?: T): Promise<TypeModelMutateRelationData<EntityProviderOperationRecoveryAudit,ModelProviderOperationRecoveryAudit, T, true>>;
+      insertBulk<T extends IModelInsertOptions<EntityProviderOperationRecoveryAudit,ModelProviderOperationRecoveryAudit>>(items: TypeModelMutateRelationData<EntityProviderOperationRecoveryAudit,ModelProviderOperationRecoveryAudit, T>[], options?: T): Promise<TypeModelMutateRelationData<EntityProviderOperationRecoveryAudit,ModelProviderOperationRecoveryAudit, T, true>[]>;
+      update<T extends IModelUpdateOptions<EntityProviderOperationRecoveryAudit,ModelProviderOperationRecoveryAudit>>(data: TypeModelMutateRelationData<EntityProviderOperationRecoveryAudit,ModelProviderOperationRecoveryAudit, T>, options?: T): Promise<TypeModelMutateRelationData<EntityProviderOperationRecoveryAudit,ModelProviderOperationRecoveryAudit, T>>;
+      updateBulk<T extends IModelUpdateOptions<EntityProviderOperationRecoveryAudit,ModelProviderOperationRecoveryAudit>>(items: TypeModelMutateRelationData<EntityProviderOperationRecoveryAudit,ModelProviderOperationRecoveryAudit, T>[], options?: T): Promise<TypeModelMutateRelationData<EntityProviderOperationRecoveryAudit,ModelProviderOperationRecoveryAudit, T>[]>;
+      delete<T extends IModelDeleteOptions<EntityProviderOperationRecoveryAudit,ModelProviderOperationRecoveryAudit>>(where?: TypeModelWhere<EntityProviderOperationRecoveryAudit>, options?: T): Promise<void>;
+      deleteBulk<T extends IModelDeleteOptions<EntityProviderOperationRecoveryAudit,ModelProviderOperationRecoveryAudit>>(ids: TableIdentity[], options?: T): Promise<void>;
+      mutate<T extends IModelMutateOptions<EntityProviderOperationRecoveryAudit,ModelProviderOperationRecoveryAudit>>(data?: TypeModelMutateRelationData<EntityProviderOperationRecoveryAudit,ModelProviderOperationRecoveryAudit, T>, options?: T): Promise<TypeModelMutateRelationData<EntityProviderOperationRecoveryAudit,ModelProviderOperationRecoveryAudit, T>>;
+      mutateBulk<T extends IModelMutateOptions<EntityProviderOperationRecoveryAudit,ModelProviderOperationRecoveryAudit>>(items: TypeModelMutateRelationData<EntityProviderOperationRecoveryAudit,ModelProviderOperationRecoveryAudit, T>[], options?: T): Promise<TypeModelMutateRelationData<EntityProviderOperationRecoveryAudit,ModelProviderOperationRecoveryAudit, T>[]>;
+      count<T extends IModelSelectCountParams<EntityProviderOperationRecoveryAudit,ModelProviderOperationRecoveryAudit,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<string | undefined>;
+      increment<T extends IModelIncrementParams<EntityProviderOperationRecoveryAudit,ModelProviderOperationRecoveryAudit,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<number>;
+      decrement<T extends IModelIncrementParams<EntityProviderOperationRecoveryAudit,ModelProviderOperationRecoveryAudit,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<number>;
+      aggregate<T extends IModelSelectAggrParams<EntityProviderOperationRecoveryAudit,ModelProviderOperationRecoveryAudit,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelAggrRelationResult<T>>;
+      group<T extends IModelSelectGroupParams<EntityProviderOperationRecoveryAudit,ModelProviderOperationRecoveryAudit,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelGroupRelationResult<EntityProviderOperationRecoveryAudit, T>[]>;
+      getById<T extends IModelGetOptions<EntityProviderOperationRecoveryAudit,ModelProviderOperationRecoveryAudit>>(id: TableIdentity, options?: T): Promise<TypeModelRelationResult<EntityProviderOperationRecoveryAudit, ModelProviderOperationRecoveryAudit, T> | undefined>;
+updateById<T extends IModelUpdateOptions<EntityProviderOperationRecoveryAudit,ModelProviderOperationRecoveryAudit>>(id: TableIdentity, data: TypeModelMutateRelationData<EntityProviderOperationRecoveryAudit,ModelProviderOperationRecoveryAudit, T>, options?: T): Promise<TypeModelMutateRelationData<EntityProviderOperationRecoveryAudit,ModelProviderOperationRecoveryAudit, T>>;
+deleteById<T extends IModelDeleteOptions<EntityProviderOperationRecoveryAudit,ModelProviderOperationRecoveryAudit>>(id: TableIdentity, options?: T): Promise<void>;
+    }
 export interface ModelRefundOperation {
       [SymbolKeyEntity]: EntityRefundOperation;
       [SymbolKeyEntityMeta]: EntityRefundOperationMeta;
@@ -459,6 +525,7 @@ declare module 'vona-module-a-orm' {
 'a-pay:paymentAudit': ModelPaymentAudit;
 'a-pay:paymentSession': ModelPaymentSession;
 'a-pay:providerOperation': ModelProviderOperation;
+'a-pay:providerOperationRecoveryAudit': ModelProviderOperationRecoveryAudit;
 'a-pay:refundOperation': ModelRefundOperation;
 'a-pay:webhookInbox': ModelWebhookInbox;
   }

package/vona/src/suite-vendor/a-pay/modules/a-pay/src/bean/bean.payProvider.ts

@@ -35,6 +35,7 @@ export class BeanPayProvider extends BeanBase {
       {},
       options.base,
       clientOptions,
+      this.ctx?.state.payProviderClientOptions?.[`${String(providerName)}/${String(clientName)}`],
     ) as TypePayProviderClientOptionsByName<N>;
     if (resolvedOptions.environment !== 'sandbox' && resolvedOptions.environment !== 'live') {
       this.app.throw(

package/vona/src/suite-vendor/a-pay/modules/a-pay/src/bean/bean.payScene.ts

@@ -1,5 +1,6 @@
 import type { TableIdentity } from 'table-identity';
 
+import { zodCustomError } from '@cabloy/utils';
 import { BeanBase } from 'vona';
 import { Bean } from 'vona-module-a-bean';
 
@@ -21,7 +22,7 @@ export class BeanPayScene extends BeanBase {
 
   getOptions<N extends keyof IPaySceneRecord>(paySceneName: N): IDecoratorPaySceneOptions {
     const onionSlice = this._getOnionSlice(paySceneName);
-    return onionSlice.beanOptions.options as IDecoratorPaySceneOptions;
+    return onionSlice.beanOptions.options as unknown as IDecoratorPaySceneOptions;
   }
 
   async getAvailableProviderCandidates<N extends keyof IPaySceneRecord>(
@@ -58,7 +59,7 @@ export class BeanPayScene extends BeanBase {
       input.providerCandidateKey &&
       !allProviders.some(item => item.key === input.providerCandidateKey)
     ) {
-      this.app.throw(422, 'payment provider candidate is unavailable');
+      throw zodCustomError(['providerCandidateKey'], 'payment provider candidate is unavailable');
     }
     const providers = await this._getAvailableProviderCandidates(options, {
       payScene: paySceneName,
@@ -69,7 +70,7 @@ export class BeanPayScene extends BeanBase {
       input.providerCandidateKey &&
       !providers.some(item => item.key === input.providerCandidateKey)
     ) {
-      this.app.throw(422, 'payment provider candidate is unavailable');
+      throw zodCustomError(['providerCandidateKey'], 'payment provider candidate is unavailable');
     }
     const candidateKey = await this._resolveProviderCandidateKey(
       paySceneName,
@@ -146,7 +147,7 @@ export class BeanPayScene extends BeanBase {
   ) {
     if (input.providerCandidateKey) {
       if (!providers.some(item => item.key === input.providerCandidateKey)) {
-        this.app.throw(422, 'payment provider candidate is unavailable');
+        throw zodCustomError(['providerCandidateKey'], 'payment provider candidate is unavailable');
       }
       return input.providerCandidateKey;
     }

package/vona/src/suite-vendor/a-pay/modules/a-pay/src/bean/meta.index.ts

@@ -7,6 +7,7 @@ import { $tableColumns } from 'vona-module-a-ormutils';
 @Meta<IMetaOptionsIndex>({
   indexes: {
     ...$tableColumns('payPaymentSession', 'businessReference'),
+    ...$tableColumns('payPaymentSession', 'providerCorrelationReference'),
     ...$tableColumns('payPaymentSession', 'state+expiresAt'),
     ...$tableColumns('payPaymentSession', 'providerPaymentId'),
     ...$tableColumns('payPaymentSession', 'providerOrderId'),
@@ -16,7 +17,14 @@ import { $tableColumns } from 'vona-module-a-ormutils';
     ...$tableColumns('payProviderOperation', 'state+nextAttemptAt'),
     ...$tableColumns('payProviderOperation', 'state+claimExpiresAt'),
     ...$tableColumns('payProviderOperation', 'idempotencyKey'),
+    ...$tableColumns(
+      'payProviderOperationRecoveryAudit',
+      'providerOperationId+actionIdempotencyKey',
+    ),
+    ...$tableColumns('payProviderOperationRecoveryAudit', 'providerOperationId+occurredAt'),
     ...$tableColumns('payRefundOperation', 'paymentSessionId'),
+    ...$tableColumns('payRefundOperation', 'providerCorrelationReference'),
+    ...$tableColumns('payRefundOperation', 'providerRefundId'),
     ...$tableColumns('payRefundOperation', 'state'),
     ...$tableColumns('payWebhookInbox', 'providerName+clientName'),
     ...$tableColumns('payWebhookInbox', 'providerEventId'),

package/vona/src/suite-vendor/a-pay/modules/a-pay/src/bean/meta.version.ts

@@ -14,6 +14,8 @@ export class MetaVersion extends BeanBase implements IMetaVersionUpdate {
       table.userId(paymentSession.userId);
       table.string(paymentSession.payScene, 100);
       table.string(paymentSession.businessReference, 100);
+      table.string(paymentSession.providerInvoiceReference, 100);
+      table.string(paymentSession.providerCorrelationReference, 100);
       table.string(paymentSession.providerName, 100);
       table.string(paymentSession.clientName, 100);
       table.string(paymentSession.environment, 16);
@@ -45,6 +47,7 @@ export class MetaVersion extends BeanBase implements IMetaVersionUpdate {
       table.string(providerOperation.claimToken, 100);
       table.dateTime(providerOperation.claimExpiresAt);
       table.dateTime(providerOperation.submittedAt);
+      table.dateTime(providerOperation.recoveryRetryGrantedAt);
       table.dateTime(providerOperation.nextAttemptAt);
       table.string(providerOperation.errorCode, 100);
       table.string(providerOperation.errorSummary, 255);
@@ -56,6 +59,8 @@ export class MetaVersion extends BeanBase implements IMetaVersionUpdate {
       table.basicFields();
       table.tableIdentity(refundOperation.paymentSessionId);
       table.string(refundOperation.businessReference, 100);
+      table.string(refundOperation.providerInvoiceReference, 100);
+      table.string(refundOperation.providerCorrelationReference, 100);
       table.integer(refundOperation.amountMinor);
       table.string(refundOperation.currency, 3);
       table.string(refundOperation.state, 32);
@@ -64,6 +69,23 @@ export class MetaVersion extends BeanBase implements IMetaVersionUpdate {
       table.dateTime(refundOperation.finalizedAt);
     });
 
+    const providerOperationRecoveryAudit = this.scope.entity.providerOperationRecoveryAudit;
+    await this.bean.model.createTable(providerOperationRecoveryAudit.$table, table => {
+      table.basicFields();
+      table.tableIdentity(providerOperationRecoveryAudit.providerOperationId);
+      table.tableIdentity(providerOperationRecoveryAudit.actorId);
+      table.string(providerOperationRecoveryAudit.action, 32);
+      table.string(providerOperationRecoveryAudit.actionIdempotencyKey, 100);
+      table.string(providerOperationRecoveryAudit.reason, 255);
+      table.string(providerOperationRecoveryAudit.beforeState, 32);
+      table.string(providerOperationRecoveryAudit.afterState, 32);
+      table.integer(providerOperationRecoveryAudit.beforeAttemptCount);
+      table.integer(providerOperationRecoveryAudit.afterAttemptCount);
+      table.string(providerOperationRecoveryAudit.resolution, 32);
+      table.string(providerOperationRecoveryAudit.providerRefundId, 255);
+      table.dateTime(providerOperationRecoveryAudit.occurredAt);
+    });
+
     const webhookInbox = this.scope.entity.webhookInbox;
     await this.bean.model.createTable(webhookInbox.$table, table => {
       table.basicFields();

package/vona/src/suite-vendor/a-pay/modules/a-pay/src/bean/schedule.providerOperationDispatch.ts

@@ -3,7 +3,7 @@ import type { IScheduleExecute } from 'vona-module-a-schedule';
 import { BeanBase } from 'vona';
 import { Schedule } from 'vona-module-a-schedule';
 
-@Schedule({ repeat: { every: 60 * 1000 } })
+@Schedule({ repeat: { every: 5 * 1000 } })
 export class ScheduleProviderOperationDispatch extends BeanBase implements IScheduleExecute {
   async execute() {
     await this.scope.service.providerOperation.queueDue();

package/vona/src/suite-vendor/a-pay/modules/a-pay/src/entity/paymentSession.tsx

@@ -20,6 +20,12 @@ export class EntityPaymentSession extends EntityBase {
   @Api.field(v.required(), v.min(1), v.max(100))
   businessReference: string;
 
+  @Api.field(v.required(), v.min(1), v.max(100))
+  providerInvoiceReference: string;
+
+  @Api.field(v.required(), v.min(1), v.max(100))
+  providerCorrelationReference: string;
+
   @Api.field(z.string())
   providerName: string;
 

package/vona/src/suite-vendor/a-pay/modules/a-pay/src/entity/providerOperation.tsx

@@ -52,6 +52,9 @@ export class EntityProviderOperation extends EntityBase {
   @Api.field(v.optional())
   submittedAt?: Date;
 
+  @Api.field(v.optional())
+  recoveryRetryGrantedAt?: Date;
+
   @Api.field(v.optional())
   nextAttemptAt?: Date;
 

package/vona/src/suite-vendor/a-pay/modules/a-pay/src/entity/providerOperationRecoveryAudit.tsx

@@ -0,0 +1,53 @@
+import type { TableIdentity } from 'table-identity';
+import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
+
+import { Api, v } from 'vona-module-a-openapiutils';
+import { Entity, EntityBase } from 'vona-module-a-orm';
+import { z } from 'zod';
+
+import type { TypeProviderOperationState } from '../types/payment.ts';
+
+export interface IEntityOptionsProviderOperationRecoveryAudit extends IDecoratorEntityOptions {}
+
+@Entity<IEntityOptionsProviderOperationRecoveryAudit>('payProviderOperationRecoveryAudit')
+export class EntityProviderOperationRecoveryAudit extends EntityBase {
+  @Api.field(v.tableIdentity())
+  providerOperationId: TableIdentity;
+
+  @Api.field(v.optional(), v.tableIdentity())
+  actorId?: TableIdentity;
+
+  @Api.field(z.enum(['reconcile', 'retry']))
+  action: 'reconcile' | 'retry';
+
+  @Api.field(v.required(), v.min(1), v.max(100))
+  actionIdempotencyKey: string;
+
+  @Api.field(v.required(), v.min(1), v.max(255))
+  reason: string;
+
+  @Api.field(
+    z.enum(['created', 'claimed', 'submitted', 'succeeded', 'failed', 'reconciliation_required']),
+  )
+  beforeState: TypeProviderOperationState;
+
+  @Api.field(
+    z.enum(['created', 'claimed', 'submitted', 'succeeded', 'failed', 'reconciliation_required']),
+  )
+  afterState: TypeProviderOperationState;
+
+  @Api.field(z.number().int().nonnegative())
+  beforeAttemptCount: number;
+
+  @Api.field(z.number().int().nonnegative())
+  afterAttemptCount: number;
+
+  @Api.field(z.enum(['reconciled', 'unresolved', 'retried']))
+  resolution: 'reconciled' | 'unresolved' | 'retried';
+
+  @Api.field(v.optional(), v.max(255))
+  providerRefundId?: string;
+
+  @Api.field(v.required())
+  occurredAt: Date;
+}

package/vona/src/suite-vendor/a-pay/modules/a-pay/src/entity/refundOperation.tsx

@@ -17,6 +17,12 @@ export class EntityRefundOperation extends EntityBase {
   @Api.field(v.required(), v.min(1), v.max(100))
   businessReference: string;
 
+  @Api.field(v.required(), v.min(1), v.max(100))
+  providerInvoiceReference: string;
+
+  @Api.field(v.required(), v.min(1), v.max(100))
+  providerCorrelationReference: string;
+
   @Api.field(z.number().int().positive())
   amountMinor: number;
 

package/vona/src/suite-vendor/a-pay/modules/a-pay/src/model/providerOperationRecoveryAudit.ts

@@ -0,0 +1,12 @@
+import type { IDecoratorModelOptions } from 'vona-module-a-orm';
+
+import { BeanModelBase, Model } from 'vona-module-a-orm';
+
+import { EntityProviderOperationRecoveryAudit } from '../entity/providerOperationRecoveryAudit.tsx';
+
+export interface IModelOptionsProviderOperationRecoveryAudit extends IDecoratorModelOptions<EntityProviderOperationRecoveryAudit> {}
+
+@Model<IModelOptionsProviderOperationRecoveryAudit>({
+  entity: EntityProviderOperationRecoveryAudit,
+})
+export class ModelProviderOperationRecoveryAudit extends BeanModelBase<EntityProviderOperationRecoveryAudit> {}

package/vona/src/suite-vendor/a-pay/modules/a-pay/src/service/paymentSession.ts

@@ -1,5 +1,7 @@
 import type { TableIdentity } from 'table-identity';
 
+import { zodCustomError } from '@cabloy/utils';
+import { randomUUID } from 'node:crypto';
 import { BeanBase } from 'vona';
 import { Service } from 'vona-module-a-bean';
 import { Core } from 'vona-module-a-core';
@@ -36,6 +38,8 @@ export class ServicePaymentSession extends BeanBase {
     }
     return await this.scope.model.paymentSession.insert({
       ...command,
+      providerInvoiceReference: randomUUID(),
+      providerCorrelationReference: randomUUID(),
       providerName: provider.providerName,
       clientName: provider.clientName,
       environment: provider.environment,
@@ -49,10 +53,10 @@ export class ServicePaymentSession extends BeanBase {
     sceneOptions: IDecoratorPaySceneOptions,
   ) {
     if (!Number.isSafeInteger(command.amountMinor) || command.amountMinor < 0) {
-      this.app.throw(422, 'payment amount is invalid');
+      throw zodCustomError(['amountMinor'], 'payment amount is invalid');
     }
     if (sceneOptions.currencies && !sceneOptions.currencies.includes(command.currency)) {
-      this.app.throw(422, 'payment currency is not allowed by the payment scene');
+      throw zodCustomError(['currency'], 'payment currency is not allowed by the payment scene');
     }
   }