payment-kit 1.27.2 → 1.29.0

package/src/locales/zh.tsx

@@ -1265,6 +1265,55 @@ export default flat({
           tip: '交易标记为确认需要的区块数',
         },
       },
+      google_play: {
+        package_name: {
+          label: '应用包名',
+          tip: '例如 com.example.app，在 Play Console 中配置',
+        },
+        service_account_json: {
+          label: '服务账号 JSON',
+          tip: '从 Google Cloud Console 下载的 service account credentials JSON，整段粘贴',
+          invalidJson: '不是合法的 JSON',
+          missingFields: 'JSON 缺少 client_email 或 private_key 字段',
+          detectedClient: '识别到客户端',
+        },
+        pubsub_topic_name: {
+          label: 'Pub/Sub 主题名（可选）',
+          tip: 'projects/<project-id>/topics/<topic-name>，用于接收 RTDN',
+        },
+      },
+      app_store: {
+        bundle_id: {
+          label: '应用 Bundle ID',
+          tip: '例如 com.example.app，在 App Store Connect 中配置',
+        },
+        environment: {
+          label: '环境',
+          tip: 'StoreKit 2 JWS 中携带的 environment 必须与此匹配',
+          production: '正式环境',
+          sandbox: '沙盒环境',
+        },
+        shared_secret: {
+          label: 'Shared Secret（StoreKit 1 用）',
+          tip: 'App-Specific Shared Secret，用于 legacy receipt 校验。StoreKit 2 JWS 不需要。在 App Store Connect → App Information → App-Specific Shared Secret',
+        },
+        serverApi: {
+          heading: 'Server API 凭据（可选）',
+          tip: 'StoreKit 2 JWS 校验不需要凭据；只在调用 App Store Server API 查询订阅状态时使用。三项需同时填写。',
+        },
+        issuer_id: {
+          label: 'Issuer ID',
+          tip: 'App Store Connect API 的 Issuer ID',
+        },
+        key_id: {
+          label: 'Key ID',
+          tip: 'App Store Connect API 的 Key ID',
+        },
+        private_key_pem: {
+          label: '私钥 (.p8 内容)',
+          tip: '从 App Store Connect 下载的 .p8 文件内容，整段粘贴',
+        },
+      },
     },
     paymentCurrency: {
       name: '支付货币',
@@ -1452,7 +1501,19 @@ export default flat({
       product: '产品',
       attention: '将过期的订阅',
       collectionMethod: '计费',
+      channel: '渠道',
       currentPeriod: '当前周期',
+      iap: {
+        googlePlayTitle: 'Google Play 订阅详情',
+        appStoreTitle: 'App Store 订阅详情',
+        purchaseToken: '购买令牌',
+        orderId: '订单号',
+        productId: '产品 ID',
+        originalTransactionId: '原始交易 ID',
+        transactionId: '本次交易 ID',
+        expiryTime: '过期时间',
+        environment: '环境',
+      },
       trialingPeriod: '试用期',
       trialEnd: '试用期结束于 {date}',
       willEnd: '将于 {date} 结束',
@@ -1569,6 +1630,8 @@ export default flat({
       email: '电子邮件',
       phone: '电话',
       invoicePrefix: '账单前缀',
+      googlePlayUuid: 'Google Play UUID',
+      appStoreUuid: 'App Store UUID',
       balance: '余额 ({currency})',
       summary: {
         refund: '退款金额',

package/src/pages/admin/billing/meter-events/index.tsx

@@ -473,6 +473,10 @@ function CustomerFilter({
               e.stopPropagation();
             }}
             onClick={(e) => e.stopPropagation()}
+            // Stop MUI <Menu>'s built-in letter-key navigation from stealing keystrokes
+            // (it jumps to a MenuItem starting with the typed letter, which makes the
+            // search field appear to "swallow" inputs like 'a'/'w'). See #1357.
+            onKeyDown={(e) => e.stopPropagation()}
           />
         </Box>
         {customers.map((customer) => (

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

@@ -335,6 +335,86 @@ export default function SubscriptionDetail(props: { id: string }) {
               )}
             </InfoRowGroup>
           </Box>
+
+          {/* IAP details — Google Play / App Store */}
+          {(data.payment_details?.google_play || data.payment_details?.app_store) && (
+            <>
+              <Divider />
+              <Box className="section" sx={{ containerType: 'inline-size' }}>
+                <SectionHeader
+                  title={
+                    data.payment_details?.google_play
+                      ? t('admin.subscription.iap.googlePlayTitle')
+                      : t('admin.subscription.iap.appStoreTitle')
+                  }
+                />
+                <InfoRowGroup
+                  sx={{
+                    '.info-row-value': { wordBreak: 'break-all' },
+                  }}>
+                  {(data as any).channel && (
+                    <InfoRow label={t('admin.subscription.channel')} value={(data as any).channel} />
+                  )}
+                  {data.payment_details?.google_play && (
+                    <>
+                      <InfoRow
+                        label={t('admin.subscription.iap.purchaseToken')}
+                        value={data.payment_details.google_play.purchase_token}
+                      />
+                      <InfoRow
+                        label={t('admin.subscription.iap.orderId')}
+                        value={data.payment_details.google_play.order_id || '—'}
+                      />
+                      <InfoRow
+                        label={t('admin.subscription.iap.productId')}
+                        value={data.payment_details.google_play.product_id}
+                      />
+                      <InfoRow
+                        label={t('admin.subscription.iap.expiryTime')}
+                        value={
+                          data.payment_details.google_play.expiry_time_millis
+                            ? formatTime(Number(data.payment_details.google_play.expiry_time_millis))
+                            : '—'
+                        }
+                      />
+                      <InfoRow
+                        label={t('admin.subscription.iap.environment')}
+                        value={data.payment_details.google_play.environment || (data as any).environment || '—'}
+                      />
+                    </>
+                  )}
+                  {data.payment_details?.app_store && (
+                    <>
+                      <InfoRow
+                        label={t('admin.subscription.iap.originalTransactionId')}
+                        value={data.payment_details.app_store.original_transaction_id}
+                      />
+                      <InfoRow
+                        label={t('admin.subscription.iap.transactionId')}
+                        value={data.payment_details.app_store.transaction_id || '—'}
+                      />
+                      <InfoRow
+                        label={t('admin.subscription.iap.productId')}
+                        value={data.payment_details.app_store.product_id}
+                      />
+                      <InfoRow
+                        label={t('admin.subscription.iap.expiryTime')}
+                        value={
+                          data.payment_details.app_store.expires_at
+                            ? formatTime(data.payment_details.app_store.expires_at * 1000)
+                            : '—'
+                        }
+                      />
+                      <InfoRow
+                        label={t('admin.subscription.iap.environment')}
+                        value={data.payment_details.app_store.environment || (data as any).environment || '—'}
+                      />
+                    </>
+                  )}
+                </InfoRowGroup>
+              </Box>
+            </>
+          )}
           <Divider />
           {/* Discount Information */}
           {(data as any).discountStats && (

package/src/pages/admin/customers/customers/detail.tsx

@@ -1,5 +1,4 @@
 /* eslint-disable react/no-unstable-nested-components */
-import DidAddress from '@arcblock/ux/lib/DID';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Toast from '@arcblock/ux/lib/Toast';
 import {
@@ -19,6 +18,7 @@ import { useRequest, useSetState } from 'ahooks';
 import { defaultCountries, FlagEmoji, parseCountry } from 'react-international-phone';
 
 import { useMemo } from 'react';
+import SafeDidAddress from '../../../../components/safe-did-address';
 import BalanceList from '../../../../components/balance-list';
 import Copyable from '../../../../components/copyable';
 import EditCustomer from '../../../../components/customer/edit';
@@ -343,12 +343,18 @@ export default function CustomerDetail(props: { id: string }) {
               }}>
               <InfoRow
                 label={t('common.did')}
-                value={<DidAddress did={data.customer.did} chainId={livemode ? 'main' : 'beta'} showQrcode />}
+                value={<SafeDidAddress did={data.customer.did} chainId={livemode ? 'main' : 'beta'} showQrcode />}
               />
               <InfoRow label={t('admin.customer.name')} value={data.customer.name} />
               <InfoRow label={t('common.createdAt')} value={formatTime(data.customer.created_at)} />
 
               <InfoRow label={t('admin.customer.invoicePrefix')} value={data.customer.invoice_prefix} />
+              {(data.customer as any).google_play_uuid && (
+                <InfoRow label={t('admin.customer.googlePlayUuid')} value={(data.customer as any).google_play_uuid} />
+              )}
+              {(data.customer as any).app_store_uuid && (
+                <InfoRow label={t('admin.customer.appStoreUuid')} value={(data.customer as any).app_store_uuid} />
+              )}
               <InfoRow label={t('common.updatedAt')} value={formatTime(data.customer.updated_at)} />
               {state.editing.customer && (
                 <EditCustomer

package/src/pages/admin/customers/customers/index.tsx

@@ -1,6 +1,5 @@
 /* eslint-disable react/no-unstable-nested-components */
 import { getDurableData } from '@arcblock/ux/lib/Datatable';
-import DidAddress from '@arcblock/ux/lib/DID';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import { api, formatTime, getCustomerAvatar, Table } from '@blocklet/payment-react';
 import type { TCustomer } from '@blocklet/payment-types';
@@ -8,6 +7,7 @@ import { Avatar, CircularProgress, Stack, Typography } from '@mui/material';
 import { useLocalStorageState } from 'ahooks';
 import { useEffect, useState } from 'react';
 import { Link } from 'react-router-dom';
+import SafeDidAddress from '../../../../components/safe-did-address';
 
 const fetchData = (params: Record<string, any> = {}): Promise<{ list: TCustomer[]; count: number }> => {
   const search = new URLSearchParams();
@@ -98,7 +98,7 @@ export default function CustomersList() {
           const item = data.list[index] as TCustomer;
           return (
             <Link to={`/admin/customers/${item.id}`}>
-              <DidAddress did={item.did} />
+              <SafeDidAddress did={item.did} />
             </Link>
           );
         },

package/src/pages/admin/overview.tsx

@@ -328,7 +328,9 @@ export default function Overview() {
   const summaryLoading = summary.loading;
   const trendLoading = trend.loading;
   const overdueLoading = overdueSummary.loading;
-  const overdueList = overdueSummary.data?.list || [];
+  // Filter out items with missing currency data — overdue API may return items whose
+  // referenced currency was deleted or failed to expand
+  const overdueList = (overdueSummary.data?.list || []).filter((item: any) => item?.currency?.id);
   const hasOverdue = overdueList.length > 0;
   const summaryData = summary.data;
   const summarySummary = summaryData?.summary;

package/src/pages/admin/settings/payment-methods/create.tsx

@@ -52,6 +52,18 @@ export default function PaymentMethodCreate() {
           explorer_host: '',
           logo: '',
         },
+        google_play: {
+          package_name: '',
+          service_account_json: '',
+          pubsub_topic_name: '',
+        },
+        app_store: {
+          bundle_id: '',
+          environment: 'sandbox',
+          issuer_id: '',
+          key_id: '',
+          private_key_pem: '',
+        },
       },
     },
   });

package/src/pages/admin/settings/payment-methods/index.tsx

@@ -453,7 +453,7 @@ export default function PaymentMethods() {
               addons={
                 <>
                   <Switch checked={method.active} disabled sx={{ cursor: 'default' }} />
-                  {method.type !== 'arcblock' && (
+                  {!['arcblock', 'google_play', 'app_store'].includes(method.type) && (
                     <IconButton
                       onClick={(e) => {
                         e.stopPropagation();

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

@@ -284,13 +284,13 @@ export default function CustomerSubscriptionDetail() {
 
   const renderOverdraftProtectionLabel = () => {
     const enabled = data?.overdraft_protection?.enabled;
+    const upcomingAmount = overdraftProtection?.upcoming?.amount || '0';
+    const gasAmount = overdraftProtection?.gas || '0';
     const insufficient =
       !enableOverdraftProtection ||
       overdraftProtection.unused === '0' ||
-      new BN(overdraftProtection.unused).lt(
-        new BN(overdraftProtection.upcoming?.amount).add(new BN(overdraftProtection.gas))
-      );
-    const estimateAmount = +fromUnitToToken(cycleAmount.amount, data.paymentCurrency?.decimal);
+      new BN(overdraftProtection.unused).lt(new BN(upcomingAmount).add(new BN(gasAmount)));
+    const estimateAmount = +fromUnitToToken(cycleAmount.amount || '0', data.paymentCurrency?.decimal);
 
     const remainingStake = +fromUnitToToken(overdraftProtection?.unused || '0', data.paymentCurrency?.decimal);
     const formatEstimatedDuration = (cycles: number) => {

package/tsconfig.api.json

@@ -3,12 +3,7 @@
   "compilerOptions": {
     "outDir": "api/dist",
     "noEmit": false,
-    "noEmitOnError": true,
-    "typeRoots": [
-      "./node_modules/@types",
-      "env.d.ts",
-      "pretty-ms-i18n.d.ts"
-    ],     
+    "noEmitOnError": true
   },
   "include": ["api/*.d.ts", "api/src"]
 }

package/tsconfig.json

@@ -31,11 +31,9 @@
     "module": "commonjs" /* Specify what module code is generated. */,
     // "rootDir": "./",                                  /* Specify the root folder within your source files. */
     // "moduleResolution": "node",                       /* Specify how TypeScript looks up a file from a given module specifier. */
-    // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
-    // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
     // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
     // "typeRoots": [],                                  /* Specify multiple folders that act like './node_modules/@types'. */
-    // "types": [],                                      /* Specify type package names to be included without being referenced in a source file. */
+    "types": ["node", "react", "react-dom", "express", "cookie-parser", "cors", "debug", "dotenv-flow", "jest"],  /* Only include types explicitly used by this package */
     // "allowUmdGlobalAccess": true,                     /* Allow accessing UMD globals from modules. */
     // "moduleSuffixes": [],                             /* List of file name suffixes to search when resolving a module. */
     // "resolveJsonModule": true,                        /* Enable importing .json files. */
@@ -98,5 +96,6 @@
     /* Completeness */
     // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
     "skipLibCheck": true, /* Skip type checking all .d.ts files. */
-  }
+  },
+  "exclude": ["node_modules", "cloudflare"]
 }

package/tsconfig.types.json

@@ -5,7 +5,8 @@
     "noEmit": false,
     "declaration": true,
     "emitDeclarationOnly": true,
-    "noEmitOnError": true
+    "noEmitOnError": true,
+    "types": ["node"]
   },
   "include": ["api/*.d.ts", "api/src/store/models"]
 }

package/vite.config.ts

@@ -56,6 +56,7 @@ export default defineConfig(({ mode }) => {
       createBlockletPlugin({
         disableDynamicAssetHost: false,
         chunkSizeLimit: 3500,
+        disableNodePolyfills: true,
       }),
       svgr(),
       process.env.ANALYZE && visualizer({ open: true, gzipSize: true, brotliSize: true }),
@@ -106,6 +107,10 @@ export default defineConfig(({ mode }) => {
         },
       },
     },
+    define: {
+      global: 'globalThis',
+      'process.env': {},
+    },
     optimizeDeps: {
       include: ['react', 'react-dom', 'react/jsx-runtime'],
       esbuildOptions: { mainFields: ['module', 'main'], resolveExtensions: ['.ts', '.tsx', '.js', '.jsx'] },
@@ -128,4 +133,4 @@ export default defineConfig(({ mode }) => {
       ],
     },
   };
-});
+});