payment-kit 1.13.195 → 1.13.196

package/api/src/integrations/stripe/handlers/subscription.ts

@@ -2,10 +2,35 @@ import pick from 'lodash/pick';
 import type Stripe from 'stripe';
 
 import logger from '../../../libs/logger';
-import { CheckoutSession, Subscription, TEventExpanded } from '../../../store/models';
+import { CheckoutSession, PaymentMethod, Subscription, TEventExpanded } from '../../../store/models';
 
-export async function handleStripeSubscriptionSucceed(subscription: Subscription) {
-  await subscription.update({ status: 'active' });
+export async function handleStripeSubscriptionSucceed(subscription: Subscription, status: string) {
+  if (!subscription.payment_details?.stripe?.subscription_id) {
+    return;
+  }
+
+  // do not move to active if actual setup is not done
+  const method = await PaymentMethod.findByPk(subscription.default_payment_method_id);
+  const client = method!.getStripeClient();
+  const result: any = await client.subscriptions.retrieve(subscription.payment_details.stripe.subscription_id, {
+    expand: ['latest_invoice.payment_intent', 'pending_setup_intent'],
+  });
+  if (result.pending_setup_intent && result.pending_setup_intent.status !== 'succeeded') {
+    logger.warn('subscription can not active because stripe setup not done', {
+      id: subscription.id,
+      status: result.pending_setup_intent.status,
+    });
+    return;
+  }
+  if (result.latest_invoice?.payment_intent && result.latest_invoice.payment_intent !== 'succeeded') {
+    logger.warn('subscription can not active because stripe payment not done', {
+      id: subscription.id,
+      status: result.latest_invoice.payment_intent.status,
+    });
+    return;
+  }
+
+  await subscription.update({ status });
   logger.info('subscription become active on stripe event', { id: subscription.id, status: subscription.status });
 
   const checkoutSession = await CheckoutSession.findOne({ where: { payment_intent_id: subscription.id } });
@@ -36,8 +61,11 @@ export async function handleSubscriptionEvent(event: TEventExpanded, _: Stripe)
   logger.info('received subscription event', { id: event.id, type: event.type, localSubscriptionId });
 
   if (event.type === 'customer.subscription.updated') {
-    if (event.data.previous_attributes?.status === 'incomplete' && event.data.object.status === 'active') {
-      await handleStripeSubscriptionSucceed(subscription);
+    if (
+      event.data.previous_attributes?.status === 'incomplete' &&
+      ['active', 'trialing'].includes(event.data.object.status)
+    ) {
+      await handleStripeSubscriptionSucceed(subscription, event.data.object.status);
       return;
     }
 
@@ -60,12 +88,20 @@ export async function handleSubscriptionEvent(event: TEventExpanded, _: Stripe)
   }
 
   if (event.type === 'customer.subscription.deleted') {
-    await subscription.update({ status: 'canceled', ended_at: event.data.object.ended_at });
-    logger.info('subscription ended on stripe event', { id: subscription.id });
+    if (['incomplete', 'incomplete_expired'].includes(subscription.status)) {
+      logger.warn('subscription not ended on stripe event', { id: subscription.id });
+    } else {
+      await subscription.update({ status: 'canceled', ended_at: event.data.object.ended_at });
+      logger.info('subscription ended on stripe event', { id: subscription.id });
+    }
   }
 
   if (event.type === 'customer.subscription.paused') {
-    await subscription.update({ status: 'paused', pause_collection: event.data.object.pause_collection });
-    logger.info('subscription paused on stripe event', { id: subscription.id });
+    if (['incomplete', 'incomplete_expired'].includes(subscription.status)) {
+      logger.warn('subscription not paused on stripe event', { id: subscription.id });
+    } else {
+      await subscription.update({ status: 'paused', pause_collection: event.data.object.pause_collection });
+      logger.info('subscription paused on stripe event', { id: subscription.id });
+    }
   }
 }

package/api/src/integrations/stripe/resource.ts

@@ -446,7 +446,7 @@ export async function batchHandleStripeSubscriptions() {
         }
 
         await subscription.update(updates);
-        logger.warn('stripe subscription synced', { local: subscription.id, stripe: subscriptionId, updates });
+        logger.info('stripe subscription synced', { local: subscription.id, stripe: subscriptionId, updates });
       } else {
         logger.warn('stripe subscription missing', { local: subscription.id, stripe: subscriptionId });
       }

package/api/src/libs/env.ts

@@ -2,7 +2,7 @@ import env from '@blocklet/sdk/lib/env';
 
 export const subscriptionCronTime: string = process.env.SUBSCRIPTION_CRON_TIME || '0 */30 * * * *'; // 默认每 30 min 行一次
 export const notificationCronTime: string = process.env.NOTIFICATION_CRON_TIME || '0 5 */6 * * *'; // 默认每6个小时执行一次
-export const expiredSessionCleanupCronTime: string = process.env.EXPIRED_SESSION_CLEANUP_CRON_TIME || '0 1 */2 * * *'; // 默认每2个小时执行一次
+export const expiredSessionCleanupCronTime: string = process.env.EXPIRED_SESSION_CLEANUP_CRON_TIME || '0 1 * * * *'; // 默认每小时执行一次
 export const notificationCronConcurrency: number = Number(process.env.NOTIFICATION_CRON_CONCURRENCY) || 8; // 默认并发数为 8
 export const stripeInvoiceCronTime: string = process.env.STRIPE_INVOICE_CRON_TIME || '0 */30 * * * *'; // 默认每 30min 执行一次
 export const stripePaymentCronTime: string = process.env.STRIPE_PAYMENT_CRON_TIME || '0 */20 * * * *'; // 默认每 20min 执行一次

package/api/src/libs/util.ts

@@ -14,7 +14,7 @@ export const MAX_SUBSCRIPTION_ITEM_COUNT = 20;
 export const MAX_RETRY_COUNT = 20; // 2^20 seconds ~~ 12 days, total retry time: 24 days
 export const MIN_RETRY_MAIL = 13; // total retry time before sending first mail: 6 hours
 
-export const CHECKOUT_SESSION_TTL = 24 * 60 * 60; // expires in 24 hours
+export const CHECKOUT_SESSION_TTL = 6 * 60 * 60; // expires in 6 hours, then removed after 12 hours
 
 export const STRIPE_API_VERSION = '2023-08-16';
 export const STRIPE_ENDPOINT: string = getUrl('/api/integrations/stripe/webhook');

package/api/src/queues/checkout-session.ts

@@ -12,6 +12,7 @@ import {
   Invoice,
   InvoiceItem,
   PaymentIntent,
+  PaymentMethod,
   Price,
   SetupIntent,
   Subscription,
@@ -123,6 +124,8 @@ events.on('checkout.session.created', (checkoutSession: CheckoutSession) => {
 });
 
 events.on('checkout.session.expired', async (checkoutSession: CheckoutSession) => {
+  logger.info('Start cleanup on checkoutSession expired', { checkoutSession: checkoutSession.id });
+
   // Do some cleanup
   if (checkoutSession.invoice_id) {
     await InvoiceItem.destroy({ where: { invoice_id: checkoutSession.invoice_id } });
@@ -143,6 +146,7 @@ events.on('checkout.session.expired', async (checkoutSession: CheckoutSession) =
       });
     }
   }
+
   if (checkoutSession.setup_intent_id) {
     await SetupIntent.destroy({ where: { id: checkoutSession.setup_intent_id } });
     logger.info('SetupIntent for checkout session deleted on expire', {
@@ -150,14 +154,71 @@ events.on('checkout.session.expired', async (checkoutSession: CheckoutSession) =
       setupIntent: checkoutSession.setup_intent_id,
     });
   }
+
   if (checkoutSession.payment_intent_id && checkoutSession.payment_status !== 'paid') {
+    const paymentIntent = await PaymentIntent.findByPk(checkoutSession.payment_intent_id);
+    const stripePaymentId = paymentIntent?.payment_details?.stripe?.payment_intent_id;
+    if (paymentIntent && stripePaymentId) {
+      const method = await PaymentMethod.findByPk(paymentIntent.payment_method_id);
+      if (method?.type === 'stripe') {
+        const client = method.getStripeClient();
+        try {
+          await client.paymentIntents.cancel(stripePaymentId, { cancellation_reason: 'abandoned' });
+          logger.info('Stripe PaymentIntent for checkout session canceled on expire', {
+            checkoutSession: checkoutSession.id,
+            paymentIntent: checkoutSession.payment_intent_id,
+            stripePayment: stripePaymentId,
+          });
+        } catch (err) {
+          logger.error('Stripe PaymentIntent for checkout session cancel failed on expire', {
+            checkoutSession: checkoutSession.id,
+            paymentIntent: checkoutSession.payment_intent_id,
+            stripePayment: stripePaymentId,
+            error: err,
+          });
+        }
+      }
+    }
+
     await PaymentIntent.destroy({ where: { id: checkoutSession.payment_intent_id } });
     logger.info('PaymentIntent for checkout session deleted on expire', {
       checkoutSession: checkoutSession.id,
       paymentIntent: checkoutSession.payment_intent_id,
     });
   }
+
   if (checkoutSession.subscription_id) {
+    const subscription = await Subscription.findByPk(checkoutSession.subscription_id);
+    const stripeSubscriptionId = subscription?.payment_details?.stripe?.subscription_id;
+    if (subscription && stripeSubscriptionId) {
+      const method = await PaymentMethod.findByPk(subscription.default_payment_method_id);
+      if (method?.type === 'stripe') {
+        const client = method.getStripeClient();
+        try {
+          await client.subscriptions.cancel(stripeSubscriptionId, {
+            prorate: false,
+            invoice_now: false,
+            cancellation_details: {
+              comment: 'checkout_session_expired',
+              feedback: 'unused',
+            },
+          });
+          logger.info('Stripe Subscription for checkout session canceled on expire', {
+            checkoutSession: checkoutSession.id,
+            subscription: checkoutSession.subscription_id,
+            stripeSubscription: stripeSubscriptionId,
+          });
+        } catch (err) {
+          logger.error('Stripe Subscription for checkout session cancel failed on expire', {
+            checkoutSession: checkoutSession.id,
+            subscription: checkoutSession.subscription_id,
+            stripeSubscription: stripeSubscriptionId,
+            error: err,
+          });
+        }
+      }
+    }
+
     await SubscriptionItem.destroy({ where: { subscription_id: checkoutSession.subscription_id } });
     await Subscription.destroy({ where: { id: checkoutSession.subscription_id } });
     logger.info('Subscription and SubscriptionItem for checkout session deleted on expire', {
@@ -185,4 +246,6 @@ events.on('checkout.session.expired', async (checkoutSession: CheckoutSession) =
       }
     }
   }
+
+  logger.info('Done cleanup on checkoutSession expired', { checkoutSession: checkoutSession.id });
 });

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

@@ -133,7 +133,7 @@ export const formatCheckoutSession = async (payload: any, throwOnEmptyItems = tr
   }
 
   if (!raw.expires_at) {
-    raw.expires_at = dayjs().unix() + CHECKOUT_SESSION_TTL; // 24 hours after creation
+    raw.expires_at = dayjs().unix() + CHECKOUT_SESSION_TTL;
   }
 
   if (raw.nft_mint_settings?.enabled) {
@@ -803,8 +803,8 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
           trialEnds
         );
         if (stripeSubscription && subscription?.payment_details?.stripe?.subscription_id === stripeSubscription.id) {
-          if (stripeSubscription.status === 'active' && subscription.status === 'incomplete') {
-            await handleStripeSubscriptionSucceed(subscription);
+          if (['active', 'trialing'].includes(stripeSubscription.status) && subscription.status === 'incomplete') {
+            await handleStripeSubscriptionSucceed(subscription, stripeSubscription.status);
           }
         }
         stripeContext = {

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.195",
+  "version": "1.13.196",
   "scripts": {
     "dev": "cross-env COMPONENT_STORE_URL=https://test.store.blocklet.dev blocklet dev --open",
     "eject": "vite eject",
@@ -50,7 +50,7 @@
     "@arcblock/jwt": "^1.18.113",
     "@arcblock/ux": "^2.9.57",
     "@blocklet/logger": "1.16.24",
-    "@blocklet/payment-react": "1.13.195",
+    "@blocklet/payment-react": "1.13.196",
     "@blocklet/sdk": "1.16.24",
     "@blocklet/ui-react": "^2.9.57",
     "@blocklet/uploader": "^0.0.74",
@@ -110,7 +110,7 @@
   "devDependencies": {
     "@abtnode/types": "1.16.24",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@blocklet/payment-types": "1.13.195",
+    "@blocklet/payment-types": "1.13.196",
     "@types/cookie-parser": "^1.4.6",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -149,5 +149,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "e8615414419a8dd76fb46b3dcdbb4ff53a8f049c"
+  "gitHead": "04bc825071dc91673a67b995f446ad7e4300e4bf"
 }

package/src/components/refund/list.tsx

@@ -57,6 +57,9 @@ const getListKey = (props: ListProps) => {
   if (props.invoice_id) {
     return `invoice-refunds-${props.invoice_id}`;
   }
+  if (props.subscription_id) {
+    return `subscription-refunds-${props.subscription_id}`;
+  }
 
   return 'refunds';
 };
@@ -75,7 +78,7 @@ export default function RefundList({ customer_id, invoice_id, subscription_id, f
   const { t } = useLocaleContext();
   const navigate = useNavigate();
   const { startTransition } = useTransitionContext();
-  const listKey = getListKey({ customer_id, invoice_id });
+  const listKey = getListKey({ customer_id, invoice_id, subscription_id });
 
   const [search, setSearch] = useLocalStorageState<SearchProps>(listKey, {
     defaultValue: {