@waffo/waffo-node 2.1.0 → 2.2.0

package/README.md

@@ -229,7 +229,7 @@ app.post('/webhook', express.raw({ type: 'application/json' }), async (req, res)
 
   const webhookHandler = waffo.webhook()
     .onPayment((notification) => {
-      console.log('Payment received:', notification.acquiringOrderId);
+      console.log('Payment received:', notification.result?.acquiringOrderId);
     });
 
   const result = await webhookHandler.handleWebhook(body, signature);
@@ -283,7 +283,7 @@ export class PaymentController {
   ) {
     const webhookHandler = this.waffo.webhook()
       .onPayment((notification) => {
-        console.log('Payment received:', notification.acquiringOrderId);
+        console.log('Payment received:', notification.result?.acquiringOrderId);
       });
 
     const result = await webhookHandler.handleWebhook(body, signature);
@@ -318,7 +318,7 @@ fastify.post('/webhook', async (request, reply) => {
 
   const webhookHandler = waffo.webhook()
     .onPayment((notification) => {
-      console.log('Payment received:', notification.acquiringOrderId);
+      console.log('Payment received:', notification.result?.acquiringOrderId);
     });
 
   const result = await webhookHandler.handleWebhook(body, signature);
@@ -688,28 +688,28 @@ const waffo = new Waffo({ /* config */ });
 const webhookHandler = waffo.webhook()
   .onPayment((notification) => {
     console.log('Payment notification received:');
-    console.log('  Acquiring Order ID:', notification.acquiringOrderId);
-    console.log('  Order Status:', notification.orderStatus);
-    console.log('  Payment Amount:', notification.orderAmount);
-    console.log('  Payment Currency:', notification.orderCurrency);
+    console.log('  Acquiring Order ID:', notification.result?.acquiringOrderId);
+    console.log('  Order Status:', notification.result?.orderStatus);
+    console.log('  Payment Amount:', notification.result?.orderAmount);
+    console.log('  Payment Currency:', notification.result?.orderCurrency);
 
     // Tip: First verify amount and currency match your records
     // Then handle based on orderStatus
 
-    if (notification.orderStatus === 'PAY_SUCCESS') {
+    if (notification.result?.orderStatus === 'PAY_SUCCESS') {
       // Payment successful - update order status, deliver goods, etc.
     }
   })
   .onRefund((notification) => {
-    console.log('Refund notification:', notification.acquiringRefundOrderId);
+    console.log('Refund notification:', notification.result?.acquiringRefundOrderId);
     // Handle refund notification
   })
   .onSubscriptionStatus((notification) => {
     console.log('Subscription status notification:');
-    console.log('  Subscription ID:', notification.subscriptionId);
-    console.log('  Subscription Status:', notification.subscriptionStatus);
+    console.log('  Subscription ID:', notification.result?.subscriptionId);
+    console.log('  Subscription Status:', notification.result?.subscriptionStatus);
 
-    switch (notification.subscriptionStatus) {
+    switch (notification.result?.subscriptionStatus) {
       case 'ACTIVE':
         // Subscription activated - grant membership privileges
         break;
@@ -731,28 +731,28 @@ const webhookHandler = waffo.webhook()
     }
   })
   .onSubscriptionPeriodChanged((notification) => {
-    console.log('Subscription period changed:', notification.subscriptionId);
+    console.log('Subscription period changed:', notification.result?.subscriptionId);
     // Key fields to track:
-    // - notification.period: Current period number
-    // - notification.nextChargeAt: Next billing time
-    // - notification.subscriptionStatus: Subscription status
-    // - notification.orderStatus: Current billing order status (SUCCESS/FAILED)
-    // - notification.orderAmount: Billing amount
-    // - notification.orderCurrency: Billing currency
+    // - notification.result?.period: Current period number
+    // - notification.result?.nextChargeAt: Next billing time
+    // - notification.result?.subscriptionStatus: Subscription status
+    // - notification.result?.orderStatus: Current billing order status (SUCCESS/FAILED)
+    // - notification.result?.orderAmount: Billing amount
+    // - notification.result?.orderCurrency: Billing currency
   })
   .onSubscriptionChange((notification) => {
     console.log('Subscription change notification:');
-    console.log('  Change Request ID:', notification.subscriptionRequest);
-    console.log('  Change Status:', notification.subscriptionChangeStatus);
-    console.log('  Origin Subscription:', notification.originSubscriptionId);
-    console.log('  New Subscription:', notification.subscriptionId);
+    console.log('  Change Request ID:', notification.result?.subscriptionRequest);
+    console.log('  Change Status:', notification.result?.subscriptionChangeStatus);
+    console.log('  Origin Subscription:', notification.result?.originSubscriptionId);
+    console.log('  New Subscription:', notification.result?.subscriptionId);
 
-    if (notification.subscriptionChangeStatus === 'SUCCESS') {
+    if (notification.result?.subscriptionChangeStatus === 'SUCCESS') {
       // Subscription change successful
       // - Original subscription is now MERCHANT_CANCELLED
       // - New subscription is now ACTIVE
       // Update user's subscription level accordingly
-    } else if (notification.subscriptionChangeStatus === 'CLOSED') {
+    } else if (notification.result?.subscriptionChangeStatus === 'CLOSED') {
       // Subscription change failed/closed
       // Original subscription remains unchanged
     }

package/dist/index.d.mts

@@ -176,7 +176,6 @@ declare enum WebhookEventType {
     PAYMENT_NOTIFICATION = "PAYMENT_NOTIFICATION",
     REFUND_NOTIFICATION = "REFUND_NOTIFICATION",
     SUBSCRIPTION_STATUS_NOTIFICATION = "SUBSCRIPTION_STATUS_NOTIFICATION",
-    SUBSCRIPTION_PAYMENT_NOTIFICATION = "SUBSCRIPTION_PAYMENT_NOTIFICATION",
     SUBSCRIPTION_PERIOD_CHANGED_NOTIFICATION = "SUBSCRIPTION_PERIOD_CHANGED_NOTIFICATION"
 }
 /**
@@ -199,47 +198,104 @@ interface BaseNotification {
     eventType: string;
 }
 /**
- * Payment notification from Waffo.
+ * Payment notification result payload (21 fields).
  */
-interface PaymentNotification extends BaseNotification {
-    eventType: 'PAYMENT_NOTIFICATION';
-    acquiringOrderId?: string;
-    merchantOrderId?: string;
+interface PaymentNotificationResult {
     paymentRequestId?: string;
+    merchantOrderId?: string;
+    acquiringOrderId?: string;
     orderStatus?: string;
-    orderAmount?: string;
+    orderAction?: string;
     orderCurrency?: string;
+    orderAmount?: string;
+    userCurrency?: string;
     finalDealAmount?: string;
+    orderDescription?: string;
+    merchantInfo?: Record<string, unknown>;
+    userInfo?: Record<string, unknown>;
+    goodsInfo?: Record<string, unknown>;
+    addressInfo?: Record<string, unknown>;
+    paymentInfo?: Record<string, unknown>;
+    orderRequestedAt?: string;
+    orderExpiredAt?: string;
+    orderUpdatedAt?: string;
+    orderCompletedAt?: string;
+    orderFailedReason?: Record<string, unknown>;
+    extendInfo?: string;
     [key: string]: unknown;
 }
 /**
- * Refund notification from Waffo.
+ * Refund notification result payload (17 fields).
  */
-interface RefundNotification extends BaseNotification {
-    eventType: 'REFUND_NOTIFICATION';
-    acquiringRefundOrderId?: string;
+interface RefundNotificationResult {
     refundRequestId?: string;
-    refundStatus?: string;
+    merchantRefundOrderId?: string;
+    acquiringOrderId?: string;
+    acquiringRefundOrderId?: string;
+    origPaymentRequestId?: string;
     refundAmount?: string;
+    refundStatus?: string;
+    remainingRefundAmount?: string;
+    userCurrency?: string;
+    finalDealAmount?: string;
+    refundReason?: string;
+    refundRequestedAt?: string;
+    refundUpdatedAt?: string;
+    refundCompletedAt?: string;
+    refundFailedReason?: Record<string, unknown>;
+    userInfo?: Record<string, unknown>;
+    extendInfo?: string;
     [key: string]: unknown;
 }
 /**
- * Subscription status notification from Waffo.
+ * Subscription notification result payload (20 fields).
+ * Shared by SubscriptionStatusNotification and SubscriptionPeriodChangedNotification.
  */
-interface SubscriptionStatusNotification extends BaseNotification {
-    eventType: 'SUBSCRIPTION_STATUS_NOTIFICATION';
+interface SubscriptionNotificationResult {
+    subscriptionRequest?: string;
+    merchantSubscriptionId?: string;
     subscriptionId?: string;
     subscriptionStatus?: string;
+    subscriptionAction?: string;
+    currency?: string;
+    amount?: string;
+    userCurrency?: string;
+    productInfo?: Record<string, unknown>;
+    merchantInfo?: Record<string, unknown>;
+    userInfo?: Record<string, unknown>;
+    goodsInfo?: Record<string, unknown>;
+    addressInfo?: Record<string, unknown>;
+    paymentInfo?: Record<string, unknown>;
+    requestedAt?: string;
+    updatedAt?: string;
+    failedReason?: Record<string, unknown>;
+    extendInfo?: string;
+    subscriptionManagementUrl?: string;
+    paymentDetails?: Record<string, unknown>[];
     [key: string]: unknown;
 }
 /**
- * Subscription payment notification from Waffo.
+ * Payment notification from Waffo.
  */
-interface SubscriptionPaymentNotification extends BaseNotification {
-    eventType: 'SUBSCRIPTION_PAYMENT_NOTIFICATION';
-    subscriptionId?: string;
-    acquiringOrderId?: string;
-    orderStatus?: string;
+interface PaymentNotification extends BaseNotification {
+    eventType: 'PAYMENT_NOTIFICATION';
+    result?: PaymentNotificationResult;
+    [key: string]: unknown;
+}
+/**
+ * Refund notification from Waffo.
+ */
+interface RefundNotification extends BaseNotification {
+    eventType: 'REFUND_NOTIFICATION';
+    result?: RefundNotificationResult;
+    [key: string]: unknown;
+}
+/**
+ * Subscription status notification from Waffo.
+ */
+interface SubscriptionStatusNotification extends BaseNotification {
+    eventType: 'SUBSCRIPTION_STATUS_NOTIFICATION';
+    result?: SubscriptionNotificationResult;
     [key: string]: unknown;
 }
 /**
@@ -247,13 +303,13 @@ interface SubscriptionPaymentNotification extends BaseNotification {
  */
 interface SubscriptionPeriodChangedNotification extends BaseNotification {
     eventType: 'SUBSCRIPTION_PERIOD_CHANGED_NOTIFICATION';
-    subscriptionId?: string;
+    result?: SubscriptionNotificationResult;
     [key: string]: unknown;
 }
 type PaymentHandler = (notification: PaymentNotification) => void | Promise<void>;
 type RefundHandler = (notification: RefundNotification) => void | Promise<void>;
 type SubscriptionStatusHandler = (notification: SubscriptionStatusNotification) => void | Promise<void>;
-type SubscriptionPaymentHandler = (notification: SubscriptionPaymentNotification) => void | Promise<void>;
+type SubscriptionPaymentHandler = (notification: SubscriptionStatusNotification) => void | Promise<void>;
 type SubscriptionPeriodChangedHandler = (notification: SubscriptionPeriodChangedNotification) => void | Promise<void>;
 /**
  * Webhook handler for processing Waffo webhook notifications.
@@ -263,10 +319,10 @@ type SubscriptionPeriodChangedHandler = (notification: SubscriptionPeriodChanged
  * // Setup handler
  * const handler = waffo.webhook()
  *   .onPayment((notification) => {
- *     console.log('Payment:', notification.orderStatus);
+ *     console.log('Payment:', notification.result?.orderStatus);
  *   })
  *   .onRefund((notification) => {
- *     console.log('Refund:', notification.refundStatus);
+ *     console.log('Refund:', notification.result?.refundStatus);
  *   });
  *
  * // Process webhook (e.g., in Express.js)
@@ -303,7 +359,8 @@ declare class WebhookHandler {
      */
     onSubscriptionStatus(handler: SubscriptionStatusHandler): this;
     /**
-     * Registers a handler for subscription payment notifications.
+     * Registers a fallback handler for SUBSCRIPTION_STATUS_NOTIFICATION events.
+     * Only called when onSubscriptionStatus handler is not registered.
      */
     onSubscriptionPayment(handler: SubscriptionPaymentHandler): this;
     /**
@@ -887,10 +944,8 @@ interface InquirySubscriptionData {
  * Cancel subscription request parameters.
  */
 interface CancelSubscriptionParams {
-    subscriptionRequest?: string;
     subscriptionId?: string;
-    merchantInfo?: SubscriptionMerchantInfo;
-    cancelReason?: string;
+    merchantId?: string;
     requestedAt?: string;
     [key: string]: unknown;
 }
@@ -1782,13 +1837,13 @@ declare class Waffo {
      * // Setup webhook handler
      * const handler = waffo.webhook()
      *   .onPayment((notification) => {
-     *     console.log('Payment:', notification.orderStatus);
+     *     console.log('Payment:', notification.result?.orderStatus);
      *   })
      *   .onRefund((notification) => {
-     *     console.log('Refund:', notification.refundStatus);
+     *     console.log('Refund:', notification.result?.refundStatus);
      *   })
      *   .onSubscriptionStatus((notification) => {
-     *     console.log('Subscription:', notification.subscriptionStatus);
+     *     console.log('Subscription:', notification.result?.subscriptionStatus);
      *   });
      *
      * // In Express.js route handler
@@ -2007,4 +2062,4 @@ declare const RsaUtils: {
     generateKeyPair: typeof generateKeyPair;
 };
 
-export { type AddressInfo, ApiResponse, type BaseNotification, type CancelOrderData, type CancelOrderParams, type CancelSubscriptionData, type CancelSubscriptionParams, type CaptureOrderData, type CaptureOrderParams, type CardInfo, type CreateOrderData, type CreateOrderParams, type CreateSubscriptionData, type CreateSubscriptionParams, Environment, EnvironmentBaseUrl, type GoodsInfo, type HttpRequest, type HttpResponse, type HttpTransport, type InquiryMerchantConfigData, type InquiryMerchantConfigParams, type InquiryOrderData, type InquiryOrderParams, type InquiryPayMethodConfigData, type InquiryPayMethodConfigParams, type InquiryRefundData, type InquiryRefundParams, type InquirySubscriptionData, type InquirySubscriptionParams, type ManageSubscriptionData, type ManageSubscriptionParams, MerchantConfigResource, type MerchantInfo, OrderResource, type OrderStatus, PayMethodConfigResource, type PayMethodInfo, type PaymentInfo, type PaymentNotification, type PeriodType, type ProductInfo, type RefundNotification, type RefundOrderData, type RefundOrderParams, RefundResource, type RefundStatus$1 as RefundStatus, type RefundUserInfo, type RequestOptions, type RiskData, RsaUtils, type SubscriptionManageAction, type SubscriptionMerchantInfo, type SubscriptionPaymentInfo, type SubscriptionPaymentNotification, type SubscriptionPeriodChangedNotification, SubscriptionResource, type SubscriptionStatus, type SubscriptionStatusNotification, type SubscriptionUserInfo, type UserInfo, Waffo, type WaffoConfig, WaffoConfigDefaults, WaffoError, WaffoErrorCode, WaffoHttpClient, type WaffoLogger, WaffoUnknownStatusError, WebhookEventType, WebhookHandler, type WebhookResult };
+export { type AddressInfo, ApiResponse, type BaseNotification, type CancelOrderData, type CancelOrderParams, type CancelSubscriptionData, type CancelSubscriptionParams, type CaptureOrderData, type CaptureOrderParams, type CardInfo, type CreateOrderData, type CreateOrderParams, type CreateSubscriptionData, type CreateSubscriptionParams, Environment, EnvironmentBaseUrl, type GoodsInfo, type HttpRequest, type HttpResponse, type HttpTransport, type InquiryMerchantConfigData, type InquiryMerchantConfigParams, type InquiryOrderData, type InquiryOrderParams, type InquiryPayMethodConfigData, type InquiryPayMethodConfigParams, type InquiryRefundData, type InquiryRefundParams, type InquirySubscriptionData, type InquirySubscriptionParams, type ManageSubscriptionData, type ManageSubscriptionParams, MerchantConfigResource, type MerchantInfo, OrderResource, type OrderStatus, PayMethodConfigResource, type PayMethodInfo, type PaymentInfo, type PaymentNotification, type PaymentNotificationResult, type PeriodType, type ProductInfo, type RefundNotification, type RefundNotificationResult, type RefundOrderData, type RefundOrderParams, RefundResource, type RefundStatus$1 as RefundStatus, type RefundUserInfo, type RequestOptions, type RiskData, RsaUtils, type SubscriptionManageAction, type SubscriptionMerchantInfo, type SubscriptionNotificationResult, type SubscriptionPaymentInfo, type SubscriptionPeriodChangedNotification, SubscriptionResource, type SubscriptionStatus, type SubscriptionStatusNotification, type SubscriptionUserInfo, type UserInfo, Waffo, type WaffoConfig, WaffoConfigDefaults, WaffoError, WaffoErrorCode, WaffoHttpClient, type WaffoLogger, WaffoUnknownStatusError, WebhookEventType, WebhookHandler, type WebhookResult };

package/dist/index.d.ts

@@ -176,7 +176,6 @@ declare enum WebhookEventType {
     PAYMENT_NOTIFICATION = "PAYMENT_NOTIFICATION",
     REFUND_NOTIFICATION = "REFUND_NOTIFICATION",
     SUBSCRIPTION_STATUS_NOTIFICATION = "SUBSCRIPTION_STATUS_NOTIFICATION",
-    SUBSCRIPTION_PAYMENT_NOTIFICATION = "SUBSCRIPTION_PAYMENT_NOTIFICATION",
     SUBSCRIPTION_PERIOD_CHANGED_NOTIFICATION = "SUBSCRIPTION_PERIOD_CHANGED_NOTIFICATION"
 }
 /**
@@ -199,47 +198,104 @@ interface BaseNotification {
     eventType: string;
 }
 /**
- * Payment notification from Waffo.
+ * Payment notification result payload (21 fields).
  */
-interface PaymentNotification extends BaseNotification {
-    eventType: 'PAYMENT_NOTIFICATION';
-    acquiringOrderId?: string;
-    merchantOrderId?: string;
+interface PaymentNotificationResult {
     paymentRequestId?: string;
+    merchantOrderId?: string;
+    acquiringOrderId?: string;
     orderStatus?: string;
-    orderAmount?: string;
+    orderAction?: string;
     orderCurrency?: string;
+    orderAmount?: string;
+    userCurrency?: string;
     finalDealAmount?: string;
+    orderDescription?: string;
+    merchantInfo?: Record<string, unknown>;
+    userInfo?: Record<string, unknown>;
+    goodsInfo?: Record<string, unknown>;
+    addressInfo?: Record<string, unknown>;
+    paymentInfo?: Record<string, unknown>;
+    orderRequestedAt?: string;
+    orderExpiredAt?: string;
+    orderUpdatedAt?: string;
+    orderCompletedAt?: string;
+    orderFailedReason?: Record<string, unknown>;
+    extendInfo?: string;
     [key: string]: unknown;
 }
 /**
- * Refund notification from Waffo.
+ * Refund notification result payload (17 fields).
  */
-interface RefundNotification extends BaseNotification {
-    eventType: 'REFUND_NOTIFICATION';
-    acquiringRefundOrderId?: string;
+interface RefundNotificationResult {
     refundRequestId?: string;
-    refundStatus?: string;
+    merchantRefundOrderId?: string;
+    acquiringOrderId?: string;
+    acquiringRefundOrderId?: string;
+    origPaymentRequestId?: string;
     refundAmount?: string;
+    refundStatus?: string;
+    remainingRefundAmount?: string;
+    userCurrency?: string;
+    finalDealAmount?: string;
+    refundReason?: string;
+    refundRequestedAt?: string;
+    refundUpdatedAt?: string;
+    refundCompletedAt?: string;
+    refundFailedReason?: Record<string, unknown>;
+    userInfo?: Record<string, unknown>;
+    extendInfo?: string;
     [key: string]: unknown;
 }
 /**
- * Subscription status notification from Waffo.
+ * Subscription notification result payload (20 fields).
+ * Shared by SubscriptionStatusNotification and SubscriptionPeriodChangedNotification.
  */
-interface SubscriptionStatusNotification extends BaseNotification {
-    eventType: 'SUBSCRIPTION_STATUS_NOTIFICATION';
+interface SubscriptionNotificationResult {
+    subscriptionRequest?: string;
+    merchantSubscriptionId?: string;
     subscriptionId?: string;
     subscriptionStatus?: string;
+    subscriptionAction?: string;
+    currency?: string;
+    amount?: string;
+    userCurrency?: string;
+    productInfo?: Record<string, unknown>;
+    merchantInfo?: Record<string, unknown>;
+    userInfo?: Record<string, unknown>;
+    goodsInfo?: Record<string, unknown>;
+    addressInfo?: Record<string, unknown>;
+    paymentInfo?: Record<string, unknown>;
+    requestedAt?: string;
+    updatedAt?: string;
+    failedReason?: Record<string, unknown>;
+    extendInfo?: string;
+    subscriptionManagementUrl?: string;
+    paymentDetails?: Record<string, unknown>[];
     [key: string]: unknown;
 }
 /**
- * Subscription payment notification from Waffo.
+ * Payment notification from Waffo.
  */
-interface SubscriptionPaymentNotification extends BaseNotification {
-    eventType: 'SUBSCRIPTION_PAYMENT_NOTIFICATION';
-    subscriptionId?: string;
-    acquiringOrderId?: string;
-    orderStatus?: string;
+interface PaymentNotification extends BaseNotification {
+    eventType: 'PAYMENT_NOTIFICATION';
+    result?: PaymentNotificationResult;
+    [key: string]: unknown;
+}
+/**
+ * Refund notification from Waffo.
+ */
+interface RefundNotification extends BaseNotification {
+    eventType: 'REFUND_NOTIFICATION';
+    result?: RefundNotificationResult;
+    [key: string]: unknown;
+}
+/**
+ * Subscription status notification from Waffo.
+ */
+interface SubscriptionStatusNotification extends BaseNotification {
+    eventType: 'SUBSCRIPTION_STATUS_NOTIFICATION';
+    result?: SubscriptionNotificationResult;
     [key: string]: unknown;
 }
 /**
@@ -247,13 +303,13 @@ interface SubscriptionPaymentNotification extends BaseNotification {
  */
 interface SubscriptionPeriodChangedNotification extends BaseNotification {
     eventType: 'SUBSCRIPTION_PERIOD_CHANGED_NOTIFICATION';
-    subscriptionId?: string;
+    result?: SubscriptionNotificationResult;
     [key: string]: unknown;
 }
 type PaymentHandler = (notification: PaymentNotification) => void | Promise<void>;
 type RefundHandler = (notification: RefundNotification) => void | Promise<void>;
 type SubscriptionStatusHandler = (notification: SubscriptionStatusNotification) => void | Promise<void>;
-type SubscriptionPaymentHandler = (notification: SubscriptionPaymentNotification) => void | Promise<void>;
+type SubscriptionPaymentHandler = (notification: SubscriptionStatusNotification) => void | Promise<void>;
 type SubscriptionPeriodChangedHandler = (notification: SubscriptionPeriodChangedNotification) => void | Promise<void>;
 /**
  * Webhook handler for processing Waffo webhook notifications.
@@ -263,10 +319,10 @@ type SubscriptionPeriodChangedHandler = (notification: SubscriptionPeriodChanged
  * // Setup handler
  * const handler = waffo.webhook()
  *   .onPayment((notification) => {
- *     console.log('Payment:', notification.orderStatus);
+ *     console.log('Payment:', notification.result?.orderStatus);
  *   })
  *   .onRefund((notification) => {
- *     console.log('Refund:', notification.refundStatus);
+ *     console.log('Refund:', notification.result?.refundStatus);
  *   });
  *
  * // Process webhook (e.g., in Express.js)
@@ -303,7 +359,8 @@ declare class WebhookHandler {
      */
     onSubscriptionStatus(handler: SubscriptionStatusHandler): this;
     /**
-     * Registers a handler for subscription payment notifications.
+     * Registers a fallback handler for SUBSCRIPTION_STATUS_NOTIFICATION events.
+     * Only called when onSubscriptionStatus handler is not registered.
      */
     onSubscriptionPayment(handler: SubscriptionPaymentHandler): this;
     /**
@@ -887,10 +944,8 @@ interface InquirySubscriptionData {
  * Cancel subscription request parameters.
  */
 interface CancelSubscriptionParams {
-    subscriptionRequest?: string;
     subscriptionId?: string;
-    merchantInfo?: SubscriptionMerchantInfo;
-    cancelReason?: string;
+    merchantId?: string;
     requestedAt?: string;
     [key: string]: unknown;
 }
@@ -1782,13 +1837,13 @@ declare class Waffo {
      * // Setup webhook handler
      * const handler = waffo.webhook()
      *   .onPayment((notification) => {
-     *     console.log('Payment:', notification.orderStatus);
+     *     console.log('Payment:', notification.result?.orderStatus);
      *   })
      *   .onRefund((notification) => {
-     *     console.log('Refund:', notification.refundStatus);
+     *     console.log('Refund:', notification.result?.refundStatus);
      *   })
      *   .onSubscriptionStatus((notification) => {
-     *     console.log('Subscription:', notification.subscriptionStatus);
+     *     console.log('Subscription:', notification.result?.subscriptionStatus);
      *   });
      *
      * // In Express.js route handler
@@ -2007,4 +2062,4 @@ declare const RsaUtils: {
     generateKeyPair: typeof generateKeyPair;
 };
 
-export { type AddressInfo, ApiResponse, type BaseNotification, type CancelOrderData, type CancelOrderParams, type CancelSubscriptionData, type CancelSubscriptionParams, type CaptureOrderData, type CaptureOrderParams, type CardInfo, type CreateOrderData, type CreateOrderParams, type CreateSubscriptionData, type CreateSubscriptionParams, Environment, EnvironmentBaseUrl, type GoodsInfo, type HttpRequest, type HttpResponse, type HttpTransport, type InquiryMerchantConfigData, type InquiryMerchantConfigParams, type InquiryOrderData, type InquiryOrderParams, type InquiryPayMethodConfigData, type InquiryPayMethodConfigParams, type InquiryRefundData, type InquiryRefundParams, type InquirySubscriptionData, type InquirySubscriptionParams, type ManageSubscriptionData, type ManageSubscriptionParams, MerchantConfigResource, type MerchantInfo, OrderResource, type OrderStatus, PayMethodConfigResource, type PayMethodInfo, type PaymentInfo, type PaymentNotification, type PeriodType, type ProductInfo, type RefundNotification, type RefundOrderData, type RefundOrderParams, RefundResource, type RefundStatus$1 as RefundStatus, type RefundUserInfo, type RequestOptions, type RiskData, RsaUtils, type SubscriptionManageAction, type SubscriptionMerchantInfo, type SubscriptionPaymentInfo, type SubscriptionPaymentNotification, type SubscriptionPeriodChangedNotification, SubscriptionResource, type SubscriptionStatus, type SubscriptionStatusNotification, type SubscriptionUserInfo, type UserInfo, Waffo, type WaffoConfig, WaffoConfigDefaults, WaffoError, WaffoErrorCode, WaffoHttpClient, type WaffoLogger, WaffoUnknownStatusError, WebhookEventType, WebhookHandler, type WebhookResult };
+export { type AddressInfo, ApiResponse, type BaseNotification, type CancelOrderData, type CancelOrderParams, type CancelSubscriptionData, type CancelSubscriptionParams, type CaptureOrderData, type CaptureOrderParams, type CardInfo, type CreateOrderData, type CreateOrderParams, type CreateSubscriptionData, type CreateSubscriptionParams, Environment, EnvironmentBaseUrl, type GoodsInfo, type HttpRequest, type HttpResponse, type HttpTransport, type InquiryMerchantConfigData, type InquiryMerchantConfigParams, type InquiryOrderData, type InquiryOrderParams, type InquiryPayMethodConfigData, type InquiryPayMethodConfigParams, type InquiryRefundData, type InquiryRefundParams, type InquirySubscriptionData, type InquirySubscriptionParams, type ManageSubscriptionData, type ManageSubscriptionParams, MerchantConfigResource, type MerchantInfo, OrderResource, type OrderStatus, PayMethodConfigResource, type PayMethodInfo, type PaymentInfo, type PaymentNotification, type PaymentNotificationResult, type PeriodType, type ProductInfo, type RefundNotification, type RefundNotificationResult, type RefundOrderData, type RefundOrderParams, RefundResource, type RefundStatus$1 as RefundStatus, type RefundUserInfo, type RequestOptions, type RiskData, RsaUtils, type SubscriptionManageAction, type SubscriptionMerchantInfo, type SubscriptionNotificationResult, type SubscriptionPaymentInfo, type SubscriptionPeriodChangedNotification, SubscriptionResource, type SubscriptionStatus, type SubscriptionStatusNotification, type SubscriptionUserInfo, type UserInfo, Waffo, type WaffoConfig, WaffoConfigDefaults, WaffoError, WaffoErrorCode, WaffoHttpClient, type WaffoLogger, WaffoUnknownStatusError, WebhookEventType, WebhookHandler, type WebhookResult };

package/dist/index.js

@@ -463,7 +463,7 @@ var HEADER_SDK_VERSION = "x-sdk-version";
 var HEADER_CONTENT_TYPE = "content-type";
 var CONTENT_TYPE_JSON = "application/json";
 var API_VERSION = "1.0.0";
-var SDK_VERSION = "waffo-node/2.1.0";
+var SDK_VERSION = "waffo-node/2.2.0";
 var WaffoHttpClient = class {
   baseUrl;
   apiKey;
@@ -616,7 +616,6 @@ var WebhookEventType = /* @__PURE__ */ ((WebhookEventType2) => {
   WebhookEventType2["PAYMENT_NOTIFICATION"] = "PAYMENT_NOTIFICATION";
   WebhookEventType2["REFUND_NOTIFICATION"] = "REFUND_NOTIFICATION";
   WebhookEventType2["SUBSCRIPTION_STATUS_NOTIFICATION"] = "SUBSCRIPTION_STATUS_NOTIFICATION";
-  WebhookEventType2["SUBSCRIPTION_PAYMENT_NOTIFICATION"] = "SUBSCRIPTION_PAYMENT_NOTIFICATION";
   WebhookEventType2["SUBSCRIPTION_PERIOD_CHANGED_NOTIFICATION"] = "SUBSCRIPTION_PERIOD_CHANGED_NOTIFICATION";
   return WebhookEventType2;
 })(WebhookEventType || {});
@@ -656,7 +655,8 @@ var WebhookHandler = class {
     return this;
   }
   /**
-   * Registers a handler for subscription payment notifications.
+   * Registers a fallback handler for SUBSCRIPTION_STATUS_NOTIFICATION events.
+   * Only called when onSubscriptionStatus handler is not registered.
    */
   onSubscriptionPayment(handler) {
     this.subscriptionPaymentHandler = handler;
@@ -703,10 +703,7 @@ var WebhookHandler = class {
         case "SUBSCRIPTION_STATUS_NOTIFICATION" /* SUBSCRIPTION_STATUS_NOTIFICATION */:
           if (this.subscriptionStatusHandler) {
             await this.subscriptionStatusHandler(parsed);
-          }
-          break;
-        case "SUBSCRIPTION_PAYMENT_NOTIFICATION" /* SUBSCRIPTION_PAYMENT_NOTIFICATION */:
-          if (this.subscriptionPaymentHandler) {
+          } else if (this.subscriptionPaymentHandler) {
             await this.subscriptionPaymentHandler(parsed);
           }
           break;
@@ -1193,13 +1190,13 @@ var Waffo = class _Waffo {
    * // Setup webhook handler
    * const handler = waffo.webhook()
    *   .onPayment((notification) => {
-   *     console.log('Payment:', notification.orderStatus);
+   *     console.log('Payment:', notification.result?.orderStatus);
    *   })
    *   .onRefund((notification) => {
-   *     console.log('Refund:', notification.refundStatus);
+   *     console.log('Refund:', notification.result?.refundStatus);
    *   })
    *   .onSubscriptionStatus((notification) => {
-   *     console.log('Subscription:', notification.subscriptionStatus);
+   *     console.log('Subscription:', notification.result?.subscriptionStatus);
    *   });
    *
    * // In Express.js route handler