payment-kit 1.15.18 → 1.15.20

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

@@ -4,8 +4,8 @@ import pick from 'lodash/pick';
 import pWaitFor from 'p-wait-for';
 import type Stripe from 'stripe';
 
-import { checkUsageReportEmpty } from '@api/libs/subscription';
-import { createEvent } from '@api/libs/audit';
+import { checkUsageReportEmpty } from '../../../libs/subscription';
+import { createEvent } from '../../../libs/audit';
 import { getLock } from '../../../libs/lock';
 import logger from '../../../libs/logger';
 import {

package/api/src/libs/notification/template/usage-report-empty.ts

@@ -1,5 +1,5 @@
-import { getOwnerDid } from '@api/libs/util';
 import prettyMsI18n from 'pretty-ms-i18n';
+import { getOwnerDid } from '../../util';
 import { translate } from '../../../locales';
 import { Subscription } from '../../../store/models';
 import type { BaseEmailTemplate, BaseEmailTemplateType } from './base';

package/api/src/queues/invoice.ts

@@ -1,6 +1,6 @@
 import { Op } from 'sequelize';
 
-import { getInvoiceShouldPayTotal } from '@api/libs/invoice';
+import { getInvoiceShouldPayTotal } from '../libs/invoice';
 import { batchHandleStripeInvoices } from '../integrations/stripe/resource';
 import { createEvent } from '../libs/audit';
 import dayjs from '../libs/dayjs';

package/api/src/queues/subscription.ts

@@ -1,6 +1,6 @@
 import type { LiteralUnion } from 'type-fest';
 
-import { createEvent } from '@api/libs/audit';
+import { createEvent } from '../libs/audit';
 import { ensurePassportRevoked } from '../integrations/blocklet/passport';
 import { batchHandleStripeSubscriptions } from '../integrations/stripe/resource';
 import { wallet } from '../libs/auth';
@@ -863,8 +863,7 @@ events.on('customer.subscription.deleted', (subscription: Subscription) => {
 });
 
 events.on('customer.subscription.upgraded', async (subscription: Subscription) => {
-  await subscriptionQueue.delete(subscription.id);
-  await addSubscriptionJob(subscription, 'cancel', true, subscription.current_period_end);
+  await addSubscriptionJob(subscription, 'cycle', true, subscription.current_period_end);
   logger.info('subscription cycle job rescheduled after upgrade', {
     subscription: subscription.id,
     runAt: subscription.current_period_end,

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

@@ -8,7 +8,9 @@ import { createListParamSchema, MetadataSchema } from '../libs/api';
 import { authenticate } from '../libs/security';
 import { expandLineItems } from '../libs/session';
 import { formatMetadata } from '../libs/util';
-import { Price, Product, SubscriptionItem, UsageRecord } from '../store/models';
+import { Price, Product, Subscription, SubscriptionItem, UsageRecord } from '../store/models';
+import { forwardUsageRecordToStripe } from '../integrations/stripe/resource';
+import { usageRecordQueue } from '../queues/usage-record';
 
 const router = Router();
 const auth = authenticate<SubscriptionItem>({ component: true, roles: ['owner', 'admin'] });
@@ -164,19 +166,55 @@ router.post('/:id/add-usage-quantity', auth, async (req, res) => {
     return res.status(403).json({ error: 'add usage quantity not allowed in livemode' });
   }
 
-  const subscriptionItem = await SubscriptionItem.findByPk(req.params.id);
-  if (!subscriptionItem) {
-    return res.status(404).json({ error: `SubscriptionItem(${req.params.id}) item not found` });
+  const quantity = Number(req.body.quantity);
+  if (quantity <= 0) {
+    return res.status(400).json({ error: 'quantity must be positive' });
   }
 
-  await UsageRecord.create({
-    livemode: Boolean(livemode),
-    subscription_item_id: subscriptionItem.id,
-    quantity: req.body.quantity,
-    timestamp: dayjs().unix(),
-  } as UsageRecord);
+  try {
+    const subscriptionItem = await SubscriptionItem.findByPk(req.params.id);
+    if (!subscriptionItem) {
+      return res.status(404).json({ error: `SubscriptionItem(${req.params.id}) item not found` });
+    }
+    const subscription = await Subscription.findByPk(subscriptionItem.subscription_id);
+    if (!subscription) {
+      return res.status(400).json({ error: `Subscription not found: ${subscriptionItem.subscription_id}` });
+    }
+
+    if (subscription.isImmutable()) {
+      return res.status(400).json({ error: `subscription(${subscription.id}) is immutable` });
+    }
+
+    const now = dayjs().unix();
+
+    if (now < subscription.current_period_start || now > subscription.current_period_end) {
+      return res.status(400).json({ error: 'timestamp must be within the current period' });
+    }
+
+    const usageRecord = await UsageRecord.create({
+      livemode: Boolean(livemode),
+      subscription_item_id: subscriptionItem.id,
+      quantity,
+      timestamp: now,
+    } as UsageRecord);
+
+    if (subscription.billing_thresholds?.amount_gte) {
+      usageRecordQueue.push({
+        id: `usage-${subscription.id}`,
+        job: { subscriptionId: subscription.id, subscriptionItemId: subscriptionItem.id },
+      });
+    }
 
-  return res.json();
+    await forwardUsageRecordToStripe(subscriptionItem, {
+      quantity,
+      timestamp: now,
+      action: 'increment',
+    });
+    return res.json(usageRecord);
+  } catch (err) {
+    console.error(err);
+    return res.status(400).json({ error: `Failed to add usage quantity: ${err.message}` });
+  }
 });
 
 export default router;

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.15.18",
+  "version": "1.15.20",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -52,7 +52,7 @@
     "@arcblock/validator": "^1.18.135",
     "@blocklet/js-sdk": "^1.16.32",
     "@blocklet/logger": "^1.16.32",
-    "@blocklet/payment-react": "1.15.18",
+    "@blocklet/payment-react": "1.15.20",
     "@blocklet/sdk": "^1.16.32",
     "@blocklet/ui-react": "^2.10.45",
     "@blocklet/uploader": "^0.1.43",
@@ -118,7 +118,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.16.32",
     "@arcblock/eslint-config-ts": "^0.3.2",
-    "@blocklet/payment-types": "1.15.18",
+    "@blocklet/payment-types": "1.15.20",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -160,5 +160,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "f57a3e622d9701fa0421f1266efc2fd92bd84780"
+  "gitHead": "0499ea79c00bb48d7a2479af589c21698c6388a0"
 }

package/tsconfig.json

@@ -100,8 +100,8 @@
     "skipLibCheck": true, /* Skip type checking all .d.ts files. */
     "baseUrl": "./",
     "paths": {
-      "@app/*": ["./src/*"],
-      "@api/*": ["./api/src/*"],
+      // "@app/*": ["./src/*"],
+      // "@api/*": ["./api/src/*"],
     }
   }
 }