payment-kit 1.13.239 → 1.13.240

package/api/src/crons/base.ts

@@ -1,5 +1,5 @@
 import dayjs from 'dayjs';
-import { clone } from 'lodash';
+import clone from 'lodash/clone';
 import pAll from 'p-all';
 
 import { notificationCronConcurrency } from '../libs/env';
@@ -27,19 +27,21 @@ export abstract class BaseSubscriptionScheduleNotification<Options extends any>
   abstract getSubscriptions(): Promise<Subscription[]>;
 
   async run() {
-    const label: string = new Date().toISOString();
+    const { name } = this.constructor;
 
-    logger.info(`${label}: ${this.constructor.name}.run start`);
+    logger.info(`${name}.run start`, { start: dayjs(this.start).toISOString(), end: dayjs(this.end).toISOString() });
 
     const subscriptions = await this.getSubscriptions();
+    logger.info(`${name}.run.${subscriptions.length}`, subscriptions.length);
+
     const subscriptionForWillRenew = this.getSubscriptionsForWillRenew(subscriptions);
 
     await this.addTaskToQueue(subscriptionForWillRenew);
 
-    logger.info(`${label}: ${this.constructor.name}.run end`);
+    logger.info(`${name}.run end`);
   }
 
-  static DIFFS: Diff[] = [
+  static readonly DIFFS: Diff[] = [
     {
       value: 1,
       unit: 'M',
@@ -164,6 +166,7 @@ export abstract class BaseSubscriptionScheduleNotification<Options extends any>
             return;
           }
 
+          logger.info(`BaseSubscriptionScheduleNotification.addTaskToQueue.${this.eventType}`, x);
           notificationQueue.push(x);
         };
       }),

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

@@ -18,6 +18,10 @@ export class SubscriptionWillCanceledSchedule extends BaseSubscriptionScheduleNo
       raw: true,
     });
 
+    subscriptions.forEach((subscription) => {
+      subscription.current_period_end = subscription.cancel_at!;
+    });
+
     return subscriptions;
   }
 
@@ -37,7 +41,7 @@ export class SubscriptionWillCanceledSchedule extends BaseSubscriptionScheduleNo
           subscriptionId: subscription.id,
           willCancelValue: diff.value,
           willCancelUnit: diff.unit,
-          required: !!diff.required,
+          required: true,
         },
       },
       delay: dayjs(subscription.current_period_end * 1000)

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

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

package/api/src/libs/env.ts

@@ -9,6 +9,7 @@ export const stripeInvoiceCronTime: string = process.env.STRIPE_INVOICE_CRON_TIM
 export const stripePaymentCronTime: string = process.env.STRIPE_PAYMENT_CRON_TIME || '0 */20 * * * *'; // 默认每 20min 执行一次
 export const stripeSubscriptionCronTime: string = process.env.STRIPE_SUBSCRIPTION_CRON_TIME || '0 10 */8 * * *'; // 默认每 8小时 执行一次
 export const revokeStakeCronTime: string = process.env.REVOKE_STAKE_CRON_TIME || '0 */5 * * * *'; // 默认每 5 min 行一次
+export const daysUntilCancel: string | undefined = process.env.DAYS_UNTIL_CANCEL;
 
 export default {
   ...env,

package/api/src/libs/invoice.ts

@@ -1,7 +1,6 @@
-import querystring from 'querystring';
-
 import { component } from '@blocklet/sdk';
 import type { LiteralUnion } from 'type-fest';
+import { withQuery } from 'ufo';
 
 import { getConnectQueryParam } from './util';
 
@@ -17,8 +16,10 @@ export function getCustomerInvoicePageUrl({
   action?: LiteralUnion<'pay', string>;
 }) {
   return component.getUrl(
-    `customer/invoice/${invoiceId}?locale=${locale}&action=${action}&${querystring.stringify(
-      getConnectQueryParam({ userDid })
-    )}`
+    withQuery(`customer/invoice/${invoiceId}`, {
+      locale,
+      action,
+      ...getConnectQueryParam({ userDid }),
+    })
   );
 }

package/api/src/libs/notification/template/one-time-payment-succeeded.ts

@@ -104,7 +104,13 @@ export class OneTimePaymentSucceededEmailTemplate
 
     // @ts-expect-error
     const txHash: string | undefined = paymentIntent?.payment_details?.[paymentMethod.type]?.tx_hash;
-    const viewTxHashLink: string | undefined = txHash && getExplorerLink(chainHost, txHash as string, 'tx');
+    const viewTxHashLink: string | undefined =
+      txHash &&
+      getExplorerLink({
+        type: 'tx',
+        did: txHash,
+        chainHost,
+      });
 
     return {
       locale,
@@ -223,17 +229,17 @@ export class OneTimePaymentSucceededEmailTemplate
       // @ts-ignore
       actions: [
         viewSubscriptionLink && {
-          name: 'viewSubscription',
+          name: translate('notification.common.viewSubscription', locale),
           title: translate('notification.common.viewSubscription', locale),
           link: viewSubscriptionLink,
         },
         viewInvoiceLink && {
-          name: 'viewSubscription',
+          name: translate('notification.common.viewInvoice', locale),
           title: translate('notification.common.viewInvoice', locale),
           link: viewInvoiceLink,
         },
         viewTxHashLink && {
-          name: 'viewTxHash',
+          name: translate('notification.common.viewTxHash', locale),
           title: translate('notification.common.viewTxHash', locale),
           link: viewTxHashLink as string,
         },

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

@@ -49,13 +49,17 @@ export class SubscriptionCanceledEmailTemplate implements BaseEmailTemplate<Subs
     if (subscription.status !== 'canceled') {
       throw new Error(`Subscription(${this.options.subscriptionId}) status(${subscription.status}) must be canceled`);
     }
-    if (subscription.cancelation_details?.reason !== 'payment_disputed') {
-      // 非管理员取消的订阅不需要发送邮件
+    if (['payment_failed', 'payment_disputed'].includes(subscription.cancelation_details?.reason as string) === false) {
+      // 只有没钱导致订阅被取消了，或者管理员取消了，才会发送通知
       logger.error(
-        `Subscription(${this.options.subscriptionId}) cancelation reason must be payment_disputed`,
-        subscription.cancelation_details
+        `Subscription(${this.options.subscriptionId}) cancelation reason must be payment_disputed or payment_failed`,
+        {
+          cancelation_details: subscription.cancelation_details,
+        }
+      );
+      throw new Error(
+        `Subscription(${this.options.subscriptionId}) cancelation reason must be payment_disputed or payment_failed`
       );
-      throw new Error(`Subscription(${this.options.subscriptionId}) cancelation reason must be payment_disputed`);
     }
 
     const customer = await Customer.findByPk(subscription.customer_id);
@@ -229,7 +233,7 @@ export class SubscriptionCanceledEmailTemplate implements BaseEmailTemplate<Subs
       // @ts-ignore
       actions: [
         viewSubscriptionLink && {
-          name: 'viewSubscription',
+          name: translate('notification.common.viewSubscription', locale),
           title: translate('notification.common.viewSubscription', locale),
           link: viewSubscriptionLink,
         },

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

@@ -115,7 +115,13 @@ export class SubscriptionRefundSucceededEmailTemplate
 
     // @ts-expect-error
     const txHash: string | undefined = refund?.payment_details?.[paymentMethod.type]?.tx_hash;
-    const viewTxHashLink: string | undefined = txHash && getExplorerLink(chainHost, txHash as string, 'tx');
+    const viewTxHashLink: string | undefined =
+      txHash &&
+      getExplorerLink({
+        type: 'tx',
+        did: txHash,
+        chainHost,
+      });
 
     return {
       locale,
@@ -269,12 +275,12 @@ export class SubscriptionRefundSucceededEmailTemplate
       // @ts-ignore
       actions: [
         {
-          name: 'viewSubscription',
+          name: translate('notification.common.viewSubscription', locale),
           title: translate('notification.common.viewSubscription', locale),
           link: viewSubscriptionLink,
         },
         viewTxHashLink && {
-          name: 'viewTxHash',
+          name: translate('notification.common.viewTxHash', locale),
           title: translate('notification.common.viewTxHash', locale),
           link: viewTxHashLink as string,
         },

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

@@ -136,7 +136,14 @@ export class SubscriptionRenewFailedEmailTemplate
     });
     const txHash: string | undefined =
       paymentIntent?.payment_details?.[checkoutSession?.nft_mint_details?.type as 'arcblock' | 'ethereum']?.tx_hash;
-    const viewTxHashLink: string | undefined = hasNft && txHash ? getExplorerLink(chainHost, txHash, 'tx') : undefined;
+    const viewTxHashLink: string | undefined =
+      hasNft && txHash
+        ? getExplorerLink({
+            type: 'tx',
+            did: txHash,
+            chainHost,
+          })
+        : undefined;
 
     return {
       locale,
@@ -181,7 +188,7 @@ export class SubscriptionRenewFailedEmailTemplate
       body: `${translate('notification.subscriptionRenewFailed.body', locale, {
         at,
         productName,
-        reason: `${reason}`,
+        reason: `<span style="color: red;">${reason}</span>`,
       })}`,
       // @ts-expect-error
       attachments: [
@@ -269,17 +276,17 @@ export class SubscriptionRenewFailedEmailTemplate
       // @ts-ignore
       actions: [
         {
-          name: 'viewSubscription',
+          name: translate('notification.common.viewSubscription', locale),
           title: translate('notification.common.viewSubscription', locale),
           link: viewSubscriptionLink,
         },
         {
-          name: 'viewInvoice',
-          title: translate('notification.subscriptionRenewFailed.renewNow', locale),
+          name: translate('notification.common.renewNow', locale),
+          title: translate('notification.common.renewNow', locale),
           link: viewInvoiceLink,
         },
         viewTxHashLink && {
-          name: 'viewTxHash',
+          name: translate('notification.common.viewTxHash', locale),
           title: translate('notification.common.viewTxHash', locale),
           link: viewTxHashLink as string,
         },

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

@@ -125,7 +125,14 @@ export class SubscriptionRenewedEmailTemplate implements BaseEmailTemplate<Subsc
     });
     const txHash: string | undefined =
       paymentIntent?.payment_details?.[checkoutSession?.nft_mint_details?.type as 'arcblock' | 'ethereum']?.tx_hash;
-    const viewTxHashLink: string | undefined = hasNft && txHash ? getExplorerLink(chainHost, txHash, 'tx') : undefined;
+    const viewTxHashLink: string | undefined =
+      hasNft && txHash
+        ? getExplorerLink({
+            type: 'tx',
+            did: txHash,
+            chainHost,
+          })
+        : undefined;
 
     return {
       locale,
@@ -261,17 +268,17 @@ export class SubscriptionRenewedEmailTemplate implements BaseEmailTemplate<Subsc
       // @ts-ignore
       actions: [
         {
-          name: 'viewSubscription',
+          name: translate('notification.common.viewSubscription', locale),
           title: translate('notification.common.viewSubscription', locale),
           link: viewSubscriptionLink,
         },
         {
-          name: 'viewSubscription',
+          name: translate('notification.common.viewInvoice', locale),
           title: translate('notification.common.viewInvoice', locale),
           link: viewInvoiceLink,
         },
         viewTxHashLink && {
-          name: 'viewTxHash',
+          name: translate('notification.common.viewTxHash', locale),
           title: translate('notification.common.viewTxHash', locale),
           link: viewTxHashLink as string,
         },

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

@@ -145,7 +145,13 @@ export class SubscriptionSucceededEmailTemplate
     const paymentIntent = await PaymentIntent.findByPk(invoice.payment_intent_id);
     const txHash: string | undefined =
       paymentIntent?.payment_details?.[checkoutSession?.nft_mint_details?.type as 'arcblock' | 'ethereum']?.tx_hash;
-    const viewTxHashLink: string | undefined = txHash && getExplorerLink(chainHost, txHash as string, 'tx');
+    const viewTxHashLink: string | undefined =
+      txHash &&
+      getExplorerLink({
+        type: 'tx',
+        did: txHash,
+        chainHost,
+      });
 
     return {
       locale,
@@ -270,17 +276,17 @@ export class SubscriptionSucceededEmailTemplate
       // @ts-ignore
       actions: [
         {
-          name: 'viewSubscription',
+          name: translate('notification.common.viewSubscription', locale),
           title: translate('notification.common.viewSubscription', locale),
           link: viewSubscriptionLink,
         },
         {
-          name: 'viewSubscription',
+          name: translate('notification.common.viewInvoice', locale),
           title: translate('notification.common.viewInvoice', locale),
           link: viewInvoiceLink,
         },
         viewTxHashLink && {
-          name: 'viewTxHash',
+          name: translate('notification.common.viewTxHash', locale),
           title: translate('notification.common.viewTxHash', locale),
           link: viewTxHashLink as string,
         },

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

@@ -262,12 +262,12 @@ export class SubscriptionTrialStartEmailTemplate
       // @ts-ignore
       actions: [
         {
-          name: 'viewSubscription',
+          name: translate('notification.common.viewSubscription', locale),
           title: translate('notification.common.viewSubscription', locale),
           link: viewSubscriptionLink,
         },
         {
-          name: 'viewSubscription',
+          name: translate('notification.common.viewInvoice', locale),
           title: translate('notification.common.viewInvoice', locale),
           link: viewInvoiceLink,
         },

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

@@ -248,7 +248,7 @@ export class SubscriptionTrialWilEndEmailTemplate
       // @ts-ignore
       actions: [
         {
-          name: 'viewSubscription',
+          name: translate('notification.common.viewSubscription', locale),
           title: translate('notification.common.viewSubscription', locale),
           link: viewSubscriptionLink,
         },

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

@@ -114,7 +114,13 @@ export class SubscriptionUpgradedEmailTemplate implements BaseEmailTemplate<Subs
 
     // @ts-expect-error
     const txHash: string | undefined = paymentIntent?.payment_details?.[paymentMethod.type]?.tx_hash;
-    const viewTxHashLink: string | undefined = txHash && getExplorerLink(chainHost, txHash, 'tx');
+    const viewTxHashLink: string | undefined =
+      txHash &&
+      getExplorerLink({
+        type: 'tx',
+        did: txHash,
+        chainHost,
+      });
 
     return {
       locale,
@@ -239,17 +245,17 @@ export class SubscriptionUpgradedEmailTemplate implements BaseEmailTemplate<Subs
       // @ts-ignore
       actions: [
         {
-          name: 'viewSubscription',
+          name: translate('notification.common.viewSubscription', locale),
           title: translate('notification.common.viewSubscription', locale),
           link: viewSubscriptionLink,
         },
         {
-          name: 'viewSubscription',
+          name: translate('notification.common.viewInvoice', locale),
           title: translate('notification.common.viewInvoice', locale),
           link: viewInvoiceLink,
         },
         viewTxHashLink && {
-          name: 'viewTxHash',
+          name: translate('notification.common.viewTxHash', locale),
           title: translate('notification.common.viewTxHash', locale),
           link: viewTxHashLink,
         },

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

@@ -208,12 +208,12 @@ export class SubscriptionWillCanceledEmailTemplate
       // @ts-ignore
       actions: [
         viewSubscriptionLink && {
-          name: 'viewSubscription',
+          name: translate('notification.common.viewSubscription', locale),
           title: translate('notification.common.viewSubscription', locale),
           link: viewSubscriptionLink,
         },
         viewInvoiceLink && {
-          name: 'viewInvoice',
+          name: translate('notification.common.renewNow', locale),
           title: translate('notification.common.renewNow', locale),
           link: viewInvoiceLink,
         },

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

@@ -7,12 +7,13 @@ import prettyMsI18n from 'pretty-ms-i18n';
 
 import { getUserLocale } from '../../../integrations/blocklet/notification';
 import { translate } from '../../../locales';
-import { Customer, Invoice, Subscription } from '../../../store/models';
+import { Customer, Invoice, PaymentMethod, Subscription } from '../../../store/models';
 import { PaymentCurrency } from '../../../store/models/payment-currency';
 import { PaymentDetail, getPaymentDetail } from '../../payment';
 import { getMainProductName } from '../../product';
 import { getCustomerSubscriptionPageUrl } from '../../subscription';
 import { formatTime, getPrettyMsI18nLocale } from '../../time';
+import { getExplorerLink } from '../../util';
 import type { BaseEmailTemplate, BaseEmailTemplateType } from './base';
 
 export interface SubscriptionWillRenewEmailTemplateOptions {
@@ -36,6 +37,7 @@ interface SubscriptionWillRenewEmailTemplateContext {
   duration: string;
 
   viewSubscriptionLink: string;
+  immediateRechargeLink: string;
 }
 
 export class SubscriptionWillRenewEmailTemplate
@@ -97,6 +99,17 @@ export class SubscriptionWillRenewEmailTemplate
       locale,
       userDid,
     });
+    const paymentMethod: PaymentMethod | null = await PaymentMethod.findByPk(paymentCurrency.payment_method_id);
+    // @ts-ignore
+    const chainHost: string | undefined = paymentMethod?.settings?.[paymentMethod.type]?.api_host;
+    const immediateRechargeLink: string = getExplorerLink({
+      type: 'account',
+      did: userDid,
+      chainHost,
+      queryParams: {
+        action: 'recharge',
+      },
+    })!;
 
     return {
       locale,
@@ -112,6 +125,7 @@ export class SubscriptionWillRenewEmailTemplate
       duration,
 
       viewSubscriptionLink,
+      immediateRechargeLink,
     };
   }
 
@@ -171,6 +185,7 @@ export class SubscriptionWillRenewEmailTemplate
       paymentInfo,
 
       viewSubscriptionLink,
+      immediateRechargeLink,
     } = await this.getContext();
 
     const canPay: boolean = paymentDetail.balance >= paymentDetail.price;
@@ -189,6 +204,7 @@ export class SubscriptionWillRenewEmailTemplate
             at,
             productName,
             willRenewDuration,
+            balance: `${paymentDetail.balance} ${paymentDetail.symbol}`,
           })}`
         : `${translate('notification.subscriptionWillRenew.unableToPayBody', locale, {
             at,
@@ -252,8 +268,13 @@ export class SubscriptionWillRenewEmailTemplate
       ].filter(Boolean),
       // @ts-ignore
       actions: [
+        !canPay && {
+          name: translate('notification.common.immediateRecharge', locale),
+          title: translate('notification.common.immediateRecharge', locale),
+          link: immediateRechargeLink,
+        },
         {
-          name: 'viewSubscription',
+          name: translate('notification.common.viewSubscription', locale),
           title: translate('notification.common.viewSubscription', locale),
           link: viewSubscriptionLink,
         },

package/api/src/libs/payment.ts

@@ -181,6 +181,12 @@ export async function getPaymentDetail(userDid: string, invoice: Invoice): Promi
     symbol: '',
   };
 
+  const paymentCurrency = await PaymentCurrency.findByPk(invoice.currency_id);
+  if (!paymentCurrency) {
+    return defaultResult;
+  }
+  Object.assign(defaultResult, { symbol: paymentCurrency.symbol });
+
   const paymentIntent = await PaymentIntent.findByPk(invoice.payment_intent_id);
   if (!paymentIntent) {
     return defaultResult;
@@ -191,12 +197,7 @@ export async function getPaymentDetail(userDid: string, invoice: Invoice): Promi
     return defaultResult;
   }
 
-  const paymentCurrency = await PaymentCurrency.findByPk(paymentIntent.currency_id);
-  if (!paymentCurrency) {
-    return defaultResult;
-  }
-
-  if (paymentMethod.type === 'arcblock') {
+  if (['arcblock', 'ethereum'].includes(paymentMethod.type)) {
     // balance enough token for payment?
     const result = await isDelegationSufficientForPayment({
       paymentMethod,

package/api/src/libs/subscription.ts

@@ -1,8 +1,7 @@
-import querystring from 'querystring';
-
 import component from '@blocklet/sdk/lib/component';
 import { BN } from '@ocap/util';
 import type { LiteralUnion } from 'type-fest';
+import { withQuery } from 'ufo';
 
 import {
   Customer,
@@ -29,9 +28,10 @@ export function getCustomerSubscriptionPageUrl({
   userDid: string;
 }) {
   return component.getUrl(
-    `customer/subscription/${subscriptionId}?locale=${locale}&${querystring.stringify(
-      getConnectQueryParam({ userDid })
-    )}`
+    withQuery(`customer/subscription/${subscriptionId}`, {
+      locale,
+      ...getConnectQueryParam({ userDid }),
+    })
   );
 }
 

package/api/src/libs/util.ts

@@ -4,6 +4,7 @@ import { getUrl } from '@blocklet/sdk/lib/component';
 import env from '@blocklet/sdk/lib/env';
 import { customAlphabet } from 'nanoid';
 import type { LiteralUnion } from 'type-fest';
+import { withQuery } from 'ufo';
 
 import dayjs from './dayjs';
 
@@ -172,11 +173,17 @@ export function getDataObjectFromQuery(
 }
 
 // @FIXME: 这个应该封装在某个通用类库里面 @jianchao @wangshijun
-export function getExplorerLink(
-  chainHost: string | undefined,
-  did: string | undefined,
-  type: LiteralUnion<'asset' | 'account' | 'tx' | 'token' | 'factory' | ' bridge', string>
-) {
+export function getExplorerLink({
+  type,
+  did,
+  chainHost = undefined,
+  queryParams = {},
+}: {
+  chainHost: string | undefined;
+  did: string | undefined;
+  type: LiteralUnion<'asset' | 'account' | 'tx' | 'token' | 'factory' | ' bridge', string>;
+  queryParams?: Record<string, string>;
+}) {
   if (!chainHost) return undefined;
   try {
     const chainUrl = new URL(chainHost);
@@ -203,7 +210,7 @@ export function getExplorerLink(
         chainUrl.pathname = '/';
     }
 
-    return chainUrl.href;
+    return withQuery(chainUrl.href, queryParams);
   } catch {
     return undefined;
   }

package/api/src/locales/en.ts

@@ -24,7 +24,8 @@ export default flat({
       minute: 'minute',
       minutes: 'minutes',
       cancellationReason: 'Cancellation reason',
-      renewNow: 'Renew now',
+      renewNow: 'Pay now',
+      immediateRecharge: 'Immediate recharge',
     },
 
     sendTo: 'Sent to',
@@ -40,9 +41,9 @@ export default flat({
 
     subscriptionTrialWillEnd: {
       title: 'The {productName} trial will end soon',
-      body: 'Your {productName} trial subscription will end after {willRenewDuration}. Please make sure your account balance is sufficient to automatically renew your subscription at the end of the trial period. Thank you for your support and trust!',
+      body: 'Your trial for {productName} will end in {willRenewDuration}. Please ensure your account balance is sufficient for automatic billing after the trial ends. Thank you for your support and trust!',
       unableToPayBody:
-        'Your {productName} trial subscription will end after {willRenewDuration}.<span style="color: red;">Your current balance is {balance}, which is less than {price}</span>，please make sure your balance is sufficient for automatic renewal. Thank you for your support and trust!',
+        'Your trial for {productName} will end in {willRenewDuration}. <span style="color: red;">Your current balance is {balance}, which is less than {price}</span>, Please ensure your balance is sufficient for automatic billing. Thank you for your support and trust!',
     },
 
     subscriptionSucceed: {
@@ -61,39 +62,35 @@ export default flat({
     },
 
     subscriptionWillRenew: {
-      title: '{productName} will be auto-renewed soon',
-      body: 'Your subscription to {productName} expires in {willRenewDuration}. Please make sure you have enough balance in your account to auto-renew your subscription when it expires ({at}). We wish you all the best!',
+      title: '{productName} will be deducted automatically',
+      body: 'Your {productName} subscription has {willRenewDuration} until the next deduction. Your current balance is {balance}, please ensure that your account balance is sufficient so that the deduction is automatically completed after the maturity ({at}). I wish you all the best! ',
       unableToPayBody:
-        'Your subscription to {productName} expires in {willRenewDuration}. <span style="color: red;">Your current balance is {balance}, which is less than {price}</span>, so please make sure you have enough balance in your account to automatically renew your subscription when it expires ({at}). We wish you all the best!',
-      renewAmount: 'Renewal amount',
+        'Your {productName} subscription has {willRenewDuration} until the next deduction. <span style="color: red;" > Your current balance is {balance}, less than {price}</span>, please ensure that your account balance is sufficient so that the deduction will be completed automatically after the expiration ({at}). I wish you all the best! ',
+      renewAmount: 'deduction amount ',
     },
 
     subscriptionRenewed: {
-      title: '{productName} renewal successful',
-      body: 'Your {productName} was successfully renewed on {at}. Thank you for your continued support and trust, have a great day!',
-      noExpenseIncurred: 'No charges were incurred during the service period',
+      title: '{productName} payment successful',
+      body: 'Payment for your subscription {productName} is successfully collected on {at}. Thank you for your continued support and trust, I wish you a happy use! ',
+      noExpenseIncurred: 'No expenses incurred during the service ',
     },
 
     subscriptionRenewFailed: {
-      title: 'Renewal of {productName} failed',
-      body: "We're sorry to inform you that your {productName} renewal failed on {at}. The reason for the failure is <span style='color: red;'>{reason}</span>. If you have any questions, please do not hesitate to contact us. Thank you.",
-      renewNow: 'Renew now',
+      title: '{productName} charge failed',
+      body: 'We are sorry to inform you that your {productName} failed to be charged on {at}. The reason for the failure is {reason}. If you have any questions, please contact us in time. Thank you!',
       reason: {
-        noDidWallet:
-          'You have not yet bound the DID Wallet, please bind the DID Wallet, make sure the balance is sufficient and then renew it',
-        noDelegation: 'No delegation found from your DID Wallet, please renew it after completing the authorization',
+        noDidWallet: 'You have not bound DID Wallet, please bind DID Wallet to ensure sufficient balance',
+        noDelegation: 'Your DID Wallet has not been authorized, please update authorization',
         noTransferPermission:
-          'Transfer permission not granted to app, please update the authorization and renew it again',
+          'Your DID Wallet has not granted transfer permission to the application, please update authorization',
         noTokenPermission:
-          'Token transfer permission not granted to app, please update the authorization and renew it again',
-        noTransferTo:
-          'App not in whitelist of the transfer permission, please update the authorization and renew it again',
-        noEnoughAllowance: 'Transfer amount exceeds tx allowance, please update the authorization and renew it again',
-        noToken: "You don't have any tokens in your account, please replenish your tokens and renew your account",
-        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.',
+          'Your DID Wallet has not granted token transfer permission to the application, please update authorization',
+        noTransferTo: 'Your DID Wallet has not granted the application charge permission, please update authorization',
+        noEnoughAllowance: 'The deduction amount exceeds the single transfer limit, please update authorization',
+        noToken: 'Your account has no tokens, please recharge tokens',
+        noEnoughToken: 'Your account token balance is {balance}, insufficient for {price}, please recharge tokens',
+        noSupported: 'It is not supported to charge with tokens, please check your package',
+        txSendFailed: 'Failed to send charge transaction',
       },
     },
 
@@ -103,9 +100,9 @@ export default flat({
     },
 
     subscriptWillCanceled: {
-      title: '{productName} subscription is about to be automatically canceled',
-      body: 'Due to the long period of unsuccessful automatic renewal, your subscription to {productName} will be automatically canceled by the system on {at} ({willCancelDuration} later). Please handle the renewal issue manually in time to avoid any inconvenience. If you have any questions, please feel free to contact us.',
-      renewAmount: 'Renewal Amount',
+      title: '{productName} subscription is about to be automatically cancelled ',
+      body: 'Your subscription {productName} will be automatically unsubscribed by the system after {at} (after {willCancelDuration}) due to a long period of failure to automatically complete the deduction. Please handle the problem of charge deduction manually in time, so as not to affect the use. If you have any questions, please feel free to contact us. ',
+      renewAmount: 'deduction amount ',
     },
 
     subscriptionCanceled: {

package/api/src/locales/zh.ts

@@ -24,7 +24,8 @@ export default flat({
       minute: '分钟',
       minutes: '分钟',
       cancellationReason: '取消原因',
-      renewNow: '立即续费',
+      renewNow: '立即付款',
+      immediateRecharge: '立即充值',
     },
 
     sendTo: '发送给',
@@ -40,9 +41,9 @@ export default flat({
 
     subscriptionTrialWillEnd: {
       title: '{productName} 试用期即将结束',
-      body: '您订阅的 {productName} 试用资格将在 {willRenewDuration} 后结束。请确保您的账户余额充足，以便在试用期结束后自动续费。感谢您的支持与信任！',
+      body: '您订阅的 {productName} 试用资格将在 {willRenewDuration} 后结束。请确保您的账户余额充足，以便在试用期结束后自动完成扣费。感谢您的支持与信任！',
       unableToPayBody:
-        '您订阅的 {productName} 试用资格将在 {willRenewDuration} 后结束。<span style="color: red;">您的当前余额为 {balance}，不足 {price}</span>，请确保余额充足以便自动续费。感谢您的支持与信任！',
+        '您订阅的 {productName} 试用资格将在 {willRenewDuration} 后结束。<span style="color: red;">您的当前余额为 {balance}，不足 {price}</span>，请确保余额充足以便自动完成扣费。感谢您的支持与信任！',
     },
 
     subscriptionSucceed: {
@@ -61,34 +62,33 @@ export default flat({
     },
 
     subscriptionWillRenew: {
-      title: '{productName} 即将自动续费',
-      body: '您订阅的 {productName} 还有 {willRenewDuration} 到期。请确保您的账户余额充足，以便在到期后({at})自动续费。祝您一切顺利！',
+      title: '{productName} 即将自动完成扣费',
+      body: '您订阅的 {productName} 距离下一次扣费还有 {willRenewDuration}。您的当前余额为 {balance}，请确保您的账户余额充足，以便在到期后({at})自动完成扣费。祝您一切顺利！',
       unableToPayBody:
-        '您订阅的 {productName} 还有 {willRenewDuration} 到期。<span style="color: red;">您的当前余额为 {balance}，不足 {price}</span>，请确保您的账户余额充足，以便在到期后({at})自动续费。祝您一切顺利！',
-      renewAmount: '扣款金额',
+        '您订阅的 {productName} 距离下一次扣费还有 {willRenewDuration}。<span style="color: red;">您的当前余额为 {balance}，不足 {price}</span>，请确保您的账户余额充足，以便在到期后({at})自动完成扣费。祝您一切顺利！',
+      renewAmount: '扣费金额',
     },
 
     subscriptionRenewed: {
-      title: '{productName} 续费成功',
-      body: '您的 {productName} 已于 {at} 成功续费。感谢您的持续支持与信任，祝您使用愉快！',
+      title: '{productName} 扣费成功',
+      body: '您的 {productName} 已于 {at} 扣费成功。感谢您的持续支持与信任，祝您使用愉快！',
       noExpenseIncurred: '服务期间未产生费用',
     },
 
     subscriptionRenewFailed: {
-      title: '{productName} 续费失败',
-      body: '很抱歉地通知您，您的 {productName} 续费于 {at} 失败。失败原因为 <span style="color: red;">{reason}</span>。如有任何疑问，请及时联系我们。谢谢！',
-      renewNow: '立即续费',
+      title: '{productName} 扣费失败',
+      body: '很抱歉地通知您，您的 {productName} 于 {at} 扣费失败。失败原因为 {reason}。如有任何疑问，请及时联系我们。谢谢！',
       reason: {
-        noDidWallet: '您尚未绑定 DID Wallet，请绑定 DID Wallet，确保余额充足后重新续费',
-        noDelegation: '您的 DID Wallet 尚未授权，请完成授权后重新续费',
-        noTransferPermission: '您的 DID Wallet 未授予应用转账权限，请更新授权后重新续费',
-        noTokenPermission: '您的 DID Wallet 未授予应用对应通证的转账权限，请更新授权后重新续费',
-        noTransferTo: '您的 DID Wallet 未授予应用扣款权限，请更新授权后重新续费',
-        noEnoughAllowance: '扣款金额超出单笔转账限额，请更新授权后重新续费',
-        noToken: '您的账户没有任何代币，请充值代币后重新续费',
-        noEnoughToken: '您的账户代币余额为 {balance}，不足 {price}，请充值代币后重新续费',
-        noSupported: '不支持使用代币续费，请检查您的套餐',
-        txSendFailed: '扣款交易发送失败',
+        noDidWallet: '您尚未绑定 DID Wallet，请绑定 DID Wallet，确保余额充足',
+        noDelegation: '您的 DID Wallet 尚未授权，请更新授权',
+        noTransferPermission: '您的 DID Wallet 未授予应用转账权限，请更新授权',
+        noTokenPermission: '您的 DID Wallet 未授予应用对应通证的转账权限，请更新授权',
+        noTransferTo: '您的 DID Wallet 未授予应用扣费权限，请更新授权',
+        noEnoughAllowance: '扣款金额超出单笔转账限额，请更新授权',
+        noToken: '您的账户没有任何代币，请充值代币',
+        noEnoughToken: '您的账户代币余额为 {balance}，不足 {price}，请充值代币',
+        noSupported: '不支持使用代币扣费，请检查您的套餐',
+        txSendFailed: '扣费交易发送失败',
       },
     },
 
@@ -99,8 +99,8 @@ export default flat({
 
     subscriptWillCanceled: {
       title: '{productName} 订阅即将自动取消',
-      body: '由于长时间未能自动完成续费，您订阅的 {productName} 将于 {at} ({willCancelDuration}后) 被系统自动取消订阅。请您及时手动处理续费问题，以免影响使用。如有任何疑问，请随时与我们联系。',
-      renewAmount: '续费金额',
+      body: '由于长时间未能自动完成扣费，您订阅的 {productName} 将于 {at} ({willCancelDuration}后) 被系统自动取消订阅。请您及时手动处理扣费问题，以免影响使用。如有任何疑问，请随时与我们联系。',
+      renewAmount: '扣费金额',
     },
 
     subscriptionCanceled: {

package/api/src/queues/notification.ts

@@ -105,6 +105,7 @@ async function handleNotificationJob(job: NotificationQueueJob): Promise<void> {
   try {
     const template = getNotificationTemplate(job);
     await new Notification(template).send();
+    logger.info('handleNotificationJob.success', { job });
   } catch (error) {
     logger.error('handleNotificationJob.error.$job', job);
     logger.error('handleNotificationJob.error', error);
@@ -133,6 +134,7 @@ export async function startNotificationQueue() {
   // 试用期开始
   events.on('customer.subscription.trial_start', (subscription: Subscription) => {
     notificationQueue.push({
+      id: `customer.subscription.trial_start.${subscription.id}`,
       job: {
         type: 'customer.subscription.trial_start',
         options: {
@@ -146,6 +148,7 @@ export async function startNotificationQueue() {
     if (!subscription.trial_start) {
       // 没有试用期的 subscription 通知
       notificationQueue.push({
+        id: `customer.subscription.started.${subscription.id}`,
         job: {
           type: 'customer.subscription.started',
           options: {
@@ -160,6 +163,7 @@ export async function startNotificationQueue() {
   events.on('checkout.session.completed', (checkoutSession: CheckoutSession) => {
     if (checkoutSession.mode === 'payment') {
       notificationQueue.push({
+        id: `checkout.session.completed.${checkoutSession.id}`,
         job: {
           type: 'checkout.session.completed',
           options: {
@@ -172,6 +176,7 @@ export async function startNotificationQueue() {
 
   events.on('customer.subscription.renewed', (subscription: Subscription) => {
     notificationQueue.push({
+      id: `customer.subscription.renewed.${subscription.id}.${subscription.latest_invoice_id}`,
       job: {
         type: 'customer.subscription.renewed',
         options: {
@@ -186,6 +191,7 @@ export async function startNotificationQueue() {
     const invoice = await Invoice.findByPk(subscription.latest_invoice_id);
     if (invoice && subscription.metadata.renew_failed_reason) {
       notificationQueue.push({
+        id: `customer.subscription.renew_failed.${subscription.id}.${invoice.id}`,
         job: {
           type: 'customer.subscription.renew_failed',
           options: {
@@ -199,6 +205,7 @@ export async function startNotificationQueue() {
 
   events.on('customer.subscription.upgraded', (subscription: Subscription) => {
     notificationQueue.push({
+      id: `customer.subscription.upgraded.${subscription.id}.${subscription.latest_invoice_id}`,
       job: {
         type: 'customer.subscription.upgraded',
         options: {
@@ -210,6 +217,7 @@ export async function startNotificationQueue() {
 
   events.on('refund.succeeded', (refund: Refund) => {
     notificationQueue.push({
+      id: `refund.succeeded.${refund.subscription_id}.${refund.id}`,
       job: {
         type: 'refund.succeeded',
         options: {
@@ -221,6 +229,7 @@ export async function startNotificationQueue() {
 
   events.on('customer.subscription.deleted', (subscription: Subscription) => {
     notificationQueue.push({
+      id: `customer.subscription.deleted.${subscription.id}`,
       job: {
         type: 'customer.subscription.deleted',
         options: {

package/api/src/queues/payment.ts

@@ -554,9 +554,9 @@ export const handlePayment = async (job: PaymentJob) => {
       await paymentIntent.update(updates.payment);
       await invoice.update(updates.invoice);
 
-      // 只有在重试次数超过阈值的时候才发送邮件，不然邮件频率太高了
+      // 只有在 第一次重试 或者 重试次数超过阈值 的时候才发送邮件，不然邮件频率太高了
       const minRetryMail = updates.minRetryMail || MIN_RETRY_MAIL;
-      if (attemptCount >= minRetryMail && invoice.billing_reason === 'subscription_cycle') {
+      if ((attemptCount === 1 || attemptCount >= minRetryMail) && invoice.billing_reason === 'subscription_cycle') {
         const subscription = await Subscription.findByPk(invoice.subscription_id);
         if (subscription) {
           await subscription.update({

package/api/src/store/models/subscription.ts

@@ -176,10 +176,12 @@ export class Subscription extends Model<InferAttributes<Subscription>, InferCrea
       type: DataTypes.ENUM('active', 'canceled', 'incomplete', 'incomplete_expired', 'past_due', 'trialing', 'paused'),
       allowNull: false,
     },
+    // 将来在什么时候这个订阅会被取消
     cancel_at: {
       type: DataTypes.INTEGER,
       allowNull: true,
     },
+    // 什么时候开始说要去取消订阅的
     canceled_at: {
       type: DataTypes.INTEGER,
       allowNull: 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.239
+version: 1.13.240
 logo: logo.png
 files:
   - dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.239",
+  "version": "1.13.240",
   "scripts": {
     "dev": "cross-env COMPONENT_STORE_URL=https://test.store.blocklet.dev blocklet dev --open",
     "eject": "vite eject",
@@ -43,30 +43,30 @@
   },
   "dependencies": {
     "@abtnode/cron": "1.16.26",
-    "@arcblock/did": "^1.18.115",
+    "@arcblock/did": "^1.18.116",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
-    "@arcblock/did-connect": "^2.9.75",
-    "@arcblock/did-util": "^1.18.115",
-    "@arcblock/jwt": "^1.18.115",
-    "@arcblock/ux": "^2.9.75",
-    "@arcblock/validator": "^1.18.115",
+    "@arcblock/did-connect": "^2.9.77",
+    "@arcblock/did-util": "^1.18.116",
+    "@arcblock/jwt": "^1.18.116",
+    "@arcblock/ux": "^2.9.77",
+    "@arcblock/validator": "^1.18.116",
     "@blocklet/logger": "1.16.26",
-    "@blocklet/payment-react": "1.13.239",
+    "@blocklet/payment-react": "1.13.240",
     "@blocklet/sdk": "1.16.26",
-    "@blocklet/ui-react": "^2.9.75",
+    "@blocklet/ui-react": "^2.9.77",
     "@blocklet/uploader": "^0.0.78",
-    "@mui/icons-material": "^5.15.15",
+    "@mui/icons-material": "^5.15.16",
     "@mui/lab": "^5.0.0-alpha.170",
-    "@mui/material": "^5.15.15",
-    "@mui/styles": "^5.15.15",
+    "@mui/material": "^5.15.16",
+    "@mui/styles": "^5.15.16",
     "@mui/system": "^5.15.15",
-    "@ocap/asset": "^1.18.115",
-    "@ocap/client": "^1.18.115",
-    "@ocap/mcrypto": "^1.18.115",
-    "@ocap/util": "^1.18.115",
-    "@ocap/wallet": "^1.18.115",
-    "@react-pdf/renderer": "^3.4.2",
-    "@stripe/react-stripe-js": "^2.7.0",
+    "@ocap/asset": "^1.18.116",
+    "@ocap/client": "^1.18.116",
+    "@ocap/mcrypto": "^1.18.116",
+    "@ocap/util": "^1.18.116",
+    "@ocap/wallet": "^1.18.116",
+    "@react-pdf/renderer": "^3.4.4",
+    "@stripe/react-stripe-js": "^2.7.1",
     "@stripe/stripe-js": "^2.4.0",
     "ahooks": "^3.7.11",
     "axios": "^0.27.2",
@@ -76,9 +76,9 @@
     "copy-to-clipboard": "^3.3.3",
     "cors": "^2.8.5",
     "date-fns": "^3.6.0",
-    "dayjs": "^1.11.10",
+    "dayjs": "^1.11.11",
     "dotenv-flow": "^3.3.0",
-    "ethers": "^6.12.0",
+    "ethers": "^6.12.1",
     "express": "^4.19.2",
     "express-async-errors": "^3.1.1",
     "express-history-api-fallback": "^2.2.1",
@@ -86,7 +86,7 @@
     "flat": "^5.0.2",
     "google-libphonenumber": "^3.2.34",
     "iframe-resizer-react": "^1.1.0",
-    "joi": "^17.12.3",
+    "joi": "^17.13.1",
     "json-stable-stringify": "^1.1.1",
     "lodash": "^4.17.21",
     "morgan": "^1.10.0",
@@ -95,13 +95,13 @@
     "p-all": "3.0.0",
     "p-wait-for": "3",
     "pretty-ms-i18n": "^1.0.3",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "react-error-boundary": "^4.0.13",
-    "react-hook-form": "^7.51.3",
+    "react-hook-form": "^7.51.4",
     "react-international-phone": "^3.1.2",
-    "react-router-dom": "^6.22.3",
-    "recharts": "^2.12.5",
+    "react-router-dom": "^6.23.0",
+    "recharts": "^2.12.7",
     "rimraf": "^3.0.2",
     "sequelize": "^6.37.3",
     "sql-where-parser": "^2.2.1",
@@ -116,14 +116,14 @@
   "devDependencies": {
     "@abtnode/types": "1.16.26",
     "@arcblock/eslint-config-ts": "^0.3.0",
-    "@blocklet/payment-types": "1.13.239",
+    "@blocklet/payment-types": "1.13.240",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
     "@types/express": "^4.17.21",
-    "@types/node": "^18.19.31",
-    "@types/react": "^18.2.79",
-    "@types/react-dom": "^18.2.25",
+    "@types/node": "^18.19.32",
+    "@types/react": "^18.3.1",
+    "@types/react-dom": "^18.3.0",
     "@vitejs/plugin-react": "^4.2.1",
     "bumpp": "^8.2.1",
     "cross-env": "^7.0.3",
@@ -137,9 +137,9 @@
     "prettier-plugin-import-sort": "^0.0.7",
     "ts-jest": "^29.1.2",
     "ts-node": "^10.9.2",
-    "type-fest": "^4.15.0",
+    "type-fest": "^4.18.2",
     "typescript": "^4.9.5",
-    "vite": "^5.2.9",
+    "vite": "^5.2.11",
     "vite-plugin-blocklet": "^0.7.9",
     "vite-plugin-node-polyfills": "^0.21.0",
     "vite-plugin-svgr": "^4.2.0",
@@ -155,5 +155,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "898fbcb595e77f6183aa0cac9fa69dbceb19d75f"
+  "gitHead": "02b0f1dc4e711c889dd88f7ace2b56062c5d2f0e"
 }