payment-kit 1.13.170 → 1.13.172

package/api/src/crons/index.ts

@@ -1,10 +1,11 @@
 import Cron from '@abtnode/cron';
 
-import { batchHandleStripeInvoices } from '../integrations/stripe/resource';
+import { batchHandleStripeInvoices, batchHandleStripeSubscriptions } from '../integrations/stripe/resource';
 import {
   expiredSessionCleanupCronTime,
   notificationCronTime,
   stripeInvoiceCronTime,
+  stripeSubscriptionCronTime,
   subscriptionCronTime,
 } from '../libs/env';
 import logger from '../libs/logger';
@@ -57,6 +58,12 @@ function init() {
         fn: batchHandleStripeInvoices,
         options: { runOnInit: false },
       },
+      {
+        name: 'stripe.subscription.sync',
+        time: stripeSubscriptionCronTime,
+        fn: batchHandleStripeSubscriptions,
+        options: { runOnInit: false },
+      },
     ],
     onError: (error: Error, name: string) => {
       logger.error('run job failed', { name, error: error.message, stack: error.stack });

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

@@ -43,7 +43,7 @@ export async function handleSubscriptionEvent(event: TEventExpanded, _: Stripe)
       return;
     }
 
-    const fields = ['cancel_at', 'cancel_at_period_end', 'canceled_at'];
+    const fields = ['cancel_at', 'cancel_at_period_end', 'canceled_at', 'current_period_start', 'current_period_end'];
     if (subscription.payment_settings?.payment_method_types?.includes('stripe')) {
       fields.push('pause_collection');
     }

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

@@ -1,5 +1,9 @@
+/* eslint-disable no-continue */
+/* eslint-disable no-await-in-loop */
 import env from '@blocklet/sdk/lib/env';
 import merge from 'lodash/merge';
+import omit from 'lodash/omit';
+import pick from 'lodash/pick';
 import { Op } from 'sequelize';
 
 import logger from '../../libs/logger';
@@ -347,15 +351,15 @@ export async function batchHandleStripeInvoices() {
     },
   });
 
-  stripeInvoices.forEach(async (invoice) => {
+  for (const invoice of stripeInvoices) {
     const stripeInvoiceId = invoice.metadata?.stripe_id;
     if (!stripeInvoiceId) {
-      return;
+      continue;
     }
 
     const method = stripeMethods.find((m) => m.livemode === invoice.livemode);
     if (!method) {
-      return;
+      continue;
     }
 
     const client = method.getStripeClient();
@@ -369,8 +373,6 @@ export async function batchHandleStripeInvoices() {
         await client.invoices.pay(stripeInvoiceId);
         logger.info('stripe invoice payment requested', { local: invoice.id, stripe: stripeInvoiceId });
 
-        await sleep(5000);
-
         await syncStripeInvoice(invoice);
 
         if (invoice.payment_intent_id) {
@@ -392,5 +394,66 @@ export async function batchHandleStripeInvoices() {
         logger.error('stripe invoice finalize error', error);
       }
     }
+
+    await sleep(5000);
+  }
+}
+
+export async function batchHandleStripeSubscriptions() {
+  const stripeMethods = await PaymentMethod.findAll({ where: { type: 'stripe' } });
+  if (stripeMethods.length === 0) {
+    return;
+  }
+
+  const subscriptions = await Subscription.findAll({
+    where: {
+      status: { [Op.not]: ['canceled', 'incomplete', 'incomplete_expired'] },
+      'payment_details.stripe.subscription_id': { [Op.not]: null },
+    },
   });
+
+  for (const subscription of subscriptions) {
+    const subscriptionId = subscription.payment_details?.stripe?.subscription_id;
+    if (!subscriptionId) {
+      continue;
+    }
+
+    const method = stripeMethods.find((m) => m.livemode === subscription.livemode);
+    if (!method) {
+      continue;
+    }
+
+    const client = method.getStripeClient();
+    try {
+      const exist = await client.subscriptions.retrieve(subscriptionId);
+      if (exist) {
+        const fields = [
+          'cancel_at',
+          'cancel_at_period_end',
+          'canceled_at',
+          'current_period_start',
+          'current_period_end',
+        ];
+        if (subscription.payment_settings?.payment_method_types?.includes('stripe')) {
+          fields.push('pause_collection');
+        }
+        await subscription.update(pick(exist, fields) as any);
+        logger.warn('stripe subscription synced', { local: subscription.id, stripe: subscriptionId });
+      } else {
+        logger.warn('stripe subscription missing', { local: subscription.id, stripe: subscriptionId });
+      }
+    } catch (error) {
+      logger.error('stripe subscription sync error', { error, local: subscription.id, stripe: subscriptionId });
+      if (error.message.includes('No such subscription')) {
+        await subscription.update({
+          payment_details: {
+            ...subscription.payment_details,
+            stripe: omit(subscription.payment_details?.stripe, ['subscription_id']),
+          },
+        });
+      }
+    }
+
+    await sleep(3000);
+  }
 }

package/api/src/libs/env.ts

@@ -4,7 +4,8 @@ export const subscriptionCronTime: string = process.env.SUBSCRIPTION_CRON_TIME |
 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 notificationCronConcurrency: number = Number(process.env.NOTIFICATION_CRON_CONCURRENCY) || 8; // 默认并发数为 8
-export const stripeInvoiceCronTime: string = process.env.PAYMENT_STRIPE_CRON_TIME || '0 */30 * * * *'; // 默认每 30min 执行一次
+export const stripeInvoiceCronTime: string = process.env.STRIPE_INVOICE_CRON_TIME || '0 */30 * * * *'; // 默认每 30min 执行一次
+export const stripeSubscriptionCronTime: string = process.env.STRIPE_SUBSCRIPTION_CRON_TIME || '0 10 */8 * * *'; // 默认每 8小时 执行一次
 
 export default {
   ...env,

package/api/src/queues/subscription.ts

@@ -1,6 +1,7 @@
 import type { LiteralUnion } from 'type-fest';
 
 import { ensurePassportRevoked } from '../integrations/blocklet/passport';
+import { batchHandleStripeSubscriptions } from '../integrations/stripe/resource';
 import dayjs from '../libs/dayjs';
 import { events } from '../libs/event';
 import { getLock } from '../libs/lock';
@@ -391,6 +392,8 @@ export const startSubscriptionQueue = async () => {
     }
     await addSubscriptionJob(x, 'cycle');
   });
+
+  await batchHandleStripeSubscriptions();
 };
 
 export async function addSubscriptionJob(

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

@@ -392,7 +392,11 @@ router.get('/:id', auth, async (req, res) => {
     doc.url = getUrl(`/checkout/${doc.submit_type}/${doc.id}`);
   }
 
-  res.json(doc?.toJSON());
+  if (doc) {
+    res.json(doc?.toJSON());
+  } else {
+    res.status(404).json(null);
+  }
 });
 
 // for checkout page

package/api/src/routes/connect/shared.ts

@@ -106,6 +106,9 @@ export async function ensurePaymentIntent(checkoutSessionId: string, userDid?: s
       throw new Error('Customer not found');
     }
     const { user } = await blocklet.getUser(userDid, { enableConnectedAccount: true });
+    if (!user) {
+      throw new Error('Seems you have not connected to this app before');
+    }
     if (customer.did !== user.did) {
       throw new Error('This is not your payment intent');
     }

package/api/src/routes/customers.ts

@@ -122,10 +122,14 @@ router.get('/me', user(), async (req, res) => {
 router.get('/:id', auth, async (req, res) => {
   try {
     const doc = await Customer.findByPkOrDid(req.params.id as string);
-    res.json(doc);
+    if (doc) {
+      res.json(doc);
+    } else {
+      res.status(404).json(null);
+    }
   } catch (err) {
     console.error(err);
-    res.json(null);
+    res.status(500).json({ error: `Failed to get customer: ${err.message}` });
   }
 });
 

package/api/src/routes/events.ts

@@ -68,11 +68,11 @@ router.get('/:id', auth, async (req, res) => {
     if (doc) {
       res.json(doc);
     } else {
-      res.json(null);
+      res.status(404).json(null);
     }
   } catch (err) {
     console.error(err);
-    res.json(null);
+    res.status(500).json({ error: `Failed to get event: ${err.message}` });
   }
 });
 

package/api/src/routes/invoices.ts

@@ -183,11 +183,11 @@ router.get('/:id', authPortal, async (req, res) => {
       expandLineItems(json.lines, products, prices);
       res.json(json);
     } else {
-      res.json(null);
+      res.status(404).json(null);
     }
   } catch (err) {
     console.error(err);
-    res.json(null);
+    res.status(500).json({ error: `Failed to get invoice: ${err.message}` });
   }
 });
 

package/api/src/routes/payment-currencies.ts

@@ -32,7 +32,11 @@ router.get('/:id', auth, async (req, res) => {
     where: { [Op.or]: [{ id: req.params.id }, { symbol: req.params.id }] },
   });
 
-  res.json(doc);
+  if (doc) {
+    res.json(doc);
+  } else {
+    res.status(404).json(null);
+  }
 });
 
 export default router;

package/api/src/routes/payment-intents.ts

@@ -186,10 +186,14 @@ router.get('/:id', authPortal, async (req, res) => {
       }
     }
 
-    res.json({ ...doc?.toJSON(), checkoutSession, invoice, subscription });
+    if (doc) {
+      res.json({ ...doc.toJSON(), checkoutSession, invoice, subscription });
+    } else {
+      res.status(404).json(null);
+    }
   } catch (err) {
     console.error(err);
-    res.json(null);
+    res.status(500).json({ error: `Failed to get payment intent: ${err.message}` });
   }
 });
 

package/api/src/routes/payment-links.ts

@@ -201,7 +201,11 @@ router.get('/:id', auth, async (req, res) => {
     doc.line_items = await Price.expand(doc.line_items);
   }
 
-  res.json(doc);
+  if (doc) {
+    res.json(doc);
+  } else {
+    res.status(404).json(null);
+  }
 });
 
 // update

package/api/src/routes/payment-methods.ts

@@ -130,7 +130,11 @@ router.get('/:id', auth, async (req, res) => {
     where: { [Op.or]: [{ id: req.params.id }, { name: req.params.id }] },
   });
 
-  res.json(doc);
+  if (doc) {
+    res.json(doc);
+  } else {
+    res.status(404).json(null);
+  }
 });
 
 export default router;

package/api/src/routes/prices.ts

@@ -200,7 +200,12 @@ router.post('/', auth, async (req, res) => {
 
 // get price detail
 router.get('/:id', auth, async (req, res) => {
-  res.json(await getExpandedPrice(req.params.id as string));
+  const doc = await getExpandedPrice(req.params.id as string);
+  if (doc) {
+    res.json(doc);
+  } else {
+    res.status(404).json(null);
+  }
 });
 
 // get price used status

package/api/src/routes/products.ts

@@ -208,7 +208,12 @@ router.get('/search', auth, async (req, res) => {
 
 // get product detail
 router.get('/:id', auth, async (req, res) => {
-  res.json(await Product.expand(req.params.id as string));
+  const doc = await Product.expand(req.params.id as string);
+  if (doc) {
+    res.json(doc);
+  } else {
+    res.status(404).json(null);
+  }
 });
 
 // update product

package/api/src/routes/subscription-items.ts

@@ -96,10 +96,14 @@ router.get('/:id', auth, async (req, res) => {
       where: { id: req.params.id },
       include: [{ model: Price, as: 'price' }],
     });
-    res.json(doc);
+    if (doc) {
+      res.json(doc);
+    } else {
+      res.status(404).json(null);
+    }
   } catch (err) {
     console.error(err);
-    res.json(null);
+    res.status(500).json({ error: `Failed to get subscription item: ${err.message}` });
   }
 });
 

package/api/src/routes/subscriptions.ts

@@ -212,11 +212,11 @@ router.get('/:id', authPortal, async (req, res) => {
       expandLineItems(json.items, products, prices);
       res.json(json);
     } else {
-      res.json(null);
+      res.status(404).json(null);
     }
   } catch (err) {
     console.error(err);
-    res.json(null);
+    res.status(500).json({ error: `Failed to get subscription: ${err.message}` });
   }
 });
 

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.170",
+  "version": "1.13.172",
   "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.110",
     "@arcblock/ux": "^2.9.39",
     "@blocklet/logger": "1.16.23",
-    "@blocklet/payment-react": "1.13.170",
+    "@blocklet/payment-react": "1.13.172",
     "@blocklet/sdk": "1.16.23",
     "@blocklet/ui-react": "^2.9.39",
     "@blocklet/uploader": "^0.0.74",
@@ -110,7 +110,7 @@
   "devDependencies": {
     "@abtnode/types": "1.16.23",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@blocklet/payment-types": "1.13.170",
+    "@blocklet/payment-types": "1.13.172",
     "@types/cookie-parser": "^1.4.6",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -149,5 +149,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "4a04bc6c92a74d683a6e84035972beb914f355ce"
+  "gitHead": "bb4f4aec316f48c3e299fe97758b00fb4380cda8"
 }