payment-kit 1.22.2 → 1.22.3

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

@@ -1,5 +1,6 @@
 import { Auth as VendorAuth } from '@blocklet/payment-vendor';
 
+import { joinURL } from 'ufo';
 import { ProductVendor } from '../../../store/models';
 import dayjs from '../../dayjs';
 import logger from '../../logger';
@@ -236,19 +237,21 @@ export class LauncherAdapter implements VendorAdapter {
   }
 
   async checkOrderStatus(params: CheckOrderStatusParams): Promise<CheckOrderStatusResult> {
-    const url = `${params.appUrl}/__blocklet__.js?type=json&noCache=1`;
+    const url = joinURL(params.appUrl, '__blocklet__.js?type=json&noCache=1');
     try {
-      const blocklet = await api.get(url, {
-        headers: { 'Content-Type': 'application/json' },
-      });
+      const blocklet = await api.get(url, { headers: { 'Content-Type': 'application/json' } });
       const blockletInfo = blocklet.data;
+
       let status: 'processing' | 'completed' | 'failed' = 'processing';
       if (blockletInfo.status === 'running') {
-        status = 'completed';
+        if (blockletInfo.componentMountPoints.every((x: any) => x.status === 'running')) {
+          status = 'completed';
+        } else if (blockletInfo.componentMountPoints.some((x: any) => x.status === 'failed')) {
+          status = 'failed';
+        }
       } else if (blockletInfo.status === 'failed') {
         status = 'failed';
       }
-
       return { status };
     } catch (error: any) {
       logger.error('Failed to check order status', {
@@ -267,8 +270,34 @@ export class LauncherAdapter implements VendorAdapter {
     return doRequestVendorData(vendor, orderId, url, options);
   }
 
-  getOrder(vendor: ProductVendor, orderId: string, options: { shortUrl: boolean }): Promise<any> {
-    const url = formatVendorUrl(vendor, `/api/vendor/orders/${orderId}`);
+  async getOrder(
+    vendor: ProductVendor,
+    orderId: string,
+    options: { shortUrl: boolean; appUrl?: string }
+  ): Promise<any> {
+    const { appUrl } = options;
+    let ownerDid = '';
+    let appDid = '';
+    if (appUrl) {
+      const blockletInfoUrl = joinURL(appUrl, '__blocklet__.js?type=json&noCache=1&owner=1');
+      try {
+        const blocklet = await api.get(blockletInfoUrl, { headers: { 'Content-Type': 'application/json' } });
+        const blockletInfo = blocklet.data;
+
+        ownerDid = blockletInfo.ownerDid;
+        appDid = blockletInfo.appId;
+      } catch (error: any) {
+        logger.error('Failed to get blocklet info', {
+          url: blockletInfoUrl,
+          error,
+        });
+      }
+    }
+
+    const url = formatVendorUrl(
+      vendor,
+      `/api/vendor/orders/${orderId}?ownerDid=${ownerDid || ''}&appDid=${appDid || ''}`
+    );
 
     return doRequestVendorData(vendor, orderId, url, options);
   }

package/api/src/routes/vendor.ts

@@ -338,13 +338,20 @@ async function testVendorConnection(req: any, res: any) {
   }
 }
 
-async function executeVendorOperation(
-  vendorId: string,
-  orderId: string,
-  operation: 'getOrder' | 'getOrderStatus',
-  shortUrl: boolean
-) {
-  if (!vendorId || !orderId) {
+async function executeVendorOperation({
+  vendorId,
+  orderId,
+  operation,
+  shortUrl,
+  appUrl,
+}: {
+  vendorId: string;
+  orderId: string;
+  operation: 'getOrder' | 'getOrderStatus';
+  shortUrl: boolean;
+  appUrl?: string;
+}) {
+  if (!vendorId || !orderId || !appUrl) {
     return {
       error: 'Bad Request',
       message: `vendorId or orderId is required, vendorId: ${vendorId}, orderId: ${orderId}`,
@@ -363,7 +370,7 @@ async function executeVendorOperation(
 
   try {
     const vendorAdapter = await VendorFulfillmentService.getVendorAdapter(vendor.vendor_key);
-    const data = await vendorAdapter[operation](vendor, orderId, { shortUrl });
+    const data = await vendorAdapter[operation](vendor, orderId, { shortUrl, appUrl });
 
     return { data: { ...data, vendorType: vendor.vendor_type }, code: 200 };
   } catch (error: any) {
@@ -424,7 +431,13 @@ async function processVendorOrders(sessionId: string, operation: 'getOrder' | 'g
       };
     }
 
-    const result = await executeVendorOperation(item.vendor_id, item.order_id, operation, shortUrl);
+    const result = await executeVendorOperation({
+      vendorId: item.vendor_id,
+      orderId: item.order_id,
+      operation,
+      shortUrl,
+      appUrl: item.app_url,
+    });
 
     // Handle error responses from vendor functions
     if (result.error) {
@@ -533,7 +546,13 @@ async function redirectToVendor(req: any, res: any) {
       return res.redirect('/404');
     }
 
-    const result = await executeVendorOperation(vendorId, order.order_id || '', 'getOrder', false);
+    const result = await executeVendorOperation({
+      vendorId,
+      orderId: order.order_id || '',
+      operation: 'getOrder',
+      shortUrl: false,
+      appUrl: order.app_url,
+    });
     if (result.error || !result.data) {
       logger.warn('Vendor status detail not found', {
         subscriptionId,

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.22.2",
+  "version": "1.22.3",
   "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.54-beta-20251029-055649-a9143beb",
     "@blocklet/logger": "^1.16.54-beta-20251029-055649-a9143beb",
-    "@blocklet/payment-broker-client": "1.22.2",
-    "@blocklet/payment-react": "1.22.2",
-    "@blocklet/payment-vendor": "1.22.2",
+    "@blocklet/payment-broker-client": "1.22.3",
+    "@blocklet/payment-react": "1.22.3",
+    "@blocklet/payment-vendor": "1.22.3",
     "@blocklet/sdk": "^1.16.54-beta-20251029-055649-a9143beb",
     "@blocklet/ui-react": "^3.1.53",
     "@blocklet/uploader": "^0.3.2",
@@ -128,7 +128,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.16.54-beta-20251029-055649-a9143beb",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.22.2",
+    "@blocklet/payment-types": "1.22.3",
     "@types/cookie-parser": "^1.4.9",
     "@types/cors": "^2.8.19",
     "@types/debug": "^4.1.12",
@@ -175,5 +175,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "13ea906cf090d7069a970d97d9a3f06426b27092"
+  "gitHead": "d5967646cdb253d7508a84ccc2dc0e96f4ae25ea"
 }