payment-kit 1.13.89 → 1.13.91

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

@@ -19,7 +19,7 @@ export async function handleSetupIntentEvent(event: TEventExpanded, _: Stripe) {
 
   if (event.type === 'setup_intent.succeeded') {
     if (subscription.status === 'incomplete') {
-      await subscription.update({ status: subscription.trail_end ? 'trialing' : 'active' });
+      await subscription.start();
       logger.info('subscription become active on stripe intent succeeded', subscription.id);
     }
 

package/api/src/libs/audit.ts

@@ -7,7 +7,7 @@ import { events } from './event';
 
 const API_VERSION = '2023-09-05';
 
-export async function createEvent(scope: string, type: LiteralUnion<EventType, string>, model: any, options: any) {
+export async function createEvent(scope: string, type: LiteralUnion<EventType, string>, model: any, options: any = {}) {
   // console.log('createEvent', scope, type, model, options);
   const data: any = {
     object: model.dataValues,
@@ -44,7 +44,7 @@ export async function createStatusEvent(
   prefix: string,
   config: Record<string, string>,
   model: any,
-  options: any
+  options: any = {}
 ) {
   // console.log('createStatusEvent', scope, prefix, config, model, options);
   if (options.fields.includes('status') === false) {

package/api/src/libs/session.ts

@@ -298,6 +298,7 @@ export function getFastCheckoutAmount(
   }
 
   const { total, renew } = getCheckoutAmount(items, currencyId, includeFreeTrial);
+
   if (mode === 'payment') {
     return total;
   }
@@ -307,7 +308,7 @@ export function getFastCheckoutAmount(
   }
 
   if (mode === 'subscription') {
-    return new BN(total).add(new BN(renew).mul(new BN(minimumCycle - 1))).toString();
+    return new BN(total).add(new BN(renew).mul(new BN(includeFreeTrial ? minimumCycle : minimumCycle - 1))).toString();
   }
 
   return '0';

package/api/src/queues/invoice.ts

@@ -58,7 +58,7 @@ export const handleInvoice = async (job: InvoiceJob) => {
     if (invoice.subscription_id) {
       const subscription = await Subscription.findByPk(invoice.subscription_id);
       if (subscription && subscription.status === 'incomplete') {
-        await subscription.update({ status: subscription.trail_end ? 'trialing' : 'active' });
+        await subscription.start();
         logger.info('invoice subscription updated', subscription.id);
       }
     }

package/api/src/queues/notification.ts

@@ -26,9 +26,8 @@ import {
   SubscriptionWillRenewEmailTemplate,
   SubscriptionWillRenewEmailTemplateOptions,
 } from '../libs/notification/template/subscription-will-renew';
-import type { SufficientForPaymentResult } from '../libs/payment';
 import createQueue from '../libs/queue';
-import type { EventType, Invoice, Subscription } from '../store/models';
+import { EventType, Invoice, Subscription } from '../store/models';
 
 export type NotificationQueueJobOptions = any;
 export type NotificationQueueJob = {
@@ -113,30 +112,30 @@ export async function startNotificationQueue() {
     }
   });
 
-  events.on('customer.subscription.renewed', (subscription: Subscription, invoice: Invoice) => {
+  events.on('customer.subscription.renewed', (subscription: Subscription) => {
     notificationQueue.push({
       job: {
         type: 'customer.subscription.renewed',
         options: {
           subscriptionId: subscription.id,
-          invoiceId: invoice?.id,
+          invoiceId: subscription.latest_invoice_id,
         } as SubscriptionRenewedEmailTemplateOptions,
       },
     });
   });
 
-  events.on(
-    'customer.subscription.renew_failed',
-    ({ invoice, result }: { invoice: Invoice; result: SufficientForPaymentResult }) => {
+  events.on('customer.subscription.renew_failed', async (subscription: Subscription) => {
+    const invoice = await Invoice.findByPk(subscription.latest_invoice_id);
+    if (invoice && subscription.metadata.renew_failed_reason) {
       notificationQueue.push({
         job: {
           type: 'customer.subscription.renew_failed',
           options: {
             invoice,
-            result,
+            result: subscription.metadata.renew_failed_reason,
           },
         },
       });
     }
-  );
+  });
 }

package/api/src/queues/payment.ts

@@ -1,4 +1,5 @@
 import { ensureStakedForGas } from '../integrations/blockchain/stake';
+import { createEvent } from '../libs/audit';
 import { wallet } from '../libs/auth';
 import dayjs from '../libs/dayjs';
 import CustomError from '../libs/error';
@@ -60,14 +61,7 @@ export const handlePaymentSucceed = async (paymentIntent: PaymentIntent, invoice
     const subscription = await Subscription.findByPk(invoice.subscription_id);
     if (subscription) {
       if (subscription.status === 'incomplete') {
-        await subscription.update({ status: subscription.trail_end ? 'trialing' : 'active' });
-
-        if (subscription.trail_end) {
-          events.emit('customer.subscription.trial_start', subscription);
-        } else {
-          events.emit('customer.subscription.started', subscription);
-        }
-
+        await subscription.start();
         logger.info(`Subscription ${subscription.id} updated on payment done ${invoice.id}`);
       } else if (subscription.status === 'past_due') {
         if (subscription.cancel_at_period_end && subscription.cancelation_details?.reason === 'payment_failed') {
@@ -82,7 +76,7 @@ export const handlePaymentSucceed = async (paymentIntent: PaymentIntent, invoice
     }
 
     if (invoice.billing_reason === 'subscription_cycle') {
-      events.emit('customer.subscription.renewed', subscription, invoice);
+      createEvent('Subscription', 'customer.subscription.renewed', subscription).catch(console.error);
     }
   }
 
@@ -412,10 +406,15 @@ export const handlePayment = async (job: PaymentJob) => {
 
       // 只有在重试次数超过阈值的时候才发送邮件，不然邮件频率太高了，初次邮件时首次失败 6 小时后
       if (attemptCount >= MIN_RETRY_MAIL && invoice.billing_reason === 'subscription_cycle') {
-        events.emit('customer.subscription.renew_failed', {
-          invoice,
-          result: result || { sufficient: false, reason: 'TX_SEND_FAILED' },
-        });
+        const subscription = await Subscription.findByPk(invoice.subscription_id);
+        if (subscription) {
+          await subscription.update({
+            metadata: Object.assign(subscription.metadata, {
+              renew_failed_reason: result || { sufficient: false, reason: 'TX_SEND_FAILED' },
+            }),
+          });
+          createEvent('Subscription', 'customer.subscription.renew_failed', subscription);
+        }
       }
 
       const updates = await handlePaymentFailed(paymentIntent, invoice, error);

package/api/src/routes/connect/collect.ts

@@ -1,9 +1,9 @@
 import type { Transaction, TransferV3Tx } from '@ocap/client';
 import { fromAddress } from '@ocap/wallet';
 
+import { createEvent } from '../../libs/audit';
 import type { CallbackArgs } from '../../libs/auth';
 import { wallet } from '../../libs/auth';
-import { events } from '../../libs/event';
 import { getGasPayerExtra } from '../../libs/payment';
 import { getTxMetadata } from '../../libs/util';
 import { invoiceQueue } from '../../queues/invoice';
@@ -101,7 +101,11 @@ export default {
       }
 
       if (invoice.subscription_id) {
-        events.emit('customer.subscription.renewed', await Subscription.findByPk(invoice.subscription_id), invoice);
+        createEvent(
+          'Subscription',
+          'customer.subscription.renewed',
+          await Subscription.findByPk(invoice.subscription_id)
+        );
       }
 
       return { hash: txHash };

package/api/src/routes/customers.ts

@@ -24,10 +24,12 @@ const authPortal = authenticate<Customer>({
 const schema = Joi.object<{
   page: number;
   pageSize: number;
+  did?: string;
   livemode?: boolean;
 }>({
   page: Joi.number().integer().min(1).default(1),
   pageSize: Joi.number().integer().min(1).max(100).default(20),
+  did: Joi.string().empty(''),
   livemode: Joi.boolean().empty(''),
 });
 router.get('/', auth, async (req, res) => {
@@ -37,6 +39,9 @@ router.get('/', auth, async (req, res) => {
   if (typeof query.livemode === 'boolean') {
     where.livemode = query.livemode;
   }
+  if (query.did) {
+    where.did = query.did;
+  }
 
   try {
     const { rows: list, count } = await Customer.findAndCountAll({

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

@@ -4,6 +4,7 @@ import { CreationOptional, DataTypes, InferAttributes, InferCreationAttributes,
 import type { LiteralUnion } from 'type-fest';
 
 import { createCustomEvent, createEvent, createStatusEvent } from '../../libs/audit';
+import logger from '../../libs/logger';
 import { createIdGenerator } from '../../libs/util';
 import { Invoice } from './invoice';
 import type { PaymentDetails, PaymentSettings, PriceRecurring } from './types';
@@ -358,6 +359,26 @@ export class Subscription extends Model<InferAttributes<Subscription>, InferCrea
   public isActive() {
     return ['active', 'trialing'].includes(this.status);
   }
+
+  public async start() {
+    if (this.isActive()) {
+      logger.warn(`subscription already started: ${this.id}`);
+      return;
+    }
+
+    if (this.isImmutable()) {
+      logger.warn(`subscription is immutable: ${this.id}`);
+      return;
+    }
+
+    if (this.trail_end) {
+      await this.update({ status: 'trialing' });
+      createEvent('Subscription', 'customer.subscription.trial_start', this).catch(console.error);
+    } else {
+      await this.update({ status: 'active' });
+      createEvent('Subscription', 'customer.subscription.started', this).catch(console.error);
+    }
+  }
 }
 
 export type TSubscription = InferAttributes<Subscription>;

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

@@ -9,9 +9,6 @@ export type Pagination<T = any> = T & {
   // TODO: cursor based
   starting_after?: string;
   ending_before?: string;
-
-  // extra
-  [key: string]: any;
 };
 
 export type Searchable<T = any> = Pagination<T> & {

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.89",
+  "version": "1.13.91",
   "scripts": {
     "dev": "COMPONENT_STORE_URL=https://test.store.blocklet.dev blocklet dev",
     "eject": "vite eject",
@@ -110,7 +110,7 @@
     "@abtnode/types": "1.16.21",
     "@arcblock/eslint-config": "^0.2.4",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@did-pay/types": "1.13.89",
+    "@did-pay/types": "1.13.91",
     "@types/cookie-parser": "^1.4.6",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -149,5 +149,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "309312b8ffce48cd121af0a5b75494a1ae5dada0"
+  "gitHead": "970a705a07b5b34cb04f54c5e76797c96c500d81"
 }