@alipay/ams-checkout 0.0.1781004142-dev.9 → 0.0.1781669097-dev.0

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

@@ -37,6 +37,7 @@ import { ServiceProvider } from "../../../../foundation/service";
 import { convertPaymentSession } from "../../../../foundation/utils/payment_context_utils";
 import { ProductSceneEnum } from "../../../../types";
 import { ELEMENT_SPM_MAP } from "../../../../util/spm-map";
+import { executeWithTimeout, BEFORE_CONFIRM_TIMEOUT_MS } from "../../../../util/beforeConfirm";
 import { ElementContainerService } from "../elementContainerService"; // 引入 ElementContainerService
 import { IContainerStatus } from "../elementContainerService/containerService";
 import { EventCenter as ElementEventCenter } from "../EventCenter/index";
@@ -374,7 +375,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, timerId, timeoutPromise, shouldContinue, isTimeout, recordResult, _recordResult, _recordResult2, _recordResult3, _recordResult4, _recordResult5, _logParams;
+        var startEventId, res, logParams, isApplePay, paymentMethodType, startTime, _yield$executeWithTim, shouldContinue, timedOut, recordResult, _recordResult, _recordResult2, _recordResult3, _recordResult4, _recordResult5, _logParams;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -404,42 +405,44 @@ var ElementController = /*#__PURE__*/function () {
               isApplePay = this.currentPaymentMethodType === 'APPLEPAY';
               paymentMethodType = this.currentPaymentMethodType || 'UNKNOWN';
               if (!(submitParams !== null && submitParams !== void 0 && submitParams.onBeforeConfirm && !isApplePay)) {
-                _context4.next = 38;
+                _context4.next = 34;
                 break;
               }
-              BEFORE_CONFIRM_TIMEOUT_MS = 15000;
               this.serviceMap.Log.logInfo({
                 title: 'sdk_before_confirm_start'
               }, {
                 paymentMethodType: paymentMethodType,
                 path: 'nonApplePay_sync'
               });
-              _context4.prev = 12;
-              timeoutPromise = new Promise(function (_, reject) {
-                timerId = setTimeout(function () {
-                  return reject(new Error('onBeforeConfirm timed out'));
-                }, BEFORE_CONFIRM_TIMEOUT_MS);
+              _context4.prev = 11;
+              startTime = Date.now();
+              _context4.next = 15;
+              return executeWithTimeout(function () {
+                return submitParams.onBeforeConfirm();
               });
-              _context4.prev = 14;
-              _context4.next = 17;
-              return Promise.race([submitParams.onBeforeConfirm(), timeoutPromise]);
-            case 17:
-              shouldContinue = _context4.sent;
-            case 18:
-              _context4.prev = 18;
-              clearTimeout(timerId);
-              return _context4.finish(18);
-            case 21:
-              if (!(shouldContinue === false)) {
-                _context4.next = 26;
+            case 15:
+              _yield$executeWithTim = _context4.sent;
+              shouldContinue = _yield$executeWithTim.result;
+              timedOut = _yield$executeWithTim.timedOut;
+              if (!(timedOut || !shouldContinue || Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS)) {
+                _context4.next = 23;
                 break;
               }
-              this.serviceMap.Log.logInfo({
-                title: 'sdk_before_confirm_abort'
-              }, {
-                paymentMethodType: paymentMethodType,
-                path: 'nonApplePay_sync'
-              });
+              if (timedOut) {
+                this.serviceMap.Log.logError({
+                  title: 'sdk_before_confirm_timeout'
+                }, {
+                  paymentMethodType: paymentMethodType,
+                  path: 'nonApplePay_sync'
+                });
+              } else {
+                this.serviceMap.Log.logInfo({
+                  title: 'sdk_before_confirm_abort'
+                }, {
+                  paymentMethodType: paymentMethodType,
+                  path: 'nonApplePay_sync'
+                });
+              }
               this.changeLoading(false);
               this.elementEventCenter.endEvent(startEventId, {
                 eventCode: PaymentStatus.FAIL,
@@ -453,35 +456,25 @@ var ElementController = /*#__PURE__*/function () {
                   needChangeSessionForRetry: false
                 }
               });
-            case 26:
+            case 23:
               this.serviceMap.Log.logInfo({
                 title: 'sdk_before_confirm_success'
               }, {
                 paymentMethodType: paymentMethodType,
                 path: 'nonApplePay_sync'
               });
-              _context4.next = 36;
+              _context4.next = 32;
               break;
-            case 29:
-              _context4.prev = 29;
-              _context4.t0 = _context4["catch"](12);
-              isTimeout = _context4.t0 instanceof Error && _context4.t0.message === 'onBeforeConfirm timed out';
-              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'
-                });
-              }
+            case 26:
+              _context4.prev = 26;
+              _context4.t0 = _context4["catch"](11);
+              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,
@@ -495,10 +488,10 @@ var ElementController = /*#__PURE__*/function () {
                   needChangeSessionForRetry: false
                 }
               });
-            case 36:
-              _context4.next = 39;
+            case 32:
+              _context4.next = 35;
               break;
-            case 38:
+            case 34:
               if (!(submitParams !== null && submitParams !== void 0 && submitParams.onBeforeConfirm)) {
                 this.serviceMap.Log.logInfo({
                   title: 'sdk_before_confirm_skip'
@@ -507,10 +500,10 @@ var ElementController = /*#__PURE__*/function () {
                   path: isApplePay ? 'applePay_eventBridge' : 'nonApplePay_sync'
                 });
               }
-            case 39:
+            case 35:
               recordResult = null;
-              _context4.prev = 40;
-              _context4.next = 43;
+              _context4.prev = 36;
+              _context4.next = 39;
               return new Promise( /*#__PURE__*/function () {
                 var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(resolve) {
                   var that, recordResultCallback, params, processStep, hasBeforeConfirmForApplePay, hasAmount, hasCurrency, _yield$_this3$onValid2, _data, errorString, errorResult;
@@ -667,10 +660,10 @@ var ElementController = /*#__PURE__*/function () {
                   return _ref3.apply(this, arguments);
                 };
               }());
-            case 43:
+            case 39:
               return _context4.abrupt("return", _context4.sent);
-            case 44:
-              _context4.prev = 44;
+            case 40:
+              _context4.prev = 40;
               _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,
@@ -681,12 +674,12 @@ var ElementController = /*#__PURE__*/function () {
               };
               this.elementEventCenter.endEvent(startEventId, _logParams);
               this.changeLoading(false);
-              return _context4.finish(44);
-            case 49:
+              return _context4.finish(40);
+            case 45:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[12, 29], [14,, 18, 21], [40,, 44, 49]]);
+        }, _callee4, this, [[11, 26], [36,, 40, 45]]);
       }));
       function submitPayment(_x) {
         return _submitPayment.apply(this, arguments);
@@ -773,7 +766,7 @@ var ElementController = /*#__PURE__*/function () {
       });
       this.serviceMap.EventCenter.listen(EVENTNAME.PAYMENTMETHODCHANGED, function (data) {
         _this4.currentPaymentMethodType = (data === null || data === void 0 ? void 0 : data.type) || '';
-      });
+      }, true);
     }
   }, {
     key: "sendRequestAndWaitWebLaunch",
@@ -1038,7 +1031,7 @@ var ElementController = /*#__PURE__*/function () {
       }
       this.serviceMap.EventCenter.listen(event, function (data) {
         callback === null || callback === void 0 || callback(data);
-      });
+      }, true);
     }
   }, {
     key: "isEventAllowed",

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

@@ -33,6 +33,7 @@ import { parseSessionData } from "../../index";
 import { oneAccount, sdkAction } from "../mock";
 import { generateIframeSrc as _generateIframeSrc, isElementPad, isElementPC, safeStringify } from "../util";
 import BaseElementProcessor from "./baseElementProcessor";
+import { executeWithTimeout, BEFORE_CONFIRM_TIMEOUT_MS } from "../../../../util/beforeConfirm";
 var logger = new Logger(LogConfig, true);
 var isExpressCheckout = function isExpressCheckout(extendInfo) {
   try {
@@ -70,6 +71,10 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
     key: "setOnBeforeConfirm",
     value: function setOnBeforeConfirm(callback) {
       this._onBeforeConfirm = callback;
+      // 展码链路：同步设置 onBeforeConfirm 到 ApplePaySdk，确保 Chrome 展码支付时能调用商户回调
+      if (this.ApplePayService) {
+        this.ApplePayService.setOnBeforeConfirm(callback);
+      }
     }
   }, {
     key: "setMerchantAmountOverride",
@@ -166,6 +171,8 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
           merchantAmount: _this2._merchantAmount,
           merchantCurrency: _this2._merchantCurrency
         });
+        // Chrome 展码链路：同步 onBeforeConfirm 到当前 ApplePaySdk 实例
+        applePayService.setOnBeforeConfirm(_this2._onBeforeConfirm);
         applePayService.startPay().then(function (res) {
           _this2.eventCenter.dispatchToApp({
             event: 'getApplePayToken',
@@ -188,7 +195,7 @@ 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 paymentMethodType, BEFORE_CONFIRM_TIMEOUT_MS, timeoutPromise, startTime, shouldContinue, isTimeout;
+        var paymentMethodType, startTime, _yield$executeWithTim, rawResult, timedOut, shouldContinue;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -212,25 +219,24 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
               });
               return _context.abrupt("return");
             case 5:
-              BEFORE_CONFIRM_TIMEOUT_MS = 15000;
               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.prev = 6;
               startTime = Date.now();
-              _context.next = 12;
-              return Promise.race([_this2._onBeforeConfirm(), timeoutPromise]);
-            case 12:
-              shouldContinue = _context.sent;
-              if (Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS) {
+              _context.next = 10;
+              return executeWithTimeout(function () {
+                return _this2._onBeforeConfirm();
+              });
+            case 10:
+              _yield$executeWithTim = _context.sent;
+              rawResult = _yield$executeWithTim.result;
+              timedOut = _yield$executeWithTim.timedOut;
+              shouldContinue = rawResult; // 双重校验：timedOut（Promise race） + startTime（实际时间差），防止竞态误判
+              if (timedOut || Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS) {
                 logger.logError({
                   title: 'sdk_before_confirm_timeout'
                 });
@@ -245,31 +251,21 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                 event: EVENT.beforeConfirm.name,
                 data: {
                   success: true,
-                  result: shouldContinue !== false
+                  result: !!shouldContinue
                 }
               });
               _context.next = 23;
               break;
-            case 18:
-              _context.prev = 18;
-              _context.t0 = _context["catch"](7);
-              isTimeout = _context.t0 instanceof Error && _context.t0.message === 'onBeforeConfirm timed out';
-              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'
-                });
-              }
+            case 19:
+              _context.prev = 19;
+              _context.t0 = _context["catch"](6);
+              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: {
@@ -281,7 +277,7 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[7, 18]]);
+        }, _callee, null, [[6, 19]]);
       })));
     }
   }, {

package/esm/modern/index.js

@@ -15,7 +15,7 @@ import { createLoader } from '@antglobal/create-sdk-loader';
 
 import { stageName } from "./stageName";
 var SDKURL = {
-  DEV: "https://sdk-dev.marmot-cloud.com/package/ams-checkout/".concat("dev-1781004142", "/ams-checkout.js"),
+  DEV: "https://sdk-dev.marmot-cloud.com/package/ams-checkout/".concat("dev-1781669097", "/ams-checkout.js"),
   LOCAL: "http://localhost:3000/ams-checkout.min.js",
   PROD: 'https://js.antom.com/v2/ams-checkout.js'
 };

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

@@ -31,11 +31,16 @@ export declare class ApplePaySdk {
      * @description 支付状态，pending：支付中，normal：正常
      */
     private paymentStatus;
+    /**
+     * @description oncancel 原因标记，用于区分用户主动取消 vs 商户通过 onBeforeConfirm 中止
+     */
+    private cancelReason;
     private logger;
     private env;
     private shipping?;
     private merchantAmount;
     private merchantCurrency;
+    private onBeforeConfirm?;
     constructor({ paymentSessionData, parseData, logger, env, shipping, merchantAmount, merchantCurrency, }: {
         paymentSessionData: string;
         parseData: IPaymentSessionMetaData;
@@ -45,6 +50,8 @@ export declare class ApplePaySdk {
         merchantAmount?: string | null;
         merchantCurrency?: string | null;
     });
+    /** 设置商户 onBeforeConfirm 回调（展码链路使用） */
+    setOnBeforeConfirm(callback: (() => Promise<boolean>) | null): void;
     startPay(): Promise<unknown>;
     begin(): Promise<unknown>;
     private submitPay;