@alipay/ams-checkout 0.0.1744283958-dev.0 → 0.0.1744283958-dev.3

package/esm/config/index.d.ts

@@ -5,10 +5,10 @@ export declare const sdkVersion: string;
 /**
  * @description: 目前应用层分为v1和v2，会存在两个应用版本号不是同步发布的情况。所以需要把默认的应用版本号配置抽离出来。
  */
-export declare const AMSCheckoutAppVersion = "1.32.0";
-export declare const AMSAutoDebitAppVersion = "1.32.0";
-export declare const AMSEasyPayAppVersion = "1.32.0";
-export declare const AMSCashierPaymentAppVersion = "1.32.0";
-export declare const AMSVaultingAppVersion = "1.32.0";
-export declare const AMSPaymentElementAppVersion = "1.32.0";
-export declare const ADDRESSElementAppVersion = "1.32.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

@@ -35,10 +35,10 @@ export var sdkVersion = json.version;
 /**
  * @description: 目前应用层分为v1和v2，会存在两个应用版本号不是同步发布的情况。所以需要把默认的应用版本号配置抽离出来。
  */
-export var AMSCheckoutAppVersion = '1.32.0'; // 兜底版本号
-export var AMSAutoDebitAppVersion = '1.32.0'; // 代扣
-export var AMSEasyPayAppVersion = '1.32.0'; // easypay
-export var AMSCashierPaymentAppVersion = '1.32.0'; // 收银台（卡、apm）
-export var AMSVaultingAppVersion = '1.32.0'; // 绑卡
-export var AMSPaymentElementAppVersion = '1.32.0'; // payment element
-export var ADDRESSElementAppVersion = '1.32.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/core/component/element/elementContainerService/containerService.d.ts

@@ -13,6 +13,7 @@ export declare class ContainerController {
     private instanceId;
     private containerService;
     private eventService;
+    private containerElement;
     private _globalData?;
     constructor({ type, instanceId, selector, processor, options, }: {
         type: string;
@@ -22,6 +23,7 @@ export declare class ContainerController {
         options: any;
     });
     private addEventListener;
+    getContainerElement(): HTMLDivElement;
     createWebLaunchPromise(): Promise<unknown>;
     switchContainerStatus(status: IContainerStatus): void;
     getContainerStatus(): IContainerStatus;

package/esm/core/component/element/elementContainerService/containerService.js

@@ -29,6 +29,7 @@ export var ContainerController = /*#__PURE__*/function () {
     _defineProperty(this, "instanceId", void 0);
     _defineProperty(this, "containerService", void 0);
     _defineProperty(this, "eventService", void 0);
+    _defineProperty(this, "containerElement", void 0);
     _defineProperty(this, "_globalData", void 0);
     this._globalData = new Map();
     this.switchContainerStatus(IContainerStatus.INITING);
@@ -39,7 +40,7 @@ export var ContainerController = /*#__PURE__*/function () {
       sdkVersion: '',
       webAppVersion: ''
     });
-    this.containerService.load({
+    this.containerElement = this.containerService.load({
       type: DisplayTypeEnum.inline,
       platform: PlatformEnum.desktop,
       isRetention: false,
@@ -72,6 +73,11 @@ export var ContainerController = /*#__PURE__*/function () {
         }
       });
     }
+  }, {
+    key: "getContainerElement",
+    value: function getContainerElement() {
+      return this.containerElement;
+    }
   }, {
     key: "createWebLaunchPromise",
     value: function createWebLaunchPromise() {

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

@@ -9,6 +9,7 @@ export declare class ElementContainerService {
     addContainerService(name: ElementType, service: ContainerController): void;
     getContainerService(name: ElementType): ContainerController | undefined;
     getContainerServices(): Map<ElementType, ContainerController>;
+    destroy(): void;
     mount({ type, selector, processor, options }: {
         type: any;
         selector: any;

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

@@ -30,6 +30,11 @@ export var ElementContainerService = /*#__PURE__*/function () {
     value: function getContainerServices() {
       return this.containerServices;
     }
+  }, {
+    key: "destroy",
+    value: function destroy() {
+      this.containerServices = new Map();
+    }
   }, {
     key: "mount",
     value: function mount(_ref2) {

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

@@ -5,6 +5,7 @@ declare class ElementController {
     private serviceMap;
     private loading;
     private elementProcessors;
+    private initTimeout;
     private elementContainerService;
     constructor(options: IElementOptions);
     private initService;
@@ -16,6 +17,7 @@ declare class ElementController {
     private changeLoading;
     private addEventListener;
     private sendRequestAndWaitWebLaunch;
+    private sendReady;
     updatePayment(paymentSessionData: any): Promise<unknown>;
     destroy(): void;
 }

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

@@ -29,8 +29,10 @@ import { destroyModal } from "../../../../plugin/component/popupWindow.style";
 import { ProductSceneEnum } from "../../../../types";
 import { ElementContainerService } from "../elementContainerService"; // 引入 ElementContainerService
 import { IContainerStatus } from "../elementContainerService/containerService";
-import { ElementPaymentEvent, ElementType, EventCallbackCode } from "../type";
+import { oneAccountUpdate, sdkActionUpdate } from "../mock";
+import { ElementPaymentEvent, ElementPaymentMethod, ElementType, EventCallbackCode } from "../type";
 import { checkCanMount, checkCanUpdate, handleRedirect } from "../util";
+var TIMEOUT_DURATION = 10000;
 var ElementController = /*#__PURE__*/function () {
   // 新增变量
 
@@ -41,13 +43,16 @@ var ElementController = /*#__PURE__*/function () {
     _defineProperty(this, "serviceMap", void 0);
     _defineProperty(this, "loading", void 0);
     _defineProperty(this, "elementProcessors", void 0);
+    _defineProperty(this, "initTimeout", void 0);
     _defineProperty(this, "elementContainerService", void 0);
-    _defineProperty(this, "onValidateFunc", function (event, params) {
+    _defineProperty(this, "onValidateFunc", function (event, target, params) {
       return new Promise(function (resolve) {
         event.emitAndListen({
           event: ElementPaymentEvent.VALIDATE,
           data: {
-            params: _objectSpread({}, params)
+            params: _objectSpread({}, params),
+            target: target,
+            source: ElementPaymentMethod.CONTAINER_ELEMENT
           }
         }, function (result) {
           resolve(result);
@@ -112,6 +117,18 @@ var ElementController = /*#__PURE__*/function () {
         });
         return;
       }
+      clearTimeout(this.initTimeout);
+      this.initTimeout = null;
+      this.initTimeout = setTimeout(function () {
+        clearTimeout(_this.initTimeout);
+        _this.initTimeout = null;
+        _this.changeLoading(false);
+        _this.elementContainer.setStatus(IContainerStatus.READY);
+        _this.elementContainerService.getContainerServices().forEach(function (value) {
+          value.getContainerElement().remove();
+        });
+        _this.elementContainerService.destroy();
+      }, TIMEOUT_DURATION);
       this.changeLoading(true);
       var startBizFlowData = {
         paymentSession: this.options.sessionData,
@@ -166,7 +183,7 @@ var ElementController = /*#__PURE__*/function () {
                   break;
                 }
                 _context.next = 4;
-                return _this2.onValidateFunc((_this2$elementProcess = _this2.elementProcessors[ElementType.auth]) === null || _this2$elementProcess === void 0 ? void 0 : _this2$elementProcess.eventCenter);
+                return _this2.onValidateFunc((_this2$elementProcess = _this2.elementProcessors[ElementType.auth]) === null || _this2$elementProcess === void 0 ? void 0 : _this2$elementProcess.eventCenter, ElementPaymentMethod.AUTH_ELEMENT);
               case 4:
                 result = _context.sent;
                 params.accountInfo = (_result$data = result.data) === null || _result$data === void 0 || (_result$data = _result$data.data) === null || _result$data === void 0 ? void 0 : _result$data.accountInfo;
@@ -181,7 +198,7 @@ var ElementController = /*#__PURE__*/function () {
                   break;
                 }
                 _context.next = 11;
-                return _this2.onValidateFunc((_this2$elementProcess2 = _this2.elementProcessors[ElementType.address]) === null || _this2$elementProcess2 === void 0 ? void 0 : _this2$elementProcess2.eventCenter);
+                return _this2.onValidateFunc((_this2$elementProcess2 = _this2.elementProcessors[ElementType.address]) === null || _this2$elementProcess2 === void 0 ? void 0 : _this2$elementProcess2.eventCenter, ElementPaymentMethod.ADDRESS_ELEMENT);
               case 11:
                 _result = _context.sent;
                 params.shipping = (_result$data3 = _result.data) === null || _result$data3 === void 0 ? void 0 : _result$data3.data;
@@ -197,7 +214,7 @@ var ElementController = /*#__PURE__*/function () {
                 }
                 _context.prev = 16;
                 _context.next = 19;
-                return _this2.onValidateFunc((_this2$elementProcess3 = _this2.elementProcessors[ElementType.payment]) === null || _this2$elementProcess3 === void 0 ? void 0 : _this2$elementProcess3.eventCenter, params);
+                return _this2.onValidateFunc((_this2$elementProcess3 = _this2.elementProcessors[ElementType.payment]) === null || _this2$elementProcess3 === void 0 ? void 0 : _this2$elementProcess3.eventCenter, ElementPaymentMethod.PAYMENT_ELEMENT, params);
               case 19:
                 return _context.abrupt("return", resolve(undefined));
               case 22:
@@ -245,13 +262,17 @@ var ElementController = /*#__PURE__*/function () {
     value: function addEventListener() {
       var _this3 = this;
       this.serviceMap.EventCenter.listen(ElementPaymentEvent.CALLBACK, function (data) {
-        if (_this3.elementProcessors[data.source].eventListener[data.event]) {
+        if (_this3.elementProcessors[data.source] && _this3.elementProcessors[data.source].eventListener[data.event]) {
           var _this3$elementProcess, _this3$elementProcess2;
           (_this3$elementProcess = (_this3$elementProcess2 = _this3.elementProcessors[data.source].eventListener)[data.event]) === null || _this3$elementProcess === void 0 || _this3$elementProcess.call(_this3$elementProcess2, data.data);
         }
       });
       this.serviceMap.EventCenter.listen(EVENT.sizeChanged.name, function (data) {
-        _this3.elementContainerService.getContainerService(data.source).switchContainerStatus(IContainerStatus.IN_BIZ_FLOW);
+        clearTimeout(_this3.initTimeout);
+        _this3.initTimeout = null;
+        if (_this3.elementContainerService.getContainerService(data.source)) {
+          _this3.elementContainerService.getContainerService(data.source).switchContainerStatus(IContainerStatus.IN_BIZ_FLOW);
+        }
         _this3.changeLoading(false);
         // 遍历containerService中的所有container查看是否所有状态都是IN_BIZ_FLOW
         // const allContainersInBizFlow = Object.values(this.elementContainerService.getContainerServices()).every(
@@ -273,13 +294,36 @@ var ElementController = /*#__PURE__*/function () {
         options = _objectWithoutProperties(renderOptions, _excluded);
       var webLaunchPromise = this.elementContainerService.getContainerService(type).createWebLaunchPromise();
       Promise.all([webLaunchPromise, this.elementProcessors[type].obtainData()]).then(function (_ref3) {
+        var _this4$elementContain;
         var _ref4 = _slicedToArray(_ref3, 2),
           _webLaunchRes = _ref4[0],
           _obtainDataRes = _ref4[1];
-        _this4.elementProcessors[type].onReady(_objectSpread(_objectSpread({}, options), {}, {
-          queryResult: _obtainDataRes.originActionQuery
-        }));
+        (_this4$elementContain = _this4.elementContainerService.getContainerService(type)) === null || _this4$elementContain === void 0 || _this4$elementContain.switchContainerStatus(IContainerStatus.READY);
+        var allReady = true;
+        _this4.elementContainerService.getContainerServices().forEach(function (item) {
+          if (!allReady) return;
+          allReady = item.getContainerStatus() === IContainerStatus.READY;
+        });
+        if (allReady) {
+          _this4.elementContainerService.getContainerServices().forEach(function (value, key) {
+            _this4.sendReady(key, options);
+          });
+        }
+      });
+    }
+  }, {
+    key: "sendReady",
+    value: function sendReady(type, options) {
+      var _this$elementProcesso;
+      var paymentResult = (_this$elementProcesso = this.elementProcessors[ElementType.payment]) === null || _this$elementProcesso === void 0 ? void 0 : _this$elementProcesso.getObtainDataRes();
+      var paymentContext = this.elementContainer.getPaymentContext();
+      var params = _objectSpread(_objectSpread({}, options), {}, {
+        originActionQueryResult: paymentResult === null || paymentResult === void 0 ? void 0 : paymentResult.originActionQuery,
+        originOneAccountQueryResult: paymentResult === null || paymentResult === void 0 ? void 0 : paymentResult.originOneAccountQuery,
+        paymentSessionData: paymentContext === null || paymentContext === void 0 ? void 0 : paymentContext.paymentSessionId,
+        sessionResult: (paymentContext === null || paymentContext === void 0 ? void 0 : paymentContext.paymentSessionObj) || {}
       });
+      this.elementProcessors[type].onReady(params);
     }
   }, {
     key: "updatePayment",
@@ -317,7 +361,10 @@ var ElementController = /*#__PURE__*/function () {
                         Object.values(_this5.elementProcessors).forEach(function (processor) {
                           processor.update({
                             data: {
-                              originActionQuery: data.originActionQuery
+                              // originActionQuery: data.originActionQuery,
+                              // originOneAccountQuery: data.originOneAccountQuery,
+                              originActionQuery: sdkActionUpdate,
+                              originOneAccountQuery: oneAccountUpdate
                             },
                             paymentSessionData: paymentSessionData
                           });
@@ -354,15 +401,15 @@ var ElementController = /*#__PURE__*/function () {
   }, {
     key: "destroy",
     value: function destroy() {
-      this.elementContainerService.getContainerServices().forEach(function (value) {
-        value.getContainerService().getWebApp().remove();
-      });
+      this.elementContainer.destroy();
+      this.elementContainer.setStatus(IContainerStatus.DESTROYED);
       // popup未注册会报错，但element不需要感知popup是否被注册
       try {
         destroyModal(); // 关闭popup弹窗
       } catch (error) {}
-      this.elementContainer.destroy();
-      this.elementContainer.setStatus(IContainerStatus.DESTROYED);
+      this.elementContainerService.getContainerServices().forEach(function (value) {
+        value.getContainerElement().remove();
+      });
     }
   }]);
   return ElementController;

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

@@ -12,6 +12,9 @@ declare class AddressProcessor extends BaseElementProcessor {
     }): string;
     obtainData(): any;
     getValue(hasValidate?: boolean): any;
-    update(data: any): void;
+    update({ data, paymentSessionData }: {
+        data: any;
+        paymentSessionData: any;
+    }): void;
 }
 export default AddressProcessor;

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

@@ -1,4 +1,10 @@
 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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -11,6 +17,7 @@ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) ===
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+import { parseSessionData } from "../..";
 import PackageJson from "../../../../../package.json";
 import { generateIframeSrc as _generateIframeSrc } from "../util";
 import BaseElementProcessor from "./baseElementProcessor";
@@ -24,7 +31,7 @@ var AddressProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
   _createClass(AddressProcessor, [{
     key: "onReady",
     value: function onReady(extraParam) {
-      var _this$elementContaine, _this$elementContaine2, _this$elementContaine3;
+      var _this$elementContaine, _this$elementContaine2, _this$elementContaine3, _extraParam$originOne;
       this.eventCenter.dispatchToApp({
         event: 'renderComponent',
         data: {
@@ -37,7 +44,8 @@ var AddressProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
               screenWidth: screen.width
             },
             appearance: (_this$elementContaine2 = this.elementContainer.getPaymentContext()) === null || _this$elementContaine2 === void 0 ? void 0 : _this$elementContaine2.displayInfo.appearance,
-            sessionResult: (_this$elementContaine3 = this.elementContainer.getPaymentContext()) === null || _this$elementContaine3 === void 0 ? void 0 : _this$elementContaine3.paymentSessionObj
+            sessionResult: (_this$elementContaine3 = this.elementContainer.getPaymentContext()) === null || _this$elementContaine3 === void 0 ? void 0 : _this$elementContaine3.paymentSessionObj,
+            prefillValue: (extraParam === null || extraParam === void 0 || (_extraParam$originOne = extraParam.originOneAccountQueryResult) === null || _extraParam$originOne === void 0 ? void 0 : _extraParam$originOne.shippings) || []
           },
           target: 'ADDRESS_ELEMENT'
         }
@@ -90,6 +98,7 @@ var AddressProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
     key: "obtainData",
     value: function obtainData() {
       // 实现 obtainData 方法
+      this.obtainDataRes = {};
       return {};
     }
   }, {
@@ -112,10 +121,23 @@ var AddressProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
     }
   }, {
     key: "update",
-    value: function update(data) {
+    value: function update(_ref3) {
+      var data = _ref3.data,
+        paymentSessionData = _ref3.paymentSessionData;
+      var _parseSessionData = parseSessionData(paymentSessionData),
+        _parseSessionData2 = _slicedToArray(_parseSessionData, 2),
+        parseData = _parseSessionData2[0],
+        sessionData = _parseSessionData2[1];
       // 实现 update 方法的具体逻辑
-      console.log('Updating address processor with data:', data);
-      // 具体实现可以根据实际需求来编写
+      this.eventCenter.dispatchToApp({
+        event: 'updatePayment',
+        data: {
+          paymentSessionData: paymentSessionData,
+          data: data,
+          sessionResult: parseData,
+          sessionData: sessionData
+        }
+      });
     }
   }]);
   return AddressProcessor;

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

@@ -12,6 +12,9 @@ declare class AuthProcessor extends BaseElementProcessor {
     }): string;
     obtainData(): any;
     getValue(): any;
-    update(data: any): void;
+    update({ data, paymentSessionData }: {
+        data: any;
+        paymentSessionData: any;
+    }): void;
 }
 export default AuthProcessor;