@alipay/ams-checkout 0.0.1746673215-dev.1 → 0.0.1746674797-dev.0

package/esm/component/channel.js

@@ -76,11 +76,11 @@ export function getDoubleFaUrl(params) {
   var isLandscapeOrientation = false; // Web 不含横屏
 
   var DOUBLE_FA_URL_MAPPING = {
-    local: "http://page.alipay.net/page/antom-web-checkout/src/component-app/doubleFA/index.".concat(sdkVersion, ".html"),
-    dev: "http://page.alipay.net/page/antom-web-checkout/src/component-app/doubleFA/index.".concat(sdkVersion, ".html"),
-    sit: "http://page.test.alipay.net/page/antom-web-checkout/src/component-app/doubleFA/index.".concat(sdkVersion, ".html"),
-    pre: "https://pre.ac.alipay.com/page/antom-web-checkout/src/component-app/doubleFA/index.".concat(sdkVersion, ".html"),
-    prod: "https://ac.alipay.com/page/antom-web-checkout/src/component-app/doubleFA/index.".concat(sdkVersion, ".html")
+    local: 'http://page.alipay.net/page/antom-web-checkout-v2/easysafepay/pages/double-fa/index-1.0.1.html',
+    dev: 'http://page.alipay.net/page/antom-web-checkout-v2/easysafepay/pages/double-fa/index-1.0.1.html',
+    sit: 'http://page.test.alipay.net/page/antom-web-checkout-v2/easysafepay/pages/double-fa/index.html',
+    pre: 'https://pre.ac.alipay.com/page/antom-web-checkout-v2/easysafepay/pages/double-fa/index.html',
+    prod: 'https://checkout.antom.com/easysafepay/pages/double-fa/index.html'
   };
   var doubleFaBaseUrl = DOUBLE_FA_URL_MAPPING[env] || DOUBLE_FA_URL_MAPPING.prod;
   return "".concat(doubleFaBaseUrl, "?scene=cashierResultPage&instanceId=").concat(instanceId, "&paymentSessionData=").concat(encodeURIComponent(paymentSessionData), "&isLandscape=").concat(isLandscapeOrientation ? 'true' : '', "&pmt=").concat(paymentMethodType, "&locale=").concat(locale, "&sdkVersion=").concat(sdkVersion);

package/esm/config/index.d.ts

@@ -1,14 +1,14 @@
 export declare const marmotMap: Record<string, string>;
 export declare const marmotConfigMap: Record<string, string>;
-export declare const elementAppMarmotMap: Record<string, string>;
+export declare const v2AppMarmotMap: Record<string, string>;
 export declare const sdkVersion: string;
 /**
  * @description: 目前应用层分为v1和v2，会存在两个应用版本号不是同步发布的情况。所以需要把默认的应用版本号配置抽离出来。
  */
-export declare const AMSCheckoutAppVersion = "1.35.0";
-export declare const AMSAutoDebitAppVersion = "1.35.0";
-export declare const AMSEasyPayAppVersion = "1.35.0";
-export declare const AMSCashierPaymentAppVersion = "1.35.0";
-export declare const AMSVaultingAppVersion = "1.35.0";
-export declare const AMSPaymentElementAppVersion = "1.35.0";
-export declare const ADDRESSElementAppVersion = "1.35.0";
+export declare const AMSCheckoutAppVersion = "1.34.0";
+export declare const AMSAutoDebitAppVersion = "1.34.0";
+export declare const AMSEasyPayAppVersion = "1.34.0";
+export declare const AMSCashierPaymentAppVersion = "1.34.0";
+export declare const AMSVaultingAppVersion = "1.34.0";
+export declare const AMSPaymentElementAppVersion = "1.34.0";
+export declare const ADDRESSElementAppVersion = "1.34.0";

package/esm/config/index.js

@@ -22,7 +22,7 @@ export var marmotConfigMap = {
   light_sandbox: 'https://config.marmot-cloud.com/config/data/antom-sdk-config/en_US.json',
   prod: 'https://config.marmot-cloud.com/config/data/antom-sdk-config/en_US.json'
 };
-export var elementAppMarmotMap = {
+export var v2AppMarmotMap = {
   dev: 'http://page.alipay.net/page/antom-web-checkout-v2',
   sit: 'http://page.test.alipay.net/page/antom-web-checkout-v2',
   pre: 'https://pre.ac.alipay.com/page/antom-web-checkout-v2',
@@ -35,10 +35,10 @@ export var sdkVersion = json.version;
 /**
  * @description: 目前应用层分为v1和v2，会存在两个应用版本号不是同步发布的情况。所以需要把默认的应用版本号配置抽离出来。
  */
-export var AMSCheckoutAppVersion = '1.35.0'; // 兜底版本号
-export var AMSAutoDebitAppVersion = '1.35.0'; // 代扣
-export var AMSEasyPayAppVersion = '1.35.0'; // easypay
-export var AMSCashierPaymentAppVersion = '1.35.0'; // 收银台（卡、apm）
-export var AMSVaultingAppVersion = '1.35.0'; // 绑卡
-export var AMSPaymentElementAppVersion = '1.35.0'; // payment element
-export var ADDRESSElementAppVersion = '1.35.0'; // address element
+export var AMSCheckoutAppVersion = '1.34.0'; // 兜底版本号
+export var AMSAutoDebitAppVersion = '1.34.0'; // 代扣
+export var AMSEasyPayAppVersion = '1.34.0'; // easypay
+export var AMSCashierPaymentAppVersion = '1.34.0'; // 收银台（卡、apm）
+export var AMSVaultingAppVersion = '1.34.0'; // 绑卡
+export var AMSPaymentElementAppVersion = '1.34.0'; // payment element
+export var ADDRESSElementAppVersion = '1.34.0'; // address element

package/esm/constant/index.d.ts

@@ -219,6 +219,9 @@ export declare const EVENT: {
     showToast: {
         name: string;
     };
+    getSdkVersion: {
+        name: string;
+    };
 };
 export declare const COMPONENT_CONTAINER_ID = "ams-component-container";
 export declare const COMPONENT_SECTION_ID = "ams-component-section";

package/esm/constant/index.js

@@ -221,6 +221,9 @@ export var EVENT = {
   },
   showToast: {
     name: 'showToast'
+  },
+  getSdkVersion: {
+    name: 'getSdkVersion'
   }
 };
 export var COMPONENT_CONTAINER_ID = 'ams-component-container';

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

@@ -19,15 +19,14 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 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 { cleanMockup, removeRetentionPopup } from "../../../../component/component.popup.style";
 import { EVENT } from "../../../../constant";
 import AddressProcessor from "../../../../core/component/element/elementProcessor/addressProcessor";
 import AuthProcessor from "../../../../core/component/element/elementProcessor/authProcessor";
 import PaymentProcessor from "../../../../core/component/element/elementProcessor/paymentProcessor";
 import { IElementStatus } from "../../../../foundation";
 import { AntomSDKCore } from "../../../../foundation/core";
-import { destroyModal } from "../../../../component/popupWindow.style";
 import { ElementProcessor } from "../../../../foundation/product-processor/element";
+import { cleanMockup, removeRetentionPopup } from "../../../../component/component.popup.style";
 import { ProductSceneEnum } from "../../../../types";
 import { ElementContainerService } from "../elementContainerService"; // 引入 ElementContainerService
 import { IContainerStatus } from "../elementContainerService/containerService";
@@ -98,10 +97,9 @@ var ElementController = /*#__PURE__*/function () {
   }, {
     key: "onEventCallback",
     value: function onEventCallback(_ref) {
-      var _this$options, _this$options$onEvent;
       var code = _ref.code,
         message = _ref.message;
-      this === null || this === void 0 || (_this$options = this.options) === null || _this$options === void 0 || (_this$options$onEvent = _this$options.onEventCallback) === null || _this$options$onEvent === void 0 || _this$options$onEvent.call(_this$options, {
+      this.options.onEventCallback({
         code: code,
         message: message
       });
@@ -322,10 +320,6 @@ var ElementController = /*#__PURE__*/function () {
       this.serviceMap.EventCenter.listen(EVENT.showToast.name, function (data) {
         showToast(data);
       });
-      this.serviceMap.EventCenter.listen(ElementPaymentEvent.SEND_MUITI_APP_EVENT_TO_SDK, function (result) {
-        var _this4$options$onEven, _this4$options;
-        (_this4$options$onEven = (_this4$options = _this4.options).onEventCallback) === null || _this4$options$onEven === void 0 || _this4$options$onEven.call(_this4$options, result.data);
-      });
     }
   }, {
     key: "sendRequestAndWaitWebLaunch",
@@ -361,11 +355,11 @@ var ElementController = /*#__PURE__*/function () {
       var paymentSessionObj = paymentContext.paymentSessionObj;
       var isConnect = paymentSessionObj.connectFactor.enableConnect && ((_paymentSessionObj$pa = paymentSessionObj.paymentSessionConfig) === null || _paymentSessionObj$pa === void 0 ? void 0 : _paymentSessionObj$pa.productScene) === ProductSceneEnum.ELEMENT_PAYMENT;
       if (!(paymentResult !== null && paymentResult !== void 0 && (_paymentResult$origin = paymentResult.originActionQueryResult) !== null && _paymentResult$origin !== void 0 && _paymentResult$origin.success) && isConnect) {
-        var _this$options$onEvent2, _this$options2;
+        var _this$options$onEvent, _this$options;
         clearTimeout(this.initTimeout);
         this.changeLoading(false);
         this.initTimeout = null;
-        (_this$options$onEvent2 = (_this$options2 = this.options).onEventCallback) === null || _this$options$onEvent2 === void 0 || _this$options$onEvent2.call(_this$options2, {
+        (_this$options$onEvent = (_this$options = this.options).onEventCallback) === null || _this$options$onEvent === void 0 || _this$options$onEvent.call(_this$options, {
           code: EventCallbackCode.SDK_CREATE_COMPONENT_ERROR,
           message: 'Component initialization exception.'
         });
@@ -454,14 +448,14 @@ var ElementController = /*#__PURE__*/function () {
   }, {
     key: "destroyHandle",
     value: function destroyHandle() {
+      var _this7 = this;
       this.elementContainer.destroy();
       cleanMockup();
       removeRetentionPopup();
-      try {
-        destroyModal();
-      } catch (error) {}
-      this.serviceMap.EventCenter.cleanIFrames();
-      this.elementContainerService.destroy();
+      setTimeout(function () {
+        _this7.serviceMap.EventCenter.cleanIFrames();
+        _this7.elementContainerService.destroy();
+      }, 0);
     }
   }, {
     key: "destroy",

package/esm/core/component/element/elementProcessor/baseElementProcessor.d.ts

@@ -14,7 +14,6 @@ declare abstract class BaseElementProcessor {
     instanceId: string;
     options: ElementProcessorOptions;
     obtainDataRes: any;
-    elementUrl: string;
     eventCenter: EventCenter;
     eventListener: {};
     abstract beforeMount(): void;
@@ -34,8 +33,6 @@ declare abstract class BaseElementProcessor {
     registerElementContainer(elementContainer: AntomSDKCore): void;
     registerEventCenter(eventCenter: EventCenter): void;
     registerEventListener(event: any, callback: any): void;
-    setElementUrl(url: any): void;
-    getElementUrl(): string;
     getObtainDataRes(): any;
 }
 export default BaseElementProcessor;

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

@@ -15,7 +15,6 @@ var BaseElementProcessor = /*#__PURE__*/function () {
     _defineProperty(this, "instanceId", void 0);
     _defineProperty(this, "options", void 0);
     _defineProperty(this, "obtainDataRes", void 0);
-    _defineProperty(this, "elementUrl", void 0);
     _defineProperty(this, "eventCenter", void 0);
     _defineProperty(this, "eventListener", {});
     this._setOptions(options);
@@ -75,16 +74,6 @@ var BaseElementProcessor = /*#__PURE__*/function () {
     value: function registerEventListener(event, callback) {
       this.eventCenter[event] = callback;
     }
-  }, {
-    key: "setElementUrl",
-    value: function setElementUrl(url) {
-      this.elementUrl = url;
-    }
-  }, {
-    key: "getElementUrl",
-    value: function getElementUrl() {
-      return this.elementUrl;
-    }
   }, {
     key: "getObtainDataRes",
     value: function getObtainDataRes() {

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

@@ -28,10 +28,9 @@ import { EVENT } from "../../../../constant";
 import { ServiceProvider } from "../../../../foundation/service";
 import { ApplePaySdk, handleGooglePay, isSkipRenderPaymentMethod } from "../../../../plugin/component/channel";
 import { LogConfig, Logger } from "../../../../util/logger";
-import { queryParse } from "../../../../util";
 import { parseSessionData } from "../../index";
 import { oneAccount, sdkAction } from "../mock";
-import { generateIframeSrc as _generateIframeSrc, isElementPC, isElementPad } from "../util";
+import { generateIframeSrc as _generateIframeSrc } from "../util";
 import BaseElementProcessor from "./baseElementProcessor";
 var logger = new Logger(LogConfig, true);
 var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
@@ -223,7 +222,7 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
           pageUrl = "/elements/".concat(version, "/pages/express_checkout/index.html");
         }
       } catch (error) {}
-      var url = _generateIframeSrc({
+      return _generateIframeSrc({
         paymentSession: paymentSession,
         paymentSessionObj: paymentSessionObj,
         environment: environment,
@@ -234,15 +233,13 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
         pageUrl: pageUrl,
         instanceId: instanceId
       });
-      this.setElementUrl(url);
-      return url;
     }
   }, {
     key: "obtainData",
     value: function () {
       var _obtainData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
         var _paymentSessionObj$co;
-        var requestService, _this$elementContaine8, paymentSession, paymentSessionObj, displayInfo, merchantAppointParam, _this$options2, environment, locale, _ref4, paymentSessionConfig, hostSign, isConnect, LOCAL_MOCK, _queryParse, appType, terminalType, generateActionQueryPromise, generateOneAccountQueryPromise, _yield$Promise$all, _yield$Promise$all2, originActionQueryResult, originOneAccountQueryResult;
+        var requestService, _this$elementContaine8, paymentSession, paymentSessionObj, displayInfo, merchantAppointParam, _this$options2, environment, locale, _ref4, paymentSessionConfig, hostSign, isConnect, LOCAL_MOCK, generateActionQueryPromise, generateOneAccountQueryPromise, _yield$Promise$all, _yield$Promise$all2, originActionQueryResult, originOneAccountQueryResult;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -254,8 +251,6 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
               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 = window.location.href.indexOf('LOCAL_MOCK=1') !== -1;
-              _queryParse = queryParse(this.getElementUrl()), appType = _queryParse.appType;
-              terminalType = isElementPad() ? 'WEB' : appType ? 'APP' : isElementPC() ? 'WEB' : 'WAP';
               generateActionQueryPromise = function generateActionQueryPromise() {
                 return new Promise(function (resolve, reject) {
                   var _displayInfo$merchant;
@@ -278,8 +273,7 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                   requestService.request(sdkRequestData, {
                     env: environment,
                     envInfo: {
-                      locale: locale,
-                      terminalType: terminalType
+                      locale: locale
                     },
                     hostSign: hostSign,
                     timeout: 300000,
@@ -309,8 +303,7 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                   }, {
                     env: environment,
                     envInfo: {
-                      locale: locale,
-                      terminalType: terminalType
+                      locale: locale
                     },
                     timeout: 300000,
                     // TODO dev环境接口超时
@@ -322,9 +315,9 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                   });
                 });
               };
-              _context2.next = 14;
+              _context2.next = 12;
               return Promise.all(isConnect ? [generateActionQueryPromise(), generateOneAccountQueryPromise()] : [generateActionQueryPromise()]);
-            case 14:
+            case 12:
               _yield$Promise$all = _context2.sent;
               _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);
               originActionQueryResult = _yield$Promise$all2[0];
@@ -337,7 +330,7 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                 originActionQueryResult: originActionQueryResult,
                 originOneAccountQueryResult: originOneAccountQueryResult
               });
-            case 20:
+            case 18:
             case "end":
               return _context2.stop();
           }

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

@@ -1,6 +1,4 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -42,10 +40,7 @@ export var ElementComponent = /*#__PURE__*/function () {
   }, {
     key: "mount",
     value: function mount(renderOptions, sdkSelector) {
-      var _this$options;
-      return this.controller.mount(_objectSpread({
-        appearance: this === null || this === void 0 || (_this$options = this.options) === null || _this$options === void 0 ? void 0 : _this$options.appearance
-      }, renderOptions), sdkSelector);
+      return this.controller.mount(renderOptions, sdkSelector);
     }
   }, {
     key: "mountCashier",

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

@@ -57,10 +57,4 @@ export declare function redirect(data: {
     callAppJudgeTime?: number;
 }): Promise<void>;
 export declare function showToast(options?: IToastOptions, callback?: Function): void;
-export declare const isElementMobile: () => boolean;
-/**
- * @description judge whether the device is a pad, by userAgent and screen aspect ratio, but not accurate
- */
-export declare const isElementPad: () => boolean;
-export declare const isElementPC: () => boolean;
 export { formatElementOption };

package/esm/core/component/element/util.js

@@ -448,31 +448,4 @@ export function showToast() {
     }, 300);
   }, config.duration);
 }
-export var isElementMobile = function isElementMobile() {
-  var userAgentInfo = navigator.userAgent;
-  // webview 容器
-  if (userAgentInfo.includes('AlipayWebViewClient')) {
-    return true;
-  }
-  var agents = ['Android', 'iPhone', 'SymbianOS', 'Windows Phone', 'iPod', 'iPad'];
-  return agents.some(function (agent) {
-    return userAgentInfo.includes(agent);
-  });
-};
-
-/**
- * @description judge whether the device is a pad, by userAgent and screen aspect ratio, but not accurate
- */
-export var isElementPad = function isElementPad() {
-  var userAgent = navigator.userAgent.toLowerCase();
-  var width = window.screen.width;
-  var height = window.screen.height;
-  var aspectRatio = Math.min(width, height) / Math.max(width, height);
-  var userAgentCheck = /ipad|tablet|(android(?!.*mobile))/i.test(userAgent);
-  var screenCheck = aspectRatio > 0.5 && aspectRatio < 0.75 && width >= 768 && height >= 1024;
-  return userAgentCheck || screenCheck;
-};
-export var isElementPC = function isElementPC() {
-  return !isElementMobile();
-};
 export { formatElementOption };

package/esm/foundation/core/index.js

@@ -178,6 +178,29 @@ export var AntomSDKCore = /*#__PURE__*/function () {
           return _ref2.apply(this, arguments);
         };
       }());
+      eventCenter.listen(EVENT.getSdkVersion.name, /*#__PURE__*/function () {
+        var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(data, payload) {
+          var _payload$context3;
+          return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+            while (1) switch (_context3.prev = _context3.next) {
+              case 0:
+                eventCenter.dispatchToApp({
+                  event: 'appEventCallback',
+                  eventCallbackId: (_payload$context3 = payload.context) === null || _payload$context3 === void 0 ? void 0 : _payload$context3.eventCallbackId,
+                  data: {
+                    version: sdkMetaData === null || sdkMetaData === void 0 ? void 0 : sdkMetaData.sdkVersion
+                  }
+                });
+              case 1:
+              case "end":
+                return _context3.stop();
+            }
+          }, _callee3);
+        }));
+        return function (_x5, _x6) {
+          return _ref3.apply(this, arguments);
+        };
+      }());
       eventCenter.listen(EVENT.destroy.name, function (data) {
         _this.setStatus(IElementStatus.READY);
         _this.destroy();
@@ -208,14 +231,14 @@ export var AntomSDKCore = /*#__PURE__*/function () {
   }, {
     key: "startBizFlow",
     value: function () {
-      var _startBizFlow = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(options) {
+      var _startBizFlow = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(options) {
         var _this$paymentContext$, _this$paymentContext$2, _this$paymentContext$3;
         var paymentSession, displayInfo, _convertPaymentSessio2, paymentSessionId, paymentSessionMetaData, mid, webAppMatchConfig, webAppVersion, productScene, paymentMethod, _this$bizFlowStartBeh, payload;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
               if (!(!options || !options.paymentSession)) {
-                _context3.next = 2;
+                _context4.next = 2;
                 break;
               }
               throw new Error('paymentSession is empty');
@@ -245,61 +268,61 @@ export var AntomSDKCore = /*#__PURE__*/function () {
               // Invoke processor
               productScene = (_this$paymentContext$2 = this.paymentContext.paymentSessionObj) === null || _this$paymentContext$2 === void 0 || (_this$paymentContext$2 = _this$paymentContext$2.paymentSessionConfig) === null || _this$paymentContext$2 === void 0 ? void 0 : _this$paymentContext$2.productScene;
               paymentMethod = (_this$paymentContext$3 = this.paymentContext.paymentSessionObj) === null || _this$paymentContext$3 === void 0 || (_this$paymentContext$3 = _this$paymentContext$3.paymentMethodInfoView) === null || _this$paymentContext$3 === void 0 ? void 0 : _this$paymentContext$3.paymentMethodType;
-              _context3.prev = 14;
+              _context4.prev = 14;
               if (!this.productProcessors["".concat(productScene, "|").concat(paymentMethod)]) {
-                _context3.next = 21;
+                _context4.next = 21;
                 break;
               }
-              _context3.next = 18;
+              _context4.next = 18;
               return this.productProcessors["".concat(productScene, "|").concat(paymentMethod)].startBizFlow(this.paymentContext);
             case 18:
-              this.bizFlowStartBehavior = _context3.sent;
-              _context3.next = 25;
+              this.bizFlowStartBehavior = _context4.sent;
+              _context4.next = 25;
               break;
             case 21:
               if (!this.productProcessors["".concat(productScene)]) {
-                _context3.next = 25;
+                _context4.next = 25;
                 break;
               }
-              _context3.next = 24;
+              _context4.next = 24;
               return this.productProcessors["".concat(productScene)].startBizFlow(this.paymentContext);
             case 24:
-              this.bizFlowStartBehavior = _context3.sent;
+              this.bizFlowStartBehavior = _context4.sent;
             case 25:
-              _context3.next = 30;
+              _context4.next = 30;
               break;
             case 27:
-              _context3.prev = 27;
-              _context3.t0 = _context3["catch"](14);
-              console.error('Invoke processor failed', _context3.t0);
+              _context4.prev = 27;
+              _context4.t0 = _context4["catch"](14);
+              console.error('Invoke processor failed', _context4.t0);
             case 30:
               if (!(!this.bizFlowStartBehavior || this.bizFlowStartBehavior.behaviorType === 'NONE' || !this.bizFlowStartBehavior.payload)) {
-                _context3.next = 32;
+                _context4.next = 32;
                 break;
               }
-              return _context3.abrupt("return");
+              return _context4.abrupt("return");
             case 32:
               if (!(this.bizFlowStartBehavior.behaviorType === 'RENDER')) {
-                _context3.next = 35;
+                _context4.next = 35;
                 break;
               }
               this.handleBehaviorRender();
-              return _context3.abrupt("return");
+              return _context4.abrupt("return");
             case 35:
               if (!(this.bizFlowStartBehavior.behaviorType === 'REDIRECT')) {
-                _context3.next = 39;
+                _context4.next = 39;
                 break;
               }
               payload = (_this$bizFlowStartBeh = this.bizFlowStartBehavior) === null || _this$bizFlowStartBeh === void 0 ? void 0 : _this$bizFlowStartBeh.payload;
               redirect(payload, this.instanceId);
-              return _context3.abrupt("return");
+              return _context4.abrupt("return");
             case 39:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3, this, [[14, 27]]);
+        }, _callee4, this, [[14, 27]]);
       }));
-      function startBizFlow(_x5) {
+      function startBizFlow(_x7) {
         return _startBizFlow.apply(this, arguments);
       }
       return startBizFlow;

package/esm/foundation/product-processor/easysafepay/index.js

@@ -46,7 +46,7 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
       this.eventCenter = ServiceProvider.getInstance(this.instanceId).getService('EventCenter');
 
       // preload web app
-      PreloadHelper.preloadWebApp(ProductSceneEnum.EASY_PAY, PaymentMethodCategoryTypeEnum.WALLET, this.initConfig.environment);
+      PreloadHelper.preloadWebApp(ProductSceneEnum.EASY_PAY, PaymentMethodCategoryTypeEnum.WALLET, this.initConfig.environment, true);
     }
   }, {
     key: "startBizFlow",
@@ -113,15 +113,19 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
   }, {
     key: "buildWebAppUrl",
     value: function buildWebAppUrl() {
-      var _paymentContext$payme3, _paymentContext$payme4, _this$initConfig$anal;
+      var _paymentContext$payme3, _paymentContext$payme4, _paymentContext$payme5, _this$initConfig$anal;
       var paymentContext = this.paymentContext;
       var paymentMethodCategoryType = (_paymentContext$payme3 = paymentContext.paymentSessionObj.paymentSessionConfig) === null || _paymentContext$payme3 === void 0 ? void 0 : _paymentContext$payme3.paymentMethodCategoryType;
-      var productSceneVersion = (_paymentContext$payme4 = paymentContext.paymentSessionObj.paymentSessionConfig) === null || _paymentContext$payme4 === void 0 ? void 0 : _paymentContext$payme4.productSceneVersion;
+      var productScene = (_paymentContext$payme4 = paymentContext.paymentSessionObj.paymentSessionConfig) === null || _paymentContext$payme4 === void 0 ? void 0 : _paymentContext$payme4.productScene;
+      var productSceneVersion = (_paymentContext$payme5 = paymentContext.paymentSessionObj.paymentSessionConfig) === null || _paymentContext$payme5 === void 0 ? void 0 : _paymentContext$payme5.productSceneVersion;
       var hostSign = this.hostSign;
-      var webAppUrl = WebAppUrlUtil.getWebAppUrl({
+      var mid = paymentContext.paymentSessionObj.clientId;
+      var extendInfo = paymentContext.paymentSessionObj.extendInfo;
+      var webAppUrl = WebAppUrlUtil.getWebAppV2Url({
         environment: this.initConfig.environment,
         paymentMethodCategoryType: paymentMethodCategoryType,
         sdkMetaData: paymentContext.sdkMetaData,
+        productScene: productScene,
         productSceneVersion: productSceneVersion,
         isPreload: false,
         query: {
@@ -130,7 +134,9 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
           instanceId: this.instanceId,
           locale: this.initConfig.locale,
           hostSign: hostSign
-        }
+        },
+        mid: mid,
+        extendInfo: extendInfo
       });
       return webAppUrl;
     }

package/esm/foundation/utils/preload_helper.d.ts

@@ -4,10 +4,10 @@ export default class PreloadHelper {
     static isWebAppPreloaded: boolean;
     static isSecuritySDKPreloaded: boolean;
     private static securitySdkMap;
-    static preloadWebApp(productScene: ProductSceneEnum, paymentMethodCategoryType: PaymentMethodCategoryTypeEnum, environment?: string): void;
+    static preloadWebApp(productScene: ProductSceneEnum, paymentMethodCategoryType: PaymentMethodCategoryTypeEnum, environment?: string, useV2?: boolean): void;
     static preloadSecuritySDK(product: ProductSceneEnum, securityRegion?: string): void;
     static getSecuritySdk(scene: any): Security;
-    static buildWebAppPreloadUrl(productScene: ProductSceneEnum, paymentMethodCategoryType: PaymentMethodCategoryTypeEnum, environment: string): {
+    static buildWebAppPreloadUrl(productScene: ProductSceneEnum, paymentMethodCategoryType: PaymentMethodCategoryTypeEnum, environment: string, useV2?: boolean): {
         preloadUrl: string;
         containerId: string;
     };

package/esm/foundation/utils/preload_helper.js

@@ -8,7 +8,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { sdkVersion } from "../../config";
 import { createPreloadIframe } from "../service/container/utils";
 import { ProductSceneEnum } from "../../types";
-import { getWebAppUrl } from "../utils/web_app_url_utils";
+import { getWebAppUrl, getWebAppV2Url } from "../utils/web_app_url_utils";
 import { ProductInfoCacheUtil } from "../utils/payment_product_utils";
 import { getWebAppVersion } from "./payment_context_utils";
 import { getSecurityConfigStorageKey, getSecurityHost, getSecurityScene, Security } from "../../util/security";
@@ -22,12 +22,13 @@ var PreloadHelper = /*#__PURE__*/function () {
     key: "preloadWebApp",
     value: function preloadWebApp(productScene, paymentMethodCategoryType) {
       var environment = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'prod';
+      var useV2 = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
       try {
         if (this.isWebAppPreloaded) {
           console.log('[web-sdk] web app already preloaded');
           return;
         }
-        var _this$buildWebAppPrel = this.buildWebAppPreloadUrl(productScene, paymentMethodCategoryType, environment),
+        var _this$buildWebAppPrel = this.buildWebAppPreloadUrl(productScene, paymentMethodCategoryType, environment, useV2),
           preloadUrl = _this$buildWebAppPrel.preloadUrl,
           containerId = _this$buildWebAppPrel.containerId;
         var preloadIframe = createPreloadIframe(containerId);
@@ -89,6 +90,7 @@ var PreloadHelper = /*#__PURE__*/function () {
   }, {
     key: "buildWebAppPreloadUrl",
     value: function buildWebAppPreloadUrl(productScene, paymentMethodCategoryType, environment) {
+      var useV2 = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
       var productSceneVersion = productScene === ProductSceneEnum.EASY_PAY ? '2.0' : '1.0';
       var previousProductInfo = ProductInfoCacheUtil.getPreviousProductInfo(productScene);
       if (previousProductInfo) {
@@ -101,14 +103,16 @@ var PreloadHelper = /*#__PURE__*/function () {
         webAppVersion: ''
       };
       sdkMetaData.webAppVersion = getWebAppVersion(sdkMetaData);
-      var preloadUrl = getWebAppUrl({
+      var preloadUrlParams = {
         environment: environment,
         sdkMetaData: sdkMetaData,
         paymentMethodCategoryType: paymentMethodCategoryType,
         isPreload: true,
+        productScene: productScene,
         productSceneVersion: productSceneVersion,
         query: undefined
-      });
+      };
+      var preloadUrl = useV2 ? getWebAppV2Url(preloadUrlParams) : getWebAppUrl(preloadUrlParams);
       return {
         preloadUrl: preloadUrl,
         containerId: containerId