@alipay/ams-checkout 0.0.1784626568-dev.7 → 0.0.1784626568-dev.9

package/esm/config/index.js

@@ -30,7 +30,7 @@ export var v2AppMarmotMap = {
   light_sandbox: 'https://checkout.antom.com',
   prod: 'https://checkout.antom.com'
 };
-export var sdkVersion = "0.0.1784626568-dev.7";
+export var sdkVersion = "0.0.1784626568-dev.9";
 
 /**
  * @description: 目前应用层分为v1和v2，会存在两个应用版本号不是同步发布的情况。所以需要把默认的应用版本号配置抽离出来。

package/esm/core/component/element/modernElementController/index.d.ts

@@ -27,6 +27,7 @@ export declare class ModernElementController implements IElementController {
     private cachedSend;
     private modalBridge;
     private modalDestroy;
+    private modalIframe;
     private _closeConfirmResolve;
     private notRedirectAfterComplete;
     private _sdkInitTime;

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

@@ -29,7 +29,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { openModal, sdkQuery, getLocaleFromRenderData, getDevReqConfig, getMetaData, buildPageUrl, debugError, debug, MessageType, request, parseHostSign, SDKBridge, parseTrackerId, oneAccountQuery, OpenSDKError, awaitWrap, themeColorMap, ApplePayHostService, checkSessionData, sdkTracker } from "../../../../modern/tools";
+import { openModal, sdkQuery, getLocaleFromRenderData, getDevReqConfig, getMetaData, buildPageUrl, debugError, debug, MessageType, request, parseHostSign, SDKBridge, parseTrackerId, oneAccountQuery, OpenSDKError, awaitWrap, themeColorMap, ApplePayHostService, buildRecurringPaymentRequest, checkSessionData, sdkTracker } from "../../../../modern/tools";
 import { device } from "../../../../util";
 import { EventCallbackCode } from "../type";
 import { adaptSubmitResult, adaptAppearance } from "./adapter";
@@ -88,6 +88,9 @@ var recoverSdkQueryBusinessResponse = function recoverSdkQueryBusinessResponse(e
 var MOUNT_TIMEOUT = 16000;
 var logger = new Logger(LogConfig, true);
 var ELEMENT_DESTROYED_MESSAGE = 'Element already destroyed';
+// 订阅/分期场景 ApplePaySession 版本：recurringPaymentRequest 需 v12+。
+// 对齐老链路 plugin/applepay/interface.ts 的 APPLE_PAY_RECURRING_VERSION = 14。
+var APPLE_PAY_RECURRING_VERSION = 14;
 var getDestroyedError = function getDestroyedError() {
   return {
     code: ERRORMESSAGE.UI_STATE_ERROR.code,
@@ -185,6 +188,7 @@ export var ModernElementController = /*#__PURE__*/function () {
     // Modal 相关资源
     _defineProperty(this, "modalBridge", null);
     _defineProperty(this, "modalDestroy", null);
+    _defineProperty(this, "modalIframe", null);
     _defineProperty(this, "_closeConfirmResolve", null);
     _defineProperty(this, "notRedirectAfterComplete", false);
     _defineProperty(this, "_sdkInitTime", Date.now());
@@ -400,7 +404,7 @@ export var ModernElementController = /*#__PURE__*/function () {
               request.setGlobalOptions({
                 hostSign: parseHostSign(sessionData),
                 env: this.options.environment,
-                sdkVersion: "0.0.1784626568-dev.7" || '',
+                sdkVersion: "0.0.1784626568-dev.9" || '',
                 tracker: sdkTracker
               });
               isConnect = !!(parseData !== null && parseData !== void 0 && (_parseData$connectFac = parseData.connectFactor) !== null && _parseData$connectFac !== void 0 && _parseData$connectFac.enableConnect);
@@ -496,7 +500,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                 // 新sdk字段
                 locale: locale,
                 // 新sdk字段
-                sdkVersion: "0.0.1784626568-dev.7" || '',
+                sdkVersion: "0.0.1784626568-dev.9" || '',
                 // 新sdk字段
                 merchantId: (sdkQueryResult === null || sdkQueryResult === void 0 || (_sdkQueryResult$data = sdkQueryResult.data) === null || _sdkQueryResult$data === void 0 ? void 0 : _sdkQueryResult$data.merchantId) || '',
                 // 新sdk字段
@@ -614,8 +618,8 @@ export var ModernElementController = /*#__PURE__*/function () {
         if (_this2.iframe) _this2.iframe.style.height = "".concat(height, "px");
       });
       this.bridge.on(MessageType.REDIRECT, function (payload, _ports, meta) {
-        var _this2$iframe;
-        if (meta && meta.source !== ((_this2$iframe = _this2.iframe) === null || _this2$iframe === void 0 ? void 0 : _this2$iframe.contentWindow)) {
+        var _this2$iframe, _this2$modalIframe;
+        if (meta && meta.source !== ((_this2$iframe = _this2.iframe) === null || _this2$iframe === void 0 ? void 0 : _this2$iframe.contentWindow) && meta.source !== ((_this2$modalIframe = _this2.modalIframe) === null || _this2$modalIframe === void 0 ? void 0 : _this2$modalIframe.contentWindow)) {
           return;
         }
         var url = payload.url,
@@ -713,7 +717,7 @@ export var ModernElementController = /*#__PURE__*/function () {
       var _handleGetApplePayToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(payload, onBeforeConfirm) {
         var _paymentMethod,
           _this3 = this;
-        var sessionData, applePayProps, paymentRequest, merchantCapabilities, merchantInfo, paymentAmount, supportedNetworks, version, requiredBillingContactFields, requiredShippingContactFields, finalAmount, finalCurrency, capturedResult, service, _capturedResult, errCode;
+        var sessionData, applePayProps, paymentRequest, merchantCapabilities, merchantInfo, paymentAmount, supportedNetworks, version, requiredBillingContactFields, requiredShippingContactFields, finalAmount, finalCurrency, capturedResult, recurringRequest, service, _capturedResult, errCode;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -747,21 +751,35 @@ export var ModernElementController = /*#__PURE__*/function () {
               if (this._merchantCurrency) {
                 finalCurrency = this._merchantCurrency;
               }
+              // 订阅场景：从 sessionData 提取 recurringInfo 构造 recurringPaymentRequest。
+              // 对齐老 ApplePaySdk 链路(parseData.paymentSessionFactor.recurringInfo)与
+              // Express 链路(applePayHostToken.ts)，否则 Chrome 非 Safari 会降级为普通支付弹窗。
+              recurringRequest = buildRecurringPaymentRequest(sessionData, merchantInfo, {
+                value: finalAmount,
+                currency: finalCurrency
+              });
               service = new ApplePayHostService({
-                paymentRequest: {
+                paymentRequest: _objectSpread({
                   countryCode: merchantInfo === null || merchantInfo === void 0 ? void 0 : merchantInfo.countryCode,
                   currencyCode: finalCurrency,
                   merchantCapabilities: merchantCapabilities,
                   supportedNetworks: supportedNetworks,
                   requiredBillingContactFields: requiredBillingContactFields,
                   requiredShippingContactFields: requiredShippingContactFields,
-                  total: {
+                  total: recurringRequest ? {
+                    type: 'final',
+                    label: recurringRequest.regularBilling.label,
+                    amount: finalAmount
+                  } : {
                     type: 'final',
                     label: (merchantInfo === null || merchantInfo === void 0 ? void 0 : merchantInfo.merchantName) || 'Payment',
                     amount: finalAmount
                   },
-                  version: version
-                },
+                  version: recurringRequest ? APPLE_PAY_RECURRING_VERSION : version
+                }, recurringRequest ? {
+                  lineItems: [recurringRequest.regularBilling],
+                  recurringPaymentRequest: recurringRequest
+                } : {}),
                 enableModalCloseListener: true,
                 callbacks: {
                   validateMerchant: function () {
@@ -885,10 +903,10 @@ export var ModernElementController = /*#__PURE__*/function () {
                   }()
                 }
               });
-              _context5.prev = 14;
-              _context5.next = 17;
+              _context5.prev = 15;
+              _context5.next = 18;
               return service.startPay();
-            case 17:
+            case 18:
               trackElement('applepay_token_success', {
                 d1: (_capturedResult = capturedResult) !== null && _capturedResult !== void 0 && _capturedResult.token ? 'has_token' : 'no_token'
               });
@@ -896,11 +914,11 @@ export var ModernElementController = /*#__PURE__*/function () {
                 success: true,
                 result: capturedResult
               });
-              _context5.next = 25;
+              _context5.next = 26;
               break;
-            case 21:
-              _context5.prev = 21;
-              _context5.t0 = _context5["catch"](14);
+            case 22:
+              _context5.prev = 22;
+              _context5.t0 = _context5["catch"](15);
               // 商户验证失败已在 validateMerchant 内单独埋点(applepay_merchant_validate_failed)，此处跳过避免重复
               if ((_context5.t0 === null || _context5.t0 === void 0 ? void 0 : _context5.t0.errorCode) !== 'APPLE_PAY_PAYMENT_SESSION_REQUEST_FAILED') {
                 errCode = (_context5.t0 === null || _context5.t0 === void 0 ? void 0 : _context5.t0.errorCode) || 'APPLE_PAY_NOT_SUPPORTED'; // 用户主动取消单独标记，便于区分取消与真实失败
@@ -921,11 +939,11 @@ export var ModernElementController = /*#__PURE__*/function () {
                   errorCode: (_context5.t0 === null || _context5.t0 === void 0 ? void 0 : _context5.t0.errorCode) || 'APPLE_PAY_NOT_SUPPORTED'
                 }
               });
-            case 25:
+            case 26:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[14, 21]]);
+        }, _callee5, this, [[15, 22]]);
       }));
       function handleGetApplePayToken(_x4, _x5) {
         return _handleGetApplePayToken.apply(this, arguments);
@@ -1728,9 +1746,11 @@ export var ModernElementController = /*#__PURE__*/function () {
           modalBridge.send(MessageType.TRANSFER_MODAL_PORT, payload.modalId, [messageChannel.port2]);
         }
       };
+      this.modalIframe = iframe;
       this.modalDestroy = function () {
         destroy();
         iframe.removeEventListener('load', handler);
+        _this12.modalIframe = null;
       };
 
       // 监听 modal 的 iframe load 事件