payment-kit 1.19.8 → 1.19.10

package/api/src/index.ts

@@ -10,6 +10,7 @@ import express, { ErrorRequestHandler } from 'express';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { xss } from '@blocklet/xss';
 import { csrf } from '@blocklet/sdk/lib/middlewares';
+import { CustomError, formatError, getStatusFromError } from '@blocklet/error';
 
 import crons from './crons/index';
 import { ensureStakedForGas } from './integrations/arcblock/stake';
@@ -94,18 +95,22 @@ if (isProduction) {
   const staticDir = path.resolve(process.env.BLOCKLET_APP_DIR!, 'dist');
   app.use(express.static(staticDir, { maxAge: '30d', index: false }));
   app.use(fallback('index.html', { root: staticDir }));
-
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  app.use(<ErrorRequestHandler>((err, req, res, _next) => {
-    logger.error(err);
-    if (req.accepts('json')) {
-      res.status(500).send({ error: err.message });
-    } else {
-      res.status(500).send('Something broke!');
-    }
-  }));
 }
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+app.use(<ErrorRequestHandler>((err, req, res, _next) => {
+  logger.error(err);
+  if (err instanceof CustomError) {
+    res.status(getStatusFromError(err)).json({ error: formatError(err) });
+    return;
+  }
+  if (req.accepts('json')) {
+    res.status(500).send({ error: err.message });
+  } else {
+    res.status(500).send('Something broke!');
+  }
+}));
+
 const port = parseInt(process.env.BLOCKLET_PORT!, 10);
 
 export const server = app.listen(port, (err?: any) => {

package/api/src/libs/env.ts

@@ -24,6 +24,10 @@ export const sequelizeOptionsPoolMax: number = process.env.SEQUELIZE_OPTIONS_POO
 export const sequelizeOptionsPoolIdle: number = process.env.SEQUELIZE_OPTIONS_POOL_IDLE
   ? +process.env.SEQUELIZE_OPTIONS_POOL_IDLE
   : 10 * 1000;
+
+export const updateDataConcurrency: number = process.env.UPDATE_DATA_CONCURRENCY
+  ? +process.env.UPDATE_DATA_CONCURRENCY
+  : 5; // 默认并发数为 5
 export default {
   ...env,
 };

package/api/src/libs/notification/index.ts

@@ -1,7 +1,7 @@
 import { Notification as BlockletNotification } from '@blocklet/sdk';
 
 import type { BaseEmailTemplate, BaseEmailTemplateType } from './template/base';
-import { CheckoutSession, Invoice, Subscription } from '../../store/models';
+import { CheckoutSession, CreditGrant, Invoice, Meter, MeterEvent, Subscription } from '../../store/models';
 import { getNotificationSettings, shouldSendSystemNotification } from '../setting';
 import logger from '../logger';
 import { events } from '../event';
@@ -86,6 +86,33 @@ export class Notification {
       }
     }
 
+    if (options.creditGrantId) {
+      const creditGrant = await CreditGrant.findByPk(options.creditGrantId);
+      if (creditGrant) {
+        const meter = await Meter.findOne({
+          where: {
+            currency_id: creditGrant.currency_id,
+            status: 'active',
+          },
+        });
+        if (meter) {
+          return { meter, id: meter.id };
+        }
+      }
+    }
+    if (options.meterEventName) {
+      const meterEvent = await MeterEvent.findOne({
+        where: {
+          event_name: options.meterEventName,
+        },
+      });
+      if (meterEvent) {
+        const meter = await Meter.getMeterByEventName(meterEvent.event_name);
+        if (meter) {
+          return { meter, id: meter.id };
+        }
+      }
+    }
     return null;
   }
 }

package/api/src/libs/payment.ts

@@ -59,6 +59,7 @@ export async function checkTokenBalance(args: {
   paymentCurrency: TPaymentCurrency;
   userDid: string;
   amount: string;
+  skipUserCheck?: boolean;
 }): Promise<SufficientForPaymentResult> {
   const { paymentMethod, paymentCurrency, userDid, amount } = args;
   const tokenAddress = paymentCurrency.contract as string;
@@ -66,8 +67,13 @@ export async function checkTokenBalance(args: {
 
   if (paymentMethod.type === 'arcblock') {
     // get user wallet did
-    const { user } = await blocklet.getUser(userDid, { enableConnectedAccount: true });
-    const delegator = getWalletDid(user);
+    let delegator = userDid;
+    if (!args.skipUserCheck) {
+      const { user } = await blocklet.getUser(userDid, { enableConnectedAccount: true });
+      if (user) {
+        delegator = getWalletDid(user);
+      }
+    }
     if (!delegator) {
       return {
         sufficient: false,
@@ -203,6 +209,9 @@ export async function isDelegationSufficientForPayment(args: {
   lineItems?: TLineItemExpanded[];
 }): Promise<SufficientForPaymentResult> {
   const { paymentCurrency, paymentMethod, userDid, amount, delegatorAmounts } = args;
+  if (!userDid) {
+    return { sufficient: false, reason: 'NO_DID_WALLET' };
+  }
   const tokenAddress = paymentCurrency.contract as string;
 
   let totalAmount = new BN(amount);
@@ -226,10 +235,13 @@ export async function isDelegationSufficientForPayment(args: {
 
     // Regular token handling for non-credit currencies
     // user have bond wallet did?
+    let delegator = userDid;
     const { user } = await blocklet.getUser(userDid, { enableConnectedAccount: true });
-    const delegator = getWalletDid(user);
-    if (!delegator) {
-      return { sufficient: false, reason: 'NO_DID_WALLET' };
+    if (user) {
+      delegator = getWalletDid(user);
+      if (!delegator) {
+        return { sufficient: false, reason: 'NO_DID_WALLET' };
+      }
     }
 
     const client = paymentMethod.getOcapClient();

package/api/src/libs/setting.ts

@@ -1,5 +1,5 @@
 import { Op } from 'sequelize';
-import { CheckoutSession, Invoice, Setting, Subscription } from '../store/models';
+import { CheckoutSession, Invoice, Meter, Setting, Subscription } from '../store/models';
 import type { EventType, NotificationSetting } from '../store/models/types';
 import logger from './logger';
 
@@ -121,15 +121,29 @@ export async function getNotificationSettingFromInvoice(invoice: Invoice): Promi
   return null;
 }
 
+export async function getNotificationSettingFromMeter(meter: Meter): Promise<NotificationSetting | null> {
+  if (!meter) {
+    return null;
+  }
+  const settingId = getSettingIdFromObject(meter);
+  if (settingId) {
+    const settings = await getSettingForNotification(settingId);
+    return settings || null;
+  }
+  return null;
+}
+
 export type NotificationSettingsProps = {
   subscription?: Subscription;
   invoice?: Invoice;
   checkoutSession?: CheckoutSession;
+  meter?: Meter;
 };
 export async function getNotificationSettings({
   subscription,
   invoice,
   checkoutSession,
+  meter,
 }: NotificationSettingsProps): Promise<NotificationSetting | null> {
   if (subscription) {
     const settings = await getNotificationSettingFromSubscription(subscription);
@@ -146,6 +160,11 @@ export async function getNotificationSettings({
     return settings || null;
   }
 
+  if (meter) {
+    const settings = await getNotificationSettingFromMeter(meter);
+    return settings || null;
+  }
+
   return null;
 }
 

package/api/src/locales/zh.ts

@@ -229,7 +229,7 @@ export default flat({
     },
 
     creditGrantGranted: {
-      title: '恭喜！您的额度授予已激活',
+      title: '恭喜！您的额度已激活',
       body: '您已获得 {grantedAmount} 的额度授予，激活时间为 {at}，有效期至 {expiresAt}。祝您使用愉快！',
       bodyNoExpire: '您已获得 {grantedAmount} 的额度授予，激活时间为 {at}。祝您使用愉快！',
       grantedCredit: '授予额度',
@@ -238,8 +238,8 @@ export default flat({
     },
 
     creditGrantLowBalance: {
-      title: '额度授予余额不足提醒',
-      body: '您的额度授予余额已低于 10%，当前剩余额度为 {availableAmount}。请及时充值或联系管理员以避免服务受限。',
+      title: '额度余额不足提醒',
+      body: '您的额度已低于 10%，当前剩余额度为 {availableAmount}。请及时充值或联系管理员以避免服务受限。',
       totalGrantedCredit: '总授予额度',
     },
   },

package/api/src/routes/checkout-sessions.ts

@@ -13,6 +13,8 @@ import sortBy from 'lodash/sortBy';
 import uniq from 'lodash/uniq';
 import type { WhereOptions } from 'sequelize';
 
+import { CustomError, formatError, getStatusFromError } from '@blocklet/error';
+import pAll from 'p-all';
 import { MetadataSchema } from '../libs/api';
 import { checkPassportForPaymentLink } from '../integrations/blocklet/passport';
 import dayjs from '../libs/dayjs';
@@ -88,6 +90,7 @@ import { handleStripeSubscriptionSucceed } from '../integrations/stripe/handlers
 import { CHARGE_SUPPORTED_CHAIN_TYPES } from '../libs/constants';
 import { blocklet } from '../libs/auth';
 import { addSubscriptionJob } from '../queues/subscription';
+import { updateDataConcurrency } from '../libs/env';
 
 const router = Router();
 
@@ -109,7 +112,7 @@ const getPaymentTypes = async (items: any[]) => {
 };
 
 export async function validateInventory(line_items: LineItem[], includePendingQuantity = false) {
-  const checks = line_items.map(async (item) => {
+  const checks = line_items.map((item) => async () => {
     const priceId = item.price_id;
     const quantity = Number(item.quantity || 0);
 
@@ -155,7 +158,7 @@ export async function validateInventory(line_items: LineItem[], includePendingQu
       throw new Error(`Can not exceed available quantity for price: ${priceId}`);
     }
   });
-  await Promise.all(checks);
+  await pAll(checks, { concurrency: updateDataConcurrency });
 }
 
 export async function validatePaymentSettings(paymentMethodId: string, paymentCurrencyId: string) {
@@ -418,7 +421,7 @@ export const formatCheckoutSession = async (payload: any, throwOnEmptyItems = tr
 
   // TODO: need to support stake subscription
   if (raw.enable_subscription_grouping === true && !raw.subscription_data?.no_stake) {
-    throw new Error('Subscription grouping is only supported for stake-free subscriptions');
+    throw new CustomError(400, 'Subscription grouping is only supported for stake-free subscriptions');
   }
 
   if (payload.include_free_trial && raw.subscription_data) {
@@ -428,7 +431,7 @@ export const formatCheckoutSession = async (payload: any, throwOnEmptyItems = tr
   if (raw.subscription_data?.service_actions) {
     const { error } = SubscriptionDataSchema.validate(raw.subscription_data);
     if (error) {
-      throw new Error('Invalid service actions for checkout session');
+      throw new CustomError(400, 'Invalid service actions for checkout session');
     }
   }
 
@@ -438,7 +441,7 @@ export const formatCheckoutSession = async (payload: any, throwOnEmptyItems = tr
 
   if (raw.nft_mint_settings?.enabled) {
     if (!raw.nft_mint_settings?.factory) {
-      throw new Error('factory is required when nft mint is enabled');
+      throw new CustomError(400, 'factory is required when nft mint is enabled');
     }
   }
 
@@ -457,20 +460,20 @@ export const formatCheckoutSession = async (payload: any, throwOnEmptyItems = tr
 
   const items = await Price.expand(raw.line_items as any[]);
   if (items.some((x) => !x.price)) {
-    throw new Error('Invalid line items for checkout session, some price may have been deleted');
+    throw new CustomError(400, 'Invalid line items for checkout session, some price may have been deleted');
   }
   if (items.some((x) => !x.price.active)) {
-    throw new Error('Invalid line items for checkout session, some price may have been archived');
+    throw new CustomError(400, 'Invalid line items for checkout session, some price may have been archived');
   }
   const enableSubscriptionGrouping = payload.enable_subscription_grouping;
   for (let i = 0; i < items.length; i++) {
     const result = isLineItemAligned(items, i);
     if (result.currency === false) {
-      throw new Error('line_items should have same currency');
+      throw new CustomError(400, 'line_items should have same currency');
     }
     // if subscription grouping is not enabled, we need to check the recurring
     if (result.recurring === false && !enableSubscriptionGrouping) {
-      throw new Error('line_items should have same recurring');
+      throw new CustomError(400, 'line_items should have same recurring');
     }
   }
 
@@ -623,11 +626,12 @@ async function processSubscriptionFastCheckout({
 }> {
   try {
     const primarySubscription = subscriptions.find((x) => x.metadata?.is_primary_subscription) || subscriptions[0];
-    const subscriptionAmounts = await Promise.all(
-      subscriptions.map(async (sub) => {
+    const subscriptionAmounts = await pAll(
+      subscriptions.map((sub) => async () => {
         const subItems = await getSubscriptionLineItems(sub, lineItems, primarySubscription);
         return getFastCheckoutAmount(subItems, 'subscription', paymentCurrency.id, trialEnd > now);
-      })
+      }),
+      { concurrency: updateDataConcurrency }
     );
     const totalAmount = subscriptionAmounts
       .reduce((sum: BN, amt: string) => sum.add(new BN(amt)), new BN('0'))
@@ -668,15 +672,23 @@ async function processSubscriptionFastCheckout({
 
     if (executePayment) {
       // Update payment settings for all subscriptions
-      await Promise.all(subscriptions.map((sub) => sub.update({ payment_settings: paymentSettings })));
+      await pAll(
+        subscriptions.map((sub) => async () => {
+          await sub.update({
+            payment_settings: paymentSettings,
+            payment_details: { [paymentMethod.type]: { payer: customer.did } },
+          });
+        }),
+        { concurrency: updateDataConcurrency }
+      );
       if (paymentCurrency.isCredit()) {
         // skip invoice creation for credit subscriptions
         checkoutSession.update({
           status: 'complete',
           payment_status: 'paid',
         });
-        await Promise.all(
-          subscriptions.map(async (sub) => {
+        await pAll(
+          subscriptions.map((sub) => async () => {
             await sub.update({
               payment_settings: paymentSettings,
               status: sub.trial_end ? 'trialing' : 'active',
@@ -687,8 +699,9 @@ async function processSubscriptionFastCheckout({
                 },
               },
             });
-            addSubscriptionJob(sub, 'cycle', false, sub.trial_end);
-          })
+            await addSubscriptionJob(sub, 'cycle', false, sub.trial_end);
+          }),
+          { concurrency: updateDataConcurrency }
         );
         return {
           success: true,
@@ -704,17 +717,22 @@ async function processSubscriptionFastCheckout({
         subscriptions,
       });
       // Update invoice settings and push to queue
-      await Promise.all(
-        invoices.map(async (invoice) => {
+      await pAll(
+        invoices.map((invoice) => async () => {
           if (invoice) {
             await invoice.update({ auto_advance: true, payment_settings: paymentSettings });
-            invoiceQueue.push({ id: invoice.id, job: { invoiceId: invoice.id, retryOnError: false } });
+            return invoiceQueue.push({ id: invoice.id, job: { invoiceId: invoice.id, retryOnError: false } });
           }
-        })
+        }),
+        { concurrency: updateDataConcurrency }
       );
-
       // Add subscription cycle jobs
-      await Promise.all(subscriptions.map((sub) => addSubscriptionJob(sub, 'cycle', false, sub.trial_end)));
+      await pAll(
+        subscriptions.map((sub) => async () => {
+          await addSubscriptionJob(sub, 'cycle', false, sub.trial_end);
+        }),
+        { concurrency: updateDataConcurrency }
+      );
 
       logger.info('Created and queued invoices for fast checkout with subscriptions', {
         checkoutSessionId: checkoutSession.id,
@@ -790,6 +808,10 @@ export async function startCheckoutSessionFromPaymentLink(id: string, req: Reque
     raw.created_via = 'portal';
     raw.submit_type = link.submit_type;
     raw.currency_id = link.currency_id || req.currency.id;
+    if (!raw.currency_id) {
+      res.status(400).json({ error: 'Currency not found in payment link' });
+      return;
+    }
     raw.payment_link_id = link.id;
 
     // Inherit multi-subscription settings from payment link
@@ -927,7 +949,11 @@ export async function startCheckoutSessionFromPaymentLink(id: string, req: Reque
     });
   } catch (err) {
     logger.error(err);
-    res.status(500).json({ error: err.message });
+    if (err instanceof CustomError) {
+      res.status(getStatusFromError(err)).json({ error: formatError(err) });
+    } else {
+      res.status(500).json({ error: err.message });
+    }
   }
 }
 
@@ -1373,8 +1399,8 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
           };
         }
         stripeContext.stripe_subscriptions = '';
-        await Promise.all(
-          subscriptions.map(async (sub) => {
+        await pAll(
+          subscriptions.map((sub) => async () => {
             const subscriptionItems = await SubscriptionItem.findAll({ where: { subscription_id: sub.id } });
             let stripeItems = lineItems.filter((x) =>
               subscriptionItems.some((y) => y.price_id === x.price_id || y.price_id === x.upsell_price_id)
@@ -1429,7 +1455,8 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
               stripeSubscription,
               subscription: sub,
             };
-          })
+          }),
+          { concurrency: updateDataConcurrency }
         );
         if (subscriptions.length > 1) {
           stripeContext.has_multiple_subscriptions = true;
@@ -1698,8 +1725,8 @@ router.post('/:id/fast-checkout-confirm', user, ensureCheckoutSessionOpen, async
           status: 'complete',
           payment_status: 'paid',
         });
-        await Promise.all(
-          subscriptions.map(async (sub) => {
+        await pAll(
+          subscriptions.map((sub) => async () => {
             await sub.update({
               payment_settings: paymentSettings,
               status: sub.trial_end ? 'trialing' : 'active',
@@ -1710,8 +1737,9 @@ router.post('/:id/fast-checkout-confirm', user, ensureCheckoutSessionOpen, async
                 },
               },
             });
-            addSubscriptionJob(sub, 'cycle', false, sub.trial_end);
-          })
+            await addSubscriptionJob(sub, 'cycle', false, sub.trial_end);
+          }),
+          { concurrency: updateDataConcurrency }
         );
         delegation = {
           sufficient: true,
@@ -2043,7 +2071,13 @@ router.put('/:id/amount', ensureCheckoutSessionOpen, async (req, res) => {
     // validate amount on donation settings
     if (checkoutSession.payment_link_id) {
       const link = await PaymentLink.findByPk(checkoutSession.payment_link_id);
+      if (!checkoutSession.currency_id) {
+        return res.status(400).json({ error: 'Currency not found in checkout session' });
+      }
       const currency = await PaymentCurrency.findByPk(checkoutSession.currency_id);
+      if (!currency) {
+        return res.status(404).json({ error: 'Currency not found' });
+      }
       if (link?.donation_settings?.amount && currency) {
         const input = Number(fromUnitToToken(amount, currency.decimal));
         const { minimum, maximum, presets, custom } = link.donation_settings.amount;
@@ -2088,10 +2122,13 @@ router.put('/:id/amount', ensureCheckoutSessionOpen, async (req, res) => {
     // recalculate amount
     await checkoutSession.update(await getCheckoutSessionAmounts(checkoutSession));
 
-    res.json({ ...checkoutSession.toJSON(), line_items: await Price.expand(newItems) });
+    return res.json({ ...checkoutSession.toJSON(), line_items: await Price.expand(newItems) });
   } catch (err) {
     logger.error(err);
-    res.status(500).json({ error: err.message });
+    if (err instanceof CustomError) {
+      return res.status(getStatusFromError(err)).json({ error: formatError(err) });
+    }
+    return res.status(500).json({ error: err.message });
   }
 });
 

package/api/src/routes/connect/change-payment.ts

@@ -28,7 +28,7 @@ export default {
   },
   onConnect: async ({ userDid, userPk, extraParams }: CallbackArgs) => {
     const { subscriptionId } = extraParams;
-    const { subscription, paymentMethod, paymentCurrency, customer } = await ensureChangePaymentContext(subscriptionId);
+    const { subscription, paymentMethod, paymentCurrency } = await ensureChangePaymentContext(subscriptionId);
 
     const claimsList: any[] = [];
     // @ts-ignore
@@ -41,7 +41,7 @@ export default {
       const delegation = await isDelegationSufficientForPayment({
         paymentMethod,
         paymentCurrency,
-        userDid: customer!.did,
+        userDid,
         amount: fastCheckoutAmount,
       });
       const needDelegation = delegation.sufficient === false;

package/api/src/routes/connect/change-plan.ts

@@ -30,7 +30,7 @@ export default {
   },
   onConnect: async ({ userDid, userPk, extraParams }: CallbackArgs) => {
     const { subscriptionId } = extraParams;
-    const { paymentMethod, paymentCurrency, subscription, customer } = await ensureSubscription(subscriptionId);
+    const { paymentMethod, paymentCurrency, subscription } = await ensureSubscription(subscriptionId);
 
     const claimsList: any[] = [];
     // @ts-ignore
@@ -43,7 +43,7 @@ export default {
       const delegation = await isDelegationSufficientForPayment({
         paymentMethod,
         paymentCurrency,
-        userDid: customer!.did,
+        userDid,
         amount: fastCheckoutAmount,
       });
 

package/api/src/routes/connect/setup.ts

@@ -32,11 +32,9 @@ export default {
   },
   onConnect: async (args: CallbackArgs) => {
     const { userDid, userPk, extraParams } = args;
-    const { checkoutSessionId, connectedDid, sessionUserDid } = extraParams;
-    const { paymentMethod, paymentCurrency, checkoutSession, subscription, customer } = await ensureSetupIntent(
-      checkoutSessionId,
-      connectedDid || sessionUserDid || userDid
-    );
+    const { checkoutSessionId } = extraParams;
+    const { paymentMethod, paymentCurrency, checkoutSession, subscription } =
+      await ensureSetupIntent(checkoutSessionId);
     if (!subscription) {
       throw new Error('Subscription for checkoutSession not found');
     }
@@ -58,7 +56,7 @@ export default {
       const delegation = await isDelegationSufficientForPayment({
         paymentMethod,
         paymentCurrency,
-        userDid: customer.did,
+        userDid,
         amount: fastCheckoutAmount,
       });
       // if we can complete purchase without any wallet interaction
@@ -121,9 +119,9 @@ export default {
   },
   onAuth: async (args: CallbackArgs) => {
     const { request, userDid, userPk, claims, extraParams, updateSession, step } = args;
-    const { checkoutSessionId, connectedDid, sessionUserDid } = extraParams;
+    const { checkoutSessionId } = extraParams;
     const { setupIntent, checkoutSession, paymentMethod, subscription, invoice, paymentCurrency, customer } =
-      await ensureSetupIntent(checkoutSessionId, connectedDid || sessionUserDid || userDid);
+      await ensureSetupIntent(checkoutSessionId);
 
     if (!subscription) {
       throw new Error('Subscription for checkoutSession not found');