@alipay/ams-checkout 0.0.1784542444-dev.2 → 0.0.1784542444-dev.4

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.1784542444-dev.2";
+export var sdkVersion = "0.0.1784542444-dev.4";
 
 /**
  * @description: 目前应用层分为v1和v2，会存在两个应用版本号不是同步发布的情况。所以需要把默认的应用版本号配置抽离出来。

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

@@ -29,10 +29,11 @@ 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, showToast, 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";
+import { safeParse } from "../util";
 import { v4 as uuid } from 'uuid';
 
 // ============================================================
@@ -43,18 +44,45 @@ import { v4 as uuid } from 'uuid';
 // ============================================================
 
 var TRACK_CODE_PREFIX = '7982';
+
+// 缓存解析出的 merchantId，供埋点 helper 在任意阶段统一带上
+var _merchantId = '';
 var track = function track(phase, msg) {
   var extra = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   try {
     var code = "".concat(TRACK_CODE_PREFIX).concat(phase === 'error' ? '' : phase);
+    // LogItem 类型未暴露 merchant_id 字段，但运行时 tracker 会透传，
+    // 故用断言保留该字段名供下游埋点消费
     sdkTracker.log(_objectSpread({
       code: code,
-      msg: msg
+      msg: msg,
+      merchant_id: _merchantId
     }, extra));
   } catch (_unused) {
     /* 埋点失败绝不影响主流程 */
   }
 };
+
+/**
+ * 优先取 sessionData 解析出的 clientId；
+ * 缺失时从容错角度回落到 extendInfo 中的 merchantId（URL 编码需解码）。
+ * 全程容错：任一步骤缺失/解析失败都返回空串，绝不抛异常。
+ */
+var resolveMerchantId = function resolveMerchantId(parseData) {
+  if (parseData !== null && parseData !== void 0 && parseData.clientId) {
+    return parseData.clientId;
+  }
+  try {
+    var info = safeParse(parseData === null || parseData === void 0 ? void 0 : parseData.extendInfo, {});
+    var merchantId = info === null || info === void 0 ? void 0 : info.merchantId;
+    if (!merchantId || typeof merchantId !== 'string') {
+      return '';
+    }
+    return decodeURIComponent(merchantId);
+  } catch (_unused2) {
+    return '';
+  }
+};
 var trackMount = function trackMount(msg) {
   var extra = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   return track('mount', msg, extra);
@@ -88,6 +116,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,
@@ -142,6 +173,7 @@ var HostSDKBridge = /*#__PURE__*/function (_SDKBridge) {
 var AMSMessageType = {
   VALIDATE: 'OPENSDK@VALIDATE',
   VALIDATE_REPLY: 'OPENSDK@VALIDATE_REPLY',
+  SHOWTOAST: 'OPENSDK@SHOWTOAST',
   GET_APPLE_PAY_TOKEN: 'OPENSDK@GET_APPLE_PAY_TOKEN',
   GET_APPLE_PAY_TOKEN_REPLY: 'OPENSDK@GET_APPLE_PAY_TOKEN_REPLY',
   // Web element GP：iframe 委托 SDK/父 frame 调 loadPaymentData（解决跨域 iframe 二次 show() 被拒问题）
@@ -269,7 +301,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                   if (iframeOrigin && iframeOrigin !== 'null') {
                     this.bridge.setOrigin(iframeOrigin);
                   }
-                } catch (_unused2) {
+                } catch (_unused3) {
                   // URL 解析失败时保持默认 origin
                 }
               } else {
@@ -385,7 +417,7 @@ export var ModernElementController = /*#__PURE__*/function () {
           _this = this,
           _parseData$paymentMet,
           _sdkQueryResult$data;
-        var sessionData, parseData, isConnect, paymentSessionConfig, genSdkQueryPromise, genOneAccountQueryPromise, promises, cancelDestroyCallback, destroyPromise, queryPromise, _yield$Promise$race$f, _yield$Promise$race$f2, sdkQueryResult, oneAccountQueryResult, _sdkQueryResult$error, _sdkQueryResult$error2, _oneAccountQueryResul, _oneAccountQueryResul2, preferredLocale, locale, renderDataError;
+        var sessionData, parseData, lastEnv, isConnect, paymentSessionConfig, genSdkQueryPromise, genOneAccountQueryPromise, promises, cancelDestroyCallback, destroyPromise, queryPromise, _yield$Promise$race$f, _yield$Promise$race$f2, sdkQueryResult, oneAccountQueryResult, _sdkQueryResult$error, _sdkQueryResult$error2, _oneAccountQueryResul, _oneAccountQueryResul2, preferredLocale, locale, renderDataError;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -395,15 +427,23 @@ export var ModernElementController = /*#__PURE__*/function () {
               this.notRedirectAfterComplete = renderOptions.notRedirectAfterComplete || false;
               sessionData = this.options.sessionData; // checkSessionData 失败会 throw AntomSDKError（SESSION_DATA_INVALID），
               // 冒泡到 mount 的 catch 由 mount_error 统一上报，此处无需额外处理
-              parseData = checkSessionData(sessionData, 'ELEMENT_PAYMENT'); // 初始化 request 全局配置，使 sdkQuery 能正确发起请求
+              parseData = checkSessionData(sessionData, 'ELEMENT_PAYMENT');
+              lastEnv = this.options.environment === 'sandbox' ? 'sandbox' : 'prod';
+              this.options.environment;
+              // 解析 merchantId（优先 clientId，缺失时容错回落到 extendInfo.merchantId），
+              // 缓存到模块级变量，使后续所有 trackXxx 埋点统一带上
+              _merchantId = resolveMerchantId(parseData);
+
+              // 初始化 request 全局配置，使 sdkQuery 能正确发起请求
               // tracker: sdkTracker —— 接入 HTTP 层自动埋点（B 套），上报每个请求的成败/RTT/错误码
               // 与 antom.ts 入口对齐；不传则 sdkQuery/submitPay/inquiry 等网络细节不可观测
-              request.setGlobalOptions({
+              request.setGlobalOptions(_objectSpread(_objectSpread({
                 hostSign: parseHostSign(sessionData),
-                env: this.options.environment,
-                sdkVersion: "0.0.1784542444-dev.2" || '',
+                env: lastEnv
+              }, getDevReqConfig()), {}, {
+                sdkVersion: "0.0.1784542444-dev.4" || '',
                 tracker: sdkTracker
-              });
+              }));
               isConnect = !!(parseData !== null && parseData !== void 0 && (_parseData$connectFac = parseData.connectFactor) !== null && _parseData$connectFac !== void 0 && _parseData$connectFac.enableConnect);
               paymentSessionConfig = parseData === null || parseData === void 0 ? void 0 : parseData.paymentSessionConfig;
               genSdkQueryPromise = function genSdkQueryPromise() {
@@ -441,9 +481,9 @@ export var ModernElementController = /*#__PURE__*/function () {
                 });
               });
               queryPromise = Promise.all(promises);
-              _context2.next = 16;
+              _context2.next = 19;
               return Promise.race([queryPromise, destroyPromise]).finally(cancelDestroyCallback);
-            case 16:
+            case 19:
               _yield$Promise$race$f = _context2.sent;
               _yield$Promise$race$f2 = _slicedToArray(_yield$Promise$race$f, 2);
               sdkQueryResult = _yield$Promise$race$f2[0];
@@ -482,6 +522,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                 sessionMetaData: parseData,
                 // 更新字段，对应老的doMain
                 merchantDomain: window.location.hostname,
+                doMain: window.location.hostname,
                 // 更新字段，对应老的appearance，结构按新的来
                 appearance: adaptAppearance((renderOptions === null || renderOptions === void 0 ? void 0 : renderOptions.appearance) || this.options.appearance, renderOptions.merchantAppointParam),
                 // 原老字段
@@ -489,7 +530,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                   paymentMethodCategoryType: paymentSessionConfig === null || paymentSessionConfig === void 0 ? void 0 : paymentSessionConfig.paymentMethodCategoryType,
                   productSceneVersion: paymentSessionConfig === null || paymentSessionConfig === void 0 ? void 0 : paymentSessionConfig.productSceneVersion,
                   trackId: parseTrackerId(sessionData),
-                  merchantId: parseData === null || parseData === void 0 ? void 0 : parseData.clientId,
+                  merchantId: _merchantId,
                   paymentMethodType: parseData === null || parseData === void 0 || (_parseData$paymentMet = parseData.paymentMethodInfoView) === null || _parseData$paymentMet === void 0 ? void 0 : _parseData$paymentMet.paymentMethodType
                 },
                 // 原老字段
@@ -497,17 +538,17 @@ export var ModernElementController = /*#__PURE__*/function () {
                 // 新sdk字段
                 locale: locale,
                 // 新sdk字段
-                sdkVersion: "0.0.1784542444-dev.2" || '',
+                sdkVersion: "0.0.1784542444-dev.4" || '',
                 // 新sdk字段
                 merchantId: (sdkQueryResult === null || sdkQueryResult === void 0 || (_sdkQueryResult$data = sdkQueryResult.data) === null || _sdkQueryResult$data === void 0 ? void 0 : _sdkQueryResult$data.merchantId) || '',
                 // 新sdk字段
-                env: this.options.environment === 'sandbox' ? 'sandbox' : 'prod',
+                env: lastEnv,
                 // 新sdk字段，开发环境调试使用
                 _requestConfig: _objectSpread({
-                  env: this.options.environment === 'sandbox' ? 'sandbox' : 'prod'
+                  env: lastEnv
                 }, getDevReqConfig())
               });
-            case 26:
+            case 29:
             case "end":
               return _context2.stop();
           }
@@ -614,11 +655,18 @@ export var ModernElementController = /*#__PURE__*/function () {
       this.bridge.on(MessageType.HEIGHT_UPDATE, function (height) {
         if (_this2.iframe) _this2.iframe.style.height = "".concat(height, "px");
       });
-      this.bridge.on(MessageType.REDIRECT, function (payload, _ports, meta) {
+      this.bridge.on(AMSMessageType.SHOWTOAST, function (payload, _ports, meta) {
         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;
         }
+        showToast(payload);
+      });
+      this.bridge.on(MessageType.REDIRECT, function (payload, _ports, meta) {
+        var _this2$iframe2, _this2$modalIframe2;
+        if (meta && meta.source !== ((_this2$iframe2 = _this2.iframe) === null || _this2$iframe2 === void 0 ? void 0 : _this2$iframe2.contentWindow) && meta.source !== ((_this2$modalIframe2 = _this2.modalIframe) === null || _this2$modalIframe2 === void 0 ? void 0 : _this2$modalIframe2.contentWindow)) {
+          return;
+        }
         var url = payload.url,
           mode = payload.mode,
           appLinkUrl = payload.appLinkUrl,
@@ -672,8 +720,8 @@ export var ModernElementController = /*#__PURE__*/function () {
         }
       });
       this.bridge.on(MessageType.OPEN_MODAL, function (payload, _ports, meta) {
-        var _this2$iframe2;
-        if (meta && meta.source !== ((_this2$iframe2 = _this2.iframe) === null || _this2$iframe2 === void 0 ? void 0 : _this2$iframe2.contentWindow)) {
+        var _this2$iframe3;
+        if (meta && meta.source !== ((_this2$iframe3 = _this2.iframe) === null || _this2$iframe3 === void 0 ? void 0 : _this2$iframe3.contentWindow)) {
           return;
         }
         _this2.handleOpenModal(payload);
@@ -682,8 +730,8 @@ export var ModernElementController = /*#__PURE__*/function () {
         });
       });
       this.bridge.on(MessageType.DESTROY_ELEMENT, function (_payload, _ports, meta) {
-        var _this2$iframe3;
-        if (meta && meta.source !== ((_this2$iframe3 = _this2.iframe) === null || _this2$iframe3 === void 0 ? void 0 : _this2$iframe3.contentWindow)) {
+        var _this2$iframe4;
+        if (meta && meta.source !== ((_this2$iframe4 = _this2.iframe) === null || _this2$iframe4 === void 0 ? void 0 : _this2$iframe4.contentWindow)) {
           return;
         }
         _this2.destroy();
@@ -714,7 +762,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:
@@ -748,21 +796,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 () {
@@ -886,10 +948,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'
               });
@@ -897,11 +959,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'; // 用户主动取消单独标记，便于区分取消与真实失败
@@ -922,11 +984,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);
@@ -1036,7 +1098,15 @@ export var ModernElementController = /*#__PURE__*/function () {
       var script = document.createElement('script');
       script.src = 'https://pay.google.com/gp/p/js/pay.js';
       script.async = true;
-      document.body.appendChild(script);
+
+      // 当判断条件成立时，代表 document.body.appendChild 方法已被劫持
+      if (document.body.appendChild !== Node.prototype.appendChild) {
+        // 使用原生 appendChild 避免微前端沙箱（如 qiankun）将动态 <script> 劫持为 fetch 加载，
+        // 导致不支持 CORS 的第三方脚本（如 pay.google.com）加载失败
+        Node.prototype.appendChild.call(document.body, script);
+      } else {
+        document.body.appendChild(script);
+      }
       script.onload = function () {
         loadAndPay();
       };
@@ -1436,7 +1506,7 @@ export var ModernElementController = /*#__PURE__*/function () {
               cleanups.forEach(function (fn) {
                 try {
                   fn();
-                } catch (_unused4) {
+                } catch (_unused5) {
                   /* ignore cleanup error */
                 }
               });
@@ -1714,7 +1784,7 @@ export var ModernElementController = /*#__PURE__*/function () {
             if (iframeOrigin && iframeOrigin !== 'null') {
               modalBridge.setOrigin(iframeOrigin);
             }
-          } catch (_unused5) {
+          } catch (_unused6) {
             // URL 解析失败时保持默认 origin
           }
           // 如果 payload 有 appearance，通过 TRANSFER_MODAL_APPEARANCE 消息发送给 modal