payment-kit 1.16.16 → 1.16.18

package/api/src/crons/index.ts

@@ -97,7 +97,7 @@ function init() {
         name: 'metering.subscription.detection',
         time: meteringSubscriptionDetectionCronTime,
         fn: () => createMeteringSubscriptionDetection(),
-        options: { runOnInit: true },
+        options: { runOnInit: false },
       },
     ],
     onError: (error: Error, name: string) => {

package/api/src/hooks/pre-start.ts

@@ -7,6 +7,7 @@ import { initPaywallResources } from '../libs/resource';
 import { initialize } from '../store/models';
 import { sequelize } from '../store/sequelize';
 import { syncCurrencyLogo } from '../crons/currency';
+import { ensureCreateOverdraftProtectionPrices } from '../libs/overdraft-protection';
 
 dotenv.config({ silent: true });
 
@@ -16,6 +17,7 @@ dotenv.config({ silent: true });
     await initPaywallResources();
     await ensurePaymentStats();
     await syncCurrencyLogo();
+    await ensureCreateOverdraftProtectionPrices();
     process.exit(0);
   } catch (err) {
     console.error('pre-start error', err);

package/api/src/index.ts

@@ -38,6 +38,7 @@ import payHandlers from './routes/connect/pay';
 import setupHandlers from './routes/connect/setup';
 import subscribeHandlers from './routes/connect/subscribe';
 import delegationHandlers from './routes/connect/delegation';
+import overdraftProtectionHandlers from './routes/connect/overdraft-protection';
 import { initialize } from './store/models';
 import { sequelize } from './store/sequelize';
 import { initUserHandler } from './integrations/blocklet/user';
@@ -73,6 +74,7 @@ handlers.attach(Object.assign({ app: router }, changePaymentHandlers));
 handlers.attach(Object.assign({ app: router }, changePlanHandlers));
 handlers.attach(Object.assign({ app: router }, rechargeHandlers));
 handlers.attach(Object.assign({ app: router }, delegationHandlers));
+handlers.attach(Object.assign({ app: router }, overdraftProtectionHandlers));
 router.use('/api', routes);
 
 const isProduction = process.env.BLOCKLET_MODE === 'production';

package/api/src/integrations/arcblock/stake.ts

@@ -7,6 +7,7 @@ import { toStakeAddress } from '@arcblock/did-util';
 import env from '@blocklet/sdk/lib/env';
 import { BN, fromUnitToToken, toBN } from '@ocap/util';
 
+import { Op } from 'sequelize';
 import { wallet } from '../../libs/auth';
 import { events } from '../../libs/event';
 import logger from '../../libs/logger';
@@ -147,7 +148,12 @@ export async function checkStakeRevokeTx() {
 
         // Check related subscriptions in the stake
         const subscriptions = await Subscription.findAll({
-          where: { 'payment_details.arcblock.staking.address': address },
+          where: {
+            [Op.or]: [
+              { 'payment_details.arcblock.staking.address': address },
+              { 'overdraft_protection.payment_details.arcblock.staking.address': address },
+            ],
+          },
         });
         if (subscriptions.length === 0) {
           return;

package/api/src/integrations/stripe/resource.ts

@@ -400,7 +400,7 @@ export async function batchHandleStripeSubscriptions() {
 
   const subscriptions = await Subscription.findAll({
     where: {
-      status: { [Op.not]: ['canceled', 'incomplete', 'incomplete_expired'] },
+      status: { [Op.notIn]: ['canceled', 'incomplete', 'incomplete_expired'] },
       'payment_details.stripe.subscription_id': { [Op.not]: null },
     },
   });

package/api/src/libs/env.ts

@@ -1,4 +1,5 @@
 import env from '@blocklet/sdk/lib/env';
+import { env as configEnv } from '@blocklet/sdk/lib/config';
 
 export const paymentStatCronTime: string = '0 1 0 * * *'; // 默认每天一次，计算前一天的
 export const subscriptionCronTime: string = process.env.SUBSCRIPTION_CRON_TIME || '0 */30 * * * *'; // 默认每 30 min 行一次
@@ -12,7 +13,18 @@ export const revokeStakeCronTime: string = process.env.REVOKE_STAKE_CRON_TIME ||
 export const daysUntilCancel: string | undefined = process.env.DAYS_UNTIL_CANCEL;
 export const meteringSubscriptionDetectionCronTime: string =
   process.env.METERING_SUBSCRIPTION_DETECTION_CRON_TIME || '0 0 10 * * *'; // 默认每天 10:00 执行
+export const overdraftProtectionMaxCount: number = Number(configEnv?.preferences?.overdraftProtectionMaxCount || 10); // 透支保护次数上限
 
+// sequelize 配置相关
+export const sequelizeOptionsPoolMin: number = process.env.SEQUELIZE_OPTIONS_POOL_MIN
+  ? +process.env.SEQUELIZE_OPTIONS_POOL_MIN
+  : 0;
+export const sequelizeOptionsPoolMax: number = process.env.SEQUELIZE_OPTIONS_POOL_MAX
+  ? +process.env.SEQUELIZE_OPTIONS_POOL_MAX
+  : 5;
+export const sequelizeOptionsPoolIdle: number = process.env.SEQUELIZE_OPTIONS_POOL_IDLE
+  ? +process.env.SEQUELIZE_OPTIONS_POOL_IDLE
+  : 10 * 1000;
 export default {
   ...env,
 };

package/api/src/libs/event.ts

@@ -10,3 +10,11 @@ interface MyEventType extends EventEmitter {
 }
 
 export const events = new EventEmitter() as MyEventType;
+
+export const emitAsync = (event: string, ...args: any[]) => {
+  return new Promise((resolve, reject) => {
+    events.emit(event, ...args);
+    events.once(`${event}.done`, resolve);
+    events.once(`${event}.error`, reject);
+  });
+};