@alipay/ams-checkout 0.0.1781004142-dev.0 → 0.0.1781004142-dev.1

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

@@ -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, shouldContinue, recordResult, _recordResult, _recordResult2, _recordResult3, _recordResult4, _recordResult5, _logParams;
+        var startEventId, res, logParams, isApplePay, BEFORE_CONFIRM_TIMEOUT_MS, 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:
@@ -402,57 +402,73 @@ var ElementController = /*#__PURE__*/function () {
 
               // Non-Apple Pay: execute onBeforeConfirm at SDK layer directly, abort on failure
               isApplePay = this.currentPaymentMethodType === 'APPLEPAY';
+              this.serviceMap.Log.logInfo({
+                title: 'sdk_element_submitPayment_beforeConfirm'
+              }, {
+                msg: safeStringify({
+                  isApplePay: isApplePay,
+                  hasOnBeforeConfirm: !!(submitParams !== null && submitParams !== void 0 && submitParams.onBeforeConfirm),
+                  currentPaymentMethodType: this.currentPaymentMethodType
+                })
+              });
               if (!(submitParams !== null && submitParams !== void 0 && submitParams.onBeforeConfirm && !isApplePay)) {
-                _context4.next = 23;
+                _context4.next = 27;
                 break;
               }
-              _context4.prev = 9;
-              _context4.next = 12;
-              return submitParams.onBeforeConfirm();
-            case 12:
+              BEFORE_CONFIRM_TIMEOUT_MS = 15000;
+              _context4.prev = 11;
+              timeoutPromise = new Promise(function (_, reject) {
+                return setTimeout(function () {
+                  return reject(new Error('onBeforeConfirm timed out'));
+                }, BEFORE_CONFIRM_TIMEOUT_MS);
+              });
+              _context4.next = 15;
+              return Promise.race([submitParams.onBeforeConfirm(), timeoutPromise]);
+            case 15:
               shouldContinue = _context4.sent;
               if (!(shouldContinue === false)) {
-                _context4.next = 16;
+                _context4.next = 19;
                 break;
               }
               this.changeLoading(false);
               return _context4.abrupt("return", {
                 status: PaymentStatus.FAIL,
                 error: {
-                  code: 'MERCHANT_ABORT',
+                  code: 'MERCHANT_CONFIRM_ABORT',
                   message: 'Payment was cancelled by merchant before confirmation.',
                   needChangeSessionForRetry: false
                 }
               });
-            case 16:
-              _context4.next = 23;
+            case 19:
+              _context4.next = 27;
               break;
-            case 18:
-              _context4.prev = 18;
-              _context4.t0 = _context4["catch"](9);
+            case 21:
+              _context4.prev = 21;
+              _context4.t0 = _context4["catch"](11);
               this.changeLoading(false);
+              isTimeout = _context4.t0 instanceof Error && _context4.t0.message === 'onBeforeConfirm timed out';
               this.serviceMap.Log.logError({
                 title: ELEMENT_SPM_MAP.sdk_element_missKeyData
               }, {
                 msg: safeStringify({
-                  error: 'onBeforeConfirm callback error'
+                  error: isTimeout ? 'onBeforeConfirm timed out after 15s' : 'onBeforeConfirm callback error'
                 })
               });
               return _context4.abrupt("return", {
                 status: PaymentStatus.FAIL,
                 error: {
-                  code: 'BEFORE_CONFIRM_ERROR',
-                  message: 'An error occurred during the before-confirm callback.',
+                  code: 'MERCHANT_CONFIRM_ABORT',
+                  message: isTimeout ? 'onBeforeConfirm timed out after 15 seconds.' : 'An error occurred during the before-confirm callback.',
                   needChangeSessionForRetry: false
                 }
               });
-            case 23:
+            case 27:
               recordResult = null;
-              _context4.prev = 24;
-              _context4.next = 27;
+              _context4.prev = 28;
+              _context4.next = 31;
               return new Promise( /*#__PURE__*/function () {
                 var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(resolve) {
-                  var that, recordResultCallback, params, processStep, _submitParams$handleA, hasBeforeConfirmForApplePay, _yield$_this3$onValid2, _data, errorString, errorResult;
+                  var that, recordResultCallback, params, processStep, hasBeforeConfirmForApplePay, _yield$_this3$onValid2, _data, errorString, errorResult;
                   return _regeneratorRuntime().wrap(function _callee3$(_context3) {
                     while (1) switch (_context3.prev = _context3.next) {
                       case 0:
@@ -528,31 +544,57 @@ var ElementController = /*#__PURE__*/function () {
                         return _context3.abrupt("return");
                       case 14:
                         if (!_this3.elementProcessors[ElementType.payment]) {
-                          _context3.next = 23;
+                          _context3.next = 24;
                           break;
                         }
                         // Apple Pay: set onBeforeConfirm on paymentProcessor for event bridge callback after iframe authorization
                         hasBeforeConfirmForApplePay = isApplePay && !!(submitParams !== null && submitParams !== void 0 && submitParams.onBeforeConfirm);
+                        _this3.serviceMap.Log.logInfo({
+                          title: 'sdk_element_submitPayment_setBeforeConfirm'
+                        }, {
+                          msg: safeStringify({
+                            hasBeforeConfirmForApplePay: hasBeforeConfirmForApplePay,
+                            isApplePay: isApplePay
+                          })
+                        });
                         _this3.elementProcessors[ElementType.payment].setOnBeforeConfirm(hasBeforeConfirmForApplePay ? submitParams.onBeforeConfirm : null);
-                        _context3.next = 19;
-                        return _this3.onValidateAndSubmitPay(_this3.elementProcessors[ElementType.payment].eventCenter, ElementPaymentMethod.PAYMENT_ELEMENT, _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,
-                          applePayAmount: submitParams === null || submitParams === void 0 ? void 0 : submitParams.applePayAmount,
-                          hasBeforeConfirm: hasBeforeConfirmForApplePay
-                        }));
-                      case 19:
+                        _context3.next = 20;
+                        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
+                          }, hasAmount && hasCurrency ? {
+                            amount: submitParams.amount,
+                            currency: submitParams.currency
+                          } : {}), {}, {
+                            hasBeforeConfirm: hasBeforeConfirmForApplePay
+                          });
+                        }());
+                      case 20:
                         _yield$_this3$onValid2 = _context3.sent;
                         _data = _yield$_this3$onValid2.data;
                         // TODO 先快速修复类型, 这里结构和标准返回不一致 @马杰
                         // TODO checkout 返回的错误未包含 status 和 message @马杰 @薛浩
                         recordResult = _data;
                         recordResultCallback(recordResult);
-                      case 23:
-                        _context3.next = 32;
+                      case 24:
+                        _context3.next = 33;
                         break;
-                      case 25:
-                        _context3.prev = 25;
+                      case 26:
+                        _context3.prev = 26;
                         _context3.t0 = _context3["catch"](2);
                         // 修复error为{}空对象的问题，上报stack&message
                         errorString = JSON.stringify(_context3.t0, Object.getOwnPropertyNames(_context3.t0));
@@ -569,20 +611,20 @@ var ElementController = /*#__PURE__*/function () {
                         });
                         recordResult = errorResult;
                         recordResultCallback(errorResult);
-                      case 32:
+                      case 33:
                       case "end":
                         return _context3.stop();
                     }
-                  }, _callee3, null, [[2, 25]]);
+                  }, _callee3, null, [[2, 26]]);
                 }));
                 return function (_x2) {
                   return _ref3.apply(this, arguments);
                 };
               }());
-            case 27:
+            case 31:
               return _context4.abrupt("return", _context4.sent);
-            case 28:
-              _context4.prev = 28;
+            case 32:
+              _context4.prev = 32;
               _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,
@@ -593,12 +635,12 @@ var ElementController = /*#__PURE__*/function () {
               };
               this.elementEventCenter.endEvent(startEventId, _logParams);
               this.changeLoading(false);
-              return _context4.finish(28);
-            case 33:
+              return _context4.finish(32);
+            case 37:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[9, 18], [24,, 28, 33]]);
+        }, _callee4, this, [[11, 21], [28,, 32, 37]]);
       }));
       function submitPayment(_x) {
         return _submitPayment.apply(this, arguments);

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

@@ -178,12 +178,17 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
       // requests SDK layer to execute merchant's onBeforeConfirm callback via beforeConfirm event,
       // and returns the result (continue/abort) to iframe via dispatchToApp.
       this.eventCenter.listen(EVENT.beforeConfirm.name, /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        var shouldContinue;
+        var BEFORE_CONFIRM_TIMEOUT_MS, timeoutPromise, shouldContinue, isTimeout;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
+              logger.logInfo({
+                title: 'sdk_element_beforeConfirm_event_received'
+              }, {
+                hasCallback: !!_this2._onBeforeConfirm
+              });
               if (_this2._onBeforeConfirm) {
-                _context.next = 3;
+                _context.next = 4;
                 break;
               }
               _this2.eventCenter.dispatchToApp({
@@ -194,12 +199,23 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                 }
               });
               return _context.abrupt("return");
-            case 3:
-              _context.prev = 3;
-              _context.next = 6;
-              return _this2._onBeforeConfirm();
-            case 6:
+            case 4:
+              BEFORE_CONFIRM_TIMEOUT_MS = 15000;
+              _context.prev = 5;
+              timeoutPromise = new Promise(function (_, reject) {
+                return setTimeout(function () {
+                  return reject(new Error('onBeforeConfirm timed out'));
+                }, BEFORE_CONFIRM_TIMEOUT_MS);
+              });
+              _context.next = 9;
+              return Promise.race([_this2._onBeforeConfirm(), timeoutPromise]);
+            case 9:
               shouldContinue = _context.sent;
+              logger.logInfo({
+                title: 'sdk_element_beforeConfirm_callback_result'
+              }, {
+                shouldContinue: shouldContinue
+              });
               _this2.eventCenter.dispatchToApp({
                 event: EVENT.beforeConfirm.name,
                 data: {
@@ -207,15 +223,16 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                   result: shouldContinue !== false
                 }
               });
-              _context.next = 14;
+              _context.next = 19;
               break;
-            case 10:
-              _context.prev = 10;
-              _context.t0 = _context["catch"](3);
+            case 14:
+              _context.prev = 14;
+              _context.t0 = _context["catch"](5);
+              isTimeout = _context.t0 instanceof Error && _context.t0.message === 'onBeforeConfirm timed out';
               logger.logError({
                 title: 'sdk_element_onBeforeConfirm_error'
               }, {
-                error: safeStringify(_context.t0)
+                error: isTimeout ? 'onBeforeConfirm timed out after 15s' : safeStringify(_context.t0)
               });
               _this2.eventCenter.dispatchToApp({
                 event: EVENT.beforeConfirm.name,
@@ -224,11 +241,11 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                   result: false
                 }
               });
-            case 14:
+            case 19:
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[3, 10]]);
+        }, _callee, null, [[5, 14]]);
       })));
     }
   }, {

package/esm/core/component/element/type.d.ts

@@ -284,32 +284,27 @@ export interface AddressSubmitData {
     shippingId: string;
     actionFlag?: 'I' | 'U' | 'D';
 }
-/**
- * Amount info displayed on Apple Pay sheet (display only; actual charge amount is controlled by server)
- */
-export interface SubmitAmount {
-    /** Amount value, e.g. '10.99' */
-    value: string;
-    /** Currency code, e.g. 'USD' */
-    currency: string;
-}
 export interface SubmitFuncParams {
     handleActions?: boolean;
     shippingInfo?: ShippingInfo;
     /**
-     * Amount displayed on Apple Pay sheet. Only effective in Apple Pay scenario,
-     * used to show amount when launching the sheet first. Actual charge amount
-     * is determined by server. Ignored in non-Apple Pay scenarios.
+     * Amount displayed on the Apple Pay payment sheet, e.g. '10.99'.
+     * Display only; actual charge amount is controlled by server.
+     * Must be provided together with `currency`. Only effective for Apple Pay.
+     */
+    amount?: string;
+    /**
+     * Currency code displayed on the Apple Pay payment sheet, e.g. 'USD'.
+     * Follows ISO 4217 standard. Must be provided together with `amount`. Only effective for Apple Pay.
      */
-    applePayAmount?: SubmitAmount;
+    currency?: string;
     /**
      * Pre-confirmation callback. Executed after user authorization but before actual charge,
      * allowing merchant to create order at this point.
-     * - Apple Pay: invoked via event bridge after user FaceID/TouchID authorization on the sheet
-     * - Non-Apple Pay: invoked synchronously at SDK layer
+     * - Only effective when payment method is Apple Pay
+     * - Invoked via event bridge after user FaceID/TouchID authorization on the payment sheet
      * - Return true: proceed with charge
-     * - Return false: abort payment, returns MERCHANT_ABORT error code
-     * - Throw error: abort payment, returns BEFORE_CONFIRM_ERROR error code
+     * - Return false / timeout / throw error: abort payment, returns MERCHANT_CONFIRM_ABORT error code
      */
     onBeforeConfirm?: () => Promise<boolean>;
 }

package/esm/core/component/element/type.js

@@ -119,10 +119,6 @@ export var AddressEventCallbackName = /*#__PURE__*/function (AddressEventCallbac
  */
 
 // export type IMountResult = AddressMountResult | LinkAuthMountResult | PaymentMountResult;
-
-/**
- * Amount info displayed on Apple Pay sheet (display only; actual charge amount is controlled by server)
- */
 var AccountStatusEnum = /*#__PURE__*/function (AccountStatusEnum) {
   AccountStatusEnum["EFFECTIVE"] = "EFFECTIVE";
   AccountStatusEnum["UNREGISTERED"] = "UNREGISTERED";

package/package.json

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