payment-kit 1.13.80 → 1.13.81

package/api/src/crons/index.ts

@@ -1,4 +1,3 @@
-// @ts-nocheck
 import Cron from '@abtnode/cron';
 
 import { notificationCronTime } from '../libs/env';
@@ -6,23 +5,29 @@ import logger from '../libs/logger';
 import { SubscriptionTrailWillEndSchedule } from './subscription-trail-will-end';
 import { SubscriptionWillRenewSchedule } from './subscription-will-renew';
 
-Cron.init({
-  context: {},
-  jobs: [
-    {
-      name: 'subscription.will.renew',
-      time: notificationCronTime,
-      fn: () => new SubscriptionWillRenewSchedule().run(),
-      options: { runOnInit: true },
+function init() {
+  Cron.init({
+    context: {},
+    jobs: [
+      {
+        name: 'subscription.will.renew',
+        time: notificationCronTime,
+        fn: () => new SubscriptionWillRenewSchedule().run(),
+        options: { runOnInit: true },
+      },
+      {
+        name: 'subscription.trial.will.end',
+        time: notificationCronTime,
+        fn: () => new SubscriptionTrailWillEndSchedule().run(),
+        options: { runOnInit: true },
+      },
+    ],
+    onError: (error: Error, name: string) => {
+      logger.error('run job failed', { name, error: error.message, stack: error.stack });
     },
-    {
-      name: 'subscription.trial.will.end',
-      time: notificationCronTime,
-      fn: () => new SubscriptionTrailWillEndSchedule().run(),
-      options: { runOnInit: true },
-    },
-  ],
-  onError: (error: Error, name: string) => {
-    logger.error('run job failed', { name, error: error.message, stack: error.stack });
-  },
-});
+  });
+}
+
+export default {
+  init,
+};

package/api/src/index.ts

@@ -1,7 +1,5 @@
 import 'express-async-errors';
 
-import './crons';
-
 import path from 'path';
 
 import fallback from '@blocklet/sdk/lib/middlewares/fallback';
@@ -11,6 +9,7 @@ import dotenv from 'dotenv-flow';
 import express, { ErrorRequestHandler, Request, Response } from 'express';
 import morgan from 'morgan';
 
+import crons from './crons/index';
 import { ensureStakedForGas } from './integrations/blockchain/stake';
 import { ensureWebhookRegistered } from './integrations/stripe/setup';
 import { handlers } from './libs/auth';
@@ -111,4 +110,6 @@ export const server = app.listen(port, (err?: any) => {
   }
 
   ensureStakedForGas().catch(console.error);
+
+  crons.init();
 });

package/api/src/integrations/stripe/handlers/payment-intent.ts

@@ -78,6 +78,7 @@ export async function handleStripePaymentCreated(event: TEventExpanded, client:
       amount_received: String(stripeIntent.amount_received),
       amount_capturable: String(stripeIntent.amount_capturable),
       amount_details: stripeIntent.amount_details,
+      setup_future_usage: stripeIntent.setup_future_usage || 'on_session',
 
       ...pick(stripeIntent, [
         'livemode',
@@ -88,7 +89,6 @@ export async function handleStripePaymentCreated(event: TEventExpanded, client:
         'receipt_email',
         'statement_descriptor',
         'statement_descriptor_suffix',
-        'setup_future_usage',
         'last_payment_error',
       ]),
 

package/api/src/queues/event.ts

@@ -37,17 +37,28 @@ export const handleEvent = async (job: EventJob) => {
 
   await event.update({ pending_webhooks: eventWebhooks.length });
   eventWebhooks.forEach(async (webhook) => {
-    const attempted = await WebhookAttempt.findOne({
-      where: { event_id: event.id, webhook_endpoint_id: webhook.id },
+    const attemptCount = await WebhookAttempt.count({
+      where: {
+        event_id: event.id,
+        webhook_endpoint_id: webhook.id,
+        response_status: {
+          [Op.gte]: 200,
+          [Op.lt]: 300,
+        },
+      },
     });
 
-    // we should only push webhook if it's not attempted before
-    if (!attempted) {
-      logger.info('schedule initial attempt for event', job);
-      webhookQueue.push({
-        id: getWebhookJobId(event.id, webhook.id),
-        job: { eventId: event.id, webhookId: webhook.id },
-      });
+    // we should only push webhook if it's not successfully attempted before
+    if (attemptCount === 0) {
+      const jobId = getWebhookJobId(event.id, webhook.id);
+      const exist = await webhookQueue.get(jobId);
+      if (!exist) {
+        logger.info('schedule attempt for event', job);
+        webhookQueue.push({
+          id: jobId,
+          job: { eventId: event.id, webhookId: webhook.id },
+        });
+      }
     }
   });
 };

package/api/src/store/models/payment-intent.ts

@@ -77,7 +77,7 @@ export class PaymentIntent extends Model<InferAttributes<PaymentIntent>, InferCr
   // 3rd party payment tx hash
   declare payment_details?: PaymentDetails;
 
-  declare setup_future_usage: LiteralUnion<'off_session' | 'on_session', string>;
+  declare setup_future_usage?: LiteralUnion<'off_session' | 'on_session', string>;
 
   // TODO: following fields not supported yet
   // automatic_payment_methods
@@ -216,7 +216,7 @@ export class PaymentIntent extends Model<InferAttributes<PaymentIntent>, InferCr
     },
     setup_future_usage: {
       type: DataTypes.ENUM('on_session', 'off_session'),
-      allowNull: false,
+      allowNull: true,
     },
     created_at: {
       type: DataTypes.DATE,

package/api/third.d.ts

@@ -10,6 +10,8 @@ declare module 'morgan';
 
 declare module 'flat';
 
+declare module '@abtnode/cron';
+
 declare module 'cls-hooked';
 
 namespace Express {

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.80",
+  "version": "1.13.81",
   "scripts": {
     "dev": "COMPONENT_STORE_URL=https://test.store.blocklet.dev blocklet dev",
     "eject": "vite eject",
@@ -109,7 +109,7 @@
     "@abtnode/types": "^1.16.20",
     "@arcblock/eslint-config": "^0.2.4",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@did-pay/types": "1.13.80",
+    "@did-pay/types": "1.13.81",
     "@types/cookie-parser": "^1.4.6",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -148,5 +148,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "7ffaad28cb871681cac2b7472307380bee4b0c39"
+  "gitHead": "ccdd4c815330b40a748619132db7bb3332850749"
 }

package/src/components/webhook/attempts.tsx

@@ -19,7 +19,7 @@ import { useInfiniteScroll } from 'ahooks';
 import React, { useEffect, useState } from 'react';
 
 import api from '../../libs/api';
-import { formatTime } from '../../libs/util';
+import { formatTime, isSuccessAttempt } from '../../libs/util';
 
 const fetchData = (params: Record<string, any> = {}): Promise<Paginated<TWebhookAttemptExpanded>> => {
   const search = new URLSearchParams();
@@ -104,7 +104,7 @@ export default function WebhookAttempts({ event_id, webhook_endpoint_id, event }
                     <Typography color="text.secondary">{formatTime(attempt.created_at, 'HH:mm:ss A')}</Typography>
                   }>
                   <ListItemIcon>
-                    {attempt.response_status > 200 ? (
+                    {isSuccessAttempt(attempt.response_status) === false ? (
                       <ErrorOutlined color="error" />
                     ) : (
                       <CheckCircleOutlined color="success" />

package/src/libs/util.ts

@@ -730,3 +730,7 @@ export function sleep(ms: number) {
     setTimeout(resolve, ms);
   });
 }
+
+export function isSuccessAttempt(code: number) {
+  return code >= 200 && code < 300;
+}