payment-kit 1.21.9 → 1.21.11

package/api/src/queues/vendors/fulfillment-coordinator.ts

@@ -4,14 +4,18 @@ import { events } from '../../libs/event';
 import { getLock } from '../../libs/lock';
 import logger from '../../libs/logger';
 import createQueue from '../../libs/queue';
+import dayjs from '../../libs/dayjs';
 import { VendorFulfillmentService } from '../../libs/vendor-util/fulfillment';
 import { CheckoutSession } from '../../store/models/checkout-session';
 import { PaymentIntent } from '../../store/models/payment-intent';
 import { Price } from '../../store/models/price';
 import { Product } from '../../store/models/product';
 import { Refund } from '../../store/models/refund';
+import { Subscription } from '../../store/models/subscription';
 import { sequelize } from '../../store/sequelize';
 import { depositVaultQueue } from '../payment';
+import { addSubscriptionJob } from '../subscription';
+import { SubscriptionWillCanceledSchedule } from '../../crons/subscription-will-canceled';
 import { Invoice } from '../../store/models';
 
 export type VendorInfo = NonNullable<CheckoutSession['vendor_info']>[number];
@@ -634,6 +638,11 @@ export async function initiateFullRefund(invoiceId: string, reason: string): Pro
     await checkoutSession.update({ fulfillment_status: 'cancelled' });
     await requestReturnsFromCompletedVendors(checkoutSession, reason);
 
+    // Cancel subscription if this refund is for a subscription
+    if (checkoutSession.subscription_id) {
+      await cancelSubscriptionForRefund(checkoutSession.subscription_id, reason);
+    }
+
     // Calculate remaining amount using the same logic as subscription createProration
     const refunds = await Refund.findAll({
       where: {
@@ -707,6 +716,66 @@ export async function initiateFullRefund(invoiceId: string, reason: string): Pro
   }
 }
 
+/**
+ * Cancel subscription when full refund is initiated due to vendor fulfillment failure
+ */
+async function cancelSubscriptionForRefund(subscriptionId: string, reason: string): Promise<void> {
+  try {
+    const subscription = await Subscription.findByPk(subscriptionId);
+    if (!subscription) {
+      logger.warn('Subscription not found for cancellation', { subscriptionId });
+      return;
+    }
+
+    // Check if subscription is already canceled
+    if (subscription.status === 'canceled') {
+      logger.info('Subscription already canceled, skipping', { subscriptionId });
+      return;
+    }
+
+    const now = dayjs().unix() + 3;
+    const haveStake = !!subscription.payment_details?.arcblock?.staking?.tx_hash;
+
+    // Prepare cancellation details
+    const updates: Partial<Subscription> = {
+      status: 'canceled',
+      cancel_at: now,
+      canceled_at: now,
+      cancelation_details: {
+        comment: `Canceled due to vendor fulfillment failure: ${reason}`,
+        reason: 'vendor_fulfillment_failed',
+        feedback: 'vendor_issue',
+        return_stake: haveStake, // Return stake when canceled due to vendor failure
+        slash_stake: false,
+        slash_reason: '',
+      },
+    };
+
+    // Update subscription
+    await subscription.update(updates);
+
+    // Schedule cancellation job
+    await addSubscriptionJob(subscription, 'cancel', true, updates.cancel_at);
+
+    // Update scheduled tasks
+    await new SubscriptionWillCanceledSchedule().reScheduleSubscriptionTasks([subscription]);
+
+    logger.info('Subscription canceled due to vendor fulfillment failure', {
+      subscriptionId: subscription.id,
+      customerId: subscription.customer_id,
+      reason,
+      cancelAt: subscription.cancel_at,
+      returnStake: haveStake,
+    });
+  } catch (error: any) {
+    logger.error('Failed to cancel subscription for refund', {
+      subscriptionId,
+      reason,
+      error,
+    });
+  }
+}
+
 async function requestReturnsFromCompletedVendors(checkoutSession: CheckoutSession, reason: string): Promise<void> {
   logger.info('Starting return request process', {
     checkoutSessionId: checkoutSession.id,

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

@@ -1329,6 +1329,49 @@ router.get('/retrieve/:id', user, async (req, res) => {
   });
 });
 
+// for checkout page
+router.get('/broker-status/:id', user, async (req, res) => {
+  const { needShortUrl = false } = req.query;
+  const doc = await CheckoutSession.findByPk(req.params.id);
+
+  if (!doc) {
+    res.json({
+      checkoutSession: {},
+      paymentLink: null,
+    });
+    return;
+  }
+
+  // @ts-ignore
+  doc.line_items = await Price.expand(doc.line_items, { upsell: true });
+
+  const hasVendorConfig = doc.line_items?.some((item: any) => !!item?.price?.product?.vendor_config?.length);
+
+  if (!hasVendorConfig || doc.payment_status === 'unpaid' || doc.fulfillment_status === 'cancelled') {
+    res.json({
+      checkoutSession: {},
+      paymentLink: null,
+    });
+    return;
+  }
+
+  const paymentUrl = getUrl(`/checkout/pay/${doc.id}`);
+  const paymentLink = needShortUrl
+    ? await formatToShortUrl({
+        url: paymentUrl,
+        validUntil: dayjs().add(20, 'minutes').format('YYYY-MM-DDTHH:mm:ss+00:00'),
+        maxVisits: 5,
+      })
+    : paymentUrl;
+
+  res.json({
+    checkoutSession: {
+      ...doc.toJSON(),
+    },
+    paymentLink,
+  });
+});
+
 async function checkVendorConfig(items: TLineItemExpanded[]) {
   const lineItems = await Price.expand(items, { upsell: true });
   return lineItems?.some((item: TLineItemExpanded) => !!item?.price?.product?.vendor_config?.length);

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.21.9",
+  "version": "1.21.11",
   "scripts": {
     "dev": "blocklet dev --open",
     "lint": "tsc --noEmit && eslint src api/src --ext .mjs,.js,.jsx,.ts,.tsx",
@@ -44,7 +44,7 @@
     ]
   },
   "dependencies": {
-    "@abtnode/cron": "^1.16.52",
+    "@abtnode/cron": "^1.16.53-beta-20251011-054719-4ed2f6b7",
     "@arcblock/did": "^1.25.6",
     "@arcblock/did-connect-react": "^3.1.46",
     "@arcblock/did-connect-storage-nedb": "^1.8.0",
@@ -54,15 +54,15 @@
     "@arcblock/validator": "^1.25.6",
     "@blocklet/did-space-js": "^1.1.32",
     "@blocklet/error": "^0.2.5",
-    "@blocklet/js-sdk": "^1.16.52",
-    "@blocklet/logger": "^1.16.52",
-    "@blocklet/payment-broker-client": "1.21.9",
-    "@blocklet/payment-react": "1.21.9",
-    "@blocklet/payment-vendor": "1.21.9",
-    "@blocklet/sdk": "^1.16.52",
+    "@blocklet/js-sdk": "^1.16.53-beta-20251011-054719-4ed2f6b7",
+    "@blocklet/logger": "^1.16.53-beta-20251011-054719-4ed2f6b7",
+    "@blocklet/payment-broker-client": "1.21.11",
+    "@blocklet/payment-react": "1.21.11",
+    "@blocklet/payment-vendor": "1.21.11",
+    "@blocklet/sdk": "^1.16.53-beta-20251011-054719-4ed2f6b7",
     "@blocklet/ui-react": "^3.1.46",
-    "@blocklet/uploader": "^0.2.13",
-    "@blocklet/xss": "^0.2.10",
+    "@blocklet/uploader": "^0.2.15",
+    "@blocklet/xss": "^0.2.12",
     "@mui/icons-material": "^7.1.2",
     "@mui/lab": "7.0.0-beta.14",
     "@mui/material": "^7.1.2",
@@ -126,9 +126,9 @@
     "web3": "^4.16.0"
   },
   "devDependencies": {
-    "@abtnode/types": "^1.16.52",
+    "@abtnode/types": "^1.16.53-beta-20251011-054719-4ed2f6b7",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.21.9",
+    "@blocklet/payment-types": "1.21.11",
     "@types/cookie-parser": "^1.4.9",
     "@types/cors": "^2.8.19",
     "@types/debug": "^4.1.12",
@@ -175,5 +175,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "dd41fc0eab97528eeb2f696e73073518ef360043"
+  "gitHead": "8a8bfd7810c58143314585fd31bad3c97637a761"
 }

package/src/components/subscription/vendor-service-list.tsx

@@ -82,7 +82,7 @@ export default function VendorServiceList({
                     {vendor.name || vendor.vendor_key}
                   </Typography>
                 </Stack>
-                {isLauncher && (
+                {isLauncher && !isCanceled && (
                   <Box>
                     <Stack direction="row" spacing={0.5}>
                       <Tooltip title={t('admin.subscription.serviceHome')} placement="top">