@paystack/checkout-js 1.57.0-beta.10 → 1.57.0-beta.11

package/dist/checkout.js

@@ -6532,8 +6532,6 @@ var Paystack = (function (exports) {
       if (response.auth && response.auth !== 'none') {
         return this.auth(response);
       }
-      // Below the auth check and gated on `url`: an open_url hand-off is only actionable with an
-      // address, and anything still carrying `auth` is an authentication response first.
       if (response.status === 'open_url' && response.url) {
         return this.getCleanResponse(response, 'Continue at the payment provider');
       }
@@ -21348,9 +21346,6 @@ var Paystack = (function (exports) {
     });
   }
 
-  // A 4xx is the server refusing the charge, and its body carries the merchant-safe reason, so parse
-  // it rather than let axios discard it. A 5xx is not a refusal — it answers "try again later" and
-  // may even land after the order was created — so it rethrows, same as the status poll below.
   var parseChargeRefusal = function parseChargeRefusal(error) {
     if (!error.response || error.response.status >= 500) throw error;
     return ChargeResponses.parse(error.response.data);
@@ -21392,9 +21387,6 @@ var Paystack = (function (exports) {
         return ChargeResponses.parse(response.data);
       }).catch(parseChargeRefusal);
     },
-    // Deliberately has no error branch. Only a 2xx body is an answer about the payment; a 404, a
-    // proxy 5xx or an expired key is the poll failing to reach a verdict, and resolving those to
-    // `failed` would have checkout conclude an outcome the server never gave it.
     requery: function requery(_ref2) {
       var transactionReference = _ref2.transactionReference,
         publicKey = _ref2.publicKey;
@@ -21413,24 +21405,36 @@ var Paystack = (function (exports) {
     }
   };
 
-  // eslint-disable-next-line import/prefer-default-export
   var PAYFLEX_CHANNEL = 'payflex';
 
-  // Checkout may never conclude failure on a timer, so the poll runs long and overlaps: a timer, a
-  // window-focus re-check and a Pusher event can all be in flight together. saveLog() re-POSTs the
-  // whole history per entry, so a run gets one pending entry. A hand-off starts a run; success or
-  // failure ends it; a straggler resolving after either is dropped. The hand-off has to reset on its
-  // own because a Pusher outcome concludes without passing through requeryPayflex.
   var pollRuns = new WeakMap();
   var runFor = function runFor(transaction) {
     if (!pollRuns.has(transaction)) {
       pollRuns.set(transaction, {
         pendingLogged: false,
-        concluded: false
+        concluded: false,
+        lastOutcome: null
       });
     }
     return pollRuns.get(transaction);
   };
+  var isTerminal = function isTerminal(status) {
+    return status === 'success' || status === 'failed';
+  };
+  var recordOutcome = function recordOutcome(transaction, response) {
+    var run = runFor(transaction);
+    if (isTerminal(response.status)) {
+      if (run.lastOutcome === response.status) return false;
+      run.concluded = true;
+      run.pendingLogged = false;
+      run.lastOutcome = response.status;
+      return true;
+    }
+    if (response.status !== 'pending') return true;
+    if (run.pendingLogged || run.concluded) return false;
+    run.pendingLogged = true;
+    return true;
+  };
   var PayflexCharge = {
     chargePayflex: function chargePayflex() {
       var _this = this;
@@ -21470,26 +21474,22 @@ var Paystack = (function (exports) {
         transactionReference: this.reference,
         publicKey: this.merchant.key
       }).then(function (response) {
-        var run = runFor(_this2);
-        if (response.status === 'success' || response.status === 'failed') {
-          run.concluded = true;
-          run.pendingLogged = false;
-          _this2.logAPIResponse(response, PAYFLEX_CHANNEL);
-        } else if (response.status !== 'pending') {
-          _this2.logAPIResponse(response, PAYFLEX_CHANNEL);
-        } else if (!run.pendingLogged && !run.concluded) {
-          run.pendingLogged = true;
+        if (recordOutcome(_this2, response)) {
           _this2.logAPIResponse(response, PAYFLEX_CHANNEL);
         }
         return response;
       });
     },
     listenForPayflexCharge: function listenForPayflexCharge(callback) {
+      var _this3 = this;
       var listenerOptions = {
         paymentMethod: PAYFLEX_CHANNEL,
         channel: "PAYFLEX_".concat(this.id)
       };
-      return this.listenForCharge(listenerOptions, callback);
+      return this.listenForCharge(listenerOptions, function (response, unsubscribe) {
+        recordOutcome(_this3, response);
+        callback(response, unsubscribe);
+      });
     }
   };
 

package/es/checkout.js

@@ -6529,8 +6529,6 @@ var ChargeResponses = {
     if (response.auth && response.auth !== 'none') {
       return this.auth(response);
     }
-    // Below the auth check and gated on `url`: an open_url hand-off is only actionable with an
-    // address, and anything still carrying `auth` is an authentication response first.
     if (response.status === 'open_url' && response.url) {
       return this.getCleanResponse(response, 'Continue at the payment provider');
     }
@@ -21345,9 +21343,6 @@ if (NATIVE_WEAK_MAP && IS_IE11) {
   });
 }
 
-// A 4xx is the server refusing the charge, and its body carries the merchant-safe reason, so parse
-// it rather than let axios discard it. A 5xx is not a refusal — it answers "try again later" and
-// may even land after the order was created — so it rethrows, same as the status poll below.
 var parseChargeRefusal = function parseChargeRefusal(error) {
   if (!error.response || error.response.status >= 500) throw error;
   return ChargeResponses.parse(error.response.data);
@@ -21389,9 +21384,6 @@ var PayflexAPI = {
       return ChargeResponses.parse(response.data);
     }).catch(parseChargeRefusal);
   },
-  // Deliberately has no error branch. Only a 2xx body is an answer about the payment; a 404, a
-  // proxy 5xx or an expired key is the poll failing to reach a verdict, and resolving those to
-  // `failed` would have checkout conclude an outcome the server never gave it.
   requery: function requery(_ref2) {
     var transactionReference = _ref2.transactionReference,
       publicKey = _ref2.publicKey;
@@ -21410,24 +21402,36 @@ var PayflexAPI = {
   }
 };
 
-// eslint-disable-next-line import/prefer-default-export
 var PAYFLEX_CHANNEL = 'payflex';
 
-// Checkout may never conclude failure on a timer, so the poll runs long and overlaps: a timer, a
-// window-focus re-check and a Pusher event can all be in flight together. saveLog() re-POSTs the
-// whole history per entry, so a run gets one pending entry. A hand-off starts a run; success or
-// failure ends it; a straggler resolving after either is dropped. The hand-off has to reset on its
-// own because a Pusher outcome concludes without passing through requeryPayflex.
 var pollRuns = new WeakMap();
 var runFor = function runFor(transaction) {
   if (!pollRuns.has(transaction)) {
     pollRuns.set(transaction, {
       pendingLogged: false,
-      concluded: false
+      concluded: false,
+      lastOutcome: null
     });
   }
   return pollRuns.get(transaction);
 };
+var isTerminal = function isTerminal(status) {
+  return status === 'success' || status === 'failed';
+};
+var recordOutcome = function recordOutcome(transaction, response) {
+  var run = runFor(transaction);
+  if (isTerminal(response.status)) {
+    if (run.lastOutcome === response.status) return false;
+    run.concluded = true;
+    run.pendingLogged = false;
+    run.lastOutcome = response.status;
+    return true;
+  }
+  if (response.status !== 'pending') return true;
+  if (run.pendingLogged || run.concluded) return false;
+  run.pendingLogged = true;
+  return true;
+};
 var PayflexCharge = {
   chargePayflex: function chargePayflex() {
     var _this = this;
@@ -21467,26 +21471,22 @@ var PayflexCharge = {
       transactionReference: this.reference,
       publicKey: this.merchant.key
     }).then(function (response) {
-      var run = runFor(_this2);
-      if (response.status === 'success' || response.status === 'failed') {
-        run.concluded = true;
-        run.pendingLogged = false;
-        _this2.logAPIResponse(response, PAYFLEX_CHANNEL);
-      } else if (response.status !== 'pending') {
-        _this2.logAPIResponse(response, PAYFLEX_CHANNEL);
-      } else if (!run.pendingLogged && !run.concluded) {
-        run.pendingLogged = true;
+      if (recordOutcome(_this2, response)) {
         _this2.logAPIResponse(response, PAYFLEX_CHANNEL);
       }
       return response;
     });
   },
   listenForPayflexCharge: function listenForPayflexCharge(callback) {
+    var _this3 = this;
     var listenerOptions = {
       paymentMethod: PAYFLEX_CHANNEL,
       channel: "PAYFLEX_".concat(this.id)
     };
-    return this.listenForCharge(listenerOptions, callback);
+    return this.listenForCharge(listenerOptions, function (response, unsubscribe) {
+      recordOutcome(_this3, response);
+      callback(response, unsubscribe);
+    });
   }
 };
 

package/lib/checkout.js

@@ -6533,8 +6533,6 @@ var ChargeResponses = {
     if (response.auth && response.auth !== 'none') {
       return this.auth(response);
     }
-    // Below the auth check and gated on `url`: an open_url hand-off is only actionable with an
-    // address, and anything still carrying `auth` is an authentication response first.
     if (response.status === 'open_url' && response.url) {
       return this.getCleanResponse(response, 'Continue at the payment provider');
     }
@@ -21349,9 +21347,6 @@ if (NATIVE_WEAK_MAP && IS_IE11) {
   });
 }
 
-// A 4xx is the server refusing the charge, and its body carries the merchant-safe reason, so parse
-// it rather than let axios discard it. A 5xx is not a refusal — it answers "try again later" and
-// may even land after the order was created — so it rethrows, same as the status poll below.
 var parseChargeRefusal = function parseChargeRefusal(error) {
   if (!error.response || error.response.status >= 500) throw error;
   return ChargeResponses.parse(error.response.data);
@@ -21393,9 +21388,6 @@ var PayflexAPI = {
       return ChargeResponses.parse(response.data);
     }).catch(parseChargeRefusal);
   },
-  // Deliberately has no error branch. Only a 2xx body is an answer about the payment; a 404, a
-  // proxy 5xx or an expired key is the poll failing to reach a verdict, and resolving those to
-  // `failed` would have checkout conclude an outcome the server never gave it.
   requery: function requery(_ref2) {
     var transactionReference = _ref2.transactionReference,
       publicKey = _ref2.publicKey;
@@ -21414,24 +21406,36 @@ var PayflexAPI = {
   }
 };
 
-// eslint-disable-next-line import/prefer-default-export
 var PAYFLEX_CHANNEL = 'payflex';
 
-// Checkout may never conclude failure on a timer, so the poll runs long and overlaps: a timer, a
-// window-focus re-check and a Pusher event can all be in flight together. saveLog() re-POSTs the
-// whole history per entry, so a run gets one pending entry. A hand-off starts a run; success or
-// failure ends it; a straggler resolving after either is dropped. The hand-off has to reset on its
-// own because a Pusher outcome concludes without passing through requeryPayflex.
 var pollRuns = new WeakMap();
 var runFor = function runFor(transaction) {
   if (!pollRuns.has(transaction)) {
     pollRuns.set(transaction, {
       pendingLogged: false,
-      concluded: false
+      concluded: false,
+      lastOutcome: null
     });
   }
   return pollRuns.get(transaction);
 };
+var isTerminal = function isTerminal(status) {
+  return status === 'success' || status === 'failed';
+};
+var recordOutcome = function recordOutcome(transaction, response) {
+  var run = runFor(transaction);
+  if (isTerminal(response.status)) {
+    if (run.lastOutcome === response.status) return false;
+    run.concluded = true;
+    run.pendingLogged = false;
+    run.lastOutcome = response.status;
+    return true;
+  }
+  if (response.status !== 'pending') return true;
+  if (run.pendingLogged || run.concluded) return false;
+  run.pendingLogged = true;
+  return true;
+};
 var PayflexCharge = {
   chargePayflex: function chargePayflex() {
     var _this = this;
@@ -21471,26 +21475,22 @@ var PayflexCharge = {
       transactionReference: this.reference,
       publicKey: this.merchant.key
     }).then(function (response) {
-      var run = runFor(_this2);
-      if (response.status === 'success' || response.status === 'failed') {
-        run.concluded = true;
-        run.pendingLogged = false;
-        _this2.logAPIResponse(response, PAYFLEX_CHANNEL);
-      } else if (response.status !== 'pending') {
-        _this2.logAPIResponse(response, PAYFLEX_CHANNEL);
-      } else if (!run.pendingLogged && !run.concluded) {
-        run.pendingLogged = true;
+      if (recordOutcome(_this2, response)) {
         _this2.logAPIResponse(response, PAYFLEX_CHANNEL);
       }
       return response;
     });
   },
   listenForPayflexCharge: function listenForPayflexCharge(callback) {
+    var _this3 = this;
     var listenerOptions = {
       paymentMethod: PAYFLEX_CHANNEL,
       channel: "PAYFLEX_".concat(this.id)
     };
-    return this.listenForCharge(listenerOptions, callback);
+    return this.listenForCharge(listenerOptions, function (response, unsubscribe) {
+      recordOutcome(_this3, response);
+      callback(response, unsubscribe);
+    });
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paystack/checkout-js",
-  "version": "1.57.0-beta.10",
+  "version": "1.57.0-beta.11",
   "description": "Client-side JS library for billing on Paystack",
   "main": "lib/checkout.js",
   "module": "es/checkout.js",