payment-kit 1.22.6 → 1.22.8

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

@@ -1,6 +1,6 @@
 import { Auth as VendorAuth } from '@blocklet/payment-vendor';
 
-import { joinURL } from 'ufo';
+import { joinURL, withQuery } from 'ufo';
 import { ProductVendor } from '../../../store/models';
 import dayjs from '../../dayjs';
 import logger from '../../logger';
@@ -18,33 +18,59 @@ import {
 } from './types';
 import { formatVendorUrl } from './util';
 
+async function getBlockletInfo(appUrl: string): Promise<any> {
+  const url = joinURL(appUrl, '__blocklet__.js?type=json&noCache=1&owner=1');
+  try {
+    const blocklet = await api.get(url, { headers: { 'Content-Type': 'application/json' } });
+    return blocklet.data;
+  } catch (error: any) {
+    logger.error('Failed to get blocklet info', { url, error });
+    return null;
+  }
+}
+
 const doRequestVendorData = async (
   vendor: ProductVendor,
   orderId: string,
-  url: string,
-  options: { shortUrl: boolean }
+  baseUrl: string,
+  options: { shortUrl: boolean; query?: Record<string, string>; type?: 'order' | 'status' }
 ) => {
-  const { headers } = await VendorAuth.signRequestWithHeaders({});
   const name = vendor?.name;
   const key = vendor?.vendor_key;
-  const { shortUrl } = options;
+  const { shortUrl, query, type } = options;
+  const { headers } = await VendorAuth.signRequestWithHeaders({ ...query });
+
+  let url = baseUrl;
+  if (query) {
+    url = withQuery(baseUrl, query);
+  }
 
-  return fetch(url, { headers })
+  return fetch(url, { headers, method: 'GET' })
     .then(async (r) => {
       const data = await r.json();
       if (r.status !== 200) {
-        logger.error('vendor status fetch failed', {
+        logger.error(`vendor ${type} fetch failed`, {
+          status: r.status,
           vendorId: vendor.id,
           vendorKey: vendor.vendor_key,
           orderId,
-          status: r.status,
           url,
+          query,
           data,
         });
         throw new Error(
           `vendor status fetch failed, vendor: ${vendor.vendor_key}, orderId: ${orderId}, status: ${r.status}, url: ${url}`
         );
+      } else if (type === 'order') {
+        logger.info('vendor order fetch success', {
+          vendorId: vendor.id,
+          vendorKey: vendor.vendor_key,
+          orderId,
+          url,
+          query,
+        });
       }
+
       if (!shortUrl || !data.dashboardUrl) {
         return {
           ...data,
@@ -237,29 +263,22 @@ export class LauncherAdapter implements VendorAdapter {
   }
 
   async checkOrderStatus(params: CheckOrderStatusParams): Promise<CheckOrderStatusResult> {
-    const url = joinURL(params.appUrl, '__blocklet__.js?type=json&noCache=1');
     try {
-      const blocklet = await api.get(url, { headers: { 'Content-Type': 'application/json' } });
-      const blockletInfo = blocklet.data;
+      const blockletInfo = await getBlockletInfo(params.appUrl);
 
       let status: 'processing' | 'completed' | 'failed' = 'processing';
       if (blockletInfo.status === 'running') {
-        if (blockletInfo.componentMountPoints.every((x: any) => x.status === 'running')) {
+        if (!!blockletInfo.ownerDid && blockletInfo.componentMountPoints.every((x: any) => x.status === 'running')) {
           status = 'completed';
-        } else if (blockletInfo.componentMountPoints.some((x: any) => x.status === 'failed')) {
+        } else if (blockletInfo.componentMountPoints.some((x: any) => ['failed', 'error'].includes(x.status))) {
           status = 'failed';
         }
-      } else if (blockletInfo.status === 'failed') {
+      } else if (['failed', 'error'].includes(blockletInfo.status)) {
         status = 'failed';
       }
       return { status };
     } catch (error: any) {
-      logger.error('Failed to check order status', {
-        url,
-        error: error.message,
-        stack: error.stack,
-      });
-
+      logger.error('Failed to check order status', { error, appUrl: params.appUrl });
       throw error;
     }
   }
@@ -273,33 +292,24 @@ export class LauncherAdapter implements VendorAdapter {
   async getOrder(
     vendor: ProductVendor,
     orderId: string,
-    options: { shortUrl: boolean; appUrl?: string }
+    options: { shortUrl: boolean; appUrl?: string; ownerDid?: string; appDid?: string }
   ): Promise<any> {
-    const { appUrl } = options;
-    let ownerDid = '';
-    let appDid = '';
+    const { appUrl, ownerDid: ownerDidParam, appDid: appDidParam } = options;
+    let ownerDid = ownerDidParam || '';
+    let appDid = appDidParam || '';
     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;
-
+        const blockletInfo = await getBlockletInfo(appUrl);
         ownerDid = blockletInfo.ownerDid;
         appDid = blockletInfo.appId;
       } catch (error: any) {
-        logger.error('Failed to get blocklet info', {
-          url: blockletInfoUrl,
-          error,
-        });
+        logger.error('Failed to get blocklet info', { appUrl, error });
       }
     }
 
-    const url = formatVendorUrl(
-      vendor,
-      `/api/vendor/orders/${orderId}?ownerDid=${ownerDid || ''}&appDid=${appDid || ''}`
-    );
+    const url = formatVendorUrl(vendor, `/api/vendor/orders/${orderId}`);
 
-    return doRequestVendorData(vendor, orderId, url, options);
+    return doRequestVendorData(vendor, orderId, url, { ...options, query: { ownerDid, appDid }, type: 'order' });
   }
 
   async connectTest(): Promise<any> {

package/api/src/routes/vendor.ts

@@ -344,12 +344,16 @@ async function executeVendorOperation({
   operation,
   shortUrl,
   appUrl,
+  ownerDid,
+  appDid,
 }: {
   vendorId: string;
   orderId: string;
   operation: 'getOrder' | 'getOrderStatus';
   shortUrl: boolean;
   appUrl?: string;
+  ownerDid?: string;
+  appDid?: string;
 }) {
   if (!vendorId || !orderId) {
     return {
@@ -370,7 +374,7 @@ async function executeVendorOperation({
 
   try {
     const vendorAdapter = await VendorFulfillmentService.getVendorAdapter(vendor.vendor_key);
-    const data = await vendorAdapter[operation](vendor, orderId, { shortUrl, appUrl });
+    const data = await vendorAdapter[operation](vendor, orderId, { shortUrl, appUrl, ownerDid, appDid });
 
     return { data: { ...data, vendorType: vendor.vendor_type }, code: 200 };
   } catch (error: any) {
@@ -389,7 +393,13 @@ async function executeVendorOperation({
   }
 }
 
-async function processVendorOrders(sessionId: string, operation: 'getOrder' | 'getOrderStatus', shortUrl: boolean) {
+async function processVendorOrders(
+  sessionId: string,
+  operation: 'getOrder' | 'getOrderStatus',
+  shortUrl: boolean,
+  ownerDid?: string,
+  appDid?: string
+) {
   const doc = await CheckoutSession.findByPk(sessionId);
 
   if (!doc) {
@@ -437,6 +447,8 @@ async function processVendorOrders(sessionId: string, operation: 'getOrder' | 'g
       operation,
       shortUrl,
       appUrl: item.app_url,
+      ownerDid,
+      appDid,
     });
 
     // Handle error responses from vendor functions
@@ -503,10 +515,10 @@ async function getVendorFulfillmentStatus(req: any, res: any) {
 
 async function getVendorFulfillmentDetail(req: any, res: any) {
   const { sessionId } = req.params;
-  const { shortUrl } = req.query;
+  const { shortUrl, ownerDid, appDid } = req.query;
 
   try {
-    const detail = await processVendorOrders(sessionId, 'getOrder', shortUrl === 'true');
+    const detail = await processVendorOrders(sessionId, 'getOrder', shortUrl === 'true', ownerDid, appDid);
     if (detail.code) {
       return res.status(detail.code).json({ error: detail.error });
     }

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.22.6",
+  "version": "1.22.8",
   "scripts": {
     "dev": "blocklet dev --open",
     "lint": "tsc --noEmit && eslint src api/src --ext .mjs,.js,.jsx,.ts,.tsx",
@@ -44,32 +44,32 @@
     ]
   },
   "dependencies": {
-    "@abtnode/cron": "^1.17.0-beta-20251104-112713-e947b159",
-    "@arcblock/did": "^1.26.3",
-    "@arcblock/did-connect-react": "^3.1.54",
+    "@abtnode/cron": "^1.17.0",
+    "@arcblock/did": "^1.27.2",
+    "@arcblock/did-connect-react": "^3.1.60",
     "@arcblock/did-connect-storage-nedb": "^1.8.0",
     "@arcblock/did-util": "^1.27.2",
     "@arcblock/jwt": "^1.27.2",
-    "@arcblock/react-hooks": "^3.1.54",
-    "@arcblock/ux": "^3.1.54",
+    "@arcblock/react-hooks": "^3.1.60",
+    "@arcblock/ux": "^3.1.60",
     "@arcblock/validator": "^1.27.2",
-    "@blocklet/did-space-js": "^1.1.35",
-    "@blocklet/error": "^0.2.5",
-    "@blocklet/js-sdk": "^1.17.0-beta-20251104-112713-e947b159",
-    "@blocklet/logger": "^1.17.0-beta-20251104-112713-e947b159",
-    "@blocklet/payment-broker-client": "1.22.6",
-    "@blocklet/payment-react": "1.22.6",
-    "@blocklet/payment-vendor": "1.22.6",
-    "@blocklet/sdk": "^1.17.0-beta-20251104-112713-e947b159",
-    "@blocklet/ui-react": "^3.1.54",
-    "@blocklet/uploader": "^0.3.4",
-    "@blocklet/xss": "^0.3.4",
+    "@blocklet/did-space-js": "^1.2.1",
+    "@blocklet/error": "^0.3.1",
+    "@blocklet/js-sdk": "^1.17.0",
+    "@blocklet/logger": "^1.17.0",
+    "@blocklet/payment-broker-client": "1.22.8",
+    "@blocklet/payment-react": "1.22.8",
+    "@blocklet/payment-vendor": "1.22.8",
+    "@blocklet/sdk": "^1.17.0",
+    "@blocklet/ui-react": "^3.1.60",
+    "@blocklet/uploader": "^0.3.5",
+    "@blocklet/xss": "^0.3.5",
     "@mui/icons-material": "^7.1.2",
     "@mui/lab": "7.0.0-beta.14",
     "@mui/material": "^7.1.2",
     "@mui/system": "^7.1.1",
     "@ocap/asset": "^1.27.2",
-    "@ocap/client": "^1.26.3",
+    "@ocap/client": "^1.27.2",
     "@ocap/mcrypto": "^1.27.2",
     "@ocap/util": "^1.27.2",
     "@ocap/wallet": "^1.27.2",
@@ -127,9 +127,9 @@
     "web3": "^4.16.0"
   },
   "devDependencies": {
-    "@abtnode/types": "^1.17.0-beta-20251104-112713-e947b159",
+    "@abtnode/types": "^1.17.0",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.22.6",
+    "@blocklet/payment-types": "1.22.8",
     "@types/cookie-parser": "^1.4.9",
     "@types/cors": "^2.8.19",
     "@types/debug": "^4.1.12",
@@ -160,7 +160,7 @@
     "vite": "^7.0.0",
     "vite-node": "^3.2.4",
     "vite-plugin-babel-import": "^2.0.5",
-    "vite-plugin-blocklet": "^0.11.2",
+    "vite-plugin-blocklet": "^0.12.1",
     "vite-plugin-node-polyfills": "^0.23.0",
     "vite-plugin-svgr": "^4.3.0",
     "vite-tsconfig-paths": "^5.1.4",
@@ -176,5 +176,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "69c7b775a4fa6ba27b5b317aa76e25db3fd4177f"
+  "gitHead": "14f70c4a934ae339a0a1e43bd84906015ca42138"
 }