payment-kit 1.13.166 → 1.13.167

package/api/src/integrations/stripe/handlers/invoice.ts

@@ -43,7 +43,7 @@ export async function syncStripeInvoice(invoice: Invoice) {
   }
 
   const method = await PaymentMethod.findByPk(invoice.default_payment_method_id);
-  if (!method) {
+  if (!method || method.type !== 'stripe') {
     return;
   }
 
@@ -216,6 +216,10 @@ export async function handleStripeInvoiceCreated(event: TEventExpanded, client:
     logger.warn('abort because local subscription not exist', { id: event.id, type: event.type });
     return null;
   }
+  const method = await PaymentMethod.findByPk(subscription.default_payment_method_id);
+  if (!method || method.type !== 'stripe') {
+    return null;
+  }
 
   logger.info('valid event for subscription detected', {
     id: event.id,
@@ -262,8 +266,8 @@ export async function handleInvoiceEvent(event: TEventExpanded, client: Stripe)
       if (subscription) {
         const method = await PaymentMethod.findByPk(subscription.default_payment_method_id);
         if (method && method.type === 'stripe') {
-          const tmp = await ensureStripeInvoice(event.data.object, subscription, method.getStripeClient());
-          localInvoiceId = tmp.id;
+          const invoice = await ensureStripeInvoice(event.data.object, subscription, method.getStripeClient());
+          localInvoiceId = invoice.id;
         }
       }
     } else {

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

@@ -31,7 +31,7 @@ export async function syncStripPayment(paymentIntent: PaymentIntent) {
   }
 
   const method = await PaymentMethod.findByPk(paymentIntent.payment_method_id);
-  if (!method) {
+  if (!method || method.type !== 'stripe') {
     return;
   }
 

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

@@ -232,6 +232,7 @@ export async function ensureStripeSubscription(
       customer: customer.id,
       items: recurringItems,
       add_invoice_items: onetimeItems,
+      collection_method: 'charge_automatically',
       payment_behavior: 'default_incomplete',
       payment_settings: { save_default_payment_method: 'on_subscription' },
       metadata: {

package/api/src/queues/invoice.ts

@@ -186,6 +186,49 @@ export const startInvoiceQueue = async () => {
       invoiceQueue.push({ id: x.id, job: { invoiceId: x.id, retryOnError: true } });
     }
   });
+
+  // handle stripe invoice
+  const stripeMethods = await PaymentMethod.findAll({ where: { type: 'stripe' } });
+  const stripeInvoices = await Invoice.findAll({
+    where: {
+      status: ['draft', 'open'],
+      'metadata.stripe_id': { [Op.not]: null },
+    },
+  });
+  stripeInvoices.forEach(async (x) => {
+    const stripeInvoiceId = x.metadata?.stripe_id;
+    if (!stripeInvoiceId) {
+      return;
+    }
+
+    const method = stripeMethods.find((m) => m.livemode === x.livemode);
+    if (!method) {
+      return;
+    }
+
+    try {
+      const client = method.getStripeClient();
+      const exist = await client.invoices.retrieve(stripeInvoiceId);
+      if (exist) {
+        if (exist.status === 'draft') {
+          await client.invoices.finalizeInvoice(stripeInvoiceId);
+          logger.info('stripe invoice finalized', { local: x.id, stripe: stripeInvoiceId });
+        }
+        await client.invoices.pay(stripeInvoiceId);
+        logger.info('stripe invoice payment requested', { local: x.id, stripe: stripeInvoiceId });
+      } else {
+        await Invoice.destroy({ where: { id: x.id } });
+        logger.warn('stripe invoice purged', { local: x.id, stripe: stripeInvoiceId });
+      }
+    } catch (error) {
+      if (error.message.includes('No such invoice')) {
+        await Invoice.destroy({ where: { id: x.id } });
+        logger.warn('stripe invoice purged', { local: x.id, stripe: stripeInvoiceId });
+      } else {
+        logger.error('stripe invoice finalize error', error);
+      }
+    }
+  });
 };
 
 invoiceQueue.on('failed', ({ id, job, error }) => {

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.166",
+  "version": "1.13.167",
   "scripts": {
     "dev": "cross-env COMPONENT_STORE_URL=https://test.store.blocklet.dev blocklet dev --open",
     "eject": "vite eject",
@@ -50,7 +50,7 @@
     "@arcblock/jwt": "^1.18.110",
     "@arcblock/ux": "^2.9.39",
     "@blocklet/logger": "1.16.23",
-    "@blocklet/payment-react": "1.13.166",
+    "@blocklet/payment-react": "1.13.167",
     "@blocklet/sdk": "1.16.23",
     "@blocklet/ui-react": "^2.9.39",
     "@blocklet/uploader": "^0.0.74",
@@ -110,7 +110,7 @@
   "devDependencies": {
     "@abtnode/types": "1.16.23",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@blocklet/payment-types": "1.13.166",
+    "@blocklet/payment-types": "1.13.167",
     "@types/cookie-parser": "^1.4.6",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -149,5 +149,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "70ee269e307cbab0ecb58fb4f287b749df0f2277"
+  "gitHead": "3c91569392e38ac71d4d04d72bbb468fd144ace4"
 }