payment-kit 1.20.18 → 1.20.20

package/api/src/routes/vendor.ts

@@ -14,6 +14,11 @@ import { VendorFulfillmentService } from '../libs/vendor-util/fulfillment';
 import { CheckoutSession, Invoice, Subscription } from '../store/models';
 import { ProductVendor } from '../store/models/product-vendor';
 
+const VENDOR_DID = {
+  launcher: 'z8iZkFBbrVQxZHvcWWB3Sa2TrfGmSeFz9MSU7',
+  didnames: 'z2qaGosS3rZ7m5ttP3Nd4V4qczR9TryTcRV4p',
+};
+
 const authAdmin = authenticate<CheckoutSession>({ component: true, roles: ['owner', 'admin'] });
 const loginAuth = authenticate<CheckoutSession>({ component: true, ensureLogin: true, mine: true });
 
@@ -25,9 +30,6 @@ const createVendorSchema = Joi.object({
   app_url: Joi.string().uri().max(512).required(),
   app_pid: Joi.string().max(255).allow('').optional(),
   app_logo: Joi.string().max(512).allow('').optional(),
-  vendor_did: Joi.string()
-    .pattern(/^(did:abt:)?[1-9A-HJ-NP-Za-km-z]{37}$/)
-    .required(),
   status: Joi.string().valid('active', 'inactive').default('active'),
   metadata: MetadataSchema,
 }).unknown(false);
@@ -39,9 +41,6 @@ const updateVendorSchema = Joi.object({
   app_url: Joi.string().uri().max(512).optional(),
   app_pid: Joi.string().max(255).allow('').optional(),
   app_logo: Joi.string().max(512).allow('').optional(),
-  vendor_did: Joi.string()
-    .pattern(/^(did:abt:)?[1-9A-HJ-NP-Za-km-z]{37}$/)
-    .required(),
   status: Joi.string().valid('active', 'inactive').optional(),
   metadata: MetadataSchema,
 }).unknown(true);
@@ -144,17 +143,19 @@ async function createVendor(req: any, res: any) {
 
     const {
       vendor_key: vendorKey,
-      vendor_type: vendorType,
+      vendor_type: type,
       name,
       description,
       app_url: appUrl,
-      vendor_did: vendorDid,
       metadata,
       app_pid: appPid,
       app_logo: appLogo,
       status,
     } = value;
 
+    const vendorType = (type || 'launcher') as 'launcher' | 'didnames';
+    const vendorDid = VENDOR_DID[vendorType];
+
     const existingVendor = await ProductVendor.findOne({
       where: { vendor_key: vendorKey },
     });
@@ -164,18 +165,25 @@ async function createVendor(req: any, res: any) {
 
     const blockletJson = await getBlockletJson(appUrl);
 
+    const mountPoint =
+      blockletJson?.componentMountPoints?.find((item: any) => item.did === vendorDid)?.mountPoint || '/';
+
     const vendor = await ProductVendor.create({
       vendor_key: vendorKey,
-      vendor_type: vendorType || 'launcher',
+      vendor_type: vendorType,
       name,
       description,
       app_url: appUrl,
-      vendor_did: vendorDid?.replace('did:abt:', '').trim(),
+      vendor_did: vendorDid,
       status: status || 'active',
       app_pid: appPid,
       app_logo: appLogo,
-      metadata: metadata || {},
+      metadata: {
+        ...metadata,
+        mountPoint,
+      },
       extends: {
+        mountPoint,
         appId: blockletJson?.appId,
         appPk: blockletJson?.appPk,
       },
@@ -208,19 +216,24 @@ async function updateVendor(req: any, res: any) {
     }
 
     const {
-      vendor_type: vendorType,
+      vendor_type: type,
       name,
       description,
       app_url: appUrl,
-      vendor_did: vendorDid,
       status,
       metadata,
       app_pid: appPid,
       app_logo: appLogo,
     } = value;
 
+    const vendorType = (type || 'launcher') as 'launcher' | 'didnames';
+    const vendorDid = VENDOR_DID[vendorType];
+
     const blockletJson = await getBlockletJson(appUrl);
 
+    const mountPoint =
+      blockletJson?.componentMountPoints?.find((item: any) => item.did === vendorDid)?.mountPoint || '/';
+
     if (req.body.vendorKey && req.body.vendorKey !== vendor.vendor_key) {
       const existingVendor = await ProductVendor.findOne({
         where: { vendor_key: req.body.vendorKey },
@@ -236,11 +249,15 @@ async function updateVendor(req: any, res: any) {
       app_url: appUrl,
       vendor_did: vendorDid,
       status,
-      metadata,
+      metadata: {
+        ...metadata,
+        mountPoint,
+      },
       app_pid: appPid,
       app_logo: appLogo,
       vendor_key: req.body.vendor_key,
       extends: {
+        mountPoint,
         appId: blockletJson?.appId,
         appPk: blockletJson?.appPk,
       },
@@ -325,7 +342,9 @@ async function getVendorStatusById(vendorId: string, orderId: string) {
 
   const vendorAdapter = await VendorFulfillmentService.getVendorAdapter(vendor.vendor_key);
 
-  return vendorAdapter.getOrderStatus(vendor, orderId);
+  const data = await vendorAdapter.getOrderStatus(vendor, orderId);
+
+  return { ...data, vendorType: vendor.vendor_type };
 }
 
 async function doRequestVendor(sessionId: string, func: (vendorId: string, orderId: string) => Promise<any>) {

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.20.18",
+  "version": "1.20.20",
   "scripts": {
     "dev": "blocklet dev --open",
     "lint": "tsc --noEmit && eslint src api/src --ext .mjs,.js,.jsx,.ts,.tsx",
@@ -56,9 +56,9 @@
     "@blocklet/error": "^0.2.5",
     "@blocklet/js-sdk": "^1.16.52-beta-20250912-112002-e3499e9c",
     "@blocklet/logger": "^1.16.52-beta-20250912-112002-e3499e9c",
-    "@blocklet/payment-broker-client": "1.20.18",
-    "@blocklet/payment-react": "1.20.18",
-    "@blocklet/payment-vendor": "1.20.18",
+    "@blocklet/payment-broker-client": "1.20.20",
+    "@blocklet/payment-react": "1.20.20",
+    "@blocklet/payment-vendor": "1.20.20",
     "@blocklet/sdk": "^1.16.52-beta-20250912-112002-e3499e9c",
     "@blocklet/ui-react": "^3.1.41",
     "@blocklet/uploader": "^0.2.12",
@@ -128,7 +128,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.16.52-beta-20250912-112002-e3499e9c",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.20.18",
+    "@blocklet/payment-types": "1.20.20",
     "@types/cookie-parser": "^1.4.9",
     "@types/cors": "^2.8.19",
     "@types/debug": "^4.1.12",
@@ -175,5 +175,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "94e4020fb0d4121ebf0430de2db1fd642676c8ae"
+  "gitHead": "0aa636abf410af4ba08cf03fd4a15ae3beab115d"
 }

package/src/components/vendor/actions.tsx

@@ -37,7 +37,7 @@ export default function VendorActions({ data, variant = 'compact', onChange }: V
     try {
       setState({ loading: true });
       const newStatus = data.status === 'active' ? 'inactive' : 'active';
-      await api.put(`/api/vendors/${data.id}`, { status: newStatus }).then((res: any) => res.data);
+      await api.put(`/api/vendors/${data.id}`, { ...data, status: newStatus }).then((res: any) => res.data);
       Toast.success(t('common.saved'));
       onChange(state.action);
     } catch (err) {

package/src/locales/zh.tsx

@@ -1099,7 +1099,7 @@ export default flat({
       vendorType: '供应商类型',
       vendorTypeRequired: '供应商类型是必填项',
       didnames: 'DID Names',
-      launcher: '启动器',
+      launcher: 'Launcher',
       vendorKey: '供应商标识',
       vendorKeyRequired: '供应商标识是必填项',
       vendorKeyHelp: '供应商的唯一标识符',

package/src/pages/admin/products/vendors/create.tsx

@@ -30,7 +30,6 @@ interface Vendor {
   name: string;
   description: string;
   app_url: string;
-  vendor_did?: string;
   status: 'active' | 'inactive';
   metadata: Record<string, any>;
   created_at: string;
@@ -50,7 +49,6 @@ interface VendorFormData {
   name: string;
   description: string;
   app_url: string;
-  vendor_did?: string;
   status: 'active' | 'inactive';
   metadata: Array<{ key: string; value: string }>;
   app_pid?: string;
@@ -80,13 +78,12 @@ export default function VendorCreate({
       }
     : {
         vendor_key: '',
-        vendor_type: 'didnames',
+        vendor_type: 'launcher',
         name: '',
         description: '',
         app_url: '',
-        vendor_did: '',
         status: 'inactive' as const,
-        metadata: [],
+        metadata: [{ key: 'blockletMetaUrl', value: '' }],
         app_pid: '',
         app_logo: '',
       };
@@ -117,16 +114,6 @@ export default function VendorCreate({
     }
   };
 
-  const validateDid = (did: string | undefined) => {
-    if (!did) return true; // DID 是可选的
-    // DID 格式验证
-    const didPattern = /^(did:abt:)?[1-9A-HJ-NP-Za-km-z]{37}$/;
-    if (!didPattern.test(did.trim())) {
-      return t('admin.vendor.vendorDidInvalid');
-    }
-    return true;
-  };
-
   const onSubmit = async (data: VendorFormData) => {
     try {
       setLoading(true);
@@ -157,7 +144,6 @@ export default function VendorCreate({
 
       const submitData = {
         ...restData,
-        vendor_did: restData.vendor_did?.replace('did:abt:', '').trim(),
         metadata: metadataObj,
       };
 
@@ -181,10 +167,6 @@ export default function VendorCreate({
           // 从响应中获取appPid和appLogo
           const blockletInfo = await response.json();
           if (blockletInfo) {
-            const component = blockletInfo.componentMountPoints?.find((x: any) => x.did === submitData.vendor_did);
-            if (component && !['', '/'].includes(component.mountPoint) && submitData.metadata) {
-              submitData.metadata.mountPoint = component.mountPoint;
-            }
             submitData.app_pid = blockletInfo.pid || blockletInfo.appPid;
             submitData.app_logo = blockletInfo.logo || blockletInfo.appLogo;
           }
@@ -326,24 +308,6 @@ export default function VendorCreate({
             )}
           />
 
-          <Controller
-            name="vendor_did"
-            control={control}
-            rules={{
-              required: t('admin.vendor.vendorDidRequired'),
-              validate: validateDid,
-            }}
-            render={({ field }) => (
-              <TextField
-                {...field}
-                label={t('admin.vendor.vendorDid')}
-                fullWidth
-                error={!!errors.vendor_did}
-                helperText={errors.vendor_did?.message || t('admin.vendor.vendorDidHelp')}
-              />
-            )}
-          />
-
           <MetadataForm title={t('common.metadata.label')} />
 
           <Controller

package/src/pages/admin/products/vendors/index.tsx

@@ -187,7 +187,7 @@ export default function VendorsList() {
 
   const handleCopyPublicKey = async () => {
     try {
-      await navigator.clipboard.writeText(data.pk);
+      await navigator.clipboard.writeText(window.blocklet.appPk);
       setCopySuccess(true);
       setTimeout(() => setCopySuccess(false), 2000);
     } catch (err) {