payment-kit 1.20.8 → 1.20.9

package/api/src/crons/index.ts

@@ -24,7 +24,7 @@ import logger from '../libs/logger';
 import { startCreditConsumeQueue } from '../queues/credit-consume';
 import { startDepositVaultQueue } from '../queues/payment';
 import { startSubscriptionQueue } from '../queues/subscription';
-import { startVendorStatusCheckSchedule } from '../queues/vendor/status-check';
+import { startVendorStatusCheckSchedule } from '../queues/vendors/status-check';
 import { CheckoutSession } from '../store/models';
 import { createMeteringSubscriptionDetection } from './metering-subscription-detection';
 import { createPaymentStat } from './payment-stat';

package/api/src/index.ts

@@ -34,8 +34,8 @@ import { startPayoutQueue } from './queues/payout';
 import { startRefundQueue } from './queues/refund';
 import { startUploadBillingInfoListener } from './queues/space';
 import { startSubscriptionQueue } from './queues/subscription';
-import { startVendorCommissionQueue } from './queues/vendor/commission';
-import { startVendorFulfillmentQueue } from './queues/vendor/fulfillment';
+import { startVendorCommissionQueue } from './queues/vendors/commission';
+import { startVendorFulfillmentQueue } from './queues/vendors/fulfillment';
 import routes from './routes';
 import autoRechargeAuthorizationHandlers from './routes/connect/auto-recharge-auth';
 import changePaymentHandlers from './routes/connect/change-payment';

package/api/src/libs/{vendor → vendor-util}/adapters/factory.ts

@@ -1,6 +1,7 @@
 import { BN } from '@ocap/util';
 import { LauncherAdapter } from './launcher-adapter';
-import { VendorAdapter, VendorConfig } from './types';
+import { VendorAdapter } from './types';
+import { ProductVendor } from '../../../store/models';
 
 export function calculateVendorCommission(
   totalAmount: string,
@@ -20,13 +21,16 @@ export function calculateVendorCommission(
 }
 
 export class VendorAdapterFactory {
-  static create(vendorConfig: string | VendorConfig): VendorAdapter {
-    const vendorKey = typeof vendorConfig === 'string' ? vendorConfig : vendorConfig.vendor_key;
-    switch (vendorKey) {
+  static async create(vendorKey: string): Promise<VendorAdapter> {
+    const vendorConfig = await ProductVendor.findOne({ where: { vendor_key: vendorKey } });
+    if (!vendorConfig) {
+      throw new Error(`Vendor not found: ${vendorKey}`);
+    }
+    switch (vendorConfig.vendor_type) {
       case 'launcher':
         return new LauncherAdapter(vendorConfig);
       default:
-        throw new Error(`Unsupported vendor: ${vendorConfig}`);
+        throw new Error(`Unsupported vendor: ${vendorConfig.vendor_type}`);
     }
   }
 

package/api/src/libs/{vendor → vendor-util}/adapters/launcher-adapter.ts

@@ -18,14 +18,9 @@ export class LauncherAdapter implements VendorAdapter {
   private vendorConfig: VendorConfig | null = null;
   private vendorKey: string;
 
-  constructor(vendorInfo: VendorConfig | string) {
-    if (typeof vendorInfo === 'string') {
-      this.vendorKey = vendorInfo;
-      this.vendorConfig = null;
-    } else {
-      this.vendorKey = vendorInfo.id;
-      this.vendorConfig = vendorInfo;
-    }
+  constructor(vendorInfo: VendorConfig) {
+    this.vendorKey = vendorInfo.vendor_key;
+    this.vendorConfig = vendorInfo;
   }
 
   async getVendorConfig(): Promise<VendorConfig> {

package/api/src/libs/{vendor → vendor-util}/adapters/types.ts

@@ -1,13 +1,10 @@
 export interface VendorConfig {
   id: string;
   vendor_key: string;
+  vendor_type: string;
   name: string;
   description: string;
   app_url: string;
-  webhook_path?: string;
-  default_commission_rate: number;
-  default_commission_type: 'percentage' | 'fixed_amount';
-  order_create_params: Record<string, any>;
   status: 'active' | 'inactive';
   metadata: Record<string, any>;
 }

package/api/src/libs/{vendor → vendor-util}/fulfillment.ts

@@ -9,6 +9,8 @@ import { calculateVendorCommission, VendorAdapterFactory } from './adapters/fact
 import { Customer } from '../../store/models';
 import logger from '../logger';
 
+const DEFAULT_COMMISSION_RATE = 20;
+
 export interface VendorFulfillmentResult {
   vendorId: string;
   vendorKey: string;
@@ -55,11 +57,11 @@ export class VendorFulfillmentService {
         throw new Error(`Vendor not found: ${vendorConfig.vendor_id}`);
       }
 
-      const adapter = this.getVendorAdapter(vendor.vendor_key);
+      const adapter = await this.getVendorAdapter(vendor.vendor_key);
 
       // Calculate commission amount
-      const commissionRate = vendorConfig.commission_rate || vendor.default_commission_rate;
-      const commissionType = vendorConfig.commission_type || vendor.default_commission_type;
+      const commissionRate = vendorConfig.commission_rate ?? DEFAULT_COMMISSION_RATE;
+      const commissionType = vendorConfig.commission_type || 'percentage';
       const commissionAmount = calculateVendorCommission(
         orderInfo.amount_total,
         commissionRate,
@@ -116,7 +118,7 @@ export class VendorFulfillmentService {
     } catch (error: any) {
       logger.error('Single vendor fulfillment failed', {
         vendorId: vendorConfig.vendor_id,
-        error: error.message,
+        error,
       });
 
       throw error;
@@ -200,8 +202,8 @@ export class VendorFulfillmentService {
           );
 
           commissionResults.push({
-            vendorId: vendorConfig.vendor_key || vendorConfig.vendor_id,
-            vendorKey: vendorConfig.vendor_key || vendorConfig.vendor_id,
+            vendorId: vendorConfig.vendor_key,
+            vendorKey: vendorConfig.vendor_key,
             orderId: `commission_${checkoutSessionId}_${product.id}_${vendorConfig.vendor_id}`,
             status: 'completed',
             commissionAmount,
@@ -303,9 +305,10 @@ export class VendorFulfillmentService {
     }
   }
 
-  static getVendorAdapter(vendorKey: string) {
+  static async getVendorAdapter(vendorKey: string) {
     try {
-      return VendorAdapterFactory.create(vendorKey);
+      const vendor = await VendorAdapterFactory.create(vendorKey);
+      return vendor;
     } catch (error: any) {
       logger.error('Failed to get vendor adapter', {
         vendorKey,

package/api/src/queues/{vendor → vendors}/commission.ts

@@ -58,7 +58,7 @@ async function checkIfPaymentIntentHasVendors(
   } catch (error: any) {
     logger.error('Failed to check vendor configuration', {
       paymentIntentId: paymentIntent.id,
-      error: error.message,
+      error,
     });
     return false;
   }
@@ -123,8 +123,7 @@ export const handleVendorCommission = async (job: VendorCommissionJob) => {
   } catch (error: any) {
     logger.error('Vendor commission decision failed, fallback to direct deposit vault', {
       paymentIntentId: job.paymentIntentId,
-      error: error.message,
-      stack: error.stack,
+      error,
     });
 
     if (!checkoutSession) {
@@ -137,7 +136,7 @@ export const handleVendorCommission = async (job: VendorCommissionJob) => {
     try {
       triggerCoordinatorCheck(checkoutSession.id, job.paymentIntentId, 'vendor_commission_decision_failed');
     } catch (err: any) {
-      logger.error('Failed to trigger coordinator check[handleVendorCommission]', { error: err.message });
+      logger.error('Failed to trigger coordinator check[handleVendorCommission]', { error: err });
     }
   }
 };
@@ -186,7 +185,7 @@ events.on('vendor.commission.queued', async (id, job, args = {}) => {
   } catch (error: any) {
     logger.error('Failed to handle vendor commission queue event', {
       id,
-      error: error.message,
+      error,
     });
   }
 });

package/api/src/queues/{vendor → vendors}/fulfillment-coordinator.ts

@@ -1,8 +1,10 @@
+import { BN } from '@ocap/util';
+import { Op } from 'sequelize';
 import { events } from '../../libs/event';
 import { getLock } from '../../libs/lock';
 import logger from '../../libs/logger';
 import createQueue from '../../libs/queue';
-import { VendorFulfillmentService } from '../../libs/vendor/fulfillment';
+import { VendorFulfillmentService } from '../../libs/vendor-util/fulfillment';
 import { CheckoutSession } from '../../store/models/checkout-session';
 import { PaymentIntent } from '../../store/models/payment-intent';
 import { Price } from '../../store/models/price';
@@ -444,11 +446,38 @@ export async function initiateFullRefund(paymentIntentId: string, reason: string
     await CheckoutSession.update({ fulfillment_status: 'cancelled' }, { where: { id: checkoutSession.id } });
     await requestReturnsFromCompletedVendors(checkoutSession.id, paymentIntentId, reason);
 
+    // Calculate remaining amount using the same logic as subscription createProration
+    const refunds = await Refund.findAll({
+      where: {
+        status: { [Op.not]: 'canceled' },
+        payment_intent_id: paymentIntentId,
+        type: 'refund',
+      },
+    });
+    const refundAmount = refunds.reduce((acc, x) => acc.add(new BN(x.amount || '0')), new BN(0));
+
+    // Calculate remaining amount, similar to subscription logic
+    const calcRemaining = (amount: BN, subtract: BN) =>
+      amount.sub(subtract).lt(new BN(0)) ? '0' : amount.sub(subtract).toString();
+
+    const remaining = calcRemaining(new BN(paymentIntent.amount), refundAmount);
+
+    // If no remaining amount or already fully refunded, skip
+    if (new BN(remaining).lte(new BN('0'))) {
+      logger.info('Payment already fully refunded, skipping', {
+        paymentIntentId,
+        paymentAmount: paymentIntent.amount,
+        totalRefundAmount: refundAmount.toString(),
+        remaining,
+      });
+      return;
+    }
+
     const refund = await Refund.create({
       type: 'refund',
       livemode: paymentIntent.livemode,
-      amount: paymentIntent.amount,
-      description: `Full refund due to ${reason}`,
+      amount: remaining,
+      description: `${new BN(remaining).eq(new BN(paymentIntent.amount)) ? 'Full' : 'Partial'} refund due to ${reason}`,
       status: 'pending',
       reason,
       currency_id: paymentIntent.currency_id,
@@ -573,7 +602,7 @@ async function requestReturnFromSingleVendor(
   });
 
   try {
-    const vendorAdapter = VendorFulfillmentService.getVendorAdapter(vendor.vendor_key);
+    const vendorAdapter = await VendorFulfillmentService.getVendorAdapter(vendor.vendor_key);
     if (!vendorAdapter) {
       throw new Error(`No adapter found for vendor: ${vendor.vendor_id}`);
     }

package/api/src/queues/{vendor → vendors}/fulfillment.ts

@@ -1,7 +1,7 @@
 import { events } from '../../libs/event';
 import logger from '../../libs/logger';
 import createQueue from '../../libs/queue';
-import { VendorFulfillmentService } from '../../libs/vendor/fulfillment';
+import { VendorFulfillmentService } from '../../libs/vendor-util/fulfillment';
 import { CheckoutSession } from '../../store/models/checkout-session';
 import { updateVendorFulfillmentStatus } from './fulfillment-coordinator';
 
@@ -52,7 +52,7 @@ export const handleVendorFulfillment = async (job: VendorFulfillmentJob) => {
     logger.error('Vendor fulfillment failed', {
       vendorId,
       checkoutSessionId,
-      error: error.message,
+      error,
     });
 
     await updateVendorFulfillmentStatus(checkoutSessionId, paymentIntentId, vendorId, 'failed', {

package/api/src/queues/{vendor → vendors}/status-check.ts

@@ -6,7 +6,7 @@ import { ProductVendor } from '../../store/models';
 import { fulfillmentCoordinatorQueue } from './fulfillment-coordinator';
 import logger from '../../libs/logger';
 import { vendorTimeoutMinutes } from '../../libs/env';
-import { VendorFulfillmentService } from '../../libs/vendor/fulfillment';
+import { VendorFulfillmentService } from '../../libs/vendor-util/fulfillment';
 
 export const startVendorStatusCheckSchedule = async () => {
   const checkoutSessions = await CheckoutSession.findAll({
@@ -109,7 +109,7 @@ export const handleVendorStatusCheck = async (job: VendorStatusCheckJob) => {
       }
     }
 
-    const adapter = VendorFulfillmentService.getVendorAdapter(vendor.vendor_key);
+    const adapter = await VendorFulfillmentService.getVendorAdapter(vendor.vendor_key);
     const result = await adapter.checkOrderStatus({ appUrl: vendor.app_url });
 
     if (result.status === 'completed') {

package/api/src/routes/payment-links.ts

@@ -423,7 +423,8 @@ router.post('/stash', auth, async (req, res) => {
     raw.livemode = !!req.livemode;
     raw.created_via = req.user?.via;
     raw.currency_id = raw.currency_id || req.currency.id;
-    raw.metadata = { preview: '1' };
+    // Merge existing metadata with preview flag
+    raw.metadata = { ...raw.metadata, preview: '1' };
 
     let doc = await PaymentLink.findByPk(raw.id);
     if (doc) {

package/api/src/routes/products.ts

@@ -452,6 +452,7 @@ router.put('/:id', auth, async (req, res) => {
       return {
         vendor_id: vendorConfig.id,
         vendor_key: vendorConfig.vendor_key,
+        vendor_type: vendorConfig.vendor_type,
         name: vendorConfig.name,
         description: vendorConfig.description,
         commission_rate: Number(config.commission_rate),