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

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, BEFORE_CONFIRM_TIMEOUT_MS, timeoutPromise, 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:
@@ -402,73 +402,118 @@ 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
-                })
-              });
+              paymentMethodType = this.currentPaymentMethodType || 'UNKNOWN';
               if (!(submitParams !== null && submitParams !== void 0 && submitParams.onBeforeConfirm && !isApplePay)) {
-                _context4.next = 27;
+                _context4.next = 38;
                 break;
               }
               BEFORE_CONFIRM_TIMEOUT_MS = 15000;
-              _context4.prev = 11;
+              this.serviceMap.Log.logInfo({
+                title: 'sdk_before_confirm_start'
+              }, {
+                paymentMethodType: paymentMethodType,
+                path: 'nonApplePay_sync'
+              });
+              _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);
               });
-              _context4.next = 15;
+              _context4.prev = 14;
+              _context4.next = 17;
               return Promise.race([submitParams.onBeforeConfirm(), timeoutPromise]);
-            case 15:
+            case 17:
               shouldContinue = _context4.sent;
+            case 18:
+              _context4.prev = 18;
+              clearTimeout(timerId);
+              return _context4.finish(18);
+            case 21:
               if (!(shouldContinue === false)) {
-                _context4.next = 19;
+                _context4.next = 26;
                 break;
               }
+              this.serviceMap.Log.logInfo({
+                title: 'sdk_before_confirm_abort'
+              }, {
+                paymentMethodType: paymentMethodType,
+                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: {
                   code: 'MERCHANT_CONFIRM_ABORT',
-                  message: 'Payment was cancelled by merchant before confirmation.',
+                  message: 'Merchant canceled payment.',
                   needChangeSessionForRetry: false
                 }
               });
-            case 19:
-              _context4.next = 27;
+            case 26:
+              this.serviceMap.Log.logInfo({
+                title: 'sdk_before_confirm_success'
+              }, {
+                paymentMethodType: paymentMethodType,
+                path: 'nonApplePay_sync'
+              });
+              _context4.next = 36;
               break;
-            case 21:
-              _context4.prev = 21;
-              _context4.t0 = _context4["catch"](11);
-              this.changeLoading(false);
+            case 29:
+              _context4.prev = 29;
+              _context4.t0 = _context4["catch"](12);
               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: isTimeout ? 'onBeforeConfirm timed out after 15s' : 'onBeforeConfirm callback error'
-                })
+              if (isTimeout) {
+                this.serviceMap.Log.logError({
+                  title: 'sdk_before_confirm_timeout'
+                }, {
+                  paymentMethodType: paymentMethodType,
+                  path: 'nonApplePay_sync'
+                });
+              } else {
+                this.serviceMap.Log.logError({
+                  title: 'sdk_before_confirm_error'
+                }, {
+                  paymentMethodType: paymentMethodType,
+                  errorMessage: String((_context4.t0 === null || _context4.t0 === void 0 ? void 0 : _context4.t0.message) || _context4.t0).slice(0, 200),
+                  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: {
                   code: 'MERCHANT_CONFIRM_ABORT',
-                  message: isTimeout ? 'onBeforeConfirm timed out after 15 seconds.' : 'An error occurred during the before-confirm callback.',
+                  message: 'Merchant canceled payment.',
                   needChangeSessionForRetry: false
                 }
               });
-            case 27:
+            case 36:
+              _context4.next = 39;
+              break;
+            case 38:
+              if (!(submitParams !== null && submitParams !== void 0 && submitParams.onBeforeConfirm)) {
+                this.serviceMap.Log.logInfo({
+                  title: 'sdk_before_confirm_skip'
+                }, {
+                  paymentMethodType: paymentMethodType,
+                  path: isApplePay ? 'applePay_eventBridge' : 'nonApplePay_sync'
+                });
+              }
+            case 39:
               recordResult = null;
-              _context4.prev = 28;
-              _context4.next = 31;
+              _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:
@@ -544,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
@@ -558,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
@@ -583,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));
@@ -611,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 31:
+            case 43:
               return _context4.abrupt("return", _context4.sent);
-            case 32:
-              _context4.prev = 32;
+            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,
@@ -635,12 +681,12 @@ var ElementController = /*#__PURE__*/function () {
               };
               this.elementEventCenter.endEvent(startEventId, _logParams);
               this.changeLoading(false);
-              return _context4.finish(32);
-            case 37:
+              return _context4.finish(44);
+            case 49:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[11, 21], [28,, 32, 37]]);
+        }, _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,12 +62,24 @@ 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, [{
     key: "setOnBeforeConfirm",
     value: function setOnBeforeConfirm(callback) {
       this._onBeforeConfirm = callback;
+      // 展码链路：同步设置 onBeforeConfirm 到 ApplePaySdk，确保 Chrome 展码支付时能调用商户回调
+      if (this.ApplePayService) {
+        this.ApplePayService.setOnBeforeConfirm(callback);
+      }
+    }
+  }, {
+    key: "setMerchantAmountOverride",
+    value: function setMerchantAmountOverride(amount, currency) {
+      this._merchantAmount = amount;
+      this._merchantCurrency = currency;
     }
   }, {
     key: "onReady",
@@ -154,8 +166,12 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
           parseData: paymentSessionObj,
           logger: logger,
           env: _this2.options.env.environment,
-          shipping: shipping
+          shipping: shipping,
+          merchantAmount: _this2._merchantAmount,
+          merchantCurrency: _this2._merchantCurrency
         });
+        // Chrome 展码链路：同步 onBeforeConfirm 到当前 ApplePaySdk 实例
+        applePayService.setOnBeforeConfirm(_this2._onBeforeConfirm);
         applePayService.startPay().then(function (res) {
           _this2.eventCenter.dispatchToApp({
             event: 'getApplePayToken',
@@ -178,19 +194,21 @@ 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 BEFORE_CONFIRM_TIMEOUT_MS, timeoutPromise, shouldContinue, isTimeout;
+        var paymentMethodType, BEFORE_CONFIRM_TIMEOUT_MS, timeoutPromise, startTime, 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
-              });
+              paymentMethodType = 'APPLEPAY';
               if (_this2._onBeforeConfirm) {
-                _context.next = 4;
+                _context.next = 5;
                 break;
               }
+              logger.logInfo({
+                title: 'sdk_before_confirm_skip'
+              }, {
+                paymentMethodType: paymentMethodType,
+                path: 'applePay_eventBridge'
+              });
               _this2.eventCenter.dispatchToApp({
                 event: EVENT.beforeConfirm.name,
                 data: {
@@ -199,18 +217,31 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                 }
               });
               return _context.abrupt("return");
-            case 4:
+            case 5:
               BEFORE_CONFIRM_TIMEOUT_MS = 15000;
-              _context.prev = 5;
+              logger.logInfo({
+                title: 'sdk_before_confirm_start'
+              }, {
+                paymentMethodType: paymentMethodType,
+                path: 'applePay_eventBridge'
+              });
+              _context.prev = 7;
               timeoutPromise = new Promise(function (_, reject) {
                 return setTimeout(function () {
                   return reject(new Error('onBeforeConfirm timed out'));
                 }, BEFORE_CONFIRM_TIMEOUT_MS);
               });
-              _context.next = 9;
+              startTime = Date.now();
+              _context.next = 12;
               return Promise.race([_this2._onBeforeConfirm(), timeoutPromise]);
-            case 9:
+            case 12:
               shouldContinue = _context.sent;
+              if (Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS) {
+                logger.logError({
+                  title: 'sdk_before_confirm_timeout'
+                });
+                shouldContinue = false;
+              }
               logger.logInfo({
                 title: 'sdk_element_beforeConfirm_callback_result'
               }, {
@@ -223,17 +254,28 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                   result: shouldContinue !== false
                 }
               });
-              _context.next = 19;
+              _context.next = 23;
               break;
-            case 14:
-              _context.prev = 14;
-              _context.t0 = _context["catch"](5);
+            case 18:
+              _context.prev = 18;
+              _context.t0 = _context["catch"](7);
               isTimeout = _context.t0 instanceof Error && _context.t0.message === 'onBeforeConfirm timed out';
-              logger.logError({
-                title: 'sdk_element_onBeforeConfirm_error'
-              }, {
-                error: isTimeout ? 'onBeforeConfirm timed out after 15s' : safeStringify(_context.t0)
-              });
+              if (isTimeout) {
+                logger.logError({
+                  title: 'sdk_before_confirm_timeout'
+                }, {
+                  paymentMethodType: paymentMethodType,
+                  path: 'applePay_eventBridge'
+                });
+              } else {
+                logger.logError({
+                  title: 'sdk_before_confirm_error'
+                }, {
+                  paymentMethodType: paymentMethodType,
+                  errorMessage: String((_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message) || _context.t0).slice(0, 200),
+                  path: 'applePay_eventBridge'
+                });
+              }
               _this2.eventCenter.dispatchToApp({
                 event: EVENT.beforeConfirm.name,
                 data: {
@@ -241,11 +283,11 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                   result: false
                 }
               });
-            case 19:
+            case 23:
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[5, 14]]);
+        }, _callee, null, [[7, 18]]);
       })));
     }
   }, {

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

@@ -34,13 +34,20 @@ export declare class ApplePaySdk {
     private logger;
     private env;
     private shipping?;
-    constructor({ paymentSessionData, parseData, logger, env, shipping, }: {
+    private merchantAmount;
+    private merchantCurrency;
+    private onBeforeConfirm?;
+    constructor({ paymentSessionData, parseData, logger, env, shipping, merchantAmount, merchantCurrency, }: {
         paymentSessionData: string;
         parseData: IPaymentSessionMetaData;
         logger: Logger;
         env?: string;
         shipping?: CKPShipping;
+        merchantAmount?: string | null;
+        merchantCurrency?: string | null;
     });
+    /** 设置商户 onBeforeConfirm 回调（展码链路使用） */
+    setOnBeforeConfirm(callback: (() => Promise<boolean>) | null): void;
     startPay(): Promise<unknown>;
     begin(): Promise<unknown>;
     private submitPay;