payment-kit 1.25.0 → 1.25.1

package/api/src/libs/payment.ts

@@ -255,10 +255,12 @@ export async function isDelegationSufficientForPayment(args: {
     const address = toDelegateAddress(delegator, wallet.address);
     const { state } = await client.getDelegateState({ address });
     if (!state) {
+      logger.error('isDelegationSufficientForPayment: no delegation state', { address, delegator });
       return { sufficient: false, reason: 'NO_DELEGATION' };
     }
 
     if (!state.ops || state.ops?.length === 0) {
+      logger.error('isDelegationSufficientForPayment: no delegation ops', { address, delegator });
       return { sufficient: false, reason: 'NO_DELEGATION' };
     }
 

package/api/src/queues/payment.ts

@@ -1012,12 +1012,12 @@ export const handlePayment = async (job: PaymentJob) => {
         logger.error('PaymentIntent capture aborted - insufficient balance/delegation', {
           paymentIntentId: paymentIntent.id,
           invoiceId: paymentIntent.invoice_id,
-          failureReason: 'INSUFFICIENT_BALANCE',
+          failureReason: result.reason,
           result,
           queueDelayMs,
           delaySeconds: Math.round(queueDelayMs / 1000),
         });
-        throw new CustomError('INSUFFICIENT_BALANCE', 'Payer balance or delegation not sufficient for this payment');
+        throw new CustomError(result.reason, 'Payer balance or delegation not sufficient for this payment');
       }
 
       const signed = await client.signTransferV2Tx({

package/api/src/queues/refund.ts

@@ -3,7 +3,7 @@ import { isRefundReasonSupportedByStripe } from '../libs/refund';
 import { checkRemainingStake, getSubscriptionStakeAddress } from '../libs/subscription';
 import { sendErc20ToUser } from '../integrations/ethereum/token';
 import { wallet } from '../libs/auth';
-import CustomError from '../libs/error';
+import CustomError, { NonRetryableError } from '../libs/error';
 import { events } from '../libs/event';
 import logger from '../libs/logger';
 import { getGasPayerExtra, isBalanceSufficientForRefund } from '../libs/payment';
@@ -35,6 +35,21 @@ type Updates = {
   };
 };
 
+const markRefundNonRetryable = async (refund: Refund, code: string, message: string, paymentMethod?: PaymentMethod) => {
+  await refund.update({
+    status: 'requires_action',
+    last_attempt_error: {
+      type: 'invalid_request_error',
+      code,
+      message,
+      payment_method_id: paymentMethod?.id,
+      payment_method_type: paymentMethod?.type,
+    },
+    attempt_count: refund.attempt_count + 1,
+    attempted: true,
+  });
+};
+
 export const handleRefundFailed = (refund: Refund, error: PaymentError) => {
   const attemptCount = refund.attempt_count + 1;
   const updates: Updates = {
@@ -94,24 +109,27 @@ export const handleRefund = async (job: RefundJob) => {
   const paymentCurrency = await PaymentCurrency.findByPk(refund.currency_id);
   if (!paymentCurrency) {
     logger.warn(`PaymentCurrency not found: ${refund.currency_id}`);
+    await markRefundNonRetryable(refund, 'CURRENCY_NOT_FOUND', 'Payment currency not found');
     return;
   }
   const paymentMethod = await PaymentMethod.findByPk(paymentCurrency.payment_method_id);
   if (!paymentMethod) {
     logger.warn(`PaymentMethod not found: ${paymentCurrency.payment_method_id}`);
+    await markRefundNonRetryable(refund, 'PAYMENT_METHOD_NOT_FOUND', 'Payment method not found');
     return;
   }
 
   const customer = await Customer.findByPk(refund.customer_id);
   if (!customer) {
     logger.warn(`Customer not found: ${refund.customer_id}`);
+    await markRefundNonRetryable(refund, 'CUSTOMER_NOT_FOUND', 'Customer not found', paymentMethod);
     return;
   }
 
   if (refund?.type === 'stake_return') {
-    handleStakeReturnJob(job, refund, paymentCurrency, paymentMethod, customer);
+    await handleStakeReturnJob(job, refund, paymentCurrency, paymentMethod, customer);
   } else if (paymentMethod) {
-    handleRefundJob(job, refund, paymentCurrency, paymentMethod, customer);
+    await handleRefundJob(job, refund, paymentCurrency, paymentMethod, customer);
   }
 };
 
@@ -164,18 +182,26 @@ const handleRefundJob = async (
   const refundSupport = ['arcblock', 'ethereum', 'stripe', 'base'].includes(paymentMethod.type);
   if (refundSupport === false) {
     logger.warn(`PaymentMethod does not support auto charge: ${paymentCurrency.payment_method_id}`);
+    await markRefundNonRetryable(
+      refund,
+      'PAYMENT_METHOD_NOT_SUPPORTED',
+      'Payment method does not support refund',
+      paymentMethod
+    );
     return;
   }
 
   // try refund transfer and reschedule on error
   logger.info('Refund transfer attempt', { id: refund.id, attempt: refund.attempt_count });
-  let result;
-  const paymentIntent = await PaymentIntent.findByPk(refund.payment_intent_id);
-  if (!paymentIntent) {
-    throw new Error('PaymentIntent not found');
-  }
-
   try {
+    if (!refund.payment_intent_id) {
+      throw new NonRetryableError('PAYMENT_INTENT_NOT_FOUND', 'payment_intent_id is missing for refund');
+    }
+    const paymentIntent = await PaymentIntent.findByPk(refund.payment_intent_id);
+    if (!paymentIntent) {
+      throw new NonRetryableError('PAYMENT_INTENT_NOT_FOUND', 'PaymentIntent not found');
+    }
+    let result;
     if (paymentMethod.type === 'arcblock') {
       const client = paymentMethod.getOcapClient();
       // check balance before transfer with transaction
@@ -288,6 +314,12 @@ const handleRefundJob = async (
   } catch (err) {
     logger.error('refund transfer failed', { error: err, id: refund.id });
 
+    if (err instanceof NonRetryableError || err?.nonRetryable === true) {
+      await markRefundNonRetryable(refund, err.code, err.message, paymentMethod);
+      logger.error('refund transfer aborted: non-retryable error', { id: refund.id, code: err.code });
+      return;
+    }
+
     const error: PaymentError = {
       type: 'card_error',
       code: err.code,

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.25.0",
+  "version": "1.25.1",
   "scripts": {
     "dev": "blocklet dev --open",
     "prelint": "npm run types",
@@ -59,9 +59,9 @@
     "@blocklet/error": "^0.3.5",
     "@blocklet/js-sdk": "^1.17.8-beta-20260104-120132-cb5b1914",
     "@blocklet/logger": "^1.17.8-beta-20260104-120132-cb5b1914",
-    "@blocklet/payment-broker-client": "1.25.0",
-    "@blocklet/payment-react": "1.25.0",
-    "@blocklet/payment-vendor": "1.25.0",
+    "@blocklet/payment-broker-client": "1.25.1",
+    "@blocklet/payment-react": "1.25.1",
+    "@blocklet/payment-vendor": "1.25.1",
     "@blocklet/sdk": "^1.17.8-beta-20260104-120132-cb5b1914",
     "@blocklet/ui-react": "^3.4.7",
     "@blocklet/uploader": "^0.3.19",
@@ -132,7 +132,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.17.8-beta-20260104-120132-cb5b1914",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.25.0",
+    "@blocklet/payment-types": "1.25.1",
     "@types/cookie-parser": "^1.4.9",
     "@types/cors": "^2.8.19",
     "@types/debug": "^4.1.12",
@@ -179,5 +179,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "00a94943fea21487c042a7b484f4649add502bc9"
+  "gitHead": "87555132c62024e5c677fd0a39df0d90be06a543"
 }