@alipay/ams-checkout 2.0.16 → 2.0.18

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 {
@@ -56,9 +57,32 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
     // parameterInitAndCheck(): void {}
     // apple pay
     _defineProperty(_assertThisInitialized(_this), "ApplePayService", void 0);
+    /**
+     * Merchant's onBeforeConfirm callback reference, used in Apple Pay scenario only.
+     * Set by elementController.submitPayment before payment,
+     * 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",
     value: function onReady(extraParam) {
       var _this$elementContaine, _this$elementContaine2, _this$elementContaine3, _this$elementContaine4, _this$elementContaine5;
@@ -143,8 +167,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',
@@ -163,19 +191,107 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
           });
         });
       });
+      // Apple Pay event bridge: after user authorization (FaceID/TouchID) in iframe, before actual charge,
+      // 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, startTime, _yield$executeWithTim, rawResult, timedOut, shouldContinue;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              paymentMethodType = 'APPLEPAY';
+              if (_this2._onBeforeConfirm) {
+                _context.next = 5;
+                break;
+              }
+              logger.logInfo({
+                title: 'sdk_before_confirm_skip'
+              }, {
+                paymentMethodType: paymentMethodType,
+                path: 'applePay_eventBridge'
+              });
+              _this2.eventCenter.dispatchToApp({
+                event: EVENT.beforeConfirm.name,
+                data: {
+                  success: true,
+                  result: true
+                }
+              });
+              return _context.abrupt("return");
+            case 5:
+              logger.logInfo({
+                title: 'sdk_before_confirm_start'
+              }, {
+                paymentMethodType: paymentMethodType,
+                path: 'applePay_eventBridge'
+              });
+              _context.prev = 6;
+              startTime = Date.now();
+              _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'
+                });
+                shouldContinue = false;
+              }
+              logger.logInfo({
+                title: 'sdk_element_beforeConfirm_callback_result'
+              }, {
+                shouldContinue: shouldContinue
+              });
+              _this2.eventCenter.dispatchToApp({
+                event: EVENT.beforeConfirm.name,
+                data: {
+                  success: true,
+                  result: !!shouldContinue
+                }
+              });
+              _context.next = 23;
+              break;
+            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: {
+                  success: false,
+                  result: false
+                }
+              });
+            case 23:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, null, [[6, 19]]);
+      })));
     }
   }, {
     key: "initApplePaySdk",
     value: function () {
-      var _initApplePaySdk = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _initApplePaySdk = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
         var _this$elementContaine6;
-        var _ref, paymentSessionObj, paymentSession;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
+        var _ref2, paymentSessionObj, paymentSession;
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _ref = ((_this$elementContaine6 = this.elementContainer) === null || _this$elementContaine6 === void 0 ? void 0 : _this$elementContaine6.getPaymentContext()) || {}, paymentSessionObj = _ref.paymentSessionObj, paymentSession = _ref.paymentSession;
+              _ref2 = ((_this$elementContaine6 = this.elementContainer) === null || _this$elementContaine6 === void 0 ? void 0 : _this$elementContaine6.getPaymentContext()) || {}, paymentSessionObj = _ref2.paymentSessionObj, paymentSession = _ref2.paymentSession;
               if (!isSkipRenderPaymentMethod(paymentSessionObj)) {
-                _context.next = 13;
+                _context2.next = 13;
                 break;
               }
               this.ApplePayService = new ApplePaySdk({
@@ -184,29 +300,29 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                 logger: logger,
                 env: this.options.env.environment
               });
-              _context.prev = 3;
+              _context2.prev = 3;
               logger.logInfo({
                 title: 'a3753.b107385.c398110'
               });
-              _context.next = 7;
+              _context2.next = 7;
               return this.ApplePayService.initApplePaySession();
             case 7:
               logger.logInfo({
                 title: 'a3753.b107385.c398112'
               });
-              _context.next = 13;
+              _context2.next = 13;
               break;
             case 10:
-              _context.prev = 10;
-              _context.t0 = _context["catch"](3);
+              _context2.prev = 10;
+              _context2.t0 = _context2["catch"](3);
               logger.logError({
                 title: 'a3753.b107385.c398111'
               });
             case 13:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
-        }, _callee, this, [[3, 10]]);
+        }, _callee2, this, [[3, 10]]);
       }));
       function initApplePaySdk() {
         return _initApplePaySdk.apply(this, arguments);
@@ -227,20 +343,20 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
     }
   }, {
     key: "generateIframeSrc",
-    value: function generateIframeSrc(_ref2) {
-      var link = _ref2.link,
-        instanceId = _ref2.instanceId;
+    value: function generateIframeSrc(_ref3) {
+      var link = _ref3.link,
+        instanceId = _ref3.instanceId;
       this.instanceId = instanceId;
-      var _ref3 = this.elementContainer.getPaymentContext() || {},
-        paymentSession = _ref3.paymentSession,
-        paymentSessionObj = _ref3.paymentSessionObj,
-        sdkMetaData = _ref3.sdkMetaData;
+      var _ref4 = this.elementContainer.getPaymentContext() || {},
+        paymentSession = _ref4.paymentSession,
+        paymentSessionObj = _ref4.paymentSessionObj,
+        sdkMetaData = _ref4.sdkMetaData;
       var _this$options = this.options,
         environment = _this$options.env.environment,
         analytics = _this$options.analytics,
         locale = _this$options.locale;
-      var _ref4 = paymentSessionObj || {},
-        extendInfo = _ref4.extendInfo;
+      var _ref5 = paymentSessionObj || {},
+        extendInfo = _ref5.extendInfo;
       var url = _generateIframeSrc({
         paymentSession: paymentSession,
         paymentSessionObj: paymentSessionObj,
@@ -258,19 +374,19 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
   }, {
     key: "obtainData",
     value: function () {
-      var _obtainData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var _obtainData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
         var _paymentSessionObj$co,
           _this3 = this;
-        var requestService, _this$elementContaine7, paymentSession, paymentSessionObj, displayInfo, _displayInfo, debugProps, _this$options2, environment, locale, _ref5, paymentSessionConfig, hostSign, isConnect, LOCAL_MOCK, _queryParse, appType, terminalType, generateActionQueryPromise, generateOneAccountQueryPromise, _yield$Promise$all, _yield$Promise$all2, originActionQueryResult, originOneAccountQueryResult;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+        var requestService, _this$elementContaine7, paymentSession, paymentSessionObj, displayInfo, _displayInfo, debugProps, _this$options2, environment, locale, _ref6, paymentSessionConfig, hostSign, isConnect, LOCAL_MOCK, _queryParse, appType, terminalType, generateActionQueryPromise, generateOneAccountQueryPromise, _yield$Promise$all, _yield$Promise$all2, originActionQueryResult, originOneAccountQueryResult;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               requestService = ServiceProvider.getInstance(this.instanceId).getService('Requester');
               _this$elementContaine7 = this.elementContainer.getPaymentContext(), paymentSession = _this$elementContaine7.paymentSession, paymentSessionObj = _this$elementContaine7.paymentSessionObj, displayInfo = _this$elementContaine7.displayInfo;
               _displayInfo = displayInfo;
               debugProps = _displayInfo.debugProps;
               _this$options2 = this.options, environment = _this$options2.env.environment, locale = _this$options2.locale;
-              _ref5 = paymentSessionObj || {}, paymentSessionConfig = _ref5.paymentSessionConfig;
+              _ref6 = paymentSessionObj || {}, paymentSessionConfig = _ref6.paymentSessionConfig;
               hostSign = paymentSession.split('&&')[1] || '';
               isConnect = paymentSessionObj === null || paymentSessionObj === void 0 || (_paymentSessionObj$co = paymentSessionObj.connectFactor) === null || _paymentSessionObj$co === void 0 ? void 0 : _paymentSessionObj$co.enableConnect;
               LOCAL_MOCK = (debugProps === null || debugProps === void 0 ? void 0 : debugProps.isDebug) && (debugProps === null || debugProps === void 0 ? void 0 : debugProps.local_mock);
@@ -407,10 +523,10 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                   });
                 });
               };
-              _context2.next = 15;
+              _context3.next = 15;
               return Promise.all(isConnect ? [generateActionQueryPromise(), generateOneAccountQueryPromise()] : [generateActionQueryPromise()]);
             case 15:
-              _yield$Promise$all = _context2.sent;
+              _yield$Promise$all = _context3.sent;
               _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);
               originActionQueryResult = _yield$Promise$all2[0];
               originOneAccountQueryResult = _yield$Promise$all2[1];
@@ -418,15 +534,15 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                 originActionQueryResult: originActionQueryResult,
                 originOneAccountQueryResult: originOneAccountQueryResult
               };
-              return _context2.abrupt("return", {
+              return _context3.abrupt("return", {
                 originActionQueryResult: originActionQueryResult,
                 originOneAccountQueryResult: originOneAccountQueryResult
               });
             case 21:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2, this);
+        }, _callee3, this);
       }));
       function obtainData() {
         return _obtainData.apply(this, arguments);
@@ -441,9 +557,9 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
     }
   }, {
     key: "update",
-    value: function update(_ref6) {
-      var data = _ref6.data,
-        paymentSessionData = _ref6.paymentSessionData;
+    value: function update(_ref7) {
+      var data = _ref7.data,
+        paymentSessionData = _ref7.paymentSessionData;
       var _parseSessionData = parseSessionData(paymentSessionData),
         _parseSessionData2 = _slicedToArray(_parseSessionData, 2),
         parseData = _parseSessionData2[0],

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

@@ -287,6 +287,26 @@ export interface AddressSubmitData {
 export interface SubmitFuncParams {
     handleActions?: boolean;
     shippingInfo?: ShippingInfo;
+    /**
+     * 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.
+     */
+    currency?: string;
+    /**
+     * Pre-confirmation callback. Executed after user authorization but before actual charge,
+     * allowing merchant to create order at this point.
+     * - 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 / timeout / throw error: abort payment, returns MERCHANT_CONFIRM_ABORT error code
+     */
+    onBeforeConfirm?: () => Promise<boolean>;
 }
 export interface SubmitServiceParams extends PaymentSubmitData {
     accountInfo: AuthSubmitData['accountInfo'];

package/esm/foundation/service/container/utils.js

@@ -1,4 +1,4 @@
-import { COMPONENT_CONTAINER_ID } from "../../../constant";
+import { COMPONENT_CONTAINER_ID, DEFAULT_IFRAME_COLOR_SCHEME } from "../../../constant";
 
 /**
  * @author 谦彧 <zhangmian.zm@alipay.com>
@@ -14,6 +14,7 @@ export var createPreloadIframe = function createPreloadIframe(containerId) {
   iframe.style.border = none;
   iframe.style.opacity = '0';
   iframe.style.overflow = 'hidden';
+  iframe.style.colorScheme = DEFAULT_IFRAME_COLOR_SCHEME;
   return iframe;
 };
 export var createIframe = function createIframe(containerId) {
@@ -27,6 +28,7 @@ export var createIframe = function createIframe(containerId) {
   iframe.style.border = none;
   iframe.style.opacity = none;
   iframe.style.overflow = 'hidden';
+  iframe.style.colorScheme = DEFAULT_IFRAME_COLOR_SCHEME;
   return iframe;
 };
 export var startSizeChangeAnim = function startSizeChangeAnim(target, height, animationStyleId) {

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("2.0.16", "/ams-checkout.js"),
+  DEV: "https://sdk-dev.marmot-cloud.com/package/ams-checkout/".concat("2.0.18", "/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,16 +31,27 @@ export declare class ApplePaySdk {
      * @description 支付状态，pending：支付中，normal：正常
      */
     private paymentStatus;
+    /**
+     * @description oncancel 原因标记，用于区分用户主动取消 vs 商户通过 onBeforeConfirm 中止
+     */
+    private cancelReason;
     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;