payment-kit 1.24.3 → 1.24.4

package/api/src/crons/overdue-detection.ts

@@ -126,13 +126,22 @@ export class HealthReportTemplate implements BaseEmailTemplate<HealthReportConte
 
     // Preload all Meter configurations to reduce database queries
     const eventNames = [...new Set(events.map((e) => e.event_name))];
-    const meters = await Meter.findAll({ where: { event_name: eventNames } });
+    const meters = await Meter.findAll({
+      where: {
+        event_name: eventNames,
+        status: 'active',
+      },
+    });
     const meterMap = new Map(meters.map((m) => [m.event_name, m]));
 
     for (const event of events) {
       const customerId = event.getCustomerId();
       if (customerId) {
         const meter = meterMap.get(event.event_name);
+        if (!meter) {
+          // eslint-disable-next-line no-continue
+          continue;
+        }
         const currencyId = meter?.currency_id;
         if (currencyId) {
           if (!userAggregates.has(customerId)) {

package/api/src/queues/notification.ts

@@ -1,4 +1,5 @@
 import { Op } from 'sequelize';
+import debounce from 'lodash/debounce';
 /* eslint-disable @typescript-eslint/indent */
 import { events } from '../libs/event';
 import logger from '../libs/logger';
@@ -337,6 +338,8 @@ interface NotificationItem<T = Record<string, any>> {
 
 // 内存缓存，记录最近发送的通知
 const notificationCache = new Map<string, number>();
+// 去抖函数（按 key 去重）
+const debounceHandlers = new Map<string, ReturnType<typeof debounce>>();
 
 // 清理过期缓存的定时器
 setInterval(
@@ -741,8 +744,26 @@ export async function startNotificationQueue() {
   // Clear credit notification cache when customer recharges
   // This allows customer to receive insufficient/low_balance notifications again
   events.on('customer.credit_grant.granted', (creditGrant: CreditGrant) => {
-    clearNotificationCache(`customer.credit.insufficient.${creditGrant.customer_id}.${creditGrant.currency_id}`);
-    clearNotificationCache(`customer.credit.low_balance.${creditGrant.customer_id}.${creditGrant.currency_id}`);
+    const cacheKeyBase = `${creditGrant.customer_id}.${creditGrant.currency_id}`;
+    const debounceKey = `credit_grant_clear.${cacheKeyBase}`;
+    const delayMs = 5 * 60 * 1000;
+
+    let handler = debounceHandlers.get(debounceKey);
+    if (!handler) {
+      handler = debounce(() => {
+        clearNotificationCache(`customer.credit.insufficient.${cacheKeyBase}`);
+        clearNotificationCache(`customer.credit.low_balance.${cacheKeyBase}`);
+        debounceHandlers.delete(debounceKey);
+        logger.info('Notification cache cleared after delay', {
+          customerId: creditGrant.customer_id,
+          currencyId: creditGrant.currency_id,
+          delayMs,
+        });
+      }, delayMs);
+      debounceHandlers.set(debounceKey, handler);
+    }
+
+    handler();
   });
 }
 

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

@@ -372,6 +372,7 @@ router.get('/overdue-summary', auth, async (req, res) => {
       JOIN meters m ON me.event_name = m.event_name
       WHERE me.livemode = :livemode 
         AND me.status IN ('requires_capture', 'requires_action')
+        AND m.status = 'active'
       GROUP BY m.currency_id
       HAVING total_pending > 0
       ORDER BY total_pending DESC`,
@@ -465,6 +466,7 @@ router.get('/overdue-customers', auth, async (req, res) => {
       JOIN meters m ON me.event_name = m.event_name
       WHERE me.livemode = :livemode 
         AND me.status IN ('requires_capture', 'requires_action')
+        AND m.status = 'active'
         ${currencyFilter}
         ${customerFilter}
       GROUP BY json_extract(me.payload, '$.customer_id'), m.currency_id
@@ -485,6 +487,7 @@ router.get('/overdue-customers', auth, async (req, res) => {
         JOIN meters m ON me.event_name = m.event_name
         WHERE me.livemode = :livemode 
           AND me.status IN ('requires_capture', 'requires_action')
+          AND m.status = 'active'
           ${currencyFilter}
           ${customerFilter}
         GROUP BY json_extract(me.payload, '$.customer_id'), m.currency_id

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.24.3",
+  "version": "1.24.4",
   "scripts": {
     "dev": "blocklet dev --open",
     "prelint": "npm run types",
@@ -59,9 +59,9 @@
     "@blocklet/error": "^0.3.5",
     "@blocklet/js-sdk": "^1.17.8-beta-20260104-120132-cb5b1914",
     "@blocklet/logger": "^1.17.8-beta-20260104-120132-cb5b1914",
-    "@blocklet/payment-broker-client": "1.24.3",
-    "@blocklet/payment-react": "1.24.3",
-    "@blocklet/payment-vendor": "1.24.3",
+    "@blocklet/payment-broker-client": "1.24.4",
+    "@blocklet/payment-react": "1.24.4",
+    "@blocklet/payment-vendor": "1.24.4",
     "@blocklet/sdk": "^1.17.8-beta-20260104-120132-cb5b1914",
     "@blocklet/ui-react": "^3.4.7",
     "@blocklet/uploader": "^0.3.19",
@@ -131,7 +131,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.17.8-beta-20260104-120132-cb5b1914",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.24.3",
+    "@blocklet/payment-types": "1.24.4",
     "@types/cookie-parser": "^1.4.9",
     "@types/cors": "^2.8.19",
     "@types/debug": "^4.1.12",
@@ -178,5 +178,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "6f2a963875ed4aced1db11f1c3a044c7f5deedd6"
+  "gitHead": "d4a5f67e657cafa8862912bb8de38a3d56a7919d"
 }