payment-kit 1.20.7 → 1.20.9

package/api/src/routes/vendor.ts

@@ -1,30 +1,25 @@
 import { Router } from 'express';
 import Joi from 'joi';
 
-import { joinURL } from 'ufo';
 import { VendorAuth } from '@blocklet/payment-vendor';
-import { VendorFulfillmentService } from '../libs/vendor/fulfillment';
-import logger from '../libs/logger';
-import { ProductVendor } from '../store/models/product-vendor';
+import { joinURL } from 'ufo';
+import { MetadataSchema } from '../libs/api';
 import { wallet } from '../libs/auth';
-import { CheckoutSession } from '../store/models';
+import dayjs from '../libs/dayjs';
+import logger from '../libs/logger';
 import { authenticate } from '../libs/security';
 import { formatToShortUrl } from '../libs/url';
-import dayjs from '../libs/dayjs';
-import { MetadataSchema } from '../libs/api';
+import { CheckoutSession } from '../store/models';
+import { ProductVendor } from '../store/models/product-vendor';
 
 const authAdmin = authenticate<CheckoutSession>({ component: true, roles: ['owner', 'admin'] });
 
 const createVendorSchema = Joi.object({
   vendor_key: Joi.string().max(50).required(),
+  vendor_type: Joi.string().valid('launcher').default('launcher'),
   name: Joi.string().max(255).required(),
   description: Joi.string().max(1000).allow('').optional(),
   app_url: Joi.string().uri().max(512).required(),
-  webhook_path: Joi.string().max(255).allow('').optional(),
-  blocklet_meta_url: Joi.string().uri().max(512).allow('').optional(),
-  default_commission_rate: Joi.number().min(0).max(100).required(),
-  default_commission_type: Joi.string().valid('percentage', 'fixed_amount').required(),
-  order_create_params: Joi.object().default({}),
   app_pid: Joi.string().max(255).allow('').optional(),
   app_logo: Joi.string().max(512).allow('').optional(),
   status: Joi.string().valid('active', 'inactive').default('active'),
@@ -32,26 +27,16 @@ const createVendorSchema = Joi.object({
 }).unknown(false);
 
 const updateVendorSchema = Joi.object({
+  vendor_type: Joi.string().valid('launcher').optional(),
   name: Joi.string().max(255).optional(),
   description: Joi.string().max(1000).allow('').optional(),
   app_url: Joi.string().uri().max(512).optional(),
-  webhook_path: Joi.string().max(255).allow('').optional(),
-  blocklet_meta_url: Joi.string().uri().max(512).allow('').optional(),
-  default_commission_rate: Joi.number().min(0).max(100).optional(),
-  default_commission_type: Joi.string().valid('percentage', 'fixed_amount').optional(),
-  order_create_params: Joi.object().optional(),
   app_pid: Joi.string().max(255).allow('').optional(),
   app_logo: Joi.string().max(512).allow('').optional(),
   status: Joi.string().valid('active', 'inactive').optional(),
   metadata: MetadataSchema,
 }).unknown(true);
 
-const testFulfillmentSchema = Joi.object({
-  productCode: Joi.string().max(100).required(),
-  quantity: Joi.number().integer().min(1).default(1),
-  customParams: Joi.object().optional(),
-}).unknown(true);
-
 const vendorIdParamSchema = Joi.object({
   id: Joi.string().max(100).required(),
 });
@@ -60,12 +45,21 @@ const sessionIdParamSchema = Joi.object({
   sessionId: Joi.string().max(100).required(),
 });
 
+const subscriptionIdParamSchema = Joi.object({
+  subscriptionId: Joi.string().max(100).required(),
+});
+
+const vendorRedirectQuerySchema = Joi.object({
+  vendorId: Joi.string().max(100).required(),
+  target: Joi.string().valid('home', 'dashboard').default('home').allow(''),
+});
+
 function validateParams(schema: Joi.ObjectSchema) {
   return (req: any, res: any, next: any) => {
     const { error } = schema.validate(req.params);
     if (error) {
       logger.error('Invalid parameters', {
-        error: error.message,
+        error,
         params: req.params,
       });
       return res.status(400).json({
@@ -77,6 +71,21 @@ function validateParams(schema: Joi.ObjectSchema) {
   };
 }
 
+function validateQuery(schema: Joi.ObjectSchema) {
+  return (req: any, res: any, next: any) => {
+    const { error, value } = schema.validate(req.query);
+    if (error) {
+      logger.error('Invalid query parameters', {
+        error,
+        query: req.query,
+      });
+      return res.redirect('/404');
+    }
+    req.query = value;
+    return next();
+  };
+}
+
 async function getAllVendors(_req: any, res: any) {
   try {
     const vendors = await ProductVendor.findAll({
@@ -90,7 +99,7 @@ async function getAllVendors(_req: any, res: any) {
     });
   } catch (error: any) {
     logger.error('Failed to get vendors', {
-      error: error.message || error.toString() || 'Unknown error',
+      error,
       stack: error.stack,
     });
     return res.status(500).json({ error: 'Internal server error. Failed to get vendors' });
@@ -107,7 +116,7 @@ async function getVendorById(req: any, res: any) {
     return res.json({ data: vendor });
   } catch (error: any) {
     logger.error('Failed to get vendor', {
-      error: error.message || error.toString() || 'Unknown error',
+      error,
       id: req.params.id,
     });
     return res.status(500).json({ error: 'Internal server error. Failed to get vendor' });
@@ -126,27 +135,16 @@ async function createVendor(req: any, res: any) {
 
     const {
       vendor_key: vendorKey,
+      vendor_type: vendorType,
       name,
       description,
       app_url: appUrl,
-      webhook_path: webhookPath,
-      blocklet_meta_url: blockletMetaUrl,
-      default_commission_rate: defaultCommissionRate,
-      default_commission_type: defaultCommissionType,
-      order_create_params: orderCreateParams,
       metadata,
       app_pid: appPid,
       app_logo: appLogo,
       status,
     } = value;
 
-    const blockletMetaUrlFromMetadata = metadata?.blockletMetaUrl || blockletMetaUrl;
-    if (!blockletMetaUrlFromMetadata) {
-      return res.status(400).json({
-        error: 'blockletMetaUrl is required in metadata',
-      });
-    }
-
     const existingVendor = await ProductVendor.findOne({
       where: { vendor_key: vendorKey },
     });
@@ -156,20 +154,14 @@ async function createVendor(req: any, res: any) {
 
     const vendor = await ProductVendor.create({
       vendor_key: vendorKey,
+      vendor_type: vendorType || 'launcher',
       name,
       description,
       app_url: appUrl,
-      webhook_path: webhookPath,
-      default_commission_rate: defaultCommissionRate,
-      default_commission_type: defaultCommissionType,
-      order_create_params: orderCreateParams || {},
       status: status || 'active',
       app_pid: appPid,
       app_logo: appLogo,
-      metadata: {
-        ...(metadata || {}),
-        ...(blockletMetaUrl && { blockletMetaUrl }),
-      },
+      metadata: metadata || {},
       created_by: req.user?.did || 'admin',
     });
 
@@ -177,7 +169,7 @@ async function createVendor(req: any, res: any) {
     return res.status(201).json({ data: vendor });
   } catch (error: any) {
     logger.error('Failed to create vendor', {
-      error: error.message || error.toString() || 'Unknown error',
+      error,
     });
     return res.status(500).json({ error: 'Internal server error' });
   }
@@ -199,14 +191,10 @@ async function updateVendor(req: any, res: any) {
     }
 
     const {
+      vendor_type: vendorType,
       name,
       description,
       app_url: appUrl,
-      webhook_path: webhookPath,
-      blocklet_meta_url: blockletMetaUrl,
-      default_commission_rate: defaultCommissionRate,
-      default_commission_type: defaultCommissionType,
-      order_create_params: orderCreateParams,
       status,
       metadata,
       app_pid: appPid,
@@ -222,21 +210,12 @@ async function updateVendor(req: any, res: any) {
       }
     }
     const updates = {
+      vendor_type: vendorType,
       name,
       description,
       app_url: appUrl,
-      webhook_path: webhookPath,
-      default_commission_rate: defaultCommissionRate,
-      default_commission_type: defaultCommissionType,
-      order_create_params: orderCreateParams,
       status,
-      ...((metadata || blockletMetaUrl !== undefined) && {
-        metadata: {
-          ...(vendor.metadata || {}),
-          ...(metadata || {}),
-          ...(blockletMetaUrl !== undefined && { blockletMetaUrl }),
-        },
-      }),
+      metadata,
       app_pid: appPid,
       app_logo: appLogo,
       vendor_key: req.body.vendor_key,
@@ -247,7 +226,7 @@ async function updateVendor(req: any, res: any) {
     logger.info('Vendor updated', { vendorId: vendor.id });
     return res.json({ data: vendor });
   } catch (error: any) {
-    logger.error('Failed to update vendor', { error: error.message, id: req.params.id });
+    logger.error('Failed to update vendor', { error, id: req.params.id });
     return res.status(500).json({ error: 'Internal server error' });
   }
 }
@@ -264,7 +243,7 @@ async function deleteVendor(req: any, res: any) {
     logger.info('Vendor deleted', { vendorId: vendor.id });
     return res.json({ success: true });
   } catch (error: any) {
-    logger.error('Failed to delete vendor', { error: error.message, id: req.params.id });
+    logger.error('Failed to delete vendor', { error, id: req.params.id });
     return res.status(500).json({ error: 'Internal server error' });
   }
 }
@@ -286,131 +265,51 @@ async function testVendorConnection(req: any, res: any) {
       },
     });
   } catch (error: any) {
-    logger.error('Failed to test vendor connection', { error: error.message, id: req.params.id });
+    logger.error('Failed to test vendor connection', { error, id: req.params.id });
     return res.status(500).json({ error: 'Internal server error' });
   }
 }
 
-async function testVendorFulfillment(req: any, res: any) {
-  try {
-    const vendor = await ProductVendor.findByPk(req.params.id);
-    if (!vendor) {
-      return res.status(404).json({ error: 'Vendor not found' });
-    }
-
-    const { error, value } = testFulfillmentSchema.validate(req.body);
-    if (error) {
-      return res.status(400).json({
-        error: 'Validation failed',
-        message: error.message,
-      });
-    }
-
-    const { productCode, quantity, customParams } = value;
-
-    const testCheckoutSession = {
-      id: `test_checkout_${Date.now()}`,
-      payment_intent_id: `test_payment_intent_${Date.now()}`,
-      customer_id: 'test_customer',
-      customer_did: 'z1XGnwJiV3Hnz36kCTJaDe6iiv2kF6DJokt',
-      amount: 1000,
-      currency: 'USD',
-      amount_total: 1000,
-      currency_id: 'USD',
-      status: 'paid',
-      line_items: [
-        {
-          vendor_id: productCode,
-          quantity,
-          amount: 1000,
-          custom_params: {
-            email: customParams?.email || 'test@example.com',
-            testMode: true,
-            ...customParams,
-          },
-        },
-      ],
-      vendor_info: [
-        {
-          vendor_key: vendor.vendor_key,
-          status: 'pending',
-          attempts: 0,
-        },
-      ],
-    };
-
-    const testVendorConfig = {
-      vendor_id: vendor.id,
-      vendor_key: vendor.vendor_key,
-      app_url: vendor.app_url,
-      commission_rate: vendor.default_commission_rate,
-      commission_type: vendor.default_commission_type,
-      order_create_params: vendor.order_create_params || {},
-      custom_params: {
-        email: customParams?.email || 'test@example.com',
-        userDid: 'z1XGnwJiV3Hnz36kCTJaDe6iiv2kF6DJokt',
-      },
-    };
+async function getVendorStatusByVendorId(vendorId: string, orderId: string, isDetail = false) {
+  if (!vendorId || !orderId) {
+    return {};
+  }
 
-    logger.info('Starting test fulfillment', {
-      vendorId: vendor.id,
-      vendorKey: vendor.vendor_key,
-      testData: {
-        checkoutSessionId: testCheckoutSession.id,
-        productCode: req.body.productCode || 'test_product',
-        amount: testCheckoutSession.amount,
-        currency: testCheckoutSession.currency,
-      },
-    });
+  const vendor = await ProductVendor.findByPk(vendorId);
+  const url = vendor?.app_url ? joinURL(vendor.app_url, '/api/vendor/', isDetail ? 'orders' : 'status', orderId) : null;
 
-    const orderInfo = {
-      checkoutSessionId: testCheckoutSession.id,
-      amount_total: testCheckoutSession.amount_total.toString(),
-      customer_id: testCheckoutSession.customer_id,
-      payment_intent_id: testCheckoutSession.payment_intent_id,
-      currency_id: testCheckoutSession.currency_id,
-      customer_did: testCheckoutSession.customer_did,
-    };
-    const fulfillmentResult = await VendorFulfillmentService.fulfillSingleVendorOrder(orderInfo, testVendorConfig);
+  const { headers } = VendorAuth.signRequestWithHeaders({});
+  const name = vendor?.name;
+  const key = vendor?.vendor_key;
 
-    logger.info('Test fulfillment completed', {
-      vendorId: vendor.id,
-      orderId: fulfillmentResult.orderId,
-      status: fulfillmentResult.status,
-      serviceUrl: fulfillmentResult.serviceUrl,
-    });
+  return url
+    ? fetch(url, { headers })
+        .then(async (r) => {
+          const data = await r.json();
 
-    return res.json({
-      success: true,
-      message: 'Test fulfillment completed successfully!',
-      vendor: {
-        id: vendor.id,
-        name: vendor.name,
-        vendor_key: vendor.vendor_key,
-        app_url: vendor.app_url,
-      },
-      testData: {
-        checkoutSessionId: testCheckoutSession.id,
-        paymentIntentId: testCheckoutSession.payment_intent_id,
-        productCode: req.body.productCode || 'test_product',
-        amount: testCheckoutSession.amount,
-        currency: testCheckoutSession.currency,
-      },
-      fulfillmentResult,
-    });
-  } catch (error: any) {
-    logger.error('Test fulfillment failed', {
-      error: error.message,
-      stack: error.stack,
-      vendorId: req.params.id,
-      requestBody: req.body,
-    });
-    return res.status(500).json({
-      error: 'Test fulfillment failed',
-      details: error.message,
-      vendor: req.params.id,
-    });
-  }
+          if (!data.dashboardUrl) {
+            return {
+              ...data,
+              name,
+              key,
+            };
+          }
+          const validUntil = dayjs().add(20, 'minutes').format('YYYY-MM-DDTHH:mm:ss+00:00');
+          const maxVisits = 5;
+
+          const homeUrl = await formatToShortUrl({ url: data.homeUrl, maxVisits, validUntil });
+          const dashboardUrl = await formatToShortUrl({ url: data.dashboardUrl, maxVisits, validUntil });
+
+          return {
+            ...data,
+            name,
+            key,
+            homeUrl,
+            dashboardUrl,
+          };
+        })
+        .catch((e) => ({ error: e.message }))
+    : null;
 }
 
 async function getVendorStatus(sessionId: string, isDetail = false) {
@@ -441,36 +340,8 @@ async function getVendorStatus(sessionId: string, isDetail = false) {
     };
   }
 
-  const vendors = doc.vendor_info.map(async (item) => {
-    const vendor = await ProductVendor.findByPk(item.vendor_id);
-    const url = vendor?.app_url
-      ? joinURL(vendor.app_url, '/api/vendor/', isDetail ? 'orders' : 'status', item.order_id)
-      : null;
-
-    const { headers } = VendorAuth.signRequestWithHeaders({});
-
-    return url
-      ? fetch(url, { headers })
-          .then(async (r) => {
-            const data = await r.json();
-
-            if (!data.dashboardUrl) {
-              return data;
-            }
-            const validUntil = dayjs().add(20, 'minutes').format('YYYY-MM-DDTHH:mm:ss+00:00');
-            const maxVisits = 5;
-
-            const homeUrl = await formatToShortUrl({ url: data.homeUrl, maxVisits, validUntil });
-            const dashboardUrl = await formatToShortUrl({ url: data.dashboardUrl, maxVisits, validUntil });
-
-            return {
-              ...data,
-              homeUrl,
-              dashboardUrl,
-            };
-          })
-          .catch((e) => ({ error: e.message }))
-      : null;
+  const vendors = doc.vendor_info.map((item) => {
+    return getVendorStatusByVendorId(item.vendor_id, item.order_id, isDetail);
   });
 
   return {
@@ -510,11 +381,63 @@ async function getVendorFulfillmentDetail(req: any, res: any) {
   }
 }
 
+async function redirectToVendor(req: any, res: any) {
+  const { subscriptionId } = req.params;
+  const { vendorId, target } = req.query;
+
+  try {
+    const checkoutSession = await CheckoutSession.findBySubscriptionId(subscriptionId);
+    if (!checkoutSession) {
+      logger.warn('CheckoutSession not found for subscription[redirect to vendor]', { subscriptionId });
+      return res.redirect('/404');
+    }
+
+    const order = checkoutSession?.vendor_info?.find((item) => item.vendor_id === vendorId);
+    if (!order) {
+      logger.warn('Vendor order not found in checkout session[redirect to vendor]', {
+        subscriptionId,
+        vendorId,
+        availableVendors: checkoutSession.vendor_info?.map((v) => v.vendor_key) || [],
+      });
+      return res.redirect('/404');
+    }
+
+    const detail = await getVendorStatusByVendorId(vendorId, order.order_id || '', true);
+    if (!detail) {
+      logger.warn('Vendor status detail not found', {
+        subscriptionId,
+        vendorId,
+        orderId: order.order_id,
+      });
+      return res.redirect('/404');
+    }
+
+    const redirectUrl = target === 'dashboard' ? detail.dashboardUrl : detail.homeUrl;
+    return res.redirect(redirectUrl);
+  } catch (error: any) {
+    logger.error('Failed to redirect to vendor service', {
+      error,
+      subscriptionId,
+      vendorId,
+      target,
+    });
+    return res.redirect('/404');
+  }
+}
+
 const router = Router();
 
 router.get('/order/:sessionId/status', validateParams(sessionIdParamSchema), getVendorFulfillmentStatus);
 router.get('/order/:sessionId/detail', validateParams(sessionIdParamSchema), getVendorFulfillmentDetail);
 
+router.get(
+  '/open/:subscriptionId',
+  authAdmin,
+  validateParams(subscriptionIdParamSchema),
+  validateQuery(vendorRedirectQuerySchema),
+  redirectToVendor
+);
+
 router.get('/', getAllVendors);
 router.get('/:id', authAdmin, validateParams(vendorIdParamSchema), getVendorById);
 router.post('/', authAdmin, createVendor);
@@ -522,6 +445,5 @@ router.put('/:id', authAdmin, validateParams(vendorIdParamSchema), updateVendor)
 router.delete('/:id', authAdmin, validateParams(vendorIdParamSchema), deleteVendor);
 
 router.post('/:id/test-connection', authAdmin, validateParams(vendorIdParamSchema), testVendorConnection);
-router.post('/:id/test-fulfillment', authAdmin, validateParams(vendorIdParamSchema), testVendorFulfillment);
 
 export default router;

package/api/src/store/migrations/20250911-add-vendor-type.ts

@@ -0,0 +1,26 @@
+import { safeApplyColumnChanges, type Migration } from '../migrate';
+
+export const up: Migration = async ({ context }) => {
+  // Add vendor_type column to product_vendors table
+  await safeApplyColumnChanges(context, {
+    product_vendors: [
+      {
+        name: 'vendor_type',
+        field: {
+          type: 'STRING',
+          allowNull: false,
+          defaultValue: 'launcher',
+        },
+      },
+    ],
+  });
+  await context.removeColumn('product_vendors', 'default_commission_rate');
+  await context.removeColumn('product_vendors', 'default_commission_type');
+  await context.removeColumn('product_vendors', 'order_create_params');
+  await context.removeColumn('product_vendors', 'webhook_path');
+};
+
+export const down: Migration = async ({ context }) => {
+  // Remove vendor_type column if we need to rollback
+  await context.removeColumn('product_vendors', 'vendor_type');
+};

package/api/src/store/models/product-vendor.ts

@@ -8,17 +8,11 @@ export const nextProductVendorId = createIdGenerator('pv', 24);
 export class ProductVendor extends Model<InferAttributes<ProductVendor>, InferCreationAttributes<ProductVendor>> {
   declare id: CreationOptional<string>;
   declare vendor_key: string;
+  declare vendor_type: string;
   declare name: string;
   declare description: string;
 
   declare app_url: string;
-  declare webhook_path?: string;
-
-  declare default_commission_rate: number;
-  declare default_commission_type: 'percentage' | 'fixed_amount';
-
-  declare order_create_params: Record<string, any>;
-
   declare app_pid?: string;
   declare app_logo?: string;
 
@@ -41,6 +35,11 @@ export class ProductVendor extends Model<InferAttributes<ProductVendor>, InferCr
       allowNull: false,
       unique: true,
     },
+    vendor_type: {
+      type: DataTypes.STRING(50),
+      allowNull: false,
+      defaultValue: 'launcher',
+    },
     name: {
       type: DataTypes.STRING(255),
       allowNull: false,
@@ -53,23 +52,6 @@ export class ProductVendor extends Model<InferAttributes<ProductVendor>, InferCr
       type: DataTypes.STRING(512),
       allowNull: false,
     },
-    webhook_path: {
-      type: DataTypes.STRING(255),
-      allowNull: true,
-    },
-    default_commission_rate: {
-      type: DataTypes.DECIMAL(7, 4),
-      allowNull: false,
-    },
-    default_commission_type: {
-      type: DataTypes.ENUM('percentage', 'fixed_amount'),
-      allowNull: false,
-    },
-    order_create_params: {
-      type: DataTypes.JSON,
-      allowNull: true,
-      defaultValue: {},
-    },
     app_pid: {
       type: DataTypes.STRING(255),
       allowNull: true,

package/api/src/store/models/product.ts

@@ -54,6 +54,7 @@ export class Product extends Model<InferAttributes<Product>, InferCreationAttrib
   declare vendor_config?: Array<{
     vendor_id: string;
     vendor_key: string;
+    vendor_type: string;
     name?: string;
     description?: string;
     commission_rate?: number;

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.7
+version: 1.20.9
 logo: logo.png
 files:
   - dist

package/doc/vendor_fulfillment_system.md

@@ -790,7 +790,7 @@ async function requestReturnFromSingleVendor(
 ): Promise<void> {
   try {
     // 1. 获取供应商适配器
-    const vendorAdapter = VendorFulfillmentService.getVendorAdapter(vendor.vendor_key);
+    const vendorAdapter = await VendorFulfillmentService.getVendorAdapter(vendor.vendor_key);
 
     // 2. 调用供应商的退货请求方法
     const returnResult = await vendorAdapter.requestReturn({