payment-kit 1.13.71 → 1.13.72

package/api/src/jobs/payment.ts

@@ -6,7 +6,7 @@ import { events } from '../libs/event';
 import logger from '../libs/logger';
 import { getGasPayerExtra, isDelegationSufficientForPayment } from '../libs/payment';
 import createQueue from '../libs/queue';
-import { MAX_RETRY_COUNT, getNextRetry } from '../libs/util';
+import { MAX_RETRY_COUNT, MIN_RETRY_MAIL, getNextRetry } from '../libs/util';
 import { CheckoutSession } from '../store/models/checkout-session';
 import { Invoice } from '../store/models/invoice';
 import { PaymentCurrency } from '../store/models/payment-currency';
@@ -66,13 +66,7 @@ export const handlePaymentSucceed = async (paymentIntent: PaymentIntent) => {
       }
     }
 
-    const count: number = await Invoice.count({
-      where: {
-        subscription_id: invoice.subscription_id,
-        status: 'paid',
-      },
-    });
-    if (count >= 2) {
+    if (invoice.billing_reason === 'subscription_cycle') {
       events.emit('customer.subscription.renewed', subscription, invoice);
     }
   }
@@ -131,6 +125,7 @@ export const handlePayment = async (job: PaymentJob) => {
 
   // try payment capture and reschedule on error
   logger.info(`PaymentIntent capture attempt: ${paymentIntent.id}`);
+  let result;
   try {
     await paymentIntent.update({ status: 'processing', last_payment_error: null });
 
@@ -138,7 +133,7 @@ export const handlePayment = async (job: PaymentJob) => {
     const payer = paymentSettings?.payment_method_options.arcblock?.payer;
 
     // check balance before capture
-    const result = await isDelegationSufficientForPayment({
+    result = await isDelegationSufficientForPayment({
       paymentMethod,
       paymentCurrency,
       userDid: payer as string,
@@ -146,11 +141,6 @@ export const handlePayment = async (job: PaymentJob) => {
     });
     if (result.sufficient === false) {
       logger.error('PaymentIntent capture aborted on preCheck', { id: paymentIntent.id, result });
-      events.emit('customer.subscription.renew_failed', {
-        invoice,
-        result,
-      });
-      // FIXME: send email to customer, pause subscription
       throw new CustomError(result.reason, 'payer balance or delegation not sufficient for this payment');
     }
 
@@ -218,11 +208,19 @@ export const handlePayment = async (job: PaymentJob) => {
         });
       }
     } else if (invoice) {
+      const attemptCount = invoice.attempt_count + 1;
+      if (attemptCount >= MIN_RETRY_MAIL && invoice.billing_reason === 'subscription_cycle') {
+        events.emit('customer.subscription.renew_failed', {
+          invoice,
+          result: result || { sufficient: false, reason: 'TX_SEND_FAILED' },
+        });
+      }
+
       if (invoice.attempt_count > MAX_RETRY_COUNT) {
         await paymentIntent.update({ status: 'requires_action', last_payment_error: error });
         await invoice.update({
           status: 'uncollectible',
-          attempt_count: invoice.attempt_count + 1,
+          attempt_count: attemptCount,
           attempted: true,
           status_transitions: { ...invoice.status_transitions, marked_uncollectible_at: dayjs().unix() },
         });
@@ -230,11 +228,11 @@ export const handlePayment = async (job: PaymentJob) => {
         // FIXME: send email to customer, pause subscription
         logger.error('PaymentIntent capture failed after max retry', { id: paymentIntent.id });
       } else {
-        const retryAt = getNextRetry(invoice.attempt_count + 1);
+        const retryAt = getNextRetry(attemptCount);
 
         await paymentIntent.update({ status: 'requires_capture', last_payment_error: error });
         await invoice.update({
-          attempt_count: invoice.attempt_count + 1,
+          attempt_count: attemptCount,
           attempted: true,
           next_payment_attempt: retryAt,
         });

package/api/src/libs/util.ts

@@ -10,6 +10,7 @@ import dayjs from './dayjs';
 export const OCAP_PAYMENT_TX_TYPE = 'fg:t:transfer_v2';
 
 export const MAX_RETRY_COUNT = 18; // 2^18 seconds ~~ 3 days, total retry time: 6 days
+export const MIN_RETRY_MAIL = 13; // total retry time before sending first mail: 6 hours
 export const STRIPE_API_VERSION = '2023-08-16';
 export const STRIPE_ENDPOINT: string = getUrl('/api/integrations/stripe/webhook');
 export const STRIPE_EVENTS: any[] = [

package/api/src/locales/en.ts

@@ -77,6 +77,7 @@ export default flat({
         noEnoughToken:
           'Your account token balance is {balance}, not enough for {price}, please replenish your tokens and renew your account',
         noSupported: 'Token renewal is not supported, please check your subscription',
+        txSendFailed: 'Failed to send transaction when try to collect payment.',
       },
     },
   },

package/api/src/locales/zh.ts

@@ -72,6 +72,7 @@ export default flat({
         noToken: '您的账户没有任何代币，请充值代币后重新续费',
         noEnoughToken: '您的账户代币余额为 {balance}，不足 {price}，请充值代币后重新续费',
         noSupported: '不支持使用代币续费，请检查您的套餐',
+        txSendFailed: '扣款交易发送失败',
       },
     },
   },

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.71",
+  "version": "1.13.72",
   "scripts": {
     "dev": "COMPONENT_STORE_URL=https://test.store.blocklet.dev blocklet dev",
     "eject": "vite eject",
@@ -106,7 +106,7 @@
     "@abtnode/types": "^1.16.19",
     "@arcblock/eslint-config": "^0.2.4",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@did-pay/types": "1.13.71",
+    "@did-pay/types": "1.13.72",
     "@types/cookie-parser": "^1.4.6",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -143,5 +143,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "790a7f2f0e18c1631bf018ca5481b01ec25996e3"
+  "gitHead": "bbd67e67e0e6154506b12d7ce30b314e895382c0"
 }