payment-kit 1.16.2 → 1.16.4

package/api/src/crons/index.ts

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

package/api/src/crons/metering-subscription-detection.ts

@@ -124,10 +124,10 @@ export class MeteringSubscriptionDetectionTemplate implements BaseEmailTemplate<
         }
       })
     );
-    const meteringInvoiceIds = meteringInvoices.map((invoice) => invoice.id);
-    const meteringSubscriptionIds = meteringInvoices
-      .map((invoice) => invoice?.subscription_id)
-      .filter(Boolean) as string[];
+    const meteringInvoiceIds = Array.from(new Set(meteringInvoices.map((invoice) => invoice.id)));
+    const meteringSubscriptionIds = Array.from(
+      new Set(meteringInvoices.map((invoice) => invoice?.subscription_id).filter(Boolean) as string[])
+    );
 
     const abnormalSubscriptions = await this.getAbnormalSubscriptions(meteringInvoiceIds, meteringSubscriptionIds);
     const userDid = await getOwnerDid();
@@ -141,7 +141,7 @@ export class MeteringSubscriptionDetectionTemplate implements BaseEmailTemplate<
       locale,
       userDid,
       summary: {
-        totalCount: meteringInvoices.length,
+        totalCount: meteringSubscriptionIds.length,
         normalCount: Math.max(0, meteringSubscriptionIds.length - abnormalSubscriptions.subscriptions.length),
         unreportedCount: abnormalSubscriptions.unreported.length,
         discrepantCount: abnormalSubscriptions.discrepant.length,

package/api/src/libs/util.ts

@@ -319,6 +319,26 @@ export async function getOwnerDid() {
   }
 }
 
+export async function getDidListByRole(role: string | string[]) {
+  try {
+    if (Array.isArray(role)) {
+      const didSet = new Set<string>();
+      await Promise.all(
+        role.map(async (r: string) => {
+          const { users } = await blocklet.getUsers({ query: { role: r } });
+          users.forEach((u) => didSet.add(u.did));
+        })
+      );
+      return Array.from(didSet);
+    }
+    const { users } = await blocklet.getUsers({ query: { role } });
+    return users.map((x: any) => x?.did);
+  } catch (error) {
+    logger.error('getDidListByRole error', error);
+    return null;
+  }
+}
+
 export function getSubscriptionNotificationCustomActions(
   subscription: Subscription,
   eventType: string,

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

@@ -2,8 +2,11 @@
 import type { Transaction } from '@ocap/client';
 import { fromAddress } from '@ocap/wallet';
 
+import { toBase58 } from '@ocap/util';
+import { encodeTransferItx } from 'api/src/integrations/ethereum/token';
+import { waitForEvmTxConfirm, waitForEvmTxReceipt } from 'api/src/integrations/ethereum/tx';
 import type { CallbackArgs } from '../../libs/auth';
-import { wallet } from '../../libs/auth';
+import { ethWallet, wallet } from '../../libs/auth';
 import { getGasPayerExtra } from '../../libs/payment';
 import { getTxMetadata } from '../../libs/util';
 import { invoiceQueue } from '../../queues/invoice';
@@ -59,30 +62,30 @@ export default {
       return claims;
     }
 
+    if (paymentMethod.type === 'ethereum') {
+      return {
+        signature: {
+          type: 'eth:transaction',
+          data: toBase58(
+            Buffer.from(
+              JSON.stringify({
+                network: paymentMethod.settings?.ethereum?.chain_id,
+                tx: encodeTransferItx(ethWallet.address, amount!, paymentCurrency.contract),
+              }),
+              'utf-8'
+            )
+          ),
+        },
+      };
+    }
+
     throw new Error(`Payment method ${paymentMethod.type} not supported`);
   },
   onAuth: async ({ request, userDid, claims, extraParams }: CallbackArgs) => {
     const { subscriptionId, currencyId } = extraParams;
     const { invoices, paymentMethod } = await ensureSubscriptionForCollectBatch(subscriptionId, currencyId);
 
-    if (paymentMethod.type === 'arcblock') {
-      const client = paymentMethod.getOcapClient();
-      const claim = claims.find((x) => x.type === 'prepareTx');
-
-      const tx: Partial<Transaction> = client.decodeTx(claim.finalTx);
-      if (claim.delegator && claim.from) {
-        tx.delegator = claim.delegator;
-        tx.from = claim.from;
-      }
-
-      // @ts-ignore
-      const { buffer } = await client.encodeTransferV3Tx({ tx });
-      const txHash = await client.sendTransferV3Tx(
-        // @ts-ignore
-        { tx, wallet: fromAddress(userDid) },
-        getGasPayerExtra(buffer, client.pickGasPayerHeaders(request))
-      );
-
+    const afterTxExecution = async (paymentDetails: any) => {
       const paymentIntents = await PaymentIntent.findAll({
         where: {
           invoice_id: invoices,
@@ -95,11 +98,7 @@ export default {
           capture_method: 'manual',
           last_payment_error: null,
           payment_details: {
-            arcblock: {
-              tx_hash: txHash,
-              payer: userDid,
-              type: 'transfer',
-            },
+            [paymentMethod.type]: paymentDetails,
           },
         });
 
@@ -117,10 +116,52 @@ export default {
           }
         }
       }
+    };
+
+    if (paymentMethod.type === 'arcblock') {
+      const client = paymentMethod.getOcapClient();
+      const claim = claims.find((x) => x.type === 'prepareTx');
+
+      const tx: Partial<Transaction> = client.decodeTx(claim.finalTx);
+      if (claim.delegator && claim.from) {
+        tx.delegator = claim.delegator;
+        tx.from = claim.from;
+      }
+
+      // @ts-ignore
+      const { buffer } = await client.encodeTransferV3Tx({ tx });
+      const txHash = await client.sendTransferV3Tx(
+        // @ts-ignore
+        { tx, wallet: fromAddress(userDid) },
+        getGasPayerExtra(buffer, client.pickGasPayerHeaders(request))
+      );
+      await afterTxExecution({ tx_hash: txHash, payer: userDid, type: 'transfer' });
 
       return { hash: txHash };
     }
+    if (paymentMethod.type === 'ethereum') {
+      const client = paymentMethod.getEvmClient();
+      const claim = claims.find((x) => x.type === 'signature');
 
+      const receipt = await waitForEvmTxReceipt(client, claim.hash);
+      if (!receipt.status) {
+        throw new Error(`EVM Transaction failed: ${claim.hash}`);
+      }
+
+      waitForEvmTxConfirm(client, Number(receipt.blockNumber), paymentMethod.confirmation.block)
+        .then(async () => {
+          await afterTxExecution({
+            tx_hash: claim.hash,
+            block_height: receipt.blockNumber.toString(),
+            gas_used: receipt.gasUsed.toString(),
+            gas_price: receipt.gasPrice.toString(),
+            payer: userDid,
+            type: 'transfer',
+          });
+        })
+        .catch(console.error);
+      return { hash: claim.hash };
+    }
     throw new Error(`Payment method ${paymentMethod.type} not supported`);
   },
 };

package/api/src/routes/subscriptions.ts

@@ -6,7 +6,8 @@ import isObject from 'lodash/isObject';
 import pick from 'lodash/pick';
 import uniq from 'lodash/uniq';
 
-import { literal, OrderItem } from 'sequelize';
+import { literal, Op, OrderItem } from 'sequelize';
+import { BN } from '@ocap/util';
 import { createEvent } from '../libs/audit';
 import {
   ensureStripeCustomer,
@@ -1858,4 +1859,60 @@ router.get('/:id/recharge', authMine, async (req, res) => {
     return res.status(400).json({ error: err.message });
   }
 });
+
+router.get('/:id/overdue/invoices', authPortal, async (req, res) => {
+  try {
+    const subscription = await Subscription.findByPk(req.params.id, {
+      include: [{ model: Customer, as: 'customer' }],
+    });
+    if (!subscription) {
+      return res.status(404).json({ error: 'Subscription not found' });
+    }
+    // @ts-ignore
+    if (subscription.customer?.did !== req.user?.did) {
+      return res.status(403).json({ error: 'You are not allowed to access this subscription' });
+    }
+    const { rows: invoices, count } = await Invoice.findAndCountAll({
+      where: {
+        subscription_id: subscription.id,
+        status: ['uncollectible'],
+        amount_remaining: { [Op.gt]: '0' },
+      },
+      include: [
+        { model: PaymentCurrency, as: 'paymentCurrency' },
+        { model: PaymentMethod, as: 'paymentMethod' },
+      ],
+    });
+    if (count === 0) {
+      return res.json({ subscription, invoices: [], summary: null });
+    }
+    const summary: Record<string, { amount: string; currency: PaymentCurrency; method: PaymentMethod }> = {};
+    invoices.forEach((invoice) => {
+      const key = invoice.currency_id;
+      if (!summary[key]) {
+        summary[key] = {
+          amount: '0',
+          // @ts-ignore
+          currency: invoice.paymentCurrency,
+          // @ts-ignore
+          method: invoice.paymentMethod,
+        };
+      }
+      if (invoice && summary[key]) {
+        // @ts-ignore
+        summary[key].amount = new BN(summary[key]?.amount || '0')
+          .add(new BN(invoice.amount_remaining || '0'))
+          .toString();
+      }
+    });
+    return res.json({
+      subscription,
+      summary,
+      invoices,
+    });
+  } catch (err) {
+    console.error(err);
+    return res.status(400).json({ error: err.message });
+  }
+});
 export default router;

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.16.2",
+  "version": "1.16.4",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -53,7 +53,7 @@
     "@arcblock/validator": "^1.18.147",
     "@blocklet/js-sdk": "1.16.33-beta-20241031-073543-49b1ff9b",
     "@blocklet/logger": "1.16.33-beta-20241031-073543-49b1ff9b",
-    "@blocklet/payment-react": "1.16.2",
+    "@blocklet/payment-react": "1.16.4",
     "@blocklet/sdk": "1.16.33-beta-20241031-073543-49b1ff9b",
     "@blocklet/ui-react": "^2.10.67",
     "@blocklet/uploader": "^0.1.52",
@@ -120,7 +120,7 @@
   "devDependencies": {
     "@abtnode/types": "1.16.33-beta-20241031-073543-49b1ff9b",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.16.2",
+    "@blocklet/payment-types": "1.16.4",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -166,5 +166,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "63c0ef382409afb79f595f82ea5e9bb9f264b844"
+  "gitHead": "d2c53c8bec3a4a34d0ef3a011ec215b69bc9a5ab"
 }