payment-kit 1.15.27 → 1.15.29

package/api/src/libs/subscription.ts

@@ -462,12 +462,14 @@ export async function getUpcomingInvoiceAmount(subscriptionId: string) {
   const expanded = await Price.expand(items.map((x) => x.toJSON()));
 
   let amount = new BN(0);
+  let minExpectedAmount = new BN(0);
   for (const item of expanded) {
     const price = getSubscriptionItemPrice(item);
     if (price.type === 'recurring') {
       const unit = getPriceUintAmountByCurrency(price, subscription.currency_id);
       if (price.recurring?.usage_type === 'licensed') {
         amount = amount.add(new BN(unit).mul(new BN(item.quantity)));
+        minExpectedAmount = minExpectedAmount.add(new BN(unit).mul(new BN(item.quantity)));
       }
       if (price.recurring?.usage_type === 'metered') {
         const rawQuantity = await UsageRecord.getSummary({
@@ -481,12 +483,14 @@ export async function getUpcomingInvoiceAmount(subscriptionId: string) {
         // @ts-ignore
         const quantity = price.transformQuantity(rawQuantity);
         amount = amount.add(new BN(unit).mul(new BN(quantity)));
+        minExpectedAmount = minExpectedAmount.add(new BN(unit).mul(new BN(item.quantity)));
       }
     }
   }
 
   return {
     amount: amount.toString(),
+    minExpectedAmount: minExpectedAmount.toString(),
     start: subscription.current_period_start,
     end: subscription.current_period_end,
     currency,

package/api/src/routes/usage-records.ts

@@ -11,12 +11,25 @@ import { authenticate } from '../libs/security';
 import { usageRecordQueue } from '../queues/usage-record';
 import { Invoice, Price, Subscription, SubscriptionItem, UsageRecord } from '../store/models';
 import logger from '../libs/logger';
+import { getLock } from '../libs/lock';
 
 const router = Router();
 const auth = authenticate<UsageRecord>({ component: true, roles: ['owner', 'admin'] });
 
+const UsageReportScheme = Joi.object({
+  subscription_item_id: Joi.string().required(),
+  quantity: Joi.number().required(),
+  action: Joi.string().valid('increment', 'set').optional(),
+  timestamp: Joi.number().optional(),
+  livemode: Joi.boolean().optional(),
+}).unknown(true);
+
 // @link https://stripe.com/docs/api/usage_records/create
 router.post('/', auth, async (req, res) => {
+  const { error } = UsageReportScheme.validate(req.body);
+  if (error) {
+    return res.status(400).json({ error: error.message });
+  }
   const raw: Partial<UsageRecord> = pick(req.body, ['timestamp', 'quantity', 'subscription_item_id']);
   const item = await SubscriptionItem.findByPk(raw.subscription_item_id);
   if (!item) {
@@ -38,73 +51,89 @@ router.post('/', auth, async (req, res) => {
     raw.timestamp = dayjs().unix();
   }
 
-  logger.info('Usage reporting', { subscriptionId: item.subscription_id, subscriptionItemId: item.id, body: req.body });
-
-  let doc = await UsageRecord.findOne({
-    where: { timestamp: raw.timestamp, subscription_item_id: raw.subscription_item_id },
-  });
-  if (doc) {
-    if (doc.billed) {
-      logger.info('UsageRecord updated', {
-        subscriptionItemId: raw.subscription_item_id,
-        timestamp: raw.timestamp,
-        newQuantity: raw.quantity,
-      });
-      return res.status(400).json({ error: 'UsageRecord is immutable because already billed' });
-    }
-    if (req.body.action === 'increment') {
-      await doc.increment('quantity', { by: raw.quantity });
-      logger.info('UsageRecord incremented', {
-        subscriptionItemId: raw.subscription_item_id,
-        timestamp: raw.timestamp,
-        incrementBy: raw.quantity,
-      });
-    } else {
-      if (subscription.billing_thresholds?.amount_gte) {
-        logger.warn('Invalid action for subscription with billing_thresholds', {
-          subscriptionId: subscription.id,
-          action: req.body.action,
+  const lock = getLock(`usage-record:${item.id}:${raw.timestamp}`);
+  try {
+    await lock.acquire();
+    logger.info('Usage reporting', {
+      subscriptionId: item.subscription_id,
+      subscriptionItemId: item.id,
+      body: req.body,
+    });
+
+    let doc = await UsageRecord.findOne({
+      where: { timestamp: raw.timestamp, subscription_item_id: raw.subscription_item_id },
+    });
+
+    const action = req.body.action || 'increment';
+    if (doc) {
+      if (doc.billed) {
+        logger.info('UsageRecord updated', {
+          subscriptionItemId: raw.subscription_item_id,
+          timestamp: raw.timestamp,
+          newQuantity: raw.quantity,
         });
-        return res
-          .status(400)
-          .json({ error: 'UsageRecord action must be `increment` for subscriptions with billing_thresholds' });
+        return res.status(400).json({ error: 'UsageRecord is immutable because already billed' });
       }
-      await doc.update({ quantity: raw.quantity });
-      logger.info('UsageRecord updated', {
-        subscriptionItemId: raw.subscription_item_id,
-        timestamp: raw.timestamp,
-        newQuantity: raw.quantity,
-      });
+      if (action === 'increment') {
+        await doc.increment('quantity', { by: raw.quantity });
+        logger.info('UsageRecord incremented', {
+          subscriptionItemId: raw.subscription_item_id,
+          timestamp: raw.timestamp,
+          incrementBy: raw.quantity,
+          action,
+        });
+      } else {
+        if (subscription.billing_thresholds?.amount_gte) {
+          logger.warn('Invalid action for subscription with billing_thresholds', {
+            subscriptionId: subscription.id,
+            action,
+          });
+          return res
+            .status(400)
+            .json({ error: 'UsageRecord action must be `increment` for subscriptions with billing_thresholds' });
+        }
+        await doc.update({ quantity: raw.quantity });
+        logger.info('UsageRecord updated', {
+          subscriptionItemId: raw.subscription_item_id,
+          timestamp: raw.timestamp,
+          newQuantity: raw.quantity,
+          action,
+        });
+      }
+    } else {
+      raw.livemode = req.livemode;
+      doc = await UsageRecord.create(raw as UsageRecord);
     }
-  } else {
-    raw.livemode = req.livemode;
-    doc = await UsageRecord.create(raw as UsageRecord);
-  }
 
-  if (subscription.billing_thresholds?.amount_gte) {
-    usageRecordQueue.push({
-      id: `usage-${subscription.id}`,
-      job: { subscriptionId: subscription.id, subscriptionItemId: item.id },
+    if (subscription.billing_thresholds?.amount_gte) {
+      usageRecordQueue.push({
+        id: `usage-${subscription.id}`,
+        job: { subscriptionId: subscription.id, subscriptionItemId: item.id },
+      });
+      logger.info('UsageRecord pushed to queue', {
+        subscriptionId: subscription.id,
+        subscriptionItemId: item.id,
+      });
+    }
+    await forwardUsageRecordToStripe(item, {
+      quantity: Number(raw.quantity),
+      timestamp: raw.timestamp,
+      action,
     });
-    logger.info('UsageRecord pushed to queue', {
-      subscriptionId: subscription.id,
+    logger.info('UsageRecord forwarded to Stripe', {
       subscriptionItemId: item.id,
+      quantity: Number(raw.quantity),
+      timestamp: raw.timestamp,
+      action,
     });
+    await doc.reload();
+    return res.json(doc);
+  } catch (err) {
+    logger.error('Error in usage-records', { error: err });
+    return res.status(400).json({ error: err.message || 'UsageRecord creation failed' });
+  } finally {
+    lock.release();
   }
-
-  await forwardUsageRecordToStripe(item, {
-    quantity: Number(raw.quantity),
-    timestamp: raw.timestamp,
-    action: req.body.action,
-  });
-
-  logger.info('UsageRecord forwarded to Stripe', {
-    subscriptionItemId: item.id,
-    quantity: Number(raw.quantity),
-    timestamp: raw.timestamp,
-    action: req.body.action,
-  });
-  return res.json(doc);
 });
 
 // @link https://stripe.com/docs/api/usage_records/subscription_item_summary_list
@@ -179,7 +208,7 @@ const UsageRecordScheme = Joi.object({
 
 export function createUsageRecordQueryFn(doc?: Subscription) {
   return async (req: Request, res: Response) => {
-    const { error, value: query } = await UsageRecordScheme.validate(req.query, { stripUnknown: true });
+    const { error, value: query } = UsageRecordScheme.validate(req.query, { stripUnknown: true });
     if (error) {
       return res.status(400).json({ error: `usage record request query invalid: ${error.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.15.27
+version: 1.15.29
 logo: logo.png
 files:
   - dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.15.27",
+  "version": "1.15.29",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -53,7 +53,7 @@
     "@arcblock/validator": "^1.18.137",
     "@blocklet/js-sdk": "1.16.33-beta-20241031-073543-49b1ff9b",
     "@blocklet/logger": "1.16.33-beta-20241031-073543-49b1ff9b",
-    "@blocklet/payment-react": "1.15.27",
+    "@blocklet/payment-react": "1.15.29",
     "@blocklet/sdk": "1.16.33-beta-20241031-073543-49b1ff9b",
     "@blocklet/ui-react": "^2.10.55",
     "@blocklet/uploader": "^0.1.51",
@@ -120,7 +120,7 @@
   "devDependencies": {
     "@abtnode/types": "1.16.33-beta-20241031-073543-49b1ff9b",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.15.27",
+    "@blocklet/payment-types": "1.15.29",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -165,5 +165,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "8946aa1f48babb0f4c9da6d21ebd5025d6c91597"
+  "gitHead": "74c394cd2a81792ea30fdf019aafb7b4e2400373"
 }

package/scripts/sdk.js

@@ -138,5 +138,24 @@ const payment = require('@blocklet/payment-js').default;
   // });
   // console.log('🚀 ~ paymentPrice:', paymentPrice);
 
+  // 测试下并发上报
+  // const promises = [
+  //   {
+  //     subscription_item_id: 'si_Tq4c2KsC40uPq7',
+  //     quantity: 1,
+  //     action: 'increment',
+  //     livemode: false,
+  //     timestamp: 1730692388,
+  //   },
+  //   // {
+  //   //   subscription_item_id: 'si_Tq4c2KsC40uPq7',
+  //   //   quantity: 2,
+  //   //   action: 'increment',
+  //   //   livemode: false,
+  //   //   timestamp: 1730692388,
+  //   // },
+  // ];
+  // const results = await Promise.allSettled(promises.map((p) => payment.subscriptionItems.createUsageRecord(p)));
+  // console.log('🚀 ~ results:', results);
   process.exit(0);
 })();

package/src/pages/customer/recharge.tsx

@@ -100,7 +100,9 @@ export default function RechargePage() {
         // Calculate preset amounts
         const getCycleAmount = (cycles: number) =>
           fromUnitToToken(
-            new BN(upcomingRes.data.amount).mul(new BN(cycles)).toString(),
+            new BN(upcomingRes.data.amount === '0' ? upcomingRes.data.minExpectedAmount : upcomingRes.data.amount)
+              .mul(new BN(cycles))
+              .toString(),
             upcomingRes.data?.currency?.decimal
           );
         setPresetAmounts([