iticket-seatingplan-dev 1.8.0 → 1.8.2

package/dist/components/SeatingPlan.js

@@ -24,7 +24,8 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-const MAX_RETRIES = 5;
+const SEATINGPLAN_MAX_RETRIES = 5;
+const BOOKING_MAX_RETRIES = 2;
 const SeatingPlan = _ref => {
   var _document, _document2, _document3;
   let {
@@ -83,8 +84,9 @@ const SeatingPlan = _ref => {
     };
     callbackFunction === null || callbackFunction === void 0 || callbackFunction(event);
   };
-  const addTicketToCart = (s, priceage) => {
+  const _addTicketToCart = async function addTicketToCart(s, priceage) {
     var _mapRef$current;
+    let retryCount = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
     const updatedSeats = _objectSpread({}, seats);
     const seatIndex = updatedSeats.seats.findIndex(seat => seat.ssId === s.ssId);
     const setSeatLoading = loading => {
@@ -109,19 +111,20 @@ const SeatingPlan = _ref => {
       return;
     }
     (_mapRef$current = mapRef.current) === null || _mapRef$current === void 0 || (_mapRef$current = _mapRef$current.target) === null || _mapRef$current === void 0 || _mapRef$current.closePopup();
-    fetch(apiUrl, {
-      method: "POST",
-      body: JSON.stringify({
-        priceAgeId: priceage.paId,
-        seatId: s.ssId,
-        price: priceage.p,
-        connectedShowings: connectedShowings
-      }),
-      headers: {
-        "content-type": "application/json",
-        "basket-key": sessionId
-      }
-    }).then(response => {
+    try {
+      const response = await fetch(apiUrl, {
+        method: "POST",
+        body: JSON.stringify({
+          priceAgeId: priceage.paId,
+          seatId: s.ssId,
+          price: priceage.p,
+          connectedShowings: connectedShowings
+        }),
+        headers: {
+          "content-type": "application/json",
+          "basket-key": sessionId
+        }
+      });
       if ((response === null || response === void 0 ? void 0 : response.status) === 403 || (response === null || response === void 0 ? void 0 : response.status) === 400) {
         if (seatIndex !== -1) {
           updatedSeats.seats[seatIndex] = _objectSpread(_objectSpread({}, s), {}, {
@@ -135,11 +138,22 @@ const SeatingPlan = _ref => {
           message: response.status === 400 ? _utils.ERROR_MESSAGES.INCOMPATIBLE_TICKETS : _utils.ERROR_MESSAGES.SEAT_UNAVAILABLE
         });
       } else if ((response === null || response === void 0 ? void 0 : response.status) === 429) {
+        if (retryCount < BOOKING_MAX_RETRIES) {
+          const delay = (0, _utils.getRetryDelay)(response, retryCount);
+          await new Promise(resolve => setTimeout(resolve, delay));
+          return _addTicketToCart(s, priceage, retryCount + 1);
+        }
         setSeatLoading(false);
         handleError({
           code: 429,
           message: _utils.ERROR_MESSAGES.SEAT_TAKEN
         });
+      } else if (!response.ok) {
+        setSeatLoading(false);
+        handleError({
+          code: 500,
+          message: _utils.ERROR_MESSAGES.GENERIC_ERROR
+        });
       } else {
         if (seatIndex !== -1) {
           updatedSeats.seats[seatIndex] = _objectSpread(_objectSpread({}, s), {}, {
@@ -172,15 +186,14 @@ const SeatingPlan = _ref => {
         };
         callbackFunction === null || callbackFunction === void 0 || callbackFunction(event);
       }
-    }).catch(() => {
+    } catch (_unused) {
       setSeatLoading(false);
       handleError({
         code: 500,
         message: _utils.ERROR_MESSAGES.GENERIC_ERROR
       });
-    }).finally(() => {
-      _initialFetch(true);
-    });
+    }
+    _initialFetch(true);
   };
   const removeTicketFromCart = (s, e) => {
     const updatedSeats = _objectSpread({}, seats);
@@ -241,31 +254,40 @@ const SeatingPlan = _ref => {
     };
     setSeatsLoading(true);
     const succeeded = [];
-    try {
-      for (const seat of seatsToBook) {
-        try {
-          const res = await fetch(apiUrl, {
-            method: "POST",
-            body: JSON.stringify({
-              priceAgeId: seat.priceage.paId,
-              seatId: seat.seat.ssId,
-              price: seat.priceage.p,
-              connectedShowings: connectedShowings
-            }),
-            headers: {
-              "content-type": "application/json",
-              "basket-key": sessionId
-            }
-          });
-          if (!res.ok) {
-            throw new Error("".concat(res.status));
+    const _tryBook = async function tryBook(seatToBook) {
+      let retryCount = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+      try {
+        const res = await fetch(apiUrl, {
+          method: "POST",
+          body: JSON.stringify({
+            priceAgeId: seatToBook.priceage.paId,
+            seatId: seatToBook.seat.ssId,
+            price: seatToBook.priceage.p,
+            connectedShowings: connectedShowings
+          }),
+          headers: {
+            "content-type": "application/json",
+            "basket-key": sessionId
           }
-          succeeded.push(seat);
-        } catch (error) {
-          console.error("Failed to book seat ".concat(seat.seat.r, " ").concat(seat.seat.c, ":"), error);
-          throw new Error(error === "429" ? error : "Booking failed for seat ".concat(seat.seat.r, " ").concat(seat.seat.c));
+        });
+        if (res.status === 429) {
+          if (retryCount < BOOKING_MAX_RETRIES) {
+            const delay = (0, _utils.getRetryDelay)(res, retryCount);
+            await new Promise(resolve => setTimeout(resolve, delay));
+            return _tryBook(seatToBook, retryCount + 1);
+          }
+          throw new Error("429");
         }
+        if (!res.ok) {
+          throw new Error("".concat(res.status));
+        }
+        succeeded.push(seatToBook);
+      } catch (_unused2) {
+        throw new Error("Booking failed for seat ".concat(seatToBook.seat.r, " ").concat(seatToBook.seat.c));
       }
+    };
+    try {
+      await Promise.all(seatsToBook.map(seatToBook => _tryBook(seatToBook)));
       setBookedSeats(prev => [...prev, ...seatsToBook.map(_ref2 => {
         let {
           seat,
@@ -357,7 +379,7 @@ const SeatingPlan = _ref => {
           console.error("Failed to remove seat ".concat(seat, ":"), error);
         }
       }
-    } catch (_unused) {
+    } catch (_unused3) {
       handleError({
         code: 500,
         message: _utils.ERROR_MESSAGES.GENERIC_ERROR
@@ -402,7 +424,7 @@ const SeatingPlan = _ref => {
       const availablePrices = ((_seats$pricing = seats.pricing) === null || _seats$pricing === void 0 ? void 0 : _seats$pricing.filter(price => (!priceSectionIds || priceSectionIds.includes(price.psId)) && s.psId === price.psId)) || [];
       const isSingleFlexi = availablePrices.length === 1 && !!availablePrices[0].pMax && !!availablePrices[0].pMin && availablePrices[0].pMax > availablePrices[0].pMin;
       if (availablePrices.length === 1 && !isSingleFlexi) {
-        addTicketToCart(s, availablePrices[0]);
+        _addTicketToCart(s, availablePrices[0]);
       }
     } else {
       removeTicketFromCart(s, e);
@@ -426,7 +448,7 @@ const SeatingPlan = _ref => {
         }
       });
       if (response.status === 429) {
-        if (retryCount >= MAX_RETRIES) {
+        if (retryCount >= SEATINGPLAN_MAX_RETRIES) {
           throw new Error("We're experiencing high demand. Please try again later.");
         }
         const delay = (0, _utils.getRetryDelay)(response, retryCount);
@@ -553,7 +575,7 @@ const SeatingPlan = _ref => {
     setTicketPopupOpen: setTicketPopupOpen,
     chosenSeat: chosenSeat,
     bookedSeats: bookedSeats,
-    addTicketToCart: addTicketToCart,
+    addTicketToCart: _addTicketToCart,
     batchRemoveTicketsFromCart: batchRemoveTicketsFromCart,
     isReloading: isReloading,
     initialFetch: _initialFetch,

package/dist/utils/helpers.js

@@ -8,14 +8,10 @@ var _enums = require("./enums");
 const getIsTouchScreen = () => {
   let hasTouchScreen = false;
   if (typeof window !== "undefined") {
-    if ("maxTouchPoints" in window.navigator || "msMaxTouchPoints" in window.navigator) {
-      hasTouchScreen = window.navigator.maxTouchPoints > 0 || window.navigator.msMaxTouchPoints > 0;
-    } else {
-      var _matchMedia;
-      const mQ = (_matchMedia = matchMedia) === null || _matchMedia === void 0 ? void 0 : _matchMedia("(pointer: coarse)");
-      if ((mQ === null || mQ === void 0 ? void 0 : mQ.media) === "(pointer: coarse)") {
-        hasTouchScreen = !!mQ.matches;
-      }
+    var _matchMedia;
+    const mQ = (_matchMedia = matchMedia) === null || _matchMedia === void 0 ? void 0 : _matchMedia("(hover: none)");
+    if ((mQ === null || mQ === void 0 ? void 0 : mQ.media) === "(hover: none)") {
+      hasTouchScreen = !!mQ.matches;
     }
   }
   return hasTouchScreen;

package/package.json

@@ -2,7 +2,7 @@
   "name": "iticket-seatingplan-dev",
   "description": "Seating plan with FLEXi pricing",
   "author": "gedwyne",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "private": false,
   "keywords": [
     "iticket",