payment-kit 1.21.2 → 1.21.3

package/api/src/routes/meter-events.ts

@@ -222,7 +222,7 @@ router.post('/', auth, async (req, res) => {
       return res.status(400).json({ error: `Event with identifier "${req.body.identifier}" already exists` });
     }
 
-    const meter = await Meter.getMeterByEventName(req.body.event_name, !!req.livemode);
+    const meter = await Meter.getMeterByEventName(req.body.event_name);
     if (!meter) {
       return res
         .status(400)
@@ -361,7 +361,7 @@ router.get('/:id', authMine, async (req, res) => {
     if (customer.did !== req.user?.did && !['owner', 'admin'].includes(req.user?.role || '')) {
       return res.status(403).json({ error: 'You are not allowed to access this resource' });
     }
-    const meter = await Meter.getMeterByEventName(event.event_name, event.livemode);
+    const meter = await Meter.getMeterByEventName(event.event_name);
     let paymentCurrency = null;
     if (meter) {
       paymentCurrency = await PaymentCurrency.findByPk(meter.currency_id);

package/api/src/routes/meters.ts

@@ -68,7 +68,7 @@ router.post('/', auth, async (req, res) => {
     }
 
     const existing = await Meter.findOne({
-      where: { event_name: req.body.event_name, livemode: !!req.livemode },
+      where: { event_name: req.body.event_name },
     });
     if (existing) {
       return res.status(409).json({ error: `Meter with event_name "${req.body.event_name}" already exists` });

package/api/src/routes/vendor.ts

@@ -603,7 +603,7 @@ router.get('/subscription/:sessionId', ensureVendorAuth, getVendorSubscription);
 
 router.get(
   '/open/:subscriptionId',
-  authAdmin,
+  loginAuth,
   validateParams(subscriptionIdParamSchema),
   validateQuery(vendorRedirectQuerySchema),
   redirectToVendor

package/api/src/store/models/meter-event.ts

@@ -374,7 +374,7 @@ export class MeterEvent extends Model<InferAttributes<MeterEvent>, InferCreation
 
     await Promise.all(
       events.map(async (event) => {
-        const meter = await Meter.getMeterByEventName(event.event_name, event.livemode);
+        const meter = await Meter.getMeterByEventName(event.event_name);
         if (!meter) {
           return;
         }

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

@@ -146,11 +146,8 @@ export class Meter extends Model<InferAttributes<Meter>, InferCreationAttributes
     });
   }
 
-  public static getMeterByEventName(eventName: string, livemode?: boolean): Promise<Meter | null> {
-    const whereClause: any = { event_name: eventName, livemode: true };
-    if (livemode !== undefined) {
-      whereClause.livemode = livemode;
-    }
+  public static getMeterByEventName(eventName: string): Promise<Meter | null> {
+    const whereClause: any = { event_name: eventName };
     return this.findOne({ where: whereClause });
   }
 

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.21.2",
+  "version": "1.21.3",
   "scripts": {
     "dev": "blocklet dev --open",
     "lint": "tsc --noEmit && eslint src api/src --ext .mjs,.js,.jsx,.ts,.tsx",
@@ -56,9 +56,9 @@
     "@blocklet/error": "^0.2.5",
     "@blocklet/js-sdk": "^1.16.52-beta-20250912-112002-e3499e9c",
     "@blocklet/logger": "^1.16.52-beta-20250912-112002-e3499e9c",
-    "@blocklet/payment-broker-client": "1.21.2",
-    "@blocklet/payment-react": "1.21.2",
-    "@blocklet/payment-vendor": "1.21.2",
+    "@blocklet/payment-broker-client": "1.21.3",
+    "@blocklet/payment-react": "1.21.3",
+    "@blocklet/payment-vendor": "1.21.3",
     "@blocklet/sdk": "^1.16.52-beta-20250912-112002-e3499e9c",
     "@blocklet/ui-react": "^3.1.43",
     "@blocklet/uploader": "^0.2.12",
@@ -128,7 +128,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.16.52-beta-20250912-112002-e3499e9c",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.21.2",
+    "@blocklet/payment-types": "1.21.3",
     "@types/cookie-parser": "^1.4.9",
     "@types/cors": "^2.8.19",
     "@types/debug": "^4.1.12",
@@ -175,5 +175,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "abd74e83a89ea2fdc1261aef68355b1ce299fa4b"
+  "gitHead": "ea1d64db9e337e2cdea02c86a0ab91b885830a11"
 }

package/src/pages/integrations/overview.tsx

@@ -261,7 +261,7 @@ export default function Overview() {
         actions={
           <Box sx={{ display: 'flex', gap: 2 }}>
             <Button onClick={() => setOpenMeterDialog(false)}>{t('common.cancel')}</Button>
-            <Button onClick={() => navigate('/admin/meters')} variant="contained">
+            <Button onClick={() => navigate('/admin/billing/meters')} variant="contained">
               {t('common.goToConfigure')}
             </Button>
           </Box>

package/src/libs/meter-utils.ts

@@ -1,196 +0,0 @@
-import { api } from '@blocklet/payment-react';
-import type { TMeter, TCustomer, TPaymentCurrency, TSubscription } from '@blocklet/payment-types';
-
-export interface MeterInfo {
-  meter?: TMeter & { paymentCurrency?: TPaymentCurrency };
-  customer?: TCustomer;
-  paymentCurrency?: TPaymentCurrency;
-  subscription?: TSubscription;
-}
-
-export interface GetMeterInfoOptions {
-  meterId?: string;
-  customerId?: string;
-  eventName?: string;
-  includeCustomer?: boolean;
-  includePaymentCurrency?: boolean;
-  includeSubscription?: boolean;
-  subscriptionId?: string;
-}
-
-/**
- * 获取meter相关信息的通用方法
- * @param options 配置选项
- * @returns Promise<MeterInfo>
- */
-export async function getMeterInfo(options: GetMeterInfoOptions = {}): Promise<MeterInfo> {
-  const {
-    meterId,
-    customerId,
-    eventName,
-    includeCustomer = false,
-    includePaymentCurrency = false,
-    includeSubscription = false,
-    subscriptionId,
-  } = options;
-
-  const result: MeterInfo = {};
-
-  try {
-    // 获取meter信息
-    if (meterId) {
-      const { data: meter } = await api.get(`/api/meters/${meterId}`);
-      result.meter = meter;
-
-      // 如果meter包含paymentCurrency且需要包含
-      if (includePaymentCurrency && meter.paymentCurrency) {
-        result.paymentCurrency = meter.paymentCurrency;
-      }
-    } else if (eventName) {
-      // 通过event_name查找meter
-      const { data: meters } = await api.get(`/api/meters?event_name=${encodeURIComponent(eventName)}`);
-      if (meters.list && meters.list.length > 0) {
-        const [firstMeter] = meters.list;
-        result.meter = firstMeter;
-
-        if (includePaymentCurrency && firstMeter.paymentCurrency) {
-          result.paymentCurrency = firstMeter.paymentCurrency;
-        }
-      }
-    }
-
-    // 获取customer信息
-    if (includeCustomer && customerId) {
-      const { data: customer } = await api.get(`/api/customers/${customerId}`);
-      result.customer = customer;
-    }
-
-    // 获取subscription信息
-    if (includeSubscription && subscriptionId) {
-      const { data: subscription } = await api.get(`/api/subscriptions/${subscriptionId}`);
-      result.subscription = subscription;
-    }
-
-    // 如果需要paymentCurrency但还没有获取到，尝试从meter的currency_id获取
-    if (includePaymentCurrency && !result.paymentCurrency && result.meter?.currency_id) {
-      try {
-        const { data: paymentCurrency } = await api.get(`/api/payment-currencies/${result.meter.currency_id}`);
-        result.paymentCurrency = paymentCurrency;
-      } catch (err) {
-        console.warn('Failed to fetch payment currency:', err);
-      }
-    }
-
-    return result;
-  } catch (error) {
-    console.error('Error fetching meter info:', error);
-    throw error;
-  }
-}
-
-/**
- * 获取meter的完整信息（包含所有关联数据）
- * @param meterId meter ID
- * @returns Promise<MeterInfo>
- */
-export function getMeterFullInfo(meterId: string): Promise<MeterInfo> {
-  return getMeterInfo({
-    meterId,
-    includePaymentCurrency: true,
-  });
-}
-
-/**
- * 根据事件名称获取meter信息
- * @param eventName 事件名称
- * @param includePaymentCurrency 是否包含支付货币信息
- * @returns Promise<MeterInfo>
- */
-export function getMeterByEventName(eventName: string, includePaymentCurrency = true): Promise<MeterInfo> {
-  return getMeterInfo({
-    eventName,
-    includePaymentCurrency,
-  });
-}
-
-/**
- * 获取meter事件的完整上下文信息
- * @param options 配置选项
- * @returns Promise<MeterInfo>
- */
-export function getMeterEventContext(options: {
-  meterId?: string;
-  eventName?: string;
-  customerId?: string;
-  subscriptionId?: string;
-}): Promise<MeterInfo> {
-  const { meterId, eventName, customerId, subscriptionId } = options;
-
-  return getMeterInfo({
-    meterId,
-    eventName,
-    customerId,
-    subscriptionId,
-    includeCustomer: !!customerId,
-    includePaymentCurrency: true,
-    includeSubscription: !!subscriptionId,
-  });
-}
-
-/**
- * 批量获取多个meter的信息
- * @param meterIds meter ID数组
- * @param includePaymentCurrency 是否包含支付货币信息
- * @returns Promise<MeterInfo[]>
- */
-export function getBatchMeterInfo(meterIds: string[], includePaymentCurrency = true): Promise<MeterInfo[]> {
-  const promises = meterIds.map((meterId) =>
-    getMeterInfo({
-      meterId,
-      includePaymentCurrency,
-    }).catch((error) => {
-      console.warn(`Failed to fetch meter ${meterId}:`, error);
-      return { meter: undefined };
-    })
-  );
-
-  return Promise.all(promises);
-}
-
-/**
- * 获取客户的meter使用情况
- * @param customerId 客户ID
- * @param meterId 可选的meter ID，如果不提供则获取所有meter
- * @returns Promise<MeterInfo[]>
- */
-export async function getCustomerMeterUsage(customerId: string, meterId?: string): Promise<MeterInfo[]> {
-  try {
-    // 获取客户的credit transactions来找到相关的meters
-    const params = new URLSearchParams();
-    params.append('customer_id', customerId);
-    if (meterId) {
-      params.append('meter_id', meterId);
-    }
-
-    const { data: transactions } = await api.get(`/api/credit-transactions?${params.toString()}`);
-
-    // 提取唯一的meter IDs
-    const uniqueMeterIds = [
-      ...new Set(
-        transactions.list
-          ?.map((t: any) => t.meter?.id)
-          .filter((id: any): id is string => Boolean(id) && typeof id === 'string')
-      ),
-    ] as string[];
-
-    if (uniqueMeterIds.length === 0) {
-      return [];
-    }
-
-    // 批量获取meter信息
-    return await getBatchMeterInfo(uniqueMeterIds);
-  } catch (error) {
-    console.error('Error fetching customer meter usage:', error);
-    return [];
-  }
-}