@wearejh/m2-pwa-adyen 0.33.0 → 0.35.0

package/CHANGELOG.md

@@ -3,6 +3,33 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.35.0](https://github.com/WeareJH/mage-mono/compare/v0.34.0...v0.35.0) (2025-09-08)
+
+**Note:** Version bump only for package @wearejh/m2-pwa-adyen
+
+
+
+
+
+# [0.34.0](https://github.com/WeareJH/mage-mono/compare/v0.33.1...v0.34.0) (2025-09-08)
+
+**Note:** Version bump only for package @wearejh/m2-pwa-adyen
+
+
+
+
+
+## [0.33.1](https://github.com/WeareJH/mage-mono/compare/v0.33.0...v0.33.1) (2025-07-01)
+
+
+### Bug Fixes
+
+* **m2-pwa-adyen:** add a retry loop to the order status API request to allow the server time to process (WOOD-2597) ([1173c66](https://github.com/WeareJH/mage-mono/commit/1173c66b3dff6cd946aeaad9807856d183a7a929))
+
+
+
+
+
 # [0.33.0](https://github.com/WeareJH/mage-mono/compare/v0.32.0...v0.33.0) (2025-06-18)
 
 **Note:** Version bump only for package @wearejh/m2-pwa-adyen

package/lib/epics/adyenPayment.epic.ts

@@ -3,8 +3,8 @@ import { AppendState, CheckoutActions, CheckoutMsg, State, TypeMap as CheckoutTy
 import { EpicDeps } from '@wearejh/m2-pwa-engine/lib/types';
 import { extractErrorAndCode } from '@wearejh/swagger-rxjs/utils/ajax-helpers';
 import { ofType } from 'redux-observable';
-import { catchError, map, mergeMap, pluck, switchMap, take, withLatestFrom } from 'rxjs/operators';
-import { concat, EMPTY, Observable, of, race } from 'rxjs';
+import { catchError, map, mergeMap, pluck, retryWhen, scan, switchMap, take, withLatestFrom } from 'rxjs/operators';
+import { concat, EMPTY, Observable, of, race, throwError, timer } from 'rxjs';
 
 import { execute as getUserAdyenPaymentStatus } from '../rest/AdyenPaymentAdyenOrderPaymentStatusV1GetOrderPaymentStatusPost';
 import { execute as getGuestAdyenPaymentStatus } from '../rest/AdyenPaymentGuestAdyenOrderPaymentStatusV1GetOrderPaymentStatusPost';
@@ -14,15 +14,58 @@ import { AdyenPayload, AdyenResponseParams } from '../adyen.types';
 import { processAdyenResponse } from './utils/processAdyenResponse';
 import { getAdyenCart } from './utils/getAdyenCart';
 
-function getOrderStatus({ cartVariant, orderId, cartId }, deps: EpicDeps) {
+/**
+ * Number of retries for getting the order status.
+ *
+ * The retries allow the errors to be handled gracefully for X number of attempts.
+ * If the error persists, the error can be thrown to the user.
+ */
+const ORDER_STATUS_RETY_COUNT = 5;
+
+/**
+ * Delay in milliseconds between retries for getting the order status.
+ */
+const ORDER_STATUS_RETRY_DELAY = 600;
+
+function getOrderStatus({ cartVariant, orderId, cartId }, deps: EpicDeps): Observable<AdyenResponseParams> {
+    let apiRequest = getGuestAdyenPaymentStatus({ cartId }, { orderId }, deps);
+
     if (cartVariant === CartVariant.Account) {
-        return getUserAdyenPaymentStatus({ orderId }, deps).pipe(
-            map((response) => JSON.parse(response) as AdyenResponseParams),
-        );
+        apiRequest = getUserAdyenPaymentStatus({ orderId }, deps);
     }
 
-    return getGuestAdyenPaymentStatus({ cartId }, { orderId }, deps).pipe(
-        map((response) => JSON.parse(response) as AdyenResponseParams),
+    if (!apiRequest) {
+        return throwError(new Error('Cannot proceed without order information'));
+    }
+
+    return apiRequest.pipe(
+        retryWhen((errors) =>
+            errors.pipe(
+                scan((retryCount, error) => {
+                    const { error: errorMessage } = extractErrorAndCode(error);
+
+                    if (retryCount >= ORDER_STATUS_RETY_COUNT) {
+                        throw error;
+                    }
+
+                    if (errorMessage.includes('Please try again')) {
+                        return retryCount + 1;
+                    }
+
+                    throw error;
+                }, 0),
+                mergeMap((retryCount) =>
+                    retryCount <= ORDER_STATUS_RETY_COUNT ? timer(ORDER_STATUS_RETRY_DELAY) : of(null),
+                ),
+            ),
+        ),
+        map((response) => {
+            if (typeof response !== 'string') {
+                throw new Error('Expected response to be a string');
+            }
+
+            return JSON.parse(response) as AdyenResponseParams;
+        }),
     );
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wearejh/m2-pwa-adyen",
-    "version": "0.33.0",
+    "version": "0.35.0",
     "description": "> TODO: description",
     "author": "Shane Osbourne <shane.osbourne8@gmail.com>",
     "homepage": "",
@@ -22,13 +22,13 @@
     },
     "dependencies": {
         "@adyen/adyen-web": "5.59.0",
-        "@wearejh/m2-pwa-cart": "^0.33.0",
-        "@wearejh/m2-pwa-checkout": "^0.33.0",
-        "@wearejh/m2-pwa-engine": "^0.33.0",
-        "@wearejh/react-hooks": "^0.33.0",
-        "@wearejh/rx-form": "^0.33.0",
-        "@wearejh/swagger-rxjs": "^0.33.0",
+        "@wearejh/m2-pwa-cart": "^0.35.0",
+        "@wearejh/m2-pwa-checkout": "^0.35.0",
+        "@wearejh/m2-pwa-engine": "^0.35.0",
+        "@wearejh/react-hooks": "^0.35.0",
+        "@wearejh/rx-form": "^0.35.0",
+        "@wearejh/swagger-rxjs": "^0.35.0",
         "load-js": "^3.0.3"
     },
-    "gitHead": "055f7dbb98d0e595ef8d904d9c981e82fcc31b25"
+    "gitHead": "c28fc34b4cd0b85fafe885cfdcd364f4c576e11b"
 }