payment-kit 1.13.79 → 1.13.80

package/api/src/crons/subscription-trail-will-end.ts

@@ -20,6 +20,7 @@ export class SubscriptionTrailWillEndSchedule extends BaseSubscriptionScheduleNo
         trail_start: {
           [Op.gt]: 0,
         },
+        status: 'trailing',
       },
       attributes: ['id', 'current_period_start', 'current_period_end'],
       raw: true,

package/api/src/crons/subscription-will-renew.ts

@@ -18,6 +18,7 @@ export class SubscriptionWillRenewSchedule extends BaseSubscriptionScheduleNotif
           [Op.lt]: this.end / 1000,
         },
         trail_start: 0,
+        status: 'active',
       },
       attributes: ['id', 'current_period_start', 'current_period_end'],
       raw: true,

package/api/src/libs/notification/template/subscription-renewed.ts

@@ -56,6 +56,9 @@ export class SubscriptionRenewedEmailTemplate implements BaseEmailTemplate<Subsc
     if (!subscription) {
       throw new Error(`Subscription not found: ${this.options.subscriptionId}`);
     }
+    if (subscription.status !== 'active') {
+      throw new Error(`Subscription not active: ${this.options.subscriptionId}`);
+    }
 
     const customer = await Customer.findByPk(subscription.customer_id);
     if (!customer) {

package/api/src/libs/notification/template/subscription-succeeded.ts

@@ -57,6 +57,9 @@ export class SubscriptionSucceededEmailTemplate
     if (!subscription) {
       throw new Error(`Subscription not found: ${this.options.subscriptionId}`);
     }
+    if (subscription.status !== 'active') {
+      throw new Error(`Subscription not active: ${this.options.subscriptionId}`);
+    }
 
     const customer = await Customer.findByPk(subscription.customer_id);
     if (!customer) {

package/api/src/libs/notification/template/subscription-trial-start.ts

@@ -49,6 +49,9 @@ export class SubscriptionTrailStartEmailTemplate
     if (!subscription) {
       throw new Error(`Subscription not found: ${this.options.subscriptionId}`);
     }
+    if (subscription.status !== 'trialing') {
+      throw new Error(`Subscription not trialing: ${this.options.subscriptionId}`);
+    }
 
     const customer = await Customer.findByPk(subscription.customer_id);
     if (!customer) {

package/api/src/libs/notification/template/subscription-trial-will-end.ts

@@ -51,6 +51,9 @@ export class SubscriptionTrailWilEndEmailTemplate
     if (!subscription) {
       throw new Error(`Subscription not found: ${this.options.subscriptionId}`);
     }
+    if (subscription.status !== 'trialing') {
+      throw new Error(`Subscription not trialing: ${this.options.subscriptionId}`);
+    }
 
     const customer = await Customer.findByPk(subscription.customer_id);
     if (!customer) {

package/api/src/libs/notification/template/subscription-will-renew.ts

@@ -51,6 +51,9 @@ export class SubscriptionWillRenewEmailTemplate
     if (!subscription) {
       throw new Error(`Subscription not found: ${this.options.subscriptionId}`);
     }
+    if (subscription.status !== 'active') {
+      throw new Error(`Subscription not active: ${this.options.subscriptionId}`);
+    }
 
     const customer = await Customer.findByPk(subscription.customer_id);
     if (!customer) {

package/api/src/libs/payment.ts

@@ -19,7 +19,6 @@ import {
 } from '../store/models';
 import type { TPaymentCurrency } from '../store/models/payment-currency';
 import { blocklet, wallet } from './auth';
-import logger from './logger';
 import { OCAP_PAYMENT_TX_TYPE } from './util';
 
 export interface SufficientForPaymentResult {
@@ -162,19 +161,16 @@ export async function getPaymentDetail(userDid: string, invoice: Invoice): Promi
 
   const paymentIntent = await PaymentIntent.findByPk(invoice.payment_intent_id);
   if (!paymentIntent) {
-    logger.error('getPayment.error', { reason: 'NO_PAYMENT_INTENT' });
     return defaultResult;
   }
 
   const paymentMethod = await PaymentMethod.findByPk(paymentIntent?.payment_method_id);
   if (!paymentMethod) {
-    logger.error('getPayment.error', { reason: 'NO_PAYMENT_METHOD' });
     return defaultResult;
   }
 
   const paymentCurrency = await PaymentCurrency.findByPk(paymentIntent.currency_id);
   if (!paymentCurrency) {
-    logger.error('getPayment.error', { reason: 'NO_PAYMENT_CURRENCY' });
     return defaultResult;
   }
 
@@ -189,7 +185,6 @@ export async function getPaymentDetail(userDid: string, invoice: Invoice): Promi
 
     // Do not have enough permission
     if (!result.token) {
-      logger.error('getPayment.error', { reason: result.reason });
       return defaultResult;
     }
 

package/api/src/queues/event.ts

@@ -56,7 +56,7 @@ export const eventQueue = createQueue<EventJob>({
   name: 'event',
   onJob: handleEvent,
   options: {
-    concurrency: 1,
+    concurrency: 5,
     maxRetries: 3,
   },
 });

package/api/src/queues/invoice.ts

@@ -140,7 +140,7 @@ export const invoiceQueue = createQueue<InvoiceJob>({
   name: 'invoice',
   onJob: handleInvoice,
   options: {
-    concurrency: 1,
+    concurrency: 2,
     maxRetries: 3,
   },
 });

package/api/src/queues/payment.ts

@@ -103,7 +103,12 @@ type Updates = {
   };
 };
 
-export const handlePaymentFailed = async (paymentIntent: PaymentIntent, invoice: Invoice, error: PaymentError) => {
+export const handlePaymentFailed = async (
+  paymentIntent: PaymentIntent,
+  invoice: Invoice,
+  error: PaymentError,
+  checkSubscriptionStatus = true
+) => {
   const now = dayjs().unix();
   const attemptCount = invoice.attempt_count + 1;
 
@@ -135,7 +140,7 @@ export const handlePaymentFailed = async (paymentIntent: PaymentIntent, invoice:
     return updates.retry;
   }
 
-  if (subscription.status !== 'active') {
+  if (checkSubscriptionStatus && subscription.status !== 'active') {
     return updates.retry;
   }
 
@@ -249,6 +254,29 @@ export const handlePayment = async (job: PaymentJob) => {
   }
 
   const invoice = await Invoice.findByPk(paymentIntent.invoice_id);
+
+  // check max retry before doing any hard work
+  if (invoice && invoice.attempt_count > MAX_RETRY_COUNT) {
+    logger.info(`PaymentIntent capture aborted since max retry exceeded: ${paymentIntent.id}`);
+    const updates = await handlePaymentFailed(
+      paymentIntent,
+      invoice,
+      {
+        type: 'card_error',
+        code: 'max_retry_exceeded',
+        message: 'max_retry_exceeded',
+      },
+      false
+    );
+    await paymentIntent.update(updates.payment);
+    await invoice.update(updates.invoice);
+    if (!updates.invoice.next_payment_attempt) {
+      logger.info(`PaymentIntent job deleted since max retry exceeded: ${paymentIntent.id}`);
+      await paymentQueue.delete(paymentIntent.id);
+    }
+    return;
+  }
+
   const paymentSettings = invoice?.payment_settings || job.paymentSettings;
   if (!paymentSettings) {
     await paymentIntent.update({ status: 'requires_action' });
@@ -334,7 +362,7 @@ export const handlePayment = async (job: PaymentJob) => {
     // @ts-ignore
     const txHash = await client.sendTransferV2Tx({ tx: signed, wallet, delegator: payer }, getGasPayerExtra(buffer));
 
-    logger.info(`PaymentIntent capture done: ${paymentIntent.id} with tx ${txHash}`);
+    logger.info('PaymentIntent capture done', { id: paymentIntent.id, txHash });
 
     await paymentIntent.update({
       status: 'succeeded',
@@ -396,6 +424,9 @@ export const handlePayment = async (job: PaymentJob) => {
           runAt: retryAt,
         });
         logger.error('PaymentIntent capture retry scheduled', { id: paymentIntent.id, retryAt });
+      } else {
+        logger.info('PaymentIntent job deleted since no retry', { id: paymentIntent.id });
+        paymentQueue.delete(paymentIntent.id);
       }
     }
   }
@@ -406,7 +437,7 @@ export const paymentQueue = createQueue<PaymentJob>({
   onJob: handlePayment,
   options: {
     concurrency: 1,
-    maxRetries: 3,
+    maxRetries: 0,
     enableScheduledJob: true,
   },
 });

package/api/src/queues/subscription.ts

@@ -81,6 +81,11 @@ export const handleSubscription = async (job: SubscriptionJob) => {
     return;
   }
 
+  if (subscription.isActive() === false) {
+    logger.warn(`Subscription not active: ${job.subscriptionId}, so new invoice is skipped`);
+    return;
+  }
+
   // Do we still have the customer
   const customer = await Customer.findByPk(subscription.customer_id);
   if (!customer) {
@@ -215,8 +220,8 @@ export const subscriptionQueue = createQueue<SubscriptionJob>({
   name: 'subscription',
   onJob: handleSubscription,
   options: {
-    concurrency: 1,
-    maxRetries: 5,
+    concurrency: 5,
+    maxRetries: 3,
     enableScheduledJob: true,
   },
 });

package/api/src/queues/webhook.ts

@@ -111,8 +111,8 @@ export const webhookQueue = createQueue<WebhookJob>({
   name: 'webhook',
   onJob: handleWebhook,
   options: {
-    concurrency: 2,
-    maxRetries: 3,
+    concurrency: 5,
+    maxRetries: 0,
     enableScheduledJob: true,
   },
 });

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.79",
+  "version": "1.13.80",
   "scripts": {
     "dev": "COMPONENT_STORE_URL=https://test.store.blocklet.dev blocklet dev",
     "eject": "vite eject",
@@ -109,7 +109,7 @@
     "@abtnode/types": "^1.16.20",
     "@arcblock/eslint-config": "^0.2.4",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@did-pay/types": "1.13.79",
+    "@did-pay/types": "1.13.80",
     "@types/cookie-parser": "^1.4.6",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -148,5 +148,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "2e35efe8ba1977c9547af7eeafeb29aeee257a90"
+  "gitHead": "7ffaad28cb871681cac2b7472307380bee4b0c39"
 }

package/src/pages/admin/billing/subscriptions/detail.tsx

@@ -111,20 +111,34 @@ export default function SubscriptionDetail(props: { id: string }) {
               value={formatTime(data.start_date ? data.start_date * 1000 : data.created_at)}
               divider
             />
-            {!data.cancel_at && (
+            {data.status === 'active' && !data.cancel_at && (
               <InfoMetric
                 label={t('admin.subscription.nextInvoice')}
                 value={formatTime(data.current_period_end * 1000)}
                 divider
               />
             )}
-            {data.cancel_at && (
+            {['active', 'trailing'].includes(data.status) && data.cancel_at && (
               <InfoMetric
                 label={t('admin.subscription.cancel.schedule')}
                 value={formatTime(data.cancel_at * 1000)}
                 divider
               />
             )}
+            {data.status !== 'canceled' && data.cancel_at_period_end && (
+              <InfoMetric
+                label={t('admin.subscription.cancel.schedule')}
+                value={formatTime(data.current_period_end * 1000)}
+                divider
+              />
+            )}
+            {data.status === 'canceled' && data.canceled_at && (
+              <InfoMetric
+                label={t('admin.subscription.cancel.done')}
+                value={formatTime(data.canceled_at * 1000)}
+                divider
+              />
+            )}
           </Stack>
         </Box>
       </Box>

package/src/pages/customer/subscription/index.tsx

@@ -84,6 +84,13 @@ export default function CustomerSubscription() {
                 divider
               />
             )}
+            {data.status !== 'canceled' && data.cancel_at_period_end && (
+              <InfoMetric
+                label={t('admin.subscription.cancel.schedule')}
+                value={formatTime(data.current_period_end * 1000)}
+                divider
+              />
+            )}
             {data.status === 'canceled' && data.canceled_at && (
               <InfoMetric
                 label={t('admin.subscription.cancel.done')}