@alipay/ams-checkout 0.0.1781004142-dev.8 → 0.0.1781004142-dev.9

package/esm/core/component/element/elementController/index.js

@@ -60,7 +60,7 @@ var ElementController = /*#__PURE__*/function () {
     _defineProperty(this, "submitPayPromise", void 0);
     _defineProperty(this, "elementEventCenter", void 0);
     /** Current selected payment method type (e.g. 'APPLEPAY', 'CARD'), updated via paymentMethodChanged event */
-    _defineProperty(this, "currentPaymentMethodType", void 0);
+    _defineProperty(this, "currentPaymentMethodType", '');
     _defineProperty(this, "onValidateFunc", function (event, target) {
       return new Promise(function (resolve) {
         event.emitAndListen({
@@ -374,7 +374,7 @@ var ElementController = /*#__PURE__*/function () {
     value: function () {
       var _submitPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(submitParams) {
         var _this3 = this;
-        var startEventId, res, logParams, isApplePay, paymentMethodType, BEFORE_CONFIRM_TIMEOUT_MS, timeoutPromise, startTime, shouldContinue, isTimeout, recordResult, _recordResult, _recordResult2, _recordResult3, _recordResult4, _recordResult5, _logParams;
+        var startEventId, res, logParams, isApplePay, paymentMethodType, BEFORE_CONFIRM_TIMEOUT_MS, timerId, timeoutPromise, shouldContinue, isTimeout, recordResult, _recordResult, _recordResult2, _recordResult3, _recordResult4, _recordResult5, _logParams;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -404,7 +404,7 @@ var ElementController = /*#__PURE__*/function () {
               isApplePay = this.currentPaymentMethodType === 'APPLEPAY';
               paymentMethodType = this.currentPaymentMethodType || 'UNKNOWN';
               if (!(submitParams !== null && submitParams !== void 0 && submitParams.onBeforeConfirm && !isApplePay)) {
-                _context4.next = 34;
+                _context4.next = 38;
                 break;
               }
               BEFORE_CONFIRM_TIMEOUT_MS = 15000;
@@ -416,23 +416,22 @@ var ElementController = /*#__PURE__*/function () {
               });
               _context4.prev = 12;
               timeoutPromise = new Promise(function (_, reject) {
-                return setTimeout(function () {
+                timerId = setTimeout(function () {
                   return reject(new Error('onBeforeConfirm timed out'));
                 }, BEFORE_CONFIRM_TIMEOUT_MS);
               });
-              startTime = Date.now();
+              _context4.prev = 14;
               _context4.next = 17;
               return Promise.race([submitParams.onBeforeConfirm(), timeoutPromise]);
             case 17:
               shouldContinue = _context4.sent;
-              if (Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS) {
-                this.serviceMap.Log.logError({
-                  title: 'sdk_before_confirm_timeout'
-                });
-                shouldContinue = false;
-              }
+            case 18:
+              _context4.prev = 18;
+              clearTimeout(timerId);
+              return _context4.finish(18);
+            case 21:
               if (!(shouldContinue === false)) {
-                _context4.next = 23;
+                _context4.next = 26;
                 break;
               }
               this.serviceMap.Log.logInfo({
@@ -442,6 +441,10 @@ var ElementController = /*#__PURE__*/function () {
                 path: 'nonApplePay_sync'
               });
               this.changeLoading(false);
+              this.elementEventCenter.endEvent(startEventId, {
+                eventCode: PaymentStatus.FAIL,
+                errorName: 'MERCHANT_CONFIRM_ABORT'
+              });
               return _context4.abrupt("return", {
                 status: PaymentStatus.FAIL,
                 error: {
@@ -450,17 +453,17 @@ var ElementController = /*#__PURE__*/function () {
                   needChangeSessionForRetry: false
                 }
               });
-            case 23:
+            case 26:
               this.serviceMap.Log.logInfo({
                 title: 'sdk_before_confirm_success'
               }, {
                 paymentMethodType: paymentMethodType,
                 path: 'nonApplePay_sync'
               });
-              _context4.next = 32;
+              _context4.next = 36;
               break;
-            case 26:
-              _context4.prev = 26;
+            case 29:
+              _context4.prev = 29;
               _context4.t0 = _context4["catch"](12);
               isTimeout = _context4.t0 instanceof Error && _context4.t0.message === 'onBeforeConfirm timed out';
               if (isTimeout) {
@@ -480,6 +483,10 @@ var ElementController = /*#__PURE__*/function () {
                 });
               }
               this.changeLoading(false);
+              this.elementEventCenter.endEvent(startEventId, {
+                eventCode: PaymentStatus.FAIL,
+                errorName: 'MERCHANT_CONFIRM_ABORT'
+              });
               return _context4.abrupt("return", {
                 status: PaymentStatus.FAIL,
                 error: {
@@ -488,10 +495,10 @@ var ElementController = /*#__PURE__*/function () {
                   needChangeSessionForRetry: false
                 }
               });
-            case 32:
-              _context4.next = 35;
+            case 36:
+              _context4.next = 39;
               break;
-            case 34:
+            case 38:
               if (!(submitParams !== null && submitParams !== void 0 && submitParams.onBeforeConfirm)) {
                 this.serviceMap.Log.logInfo({
                   title: 'sdk_before_confirm_skip'
@@ -500,13 +507,13 @@ var ElementController = /*#__PURE__*/function () {
                   path: isApplePay ? 'applePay_eventBridge' : 'nonApplePay_sync'
                 });
               }
-            case 35:
+            case 39:
               recordResult = null;
-              _context4.prev = 36;
-              _context4.next = 39;
+              _context4.prev = 40;
+              _context4.next = 43;
               return new Promise( /*#__PURE__*/function () {
                 var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(resolve) {
-                  var that, recordResultCallback, params, processStep, hasBeforeConfirmForApplePay, _yield$_this3$onValid2, _data, errorString, errorResult;
+                  var that, recordResultCallback, params, processStep, hasBeforeConfirmForApplePay, hasAmount, hasCurrency, _yield$_this3$onValid2, _data, errorString, errorResult;
                   return _regeneratorRuntime().wrap(function _callee3$(_context3) {
                     while (1) switch (_context3.prev = _context3.next) {
                       case 0:
@@ -582,7 +589,7 @@ var ElementController = /*#__PURE__*/function () {
                         return _context3.abrupt("return");
                       case 14:
                         if (!_this3.elementProcessors[ElementType.payment]) {
-                          _context3.next = 24;
+                          _context3.next = 28;
                           break;
                         }
                         // Apple Pay: set onBeforeConfirm on paymentProcessor for event bridge callback after iframe authorization
@@ -596,21 +603,22 @@ var ElementController = /*#__PURE__*/function () {
                           })
                         });
                         _this3.elementProcessors[ElementType.payment].setOnBeforeConfirm(hasBeforeConfirmForApplePay ? submitParams.onBeforeConfirm : null);
-                        _context3.next = 20;
+                        hasAmount = !!(submitParams !== null && submitParams !== void 0 && submitParams.amount);
+                        hasCurrency = !!(submitParams !== null && submitParams !== void 0 && submitParams.currency);
+                        if ((hasAmount || hasCurrency) && !(hasAmount && hasCurrency)) {
+                          _this3.serviceMap.Log.logError({
+                            title: 'sdk_element_submitPayment_amountCurrencyMismatch'
+                          }, {
+                            msg: safeStringify({
+                              amount: submitParams === null || submitParams === void 0 ? void 0 : submitParams.amount,
+                              currency: submitParams === null || submitParams === void 0 ? void 0 : submitParams.currency,
+                              reason: 'amount and currency must be provided together, both ignored'
+                            })
+                          });
+                        }
+                        _this3.elementProcessors[ElementType.payment].setMerchantAmountOverride(hasAmount && hasCurrency ? submitParams.amount : null, hasAmount && hasCurrency ? submitParams.currency : null);
+                        _context3.next = 24;
                         return _this3.onValidateAndSubmitPay(_this3.elementProcessors[ElementType.payment].eventCenter, ElementPaymentMethod.PAYMENT_ELEMENT, function (_submitParams$handleA) {
-                          var hasAmount = !!(submitParams !== null && submitParams !== void 0 && submitParams.amount);
-                          var hasCurrency = !!(submitParams !== null && submitParams !== void 0 && submitParams.currency);
-                          if ((hasAmount || hasCurrency) && !(hasAmount && hasCurrency)) {
-                            _this3.serviceMap.Log.logError({
-                              title: 'sdk_element_submitPayment_amountCurrencyMismatch'
-                            }, {
-                              msg: safeStringify({
-                                amount: submitParams === null || submitParams === void 0 ? void 0 : submitParams.amount,
-                                currency: submitParams === null || submitParams === void 0 ? void 0 : submitParams.currency,
-                                reason: 'amount and currency must be provided together, both ignored'
-                              })
-                            });
-                          }
                           return _objectSpread(_objectSpread(_objectSpread({}, params), {}, {
                             handleActions: (_submitParams$handleA = submitParams === null || submitParams === void 0 ? void 0 : submitParams.handleActions) !== null && _submitParams$handleA !== void 0 ? _submitParams$handleA : true,
                             shipping: submitParams === null || submitParams === void 0 ? void 0 : submitParams.shippingInfo
@@ -621,18 +629,18 @@ var ElementController = /*#__PURE__*/function () {
                             hasBeforeConfirm: hasBeforeConfirmForApplePay
                           });
                         }());
-                      case 20:
+                      case 24:
                         _yield$_this3$onValid2 = _context3.sent;
                         _data = _yield$_this3$onValid2.data;
                         // TODO 先快速修复类型, 这里结构和标准返回不一致 @马杰
                         // TODO checkout 返回的错误未包含 status 和 message @马杰 @薛浩
                         recordResult = _data;
                         recordResultCallback(recordResult);
-                      case 24:
-                        _context3.next = 33;
+                      case 28:
+                        _context3.next = 37;
                         break;
-                      case 26:
-                        _context3.prev = 26;
+                      case 30:
+                        _context3.prev = 30;
                         _context3.t0 = _context3["catch"](2);
                         // 修复error为{}空对象的问题，上报stack&message
                         errorString = JSON.stringify(_context3.t0, Object.getOwnPropertyNames(_context3.t0));
@@ -649,20 +657,20 @@ var ElementController = /*#__PURE__*/function () {
                         });
                         recordResult = errorResult;
                         recordResultCallback(errorResult);
-                      case 33:
+                      case 37:
                       case "end":
                         return _context3.stop();
                     }
-                  }, _callee3, null, [[2, 26]]);
+                  }, _callee3, null, [[2, 30]]);
                 }));
                 return function (_x2) {
                   return _ref3.apply(this, arguments);
                 };
               }());
-            case 39:
+            case 43:
               return _context4.abrupt("return", _context4.sent);
-            case 40:
-              _context4.prev = 40;
+            case 44:
+              _context4.prev = 44;
               _logParams = {
                 eventCode: (_recordResult = recordResult) === null || _recordResult === void 0 ? void 0 : _recordResult.status,
                 errorName: (_recordResult2 = recordResult) === null || _recordResult2 === void 0 || (_recordResult2 = _recordResult2.error) === null || _recordResult2 === void 0 ? void 0 : _recordResult2.code,
@@ -673,12 +681,12 @@ var ElementController = /*#__PURE__*/function () {
               };
               this.elementEventCenter.endEvent(startEventId, _logParams);
               this.changeLoading(false);
-              return _context4.finish(40);
-            case 45:
+              return _context4.finish(44);
+            case 49:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[12, 26], [36,, 40, 45]]);
+        }, _callee4, this, [[12, 29], [14,, 18, 21], [40,, 44, 49]]);
       }));
       function submitPayment(_x) {
         return _submitPayment.apply(this, arguments);

package/esm/core/component/element/elementProcessor/paymentProcessor.d.ts

@@ -8,7 +8,10 @@ declare class PaymentProcessor extends BaseElementProcessor {
      * triggered via beforeConfirm event after Apple Pay authorization in iframe.
      */
     private _onBeforeConfirm;
+    private _merchantAmount;
+    private _merchantCurrency;
     setOnBeforeConfirm(callback: (() => Promise<boolean>) | null): void;
+    setMerchantAmountOverride(amount: string | null, currency: string | null): void;
     onReady(extraParam: any): void;
     getLogger(): LogService;
     private addEventListener;

package/esm/core/component/element/elementProcessor/paymentProcessor.js

@@ -62,6 +62,8 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
      * triggered via beforeConfirm event after Apple Pay authorization in iframe.
      */
     _defineProperty(_assertThisInitialized(_this), "_onBeforeConfirm", null);
+    _defineProperty(_assertThisInitialized(_this), "_merchantAmount", null);
+    _defineProperty(_assertThisInitialized(_this), "_merchantCurrency", null);
     return _this;
   }
   _createClass(PaymentProcessor, [{
@@ -69,6 +71,12 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
     value: function setOnBeforeConfirm(callback) {
       this._onBeforeConfirm = callback;
     }
+  }, {
+    key: "setMerchantAmountOverride",
+    value: function setMerchantAmountOverride(amount, currency) {
+      this._merchantAmount = amount;
+      this._merchantCurrency = currency;
+    }
   }, {
     key: "onReady",
     value: function onReady(extraParam) {
@@ -154,7 +162,9 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
           parseData: paymentSessionObj,
           logger: logger,
           env: _this2.options.env.environment,
-          shipping: shipping
+          shipping: shipping,
+          merchantAmount: _this2._merchantAmount,
+          merchantCurrency: _this2._merchantCurrency
         });
         applePayService.startPay().then(function (res) {
           _this2.eventCenter.dispatchToApp({

package/esm/plugin/component/channel.d.ts

@@ -34,12 +34,16 @@ export declare class ApplePaySdk {
     private logger;
     private env;
     private shipping?;
-    constructor({ paymentSessionData, parseData, logger, env, shipping, }: {
+    private merchantAmount;
+    private merchantCurrency;
+    constructor({ paymentSessionData, parseData, logger, env, shipping, merchantAmount, merchantCurrency, }: {
         paymentSessionData: string;
         parseData: IPaymentSessionMetaData;
         logger: Logger;
         env?: string;
         shipping?: CKPShipping;
+        merchantAmount?: string | null;
+        merchantCurrency?: string | null;
     });
     startPay(): Promise<unknown>;
     begin(): Promise<unknown>;

package/esm/plugin/component/channel.js

@@ -137,7 +137,11 @@ export var ApplePaySdk = /*#__PURE__*/function () {
       logger = _ref.logger,
       _ref$env = _ref.env,
       env = _ref$env === void 0 ? EnvironmentEnum.prod : _ref$env,
-      shipping = _ref.shipping;
+      shipping = _ref.shipping,
+      _ref$merchantAmount = _ref.merchantAmount,
+      merchantAmount = _ref$merchantAmount === void 0 ? null : _ref$merchantAmount,
+      _ref$merchantCurrency = _ref.merchantCurrency,
+      merchantCurrency = _ref$merchantCurrency === void 0 ? null : _ref$merchantCurrency;
     _classCallCheck(this, ApplePaySdk);
     _defineProperty(this, "APPLESDKURL", 'https://applepay.cdn-apple.com/jsapi/1.latest/apple-pay-sdk.js');
     _defineProperty(this, "session", null);
@@ -150,11 +154,15 @@ export var ApplePaySdk = /*#__PURE__*/function () {
     _defineProperty(this, "logger", void 0);
     _defineProperty(this, "env", void 0);
     _defineProperty(this, "shipping", void 0);
+    _defineProperty(this, "merchantAmount", void 0);
+    _defineProperty(this, "merchantCurrency", void 0);
     this.paymentSessionData = paymentSessionData;
     this.parseData = parseData;
     this.env = env;
     this.logger = logger;
     this.shipping = shipping;
+    this.merchantAmount = merchantAmount;
+    this.merchantCurrency = merchantCurrency;
   }
   _createClass(ApplePaySdk, [{
     key: "startPay",
@@ -496,13 +504,13 @@ export var ApplePaySdk = /*#__PURE__*/function () {
         extendInfo = _ref5.extendInfo;
       var request = {
         countryCode: merchantInfo === null || merchantInfo === void 0 ? void 0 : merchantInfo.registeredCountry,
-        currencyCode: paymentAmount === null || paymentAmount === void 0 ? void 0 : paymentAmount.currency,
+        currencyCode: this.merchantCurrency || (paymentAmount === null || paymentAmount === void 0 ? void 0 : paymentAmount.currency),
         merchantCapabilities: extendInfo === null || extendInfo === void 0 ? void 0 : extendInfo.merchantCapabilities,
         supportedNetworks: extendInfo === null || extendInfo === void 0 ? void 0 : extendInfo.supportedNetworks,
         total: {
           label: merchantInfo === null || merchantInfo === void 0 ? void 0 : merchantInfo.merchantName,
           type: 'final',
-          amount: paymentAmount === null || paymentAmount === void 0 ? void 0 : paymentAmount.value
+          amount: this.merchantAmount || (paymentAmount === null || paymentAmount === void 0 ? void 0 : paymentAmount.value)
         },
         requiredBillingContactFields: extendInfo === null || extendInfo === void 0 ? void 0 : extendInfo.requiredBillingContactFields,
         requiredShippingContactFields: extendInfo === null || extendInfo === void 0 ? void 0 : extendInfo.requiredShippingContactFields

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alipay/ams-checkout",
-  "version": "0.0.1781004142-dev.8",
+  "version": "0.0.1781004142-dev.9",
   "description": "",
   "author": "",
   "exports": {