payment-kit 1.20.6 → 1.20.7

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/vendor-status-check';
+import { startVendorStatusCheckSchedule } from '../queues/vendor/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/vendor-commission';
-import { startVendorFulfillmentQueue } from './queues/vendor/vendor-fulfillment';
+import { startVendorCommissionQueue } from './queues/vendor/commission';
+import { startVendorFulfillmentQueue } from './queues/vendor/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-adapter-factory.ts → vendor/adapters/factory.ts}

@@ -1,5 +1,23 @@
-import { VendorAdapter, VendorConfig } from './vendor-adapter';
-import { LauncherAdapter } from './adapters/launcher-adapter.js';
+import { BN } from '@ocap/util';
+import { LauncherAdapter } from './launcher-adapter';
+import { VendorAdapter, VendorConfig } from './types';
+
+export function calculateVendorCommission(
+  totalAmount: string,
+  commissionRate: number,
+  commissionType: 'percentage' | 'fixed_amount',
+  itemAmount?: string
+): string {
+  const amount = itemAmount || totalAmount || '0';
+
+  if (commissionType === 'percentage') {
+    return new BN(amount)
+      .mul(new BN(commissionRate || 0))
+      .div(new BN(100))
+      .toString();
+  }
+  return new BN(commissionRate).toString();
+}
 
 export class VendorAdapterFactory {
   static create(vendorConfig: string | VendorConfig): VendorAdapter {

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

@@ -1,18 +1,18 @@
 import { VendorAuth } from '@blocklet/payment-vendor';
 
+import { ProductVendor } from '../../../store/models';
+import logger from '../../logger';
+import { api } from '../../util';
 import {
-  VendorAdapter,
-  VendorConfig,
+  CheckOrderStatusParams,
+  CheckOrderStatusResult,
   FulfillOrderParams,
   FulfillOrderResult,
   ReturnRequestParams,
   ReturnRequestResult,
-  CheckOrderStatusParams,
-  CheckOrderStatusResult,
-} from '../vendor-adapter';
-import logger from '../logger';
-import { ProductVendor } from '../../store/models';
-import { api } from '../util';
+  VendorAdapter,
+  VendorConfig,
+} from './types';
 
 export class LauncherAdapter implements VendorAdapter {
   private vendorConfig: VendorConfig | null = null;
@@ -40,6 +40,7 @@ export class LauncherAdapter implements VendorAdapter {
 
   async fulfillOrder(params: FulfillOrderParams): Promise<FulfillOrderResult> {
     logger.info('Creating launcher order via real API', {
+      checkoutSessionId: params.checkoutSessionId,
       productCode: params.productCode,
       customerId: params.customerId,
       description: params.description,
@@ -50,6 +51,7 @@ export class LauncherAdapter implements VendorAdapter {
     try {
       const launcherApiUrl = vendorConfig.app_url;
       const orderData = {
+        checkoutSessionId: params.checkoutSessionId,
         description: params.description,
         userInfo: params.userInfo,
         deliveryParams: params.deliveryParams,
@@ -119,7 +121,7 @@ export class LauncherAdapter implements VendorAdapter {
   }
 
   async requestReturn(params: ReturnRequestParams): Promise<ReturnRequestResult> {
-    logger.debug('Requesting return for Launcher order', {
+    logger.info('Requesting return for Launcher order', {
       orderId: params.orderId,
       reason: params.reason,
     });

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

@@ -1,5 +1,3 @@
-import { BN } from '@ocap/util';
-
 export interface VendorConfig {
   id: string;
   vendor_key: string;
@@ -15,6 +13,7 @@ export interface VendorConfig {
 }
 
 export interface FulfillOrderParams {
+  checkoutSessionId: string;
   productCode: string;
   customerId: string;
   quantity: number;
@@ -90,20 +89,3 @@ export interface VendorAdapter {
   requestReturn(params: ReturnRequestParams): Promise<ReturnRequestResult>;
   checkOrderStatus(params: CheckOrderStatusParams): Promise<CheckOrderStatusResult>;
 }
-
-export function calculateVendorCommission(
-  totalAmount: string,
-  commissionRate: number,
-  commissionType: 'percentage' | 'fixed_amount',
-  itemAmount?: string
-): string {
-  const amount = itemAmount || totalAmount || '0';
-
-  if (commissionType === 'percentage') {
-    return new BN(amount)
-      .mul(new BN(commissionRate || 0))
-      .div(new BN(100))
-      .toString();
-  }
-  return new BN(commissionRate).toString();
-}

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

@@ -1,14 +1,13 @@
 import { BN } from '@ocap/util';
-import { CheckoutSession } from '../store/models/checkout-session';
-import { Product } from '../store/models/product';
-import { ProductVendor } from '../store/models/product-vendor';
-import { Payout } from '../store/models/payout';
-import { PaymentIntent } from '../store/models/payment-intent';
-import { Price } from '../store/models/price';
-import { VendorAdapterFactory } from './vendor-adapter-factory';
-import { calculateVendorCommission } from './vendor-adapter';
-import logger from './logger';
-import { Customer } from '../store/models';
+import { CheckoutSession } from '../../store/models/checkout-session';
+import { Product } from '../../store/models/product';
+import { ProductVendor } from '../../store/models/product-vendor';
+import { Payout } from '../../store/models/payout';
+import { PaymentIntent } from '../../store/models/payment-intent';
+import { Price } from '../../store/models/price';
+import { calculateVendorCommission, VendorAdapterFactory } from './adapters/factory';
+import { Customer } from '../../store/models';
+import logger from '../logger';
 
 export interface VendorFulfillmentResult {
   vendorId: string;
@@ -40,6 +39,7 @@ export class VendorFulfillmentService {
   // Execute single vendor fulfillment (public interface for coordinator system)
   static async fulfillSingleVendorOrder(
     orderInfo: {
+      checkoutSessionId: string;
       amount_total: string;
       customer_id: string;
       payment_intent_id: string | null;
@@ -55,7 +55,7 @@ export class VendorFulfillmentService {
         throw new Error(`Vendor not found: ${vendorConfig.vendor_id}`);
       }
 
-      const adapter = VendorAdapterFactory.create(vendor.vendor_key);
+      const adapter = this.getVendorAdapter(vendor.vendor_key);
 
       // Calculate commission amount
       const commissionRate = vendorConfig.commission_rate || vendor.default_commission_rate;
@@ -70,6 +70,7 @@ export class VendorFulfillmentService {
       const userEmail = (await Customer.findByPk(orderInfo.customer_id))?.email || '';
 
       const fulfillmentResult = await adapter.fulfillOrder({
+        checkoutSessionId: orderInfo.checkoutSessionId,
         productCode: vendorConfig.vendor_id,
         customerId: orderInfo.customer_id || '',
         quantity: 1,
@@ -302,17 +303,12 @@ export class VendorFulfillmentService {
     }
   }
 
-  static async getVendorAdapter(vendorId: string) {
+  static getVendorAdapter(vendorKey: string) {
     try {
-      const vendor = await ProductVendor.findByPk(vendorId);
-      if (!vendor) {
-        throw new Error(`Vendor not found: ${vendorId}`);
-      }
-
-      return VendorAdapterFactory.create(vendor.vendor_key);
+      return VendorAdapterFactory.create(vendorKey);
     } catch (error: any) {
       logger.error('Failed to get vendor adapter', {
-        vendorId,
+        vendorKey,
         error: error.message,
       });
       throw error;

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

@@ -6,7 +6,7 @@ import { PaymentIntent } from '../../store/models/payment-intent';
 import { Product } from '../../store/models/product';
 import { Price } from '../../store/models/price';
 import { depositVaultQueue } from '../payment';
-import { startVendorFulfillment, triggerCoordinatorCheck } from './vendor-fulfillment-coordinator';
+import { startVendorFulfillment, triggerCommissionProcess, triggerCoordinatorCheck } from './fulfillment-coordinator';
 
 type VendorCommissionJob = {
   paymentIntentId: string;
@@ -97,20 +97,12 @@ export const handleVendorCommission = async (job: VendorCommissionJob) => {
     // Find CheckoutSession through PaymentIntent
     checkoutSession = await CheckoutSession.findByPaymentIntentId(paymentIntent.id);
     if (!checkoutSession) {
-      logger.warn('CheckoutSession not found for PaymentIntent, proceeding with direct deposit vault transfer', {
-        paymentIntentId: paymentIntent.id,
-      });
       await executeDirectDepositVault(paymentIntent);
       return;
     }
 
     const hasVendorConfig = await checkIfPaymentIntentHasVendors(paymentIntent, checkoutSession);
     if (!hasVendorConfig) {
-      logger.info('No vendor configuration found , proceeding with direct deposit vault transfer', {
-        paymentIntentId: paymentIntent.id,
-        currencyId: paymentIntent.currency_id,
-      });
-
       await executeDirectDepositVault(paymentIntent);
       return;
     }
@@ -119,6 +111,14 @@ export const handleVendorCommission = async (job: VendorCommissionJob) => {
       paymentIntentId: paymentIntent.id,
     });
 
+    if (checkoutSession.fulfillment_status === 'completed') {
+      logger.info('CheckoutSession already completed, directly trigger commission process', {
+        checkoutSessionId: checkoutSession.id,
+      });
+      await triggerCommissionProcess(checkoutSession.id, paymentIntent.id);
+      return;
+    }
+
     await startVendorFulfillment(checkoutSession.id, paymentIntent.id);
   } catch (error: any) {
     logger.error('Vendor commission decision failed, fallback to direct deposit vault', {
@@ -135,7 +135,7 @@ export const handleVendorCommission = async (job: VendorCommissionJob) => {
     }
 
     try {
-      await triggerCoordinatorCheck(checkoutSession.id, job.paymentIntentId, 'vendor_commission_decision_failed');
+      triggerCoordinatorCheck(checkoutSession.id, job.paymentIntentId, 'vendor_commission_decision_failed');
     } catch (err: any) {
       logger.error('Failed to trigger coordinator check[handleVendorCommission]', { error: err.message });
     }

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

@@ -2,7 +2,7 @@ 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/fulfillment';
 import { CheckoutSession } from '../../store/models/checkout-session';
 import { PaymentIntent } from '../../store/models/payment-intent';
 import { Price } from '../../store/models/price';
@@ -394,7 +394,7 @@ export function triggerCoordinatorCheck(checkoutSessionId: string, paymentIntent
   });
 }
 
-async function triggerCommissionProcess(checkoutSessionId: string, paymentIntentId: string): Promise<void> {
+export async function triggerCommissionProcess(checkoutSessionId: string, paymentIntentId: string): Promise<void> {
   logger.info('Triggering commission process', {
     checkoutSessionId,
     paymentIntentId,
@@ -481,8 +481,6 @@ export async function initiateFullRefund(paymentIntentId: string, reason: string
       amount: refund.amount,
       reason,
     });
-
-    events.emit('refund.created', refund);
   } catch (error: any) {
     logger.error('Failed to create full refund', {
       paymentIntentId,
@@ -575,7 +573,7 @@ async function requestReturnFromSingleVendor(
   });
 
   try {
-    const vendorAdapter = await VendorFulfillmentService.getVendorAdapter(vendor.vendor_id);
+    const vendorAdapter = VendorFulfillmentService.getVendorAdapter(vendor.vendor_key);
     if (!vendorAdapter) {
       throw new Error(`No adapter found for vendor: ${vendor.vendor_id}`);
     }

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

@@ -1,9 +1,9 @@
 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/fulfillment';
 import { CheckoutSession } from '../../store/models/checkout-session';
-import { updateVendorFulfillmentStatus } from './vendor-fulfillment-coordinator';
+import { updateVendorFulfillmentStatus } from './fulfillment-coordinator';
 
 type VendorFulfillmentJob = {
   checkoutSessionId: string;
@@ -28,6 +28,7 @@ export const handleVendorFulfillment = async (job: VendorFulfillmentJob) => {
     }
 
     const orderInfo = {
+      checkoutSessionId,
       amount_total: checkoutSession.amount_total,
       customer_id: checkoutSession.customer_id || '',
       payment_intent_id: checkoutSession.payment_intent_id || '',

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

@@ -1,12 +1,12 @@
 import { joinURL } from 'ufo';
 import createQueue from '../../libs/queue';
 import { getBlockletJson } from '../../libs/util';
-import { VendorAdapterFactory } from '../../libs/vendor-adapter-factory';
 import { CheckoutSession } from '../../store/models/checkout-session';
 import { ProductVendor } from '../../store/models';
-import { fulfillmentCoordinatorQueue } from './vendor-fulfillment-coordinator';
+import { fulfillmentCoordinatorQueue } from './fulfillment-coordinator';
 import logger from '../../libs/logger';
 import { vendorTimeoutMinutes } from '../../libs/env';
+import { VendorFulfillmentService } from '../../libs/vendor/fulfillment';
 
 export const startVendorStatusCheckSchedule = async () => {
   const checkoutSessions = await CheckoutSession.findAll({
@@ -109,8 +109,7 @@ export const handleVendorStatusCheck = async (job: VendorStatusCheckJob) => {
       }
     }
 
-    logger.info('checkOrderStatus', { vendor });
-    const adapter = await VendorAdapterFactory.create(vendor.vendor_key);
+    const adapter = VendorFulfillmentService.getVendorAdapter(vendor.vendor_key);
     const result = await adapter.checkOrderStatus({ appUrl: vendor.app_url });
 
     if (result.status === 'completed') {

package/api/src/routes/checkout-sessions.ts

@@ -94,6 +94,7 @@ import { CHARGE_SUPPORTED_CHAIN_TYPES } from '../libs/constants';
 import { blocklet } from '../libs/auth';
 import { addSubscriptionJob } from '../queues/subscription';
 import { updateDataConcurrency } from '../libs/env';
+import { formatToShortUrl } from '../libs/url';
 
 const router = Router();
 
@@ -824,7 +825,7 @@ router.post('/', authLogin, async (req, res) => {
 });
 
 export async function startCheckoutSessionFromPaymentLink(id: string, req: Request, res: Response) {
-  const { metadata } = req.body;
+  const { metadata, needShortUrl = false } = req.body;
   try {
     const link = await PaymentLink.findByPk(id);
     if (!link) {
@@ -980,7 +981,15 @@ export async function startCheckoutSessionFromPaymentLink(id: string, req: Reque
       doc.line_items = await Price.expand(updatedItems, { upsell: true });
     }
 
+    let paymentUrl = getUrl(`/checkout/pay/${doc.id}`);
+    if (needShortUrl) {
+      const validUntil = dayjs().add(20, 'minutes').format('YYYY-MM-DDTHH:mm:ss+00:00');
+      const maxVisits = 5;
+      paymentUrl = await formatToShortUrl({ url: paymentUrl, validUntil, maxVisits });
+    }
+
     res.json({
+      paymentUrl,
       checkoutSession: doc.toJSON(),
       paymentMethods: await getPaymentMethods(doc),
       paymentLink: link,

package/api/src/routes/vendor.ts

@@ -3,7 +3,7 @@ import Joi from 'joi';
 
 import { joinURL } from 'ufo';
 import { VendorAuth } from '@blocklet/payment-vendor';
-import { VendorFulfillmentService } from '../libs/vendor-fulfillment';
+import { VendorFulfillmentService } from '../libs/vendor/fulfillment';
 import logger from '../libs/logger';
 import { ProductVendor } from '../store/models/product-vendor';
 import { wallet } from '../libs/auth';
@@ -364,6 +364,7 @@ async function testVendorFulfillment(req: any, res: any) {
     });
 
     const orderInfo = {
+      checkoutSessionId: testCheckoutSession.id,
       amount_total: testCheckoutSession.amount_total.toString(),
       customer_id: testCheckoutSession.customer_id,
       payment_intent_id: testCheckoutSession.payment_intent_id,

package/blocklet.yml

@@ -14,7 +14,7 @@ repository:
   type: git
   url: git+https://github.com/blocklet/payment-kit.git
 specVersion: 1.2.8
-version: 1.20.6
+version: 1.20.7
 logo: logo.png
 files:
   - dist

package/doc/vendor_fulfillment_system.md

@@ -745,8 +745,6 @@ async function initiateFullRefund(
       // ... 其他字段
     });
 
-    // 触发退款队列处理
-    events.emit('refund.created', refund);
   } catch (error) {
     logger.error('Failed to create full refund', { error: error.message });
   }
@@ -792,7 +790,7 @@ async function requestReturnFromSingleVendor(
 ): Promise<void> {
   try {
     // 1. 获取供应商适配器
-    const vendorAdapter = await VendorFulfillmentService.getVendorAdapter(vendor.vendor_id);
+    const vendorAdapter = VendorFulfillmentService.getVendorAdapter(vendor.vendor_key);
 
     // 2. 调用供应商的退货请求方法
     const returnResult = await vendorAdapter.requestReturn({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.20.6",
+  "version": "1.20.7",
   "scripts": {
     "dev": "blocklet dev --open",
     "lint": "tsc --noEmit && eslint src api/src --ext .mjs,.js,.jsx,.ts,.tsx",
@@ -55,8 +55,8 @@
     "@blocklet/error": "^0.2.5",
     "@blocklet/js-sdk": "^1.16.52-beta-20250908-085420-224a58fa",
     "@blocklet/logger": "^1.16.52-beta-20250908-085420-224a58fa",
-    "@blocklet/payment-react": "1.20.6",
-    "@blocklet/payment-vendor": "1.20.6",
+    "@blocklet/payment-react": "1.20.7",
+    "@blocklet/payment-vendor": "1.20.7",
     "@blocklet/sdk": "^1.16.52-beta-20250908-085420-224a58fa",
     "@blocklet/ui-react": "^3.1.37",
     "@blocklet/uploader": "^0.2.10",
@@ -125,7 +125,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.16.52-beta-20250908-085420-224a58fa",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.20.6",
+    "@blocklet/payment-types": "1.20.7",
     "@types/cookie-parser": "^1.4.9",
     "@types/cors": "^2.8.19",
     "@types/debug": "^4.1.12",
@@ -172,5 +172,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "d04ed7906bd1e13240198623aa0d4eef4db8886e"
+  "gitHead": "4ceda9d8cf6413d3c28514d774eb653ba5145f1b"
 }