payment-kit 1.18.39 → 1.18.40

package/api/src/libs/subscription.ts

@@ -1354,126 +1354,136 @@ export async function slashOverdraftProtectionStake(subscription: Subscription,
 
     let slashAmount = new BN(0);
     const slashInvoices: Invoice[] = [];
-    const updatePromises = invoices.map(async (invoice) => {
+    for (const invoice of invoices) {
       if (!invoice.payment_intent_id) {
         await emitAsync(
           'invoice.queued',
           invoice.id,
           { invoiceId: invoice.id, retryOnError: false, justCreate: true },
-          {
-            sync: true,
-          }
+          { sync: true }
         );
         await invoice.reload();
       }
+
       const paymentIntent = await PaymentIntent.findByPk(invoice.payment_intent_id);
       if (paymentIntent) {
-        if (paymentIntent.status === 'succeeded' && invoice.status === 'paid') {
+        const isAlreadyPaid = paymentIntent.status === 'succeeded' && invoice.status === 'paid';
+
+        if (!isAlreadyPaid) {
+          const tmp = slashAmount.add(new BN(invoice.amount_remaining));
+          if (tmp.lte(new BN(remainingStake))) {
+            slashAmount = tmp;
+            slashInvoices.push(invoice);
+          } else {
+            break;
+          }
+        } else {
           logger.info('PaymentIntent and Invoice already updated', {
             subscription: subscription.id,
             paymentIntent: paymentIntent.id,
             invoice: invoice.id,
           });
-          return;
         }
-        const tmp = slashAmount.add(new BN(invoice.amount_remaining));
-
-        if (tmp.lte(new BN(remainingStake))) {
-          slashAmount = tmp;
-          slashInvoices.push(invoice);
-          try {
-            const stakeEnough = await checkRemainingStake(
-              paymentMethod,
-              paymentCurrency,
+      }
+    }
+
+    const slashedInvoiceIds: string[] = [];
+    const processInvoice = async (invoice: Invoice): Promise<void> => {
+      const paymentIntent = await PaymentIntent.findByPk(invoice.payment_intent_id);
+      if (!paymentIntent || (paymentIntent.status === 'succeeded' && invoice.status === 'paid')) return;
+
+      try {
+        const stakeEnough = await checkRemainingStake(
+          paymentMethod,
+          paymentCurrency,
+          address,
+          invoice.amount_remaining
+        );
+        if (!stakeEnough.enough) {
+          throw new Error(`Stake slashing aborted because no enough staking for invoice: ${invoice.id}`);
+        }
+        // do the slash
+        const signed = await client.signSlashStakeTx({
+          tx: {
+            itx: {
               address,
-              invoice.amount_remaining
-            );
-            if (!stakeEnough.enough) {
-              throw new Error(`Stake slashing aborted because no enough staking for invoice: ${invoice.id}`);
-            }
-            // do the slash
-            const signed = await client.signSlashStakeTx({
-              tx: {
-                itx: {
-                  address,
-                  outputs: [
-                    {
-                      owner: wallet.address,
-                      tokens: [{ address: paymentCurrency.contract, value: invoice.amount_remaining }],
-                    },
-                  ],
-                  message: 'overdraft_exceeded',
-                  data: {
-                    typeUrl: 'json',
-                    // @ts-ignore
-                    value: {
-                      appId: wallet.address,
-                      reason: 'overdraft_exceeded',
-                      subscriptionId: subscription.id,
-                      invoiceId: invoice.id,
-                      paymentIntentId: paymentIntent.id,
-                    },
-                  },
+              outputs: [
+                {
+                  owner: wallet.address,
+                  tokens: [{ address: paymentCurrency.contract, value: invoice.amount_remaining }],
                 },
-              },
-              wallet,
-            });
-            // @ts-ignore
-            const { buffer } = await client.encodeSlashStakeTx({ tx: signed });
-            // @ts-ignore
-            const txHash = await client.sendSlashStakeTx({ tx: signed, wallet }, getGasPayerExtra(buffer));
-
-            await paymentIntent.update({
-              status: 'succeeded',
-              amount_received: invoice.amount_remaining,
-              capture_method: 'manual',
-              last_payment_error: null,
-              payment_details: {
-                arcblock: {
-                  tx_hash: txHash,
-                  payer:
-                    subscription.overdraft_protection?.payment_details?.arcblock?.payer ||
-                    getSubscriptionPaymentAddress(subscription, 'arcblock'),
-                  type: 'slash',
+              ],
+              message: 'overdraft_exceeded',
+              data: {
+                typeUrl: 'json',
+                // @ts-ignore
+                value: {
+                  appId: wallet.address,
+                  reason: 'overdraft_exceeded',
+                  subscriptionId: subscription.id,
+                  invoiceId: invoice.id,
+                  paymentIntentId: paymentIntent.id,
                 },
               },
-            });
-            logger.info('PaymentIntent updated after stake slash', {
-              subscription: subscription.id,
-              paymentIntent: paymentIntent.id,
-              status: 'succeeded',
-            });
-
-            await invoice.update({
-              status: 'paid',
-              paid: true,
-              amount_paid: invoice.amount_remaining,
-              amount_remaining: '0',
-              attempted: true,
-              attempt_count: invoice.attempt_count + 1,
-              status_transitions: { ...invoice.status_transitions, paid_at: dayjs().unix() },
-            });
-            logger.info('Invoice updated after stake slash', {
-              subscription: subscription.id,
-              invoice: invoice.id,
-              status: 'paid',
-            });
-          } catch (updateError) {
-            logger.error('stake slash failed', {
-              subscription: subscription.id,
-              invoice: invoice.id,
-              error: updateError,
-            });
-            throw updateError;
-          }
-        }
+            },
+          },
+          wallet,
+        });
+        // @ts-ignore
+        const { buffer } = await client.encodeSlashStakeTx({ tx: signed });
+        // @ts-ignore
+        const txHash = await client.sendSlashStakeTx({ tx: signed, wallet }, getGasPayerExtra(buffer));
+
+        await paymentIntent.update({
+          status: 'succeeded',
+          amount_received: invoice.amount_remaining,
+          capture_method: 'manual',
+          last_payment_error: null,
+          payment_details: {
+            arcblock: {
+              tx_hash: txHash,
+              payer:
+                subscription.overdraft_protection?.payment_details?.arcblock?.payer ||
+                getSubscriptionPaymentAddress(subscription, 'arcblock'),
+              type: 'slash',
+            },
+          },
+        });
+        logger.info('PaymentIntent updated after stake slash', {
+          subscription: subscription.id,
+          paymentIntent: paymentIntent.id,
+          status: 'succeeded',
+        });
+
+        await invoice.update({
+          status: 'paid',
+          paid: true,
+          amount_paid: invoice.amount_remaining,
+          amount_remaining: '0',
+          attempted: true,
+          attempt_count: invoice.attempt_count + 1,
+          status_transitions: { ...invoice.status_transitions, paid_at: dayjs().unix() },
+        });
+        logger.info('Invoice updated after stake slash', {
+          subscription: subscription.id,
+          invoice: invoice.id,
+          status: 'paid',
+        });
+        slashedInvoiceIds.push(invoice.id);
+      } catch (updateError) {
+        logger.error('stake slash failed', {
+          subscription: subscription.id,
+          invoice: invoice.id,
+          error: updateError,
+        });
+        throw updateError;
       }
-    });
+    };
 
-    await Promise.all(updatePromises);
-    logger.info(`${slashInvoices.length} invoices updated after stake slash`, {
+    await Promise.all(slashInvoices.map(processInvoice));
+    logger.info(`${slashedInvoiceIds.length} invoices updated after stake slash`, {
       subscription: subscription.id,
-      invoices: slashInvoices.map((x) => x.id),
+      invoices: slashedInvoiceIds,
       slashAmount: slashAmount.toString(),
     });
   } catch (error) {

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

@@ -346,7 +346,9 @@ const SubscriptionDataSchema = Joi.object({
         color: Joi.string().valid('primary', 'secondary', 'success', 'error', 'warning').optional(),
         variant: Joi.string().valid('text', 'contained', 'outlined').optional(),
         text: Joi.object().required(),
-        link: Joi.string().uri().required(),
+        link: Joi.alternatives()
+          .try(Joi.string().uri(), Joi.string().pattern(/^\/[^\s]*$/))
+          .required(),
         type: Joi.string().valid('notification', 'custom').optional(),
         triggerEvents: Joi.array().items(Joi.string()).optional(),
       })

package/api/src/routes/subscriptions.ts

@@ -691,7 +691,9 @@ const updateSchema = Joi.object<{
         color: Joi.string().valid('primary', 'secondary', 'success', 'error', 'warning').optional(),
         variant: Joi.string().valid('text', 'contained', 'outlined').optional(),
         text: Joi.object().required(),
-        link: Joi.string().uri().required(),
+        link: Joi.alternatives()
+          .try(Joi.string().uri(), Joi.string().pattern(/^\/[^\s]*$/))
+          .required(),
         type: Joi.string().valid('notification', 'custom').optional(),
         triggerEvents: Joi.array().items(Joi.string()).optional(),
       })

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.18.39",
+  "version": "1.18.40",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -47,18 +47,18 @@
     "@abtnode/cron": "^1.16.42",
     "@arcblock/did": "^1.20.6",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
-    "@arcblock/did-connect": "^2.13.23",
+    "@arcblock/did-connect": "^2.13.24",
     "@arcblock/did-util": "^1.20.6",
     "@arcblock/jwt": "^1.20.6",
-    "@arcblock/ux": "^2.13.23",
+    "@arcblock/ux": "^2.13.24",
     "@arcblock/validator": "^1.20.6",
-    "@blocklet/did-space-js": "^1.0.49",
+    "@blocklet/did-space-js": "^1.0.51",
     "@blocklet/js-sdk": "^1.16.42",
     "@blocklet/logger": "^1.16.42",
-    "@blocklet/payment-react": "1.18.39",
+    "@blocklet/payment-react": "1.18.40",
     "@blocklet/sdk": "^1.16.42",
-    "@blocklet/ui-react": "^2.13.23",
-    "@blocklet/uploader": "^0.1.85",
+    "@blocklet/ui-react": "^2.13.24",
+    "@blocklet/uploader": "^0.1.89",
     "@blocklet/xss": "^0.1.34",
     "@mui/icons-material": "^5.16.6",
     "@mui/lab": "^5.0.0-alpha.173",
@@ -123,7 +123,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.16.42",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.18.39",
+    "@blocklet/payment-types": "1.18.40",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -169,5 +169,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "9e9a5c18fc160094505e902e995f5a5a052d544f"
+  "gitHead": "53abc664b88898a7cb9afa494f4ace333b1afe9c"
 }

package/scripts/sdk.js

@@ -196,6 +196,32 @@ const checkoutModule = {
     console.log('createCheckoutWithSettingId', checkoutSession);
     return { setting, checkoutSession };
   },
+
+  async createCheckoutWithServiceAction() {
+    const checkoutSession = await payment.checkout.sessions.create({
+      mode: 'subscription',
+      line_items: [{ price_id: 'price_fQFIS12yi0JR3KePLmitjrhA', quantity: 1 }],
+      subscription_data: {
+        service_actions: [
+          {
+            text: {
+              zh: '全链接测试',
+              en: 'Full Link Test',
+            },
+            link: 'https://baidu.com',
+          },
+          {
+            text: {
+              zh: '相对路径访问',
+              en: 'Relative Path Access',
+            },
+            link: '/.well-known/service/user/notifications',
+          },
+        ],
+      },
+    });
+    console.log('createCheckoutWithServiceAction', checkoutSession);
+  },
 };
 
 const paymentModule = {
@@ -515,7 +541,6 @@ const subscriptionModule = {
   },
 };
 
-// 测试模块注册
 const testModules = {
   checkout: checkoutModule,
   payment: paymentModule,
@@ -523,6 +548,7 @@ const testModules = {
   subscription: subscriptionModule,
 };
 
+// 测试入口
 async function runTest() {
   payment.environments.setTestMode(true);
   await testModules.checkout.createBatchSubscriptionWithCustomField();

package/src/components/customer/link.tsx

@@ -2,18 +2,21 @@ import type { TCustomer } from '@blocklet/payment-types';
 import { Link } from 'react-router-dom';
 import UserCard from '@arcblock/ux/lib/UserCard';
 import { getCustomerAvatar } from '@blocklet/payment-react';
+import { InfoType, UserCardProps } from '@arcblock/ux/lib/UserCard/types';
 
 export default function CustomerLink({
   customer,
   linked,
   linkTo,
   size,
+  cardProps,
 }: {
   customer: TCustomer;
   linked?: boolean;
   linkTo?: string;
   size?: 'default' | 'small';
   tooltip?: boolean;
+  cardProps?: UserCardProps;
 }) {
   if (!customer) {
     return null;
@@ -31,6 +34,7 @@ export default function CustomerLink({
       avatarProps={{
         size: size === 'small' ? 24 : 40,
       }}
+      popupInfoType={InfoType.Minimal}
       showDid={size !== 'small'}
       {...(customer.metadata.anonymous === true
         ? {
@@ -45,6 +49,7 @@ export default function CustomerLink({
             },
           }
         : {})}
+      {...cardProps}
     />
   );
   if (linked) {
@@ -59,4 +64,5 @@ CustomerLink.defaultProps = {
   linkTo: '',
   size: 'default',
   tooltip: true,
+  cardProps: {},
 };

package/src/components/info-card.tsx

@@ -41,11 +41,11 @@ export default function InfoCard(props: Props) {
           wordBreak: getWordBreakStyle(props.name),
           minWidth: 140,
         }}>
-        <Typography variant="body1" color="text.primary" component="div">
+        <Typography variant="body2" color="text.primary" component="div">
           {props.name}
         </Typography>
         {props.description && (
-          <Typography variant="subtitle1" color="text.secondary">
+          <Typography variant="subtitle2" color="text.secondary">
             {props.description}
           </Typography>
         )}

package/src/components/info-metric.tsx

@@ -16,7 +16,7 @@ export default function InfoMetric(props: Props) {
   return (
     <>
       <Stack direction="column" alignItems="flex-start">
-        <Typography component="div" variant="body1" mb={1} color="text.primary" sx={{ fontWeight: 500 }}>
+        <Typography component="div" variant="subtitle2" mb={1} color="text.primary">
           {props.label}
           {!!props.tip && (
             <Tooltip title={props.tip}>

package/src/components/metadata/list.tsx

@@ -18,10 +18,12 @@ export default function MetadataList({
   if (isEmpty(data)) {
     return (
       <Box sx={{ textAlign: 'center' }}>
-        <Typography color="text.primary" fontWeight={500}>
+        <Typography variant="subtitle1" color="text.primary">
           {t('common.metadata.empty')}
         </Typography>
-        <Typography color="text.lighter">{t('common.metadata.emptyTip')}</Typography>
+        <Typography variant="body2" color="text.lighter">
+          {t('common.metadata.emptyTip')}
+        </Typography>
         <Button sx={{ color: 'text.link' }} onClick={handleEditMetadata}>
           {t('common.add')}
         </Button>

package/src/components/subscription/description.tsx

@@ -5,17 +5,18 @@ import { Stack, Tooltip, Typography } from '@mui/material';
 
 type Props = {
   subscription: TSubscriptionExpanded;
-  variant?: 'body1' | 'h5' | 'h4' | 'h3' | 'h2' | 'h1';
+  variant?: 'subtitle1' | 'subtitle2' | 'body1' | 'body2' | 'h5' | 'h4' | 'h3' | 'h2' | 'h1';
   hideSubscription?: boolean;
+  maxLength?: number;
 };
 
-export default function SubscriptionDescription({ subscription, variant, hideSubscription }: Props) {
+export default function SubscriptionDescription({ subscription, variant, hideSubscription, maxLength = 80 }: Props) {
   const { isMobile } = useMobile();
   if (subscription.description) {
     return (
       <Stack direction="row" alignItems="center" spacing={1}>
-        <Typography variant={variant} fontWeight={600} className="subscription-description">
-          <TruncatedText text={subscription.description} maxLength={80} useWidth />
+        <Typography variant={variant} className="subscription-description">
+          <TruncatedText text={subscription.description} maxLength={maxLength} useWidth />
         </Typography>
         {!hideSubscription && !isMobile && (
           <Tooltip title={formatSubscriptionProduct(subscription.items)}>
@@ -27,8 +28,8 @@ export default function SubscriptionDescription({ subscription, variant, hideSub
   }
 
   return (
-    <Typography variant={variant} fontWeight={600}>
-      {formatSubscriptionProduct(subscription.items)}
+    <Typography variant={variant}>
+      <TruncatedText text={formatSubscriptionProduct(subscription.items)} maxLength={maxLength} useWidth />
     </Typography>
   );
 }
@@ -36,4 +37,5 @@ export default function SubscriptionDescription({ subscription, variant, hideSub
 SubscriptionDescription.defaultProps = {
   variant: 'body1',
   hideSubscription: false,
+  maxLength: 80,
 };