cabloy 5.1.127 → 5.1.129

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

@@ -17,7 +17,7 @@ import type { IEntityOptionsRefundOperation } from '../entity/refundOperation.ts
 import type { IEntityOptionsWebhookInbox } from '../entity/webhookInbox.tsx';
 import 'vona-module-a-orm';
 declare module 'vona-module-a-orm' {
-  
+
     export interface IEntityRecord {
       'a-pay:outboxEvent': IEntityOptionsOutboxEvent;
 'a-pay:paymentAudit': IEntityOptionsPaymentAudit;
@@ -27,10 +27,10 @@ declare module 'vona-module-a-orm' {
 'a-pay:webhookInbox': IEntityOptionsWebhookInbox;
     }
 
-  
+
 }
 declare module 'vona-module-a-pay' {
-   
+
 }
 /** entity: end */
 /** entity: begin */
@@ -73,7 +73,7 @@ declare module 'vona-module-a-orm' {
   }
 }
 declare module 'vona-module-a-pay' {
-  
+
     export interface IEntityOptionsOutboxEvent {
       fields?: TypeEntityOptionsFields<EntityOutboxEvent, IEntityOptionsOutboxEvent[TypeSymbolKeyFieldsMore]>;
     }
@@ -114,7 +114,7 @@ import type { IModelOptionsRefundOperation } from '../model/refundOperation.ts';
 import type { IModelOptionsWebhookInbox } from '../model/webhookInbox.ts';
 import 'vona-module-a-orm';
 declare module 'vona-module-a-orm' {
-  
+
     export interface IModelRecord {
       'a-pay:outboxEvent': IModelOptionsOutboxEvent;
 'a-pay:paymentAudit': IModelOptionsPaymentAudit;
@@ -124,10 +124,10 @@ declare module 'vona-module-a-orm' {
 'a-pay:webhookInbox': IModelOptionsWebhookInbox;
     }
 
-  
+
 }
 declare module 'vona-module-a-pay' {
-  
+
         export interface ModelOutboxEvent {
           /** @internal */
           get scope(): ScopeModuleAPay;
@@ -192,7 +192,7 @@ declare module 'vona-module-a-pay' {
             get $beanFullName(): 'a-pay.model.webhookInbox';
             get $onionName(): 'a-pay:webhookInbox';
             get $onionOptions(): IModelOptionsWebhookInbox;
-          } 
+          }
 }
 /** model: end */
 /** model: begin */
@@ -229,7 +229,7 @@ declare module 'vona' {
 import type { IModelGetOptions, IModelMethodOptions, IModelSelectParams, TypeModelSelectAndCount, TypeModelRelationResult, TypeModelWhere, IModelInsertOptions, TypeModelMutateRelationData, IModelDeleteOptions, IModelUpdateOptions, IModelMutateOptions, IModelSelectCountParams, IModelIncrementParams, IModelSelectAggrParams, TypeModelAggrRelationResult, IModelSelectGroupParams, TypeModelGroupRelationResult } from 'vona-module-a-orm';
 import { SymbolKeyEntity, SymbolKeyEntityMeta, SymbolKeyModelOptions } from 'vona-module-a-orm';
 declare module 'vona-module-a-pay' {
-  
+
   export interface ModelOutboxEvent {
       [SymbolKeyEntity]: EntityOutboxEvent;
       [SymbolKeyEntityMeta]: EntityOutboxEventMeta;
@@ -470,11 +470,11 @@ export * from '../bean/bean.payScene.ts';
 
 import 'vona';
 declare module 'vona' {
-  
-  
+
+
 }
 declare module 'vona-module-a-pay' {
-  
+
         export interface BeanPayProvider {
           /** @internal */
           get scope(): ScopeModuleAPay;
@@ -483,7 +483,7 @@ declare module 'vona-module-a-pay' {
         export interface BeanPayScene {
           /** @internal */
           get scope(): ScopeModuleAPay;
-        } 
+        }
 }
 /** bean: end */
 /** bean: begin */
@@ -499,6 +499,7 @@ declare module 'vona' {
 /** bean: end */
 /** service: begin */
 export * from '../service/outbox.ts';
+export * from '../service/paymentCallback.ts';
 export * from '../service/paymentSession.ts';
 export * from '../service/providerOperation.ts';
 export * from '../service/refundOperation.ts';
@@ -506,19 +507,20 @@ export * from '../service/webhook.ts';
 
 import 'vona-module-a-bean';
 declare module 'vona-module-a-bean' {
-  
+
     export interface IServiceRecord {
       'a-pay:outbox': never;
+'a-pay:paymentCallback': never;
 'a-pay:paymentSession': never;
 'a-pay:providerOperation': never;
 'a-pay:refundOperation': never;
 'a-pay:webhook': never;
     }
 
-  
+
 }
 declare module 'vona-module-a-pay' {
-  
+
         export interface ServiceOutbox {
           /** @internal */
           get scope(): ScopeModuleAPay;
@@ -527,7 +529,18 @@ declare module 'vona-module-a-pay' {
           export interface ServiceOutbox {
             get $beanFullName(): 'a-pay.service.outbox';
             get $onionName(): 'a-pay:outbox';
-            
+
+          }
+
+        export interface ServicePaymentCallback {
+          /** @internal */
+          get scope(): ScopeModuleAPay;
+        }
+
+          export interface ServicePaymentCallback {
+            get $beanFullName(): 'a-pay.service.paymentCallback';
+            get $onionName(): 'a-pay:paymentCallback';
+
           }
 
         export interface ServicePaymentSession {
@@ -538,7 +551,7 @@ declare module 'vona-module-a-pay' {
           export interface ServicePaymentSession {
             get $beanFullName(): 'a-pay.service.paymentSession';
             get $onionName(): 'a-pay:paymentSession';
-            
+
           }
 
         export interface ServiceProviderOperation {
@@ -549,7 +562,7 @@ declare module 'vona-module-a-pay' {
           export interface ServiceProviderOperation {
             get $beanFullName(): 'a-pay.service.providerOperation';
             get $onionName(): 'a-pay:providerOperation';
-            
+
           }
 
         export interface ServiceRefundOperation {
@@ -560,7 +573,7 @@ declare module 'vona-module-a-pay' {
           export interface ServiceRefundOperation {
             get $beanFullName(): 'a-pay.service.refundOperation';
             get $onionName(): 'a-pay:refundOperation';
-            
+
           }
 
         export interface ServiceWebhook {
@@ -571,18 +584,20 @@ declare module 'vona-module-a-pay' {
           export interface ServiceWebhook {
             get $beanFullName(): 'a-pay.service.webhook';
             get $onionName(): 'a-pay:webhook';
-            
-          } 
+
+          }
 }
 /** service: end */
 /** service: begin */
 import type { ServiceOutbox } from '../service/outbox.ts';
+import type { ServicePaymentCallback } from '../service/paymentCallback.ts';
 import type { ServicePaymentSession } from '../service/paymentSession.ts';
 import type { ServiceProviderOperation } from '../service/providerOperation.ts';
 import type { ServiceRefundOperation } from '../service/refundOperation.ts';
 import type { ServiceWebhook } from '../service/webhook.ts';
 export interface IModuleService {
   'outbox': ServiceOutbox;
+'paymentCallback': ServicePaymentCallback;
 'paymentSession': ServicePaymentSession;
 'providerOperation': ServiceProviderOperation;
 'refundOperation': ServiceRefundOperation;
@@ -595,6 +610,7 @@ import 'vona';
 declare module 'vona' {
   export interface IBeanRecordGeneral {
     'a-pay.service.outbox': ServiceOutbox;
+'a-pay.service.paymentCallback': ServicePaymentCallback;
 'a-pay.service.paymentSession': ServicePaymentSession;
 'a-pay.service.providerOperation': ServiceProviderOperation;
 'a-pay.service.refundOperation': ServiceRefundOperation;
@@ -609,17 +625,17 @@ export * from '../bean/meta.version.ts';
 import type { IMetaOptionsIndex } from 'vona-module-a-index';
 import 'vona-module-a-meta';
 declare module 'vona-module-a-meta' {
-  
+
     export interface IMetaRecord {
       'a-pay:index': IMetaOptionsIndex;
 'a-pay:redlock': never;
 'a-pay:version': never;
     }
 
-  
+
 }
 declare module 'vona-module-a-pay' {
-  
+
         export interface MetaIndex {
           /** @internal */
           get scope(): ScopeModuleAPay;
@@ -639,7 +655,7 @@ declare module 'vona-module-a-pay' {
           export interface MetaRedlock {
             get $beanFullName(): 'a-pay.meta.redlock';
             get $onionName(): 'a-pay:redlock';
-            
+
           }
 
         export interface MetaVersion {
@@ -650,8 +666,8 @@ declare module 'vona-module-a-pay' {
           export interface MetaVersion {
             get $beanFullName(): 'a-pay.meta.version';
             get $onionName(): 'a-pay:version';
-            
-          } 
+
+          }
 }
 /** meta: end */
 /** meta redlock: begin */
@@ -662,15 +678,15 @@ export * from '../bean/queue.outboxDispatch.ts';
 
 import { type IDecoratorQueueOptions } from 'vona-module-a-queue';
 declare module 'vona-module-a-queue' {
-  
+
     export interface IQueueRecord {
       'a-pay:outboxDispatch': IDecoratorQueueOptions;
     }
 
-  
+
 }
 declare module 'vona-module-a-pay' {
-  
+
         export interface QueueOutboxDispatch {
           /** @internal */
           get scope(): ScopeModuleAPay;
@@ -680,7 +696,7 @@ declare module 'vona-module-a-pay' {
             get $beanFullName(): 'a-pay.queue.outboxDispatch';
             get $onionName(): 'a-pay:outboxDispatch';
             get $onionOptions(): IDecoratorQueueOptions;
-          } 
+          }
 }
 /** queue: end */
 /** queue: begin */
@@ -695,16 +711,16 @@ export * from '../bean/schedule.providerOperationDispatch.ts';
 
 import { type IDecoratorScheduleOptions } from 'vona-module-a-schedule';
 declare module 'vona-module-a-schedule' {
-  
+
     export interface IScheduleRecord {
       'a-pay:outboxDispatch': IDecoratorScheduleOptions;
 'a-pay:providerOperationDispatch': IDecoratorScheduleOptions;
     }
 
-  
+
 }
 declare module 'vona-module-a-pay' {
-  
+
         export interface ScheduleOutboxDispatch {
           /** @internal */
           get scope(): ScopeModuleAPay;
@@ -725,7 +741,7 @@ declare module 'vona-module-a-pay' {
             get $beanFullName(): 'a-pay.schedule.providerOperationDispatch';
             get $onionName(): 'a-pay:providerOperationDispatch';
             get $onionOptions(): IDecoratorScheduleOptions;
-          } 
+          }
 }
 /** schedule: end */
 /** dto: begin */
@@ -737,17 +753,17 @@ import type { IDtoOptionsPaymentSessionView } from '../dto/paymentSessionView.ts
 import type { IDtoOptionsWebhookReceipt } from '../dto/webhookReceipt.tsx';
 import 'vona-module-a-web';
 declare module 'vona-module-a-web' {
-  
+
     export interface IDtoRecord {
       'a-pay:paymentSessionStart': IDtoOptionsPaymentSessionStart;
 'a-pay:paymentSessionView': IDtoOptionsPaymentSessionView;
 'a-pay:webhookReceipt': IDtoOptionsWebhookReceipt;
     }
 
-  
+
 }
 declare module 'vona-module-a-pay' {
-   
+
 }
 /** dto: end */
 /** dto: begin */
@@ -755,7 +771,7 @@ import type { DtoPaymentSessionStart } from '../dto/paymentSessionStart.tsx';
 import type { DtoPaymentSessionView } from '../dto/paymentSessionView.tsx';
 import type { DtoWebhookReceipt } from '../dto/webhookReceipt.tsx';
 declare module 'vona-module-a-pay' {
-  
+
     export interface IDtoOptionsPaymentSessionStart {
       fields?: TypeEntityOptionsFields<DtoPaymentSessionStart, IDtoOptionsPaymentSessionStart[TypeSymbolKeyFieldsMore]>;
     }
@@ -770,22 +786,36 @@ declare module 'vona-module-a-pay' {
 }
 /** dto: end */
 /** controller: begin */
+export * from '../controller/paymentCallback.ts';
 export * from '../controller/paymentSession.ts';
 export * from '../controller/webhook.ts';
+import type { IControllerOptionsPaymentCallback } from '../controller/paymentCallback.ts';
 import type { IControllerOptionsPaymentSession } from '../controller/paymentSession.ts';
 import type { IControllerOptionsWebhook } from '../controller/webhook.ts';
 import 'vona-module-a-web';
 declare module 'vona-module-a-web' {
-  
+
     export interface IControllerRecord {
-      'a-pay:paymentSession': IControllerOptionsPaymentSession;
+      'a-pay:paymentCallback': IControllerOptionsPaymentCallback;
+'a-pay:paymentSession': IControllerOptionsPaymentSession;
 'a-pay:webhook': IControllerOptionsWebhook;
     }
 
-  
+
 }
 declare module 'vona-module-a-pay' {
-  
+
+        export interface ControllerPaymentCallback {
+          /** @internal */
+          get scope(): ScopeModuleAPay;
+        }
+
+          export interface ControllerPaymentCallback {
+            get $beanFullName(): 'a-pay.controller.paymentCallback';
+            get $onionName(): 'a-pay:paymentCallback';
+            get $onionOptions(): IControllerOptionsPaymentCallback;
+          }
+
         export interface ControllerPaymentSession {
           /** @internal */
           get scope(): ScopeModuleAPay;
@@ -806,16 +836,22 @@ declare module 'vona-module-a-pay' {
             get $beanFullName(): 'a-pay.controller.webhook';
             get $onionName(): 'a-pay:webhook';
             get $onionOptions(): IControllerOptionsWebhook;
-          } 
+          }
 }
 /** controller: end */
 /** controller: begin */
 // @ts-ignore ignore
+import type { ControllerPaymentCallback } from '../controller/paymentCallback.ts';
+// @ts-ignore ignore
 import type { ControllerPaymentSession } from '../controller/paymentSession.ts';
 // @ts-ignore ignore
 import type { ControllerWebhook } from '../controller/webhook.ts';
 declare module 'vona-module-a-pay' {
-  
+
+    export interface IControllerOptionsPaymentCallback {
+      actions?: TypeControllerOptionsActions<ControllerPaymentCallback>;
+    }
+
     export interface IControllerOptionsPaymentSession {
       actions?: TypeControllerOptionsActions<ControllerPaymentSession>;
     }
@@ -825,12 +861,15 @@ declare module 'vona-module-a-pay' {
     }
 }
 declare module 'vona-module-a-web' {
-  export interface IApiPathPostRecord{
-        '/payment-session/:id/start': undefined;
-'/pay/webhook/:providerName/:clientName': undefined;
+  export interface IApiPathGetRecord{
+        '/pay/payment-callback/return': undefined;
+'/pay/payment-callback/cancel': undefined;
+'/pay/payment-session/:id': undefined;
     }
-export interface IApiPathGetRecord{
-        '/payment-session/:id': undefined;
+export interface IApiPathPostRecord{
+        '/pay/payment-session/:id/start': undefined;
+'/pay/payment-session/:id/reconcile': undefined;
+'/pay/webhook/:providerName/:clientName': undefined;
     }
 
 }
@@ -861,11 +900,11 @@ declare module 'vona' {
   export interface IBeanScopeContainer {
     pay: ScopeModuleAPay;
   }
-  
-  
 
-  
 
-  
+
+
+
+
 }
 /** scope: end */

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

@@ -24,6 +24,24 @@ export class BeanPayScene extends BeanBase {
     return onionSlice.beanOptions.options as IDecoratorPaySceneOptions;
   }
 
+  async getAvailableProviderCandidates<N extends keyof IPaySceneRecord>(
+    paySceneName: N,
+    input: {
+      userId: TableIdentity;
+      businessReference: string;
+      amountMinor: number;
+      currency: string;
+      providerCandidateKey?: string;
+    },
+  ) {
+    const options = this.getOptions(paySceneName);
+    return await this._getAvailableProviderCandidates(options, {
+      payScene: paySceneName,
+      ...input,
+      providers: this._getProviderCandidates(options),
+    });
+  }
+
   async resolveProvider<N extends keyof IPaySceneRecord>(
     paySceneName: N,
     input: {
@@ -31,10 +49,28 @@ export class BeanPayScene extends BeanBase {
       businessReference: string;
       amountMinor: number;
       currency: string;
+      providerCandidateKey?: string;
     },
   ) {
     const options = this.getOptions(paySceneName);
-    const providers = this._getProviderCandidates(options);
+    const allProviders = this._getProviderCandidates(options);
+    if (
+      input.providerCandidateKey &&
+      !allProviders.some(item => item.key === input.providerCandidateKey)
+    ) {
+      this.app.throw(422, 'payment provider candidate is unavailable');
+    }
+    const providers = await this._getAvailableProviderCandidates(options, {
+      payScene: paySceneName,
+      ...input,
+      providers: allProviders,
+    });
+    if (
+      input.providerCandidateKey &&
+      !providers.some(item => item.key === input.providerCandidateKey)
+    ) {
+      this.app.throw(422, 'payment provider candidate is unavailable');
+    }
     const candidateKey = await this._resolveProviderCandidateKey(
       paySceneName,
       options,
@@ -59,6 +95,27 @@ export class BeanPayScene extends BeanBase {
     };
   }
 
+  private async _getAvailableProviderCandidates(
+    options: IDecoratorPaySceneOptions,
+    input: Omit<
+      Parameters<NonNullable<IDecoratorPaySceneOptions['isProviderAvailable']>>[1],
+      'candidate'
+    >,
+  ) {
+    const providers = input.providers;
+    const available = await Promise.all(
+      providers.map(async candidate => ({
+        candidate,
+        available: options.isProviderAvailable
+          ? await options.isProviderAvailable(this.ctx, { ...input, candidate })
+          : true,
+      })),
+    );
+    const result = available.filter(item => item.available).map(item => item.candidate);
+    if (!result.length) this.app.throw(409, 'payment scene has no available provider candidates');
+    return result;
+  }
+
   private _getProviderCandidates(options: IDecoratorPaySceneOptions) {
     const providers = options.providers;
     if (!providers?.length) this.app.throw(500, 'payment scene has no provider candidates');
@@ -84,8 +141,15 @@ export class BeanPayScene extends BeanBase {
       businessReference: string;
       amountMinor: number;
       currency: string;
+      providerCandidateKey?: string;
     },
   ) {
+    if (input.providerCandidateKey) {
+      if (!providers.some(item => item.key === input.providerCandidateKey)) {
+        this.app.throw(422, 'payment provider candidate is unavailable');
+      }
+      return input.providerCandidateKey;
+    }
     if (providers.length === 1 && !options.resolveProvider) return providers[0]!.key;
     if (!options.resolveProvider) {
       this.app.throw(500, 'payment scene requires a provider resolver for multiple candidates');

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

@@ -3,6 +3,8 @@ import { BeanRedlockBase } from 'vona-module-a-redlock';
 
 export type TypeRedlockLockResource =
   | `pay.providerOperation.start.${string}`
+  | `pay.providerOperation.confirm.${string}`
+  | `pay.providerOperation.query.${string}`
   | `pay.webhook.${string}`;
 export type TypeRedlockLockIsolateResource = never;
 

package/vona/src/suite-vendor/a-pay/modules/a-pay/src/controller/paymentCallback.ts

@@ -0,0 +1,32 @@
+import type { IDecoratorControllerOptions } from 'vona-module-a-web';
+
+import { BeanBase } from 'vona';
+import { Passport } from 'vona-module-a-user';
+import { Arg, Controller, Web } from 'vona-module-a-web';
+
+export interface IControllerOptionsPaymentCallback extends IDecoratorControllerOptions {}
+
+@Controller<IControllerOptionsPaymentCallback>('payment-callback')
+export class ControllerPaymentCallback extends BeanBase {
+  @Web.get('return')
+  @Passport.public()
+  async returned(@Arg.query('state') state: string) {
+    await this._handle('return', state);
+  }
+
+  @Web.get('cancel')
+  @Passport.public()
+  async cancelled(@Arg.query('state') state: string) {
+    await this._handle('cancel', state);
+  }
+
+  private async _handle(purpose: 'return' | 'cancel', token: string) {
+    const callback = await this.scope.service.paymentCallback.consume(purpose, token);
+    if (purpose === 'return') {
+      await this.scope.service.providerOperation.confirm(callback.paymentSessionId);
+    } else {
+      await this.scope.service.providerOperation.reconcile(callback.paymentSessionId);
+    }
+    this.ctx.redirect(callback.continuationPath);
+  }
+}

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

@@ -23,14 +23,21 @@ export class ControllerPaymentSession extends BeanBase {
       this.app.throw(404, 'payment session not found');
     }
     const started = await this.scope.service.paymentSession.start(session.id);
-    return {
-      id: started.id,
-      state: started.state,
-      providerName: started.providerName,
-      nextAction: started.nextAction,
-      amountMinor: started.amountMinor,
-      currency: started.currency,
-    };
+    return this._toView(started);
+  }
+
+  @Web.post(':id/reconcile')
+  @Api.body(DtoPaymentSessionView)
+  async reconcile(
+    @Arg.user() user: IUser,
+    @Arg.param('id', v.tableIdentity()) id: TableIdentity,
+  ): Promise<DtoPaymentSessionView> {
+    const session = await this.scope.model.paymentSession.getById(id);
+    if (!session || String(session.userId) !== String(user.id)) {
+      this.app.throw(404, 'payment session not found');
+    }
+    const reconciled = await this.scope.service.providerOperation.reconcile(session.id);
+    return this._toView(reconciled);
   }
 
   @Web.get(':id')
@@ -43,6 +50,17 @@ export class ControllerPaymentSession extends BeanBase {
     if (!session || String(session.userId) !== String(user.id)) {
       this.app.throw(404, 'payment session not found');
     }
+    return this._toView(session);
+  }
+
+  private _toView(session: {
+    id: TableIdentity;
+    state: DtoPaymentSessionView['state'];
+    providerName: string;
+    nextAction?: DtoPaymentSessionView['nextAction'];
+    amountMinor: number;
+    currency: string;
+  }): DtoPaymentSessionView {
     return {
       id: session.id,
       state: session.state,