@alipay/ams-checkout 1.25.0 → 1.25.2

package/esm/config/index.d.ts

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

package/esm/config/index.js

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

package/esm/constant/index.d.ts

@@ -112,6 +112,10 @@ export declare const EVENT: {
         name: string;
         uniqueKey: string;
     };
+    closeCallback: {
+        name: string;
+        uniqueKey: string;
+    };
     eventCallback: {
         name: string;
         uniqueKey: string;

package/esm/constant/index.js

@@ -112,6 +112,11 @@ export var EVENT = {
     name: 'onClose',
     uniqueKey: 'userOnClose'
   },
+  // 标记 SDK 回调事件
+  closeCallback: {
+    name: 'onCloseCallback',
+    uniqueKey: 'closeCallback'
+  },
   eventCallback: {
     name: 'onEventCallback',
     uniqueKey: 'userEventCallback'

package/esm/foundation/core/index.d.ts

@@ -22,5 +22,6 @@ export declare class AntomSDKCore {
     getPaymentContext(): PaymentContext;
     destroy(): void;
     private handleBehaviorRender;
+    private handleClose;
     private cleanRender;
 }

package/esm/foundation/core/index.js

@@ -10,7 +10,7 @@ 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 { DisplayTypeEnum } from "../../types";
+import { DisplayTypeEnum, eventCodeEnum } from "../../types";
 import { DisplayInfo } from "../index";
 import { v4 as uuid } from 'uuid';
 import { ServiceProvider } from "../service";
@@ -150,6 +150,18 @@ export var AntomSDKCore = /*#__PURE__*/function () {
           return _ref2.apply(this, arguments);
         };
       }());
+      eventCenter.listen(EVENT.closeCallback.name, function () {
+        var _options$onClose;
+        (_options$onClose = options.onClose) === null || _options$onClose === void 0 || _options$onClose.call(options);
+      });
+      eventCenter.listen(EVENT.eventCallback.name, function (data) {
+        var _options$onEventCallb;
+        (_options$onEventCallb = options.onEventCallback) === null || _options$onEventCallb === void 0 || _options$onEventCallb.call(options, data);
+      });
+      eventCenter.listen(EVENT.error.name, function (data) {
+        var _options$onError;
+        (_options$onError = options.onError) === null || _options$onError === void 0 || _options$onError.call(options, data);
+      });
 
       // execute additional logic from specified product
       if (this.productProcessors[sdkMetaData.productScene]) {
@@ -291,11 +303,7 @@ export var AntomSDKCore = /*#__PURE__*/function () {
           showRetentionPopup();
           return;
         } else {
-          _this2.cleanRender();
-          eventCenter.dispatchToApp({
-            event: EVENT.close.name,
-            data: {}
-          });
+          _this2.handleClose();
         }
       };
 
@@ -322,12 +330,8 @@ export var AntomSDKCore = /*#__PURE__*/function () {
         createRetentionPopup(platform, function () {
           hideRetentionPopup();
         }, function () {
-          eventCenter.dispatchToApp({
-            event: EVENT.close.name,
-            data: {}
-          });
           hideRetentionPopup();
-          _this2.cleanRender();
+          _this2.handleClose();
         });
         createMockup({
           platform: platform,
@@ -337,6 +341,19 @@ export var AntomSDKCore = /*#__PURE__*/function () {
         return;
       }
     }
+  }, {
+    key: "handleClose",
+    value: function handleClose() {
+      var eventCenter = ServiceProvider.getInstance(this.instanceId).getService('EventCenter');
+      eventCenter.emit(EVENT.closeCallback.name, {});
+      eventCenter.emit(EVENT.eventCallback.name, {
+        code: eventCodeEnum.SDK_PAYMENT_CANCEL,
+        result: {
+          result: {}
+        }
+      });
+      this.cleanRender();
+    }
   }, {
     key: "cleanRender",
     value: function cleanRender() {

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

@@ -82,6 +82,8 @@ export var ContainerService = /*#__PURE__*/function () {
       }
       var container = document.getElementById(COMPONENT_CONTAINER_ID);
       if (container) container === null || container === void 0 || container.remove();
+      this.webApp = null;
+      this.eventCenter.cleanIFrames();
 
       // animation
       (_document$getElementB = document.getElementById("".concat(COMPONENT_CONTAINER_ID, "-").concat(displayInfo.platform, "-animation-style"))) === null || _document$getElementB === void 0 || _document$getElementB.remove();

package/esm/foundation/service/event-center.d.ts

@@ -27,12 +27,17 @@ export declare class EventCenter implements Service {
      * @param domain - The domain of the app.
      */
     addIFrame(iframe: HTMLIFrameElement): void;
+    /**
+     * Cleans iframes when web app close
+     */
+    cleanIFrames(): void;
     removeIFrame(iframe: HTMLIFrameElement): void;
     /**
      * Handles messages received from the app.
      * @param e - The message event.
      */
     private handleAppMessage;
+    private checkEventCompliant;
     /**
      * Processes the application message and emits the associated event.
      * @param data - Parsed EventPayload from the app.
@@ -42,8 +47,9 @@ export declare class EventCenter implements Service {
      * Listens to an event by adding a callback function.
      * @param name - The name of the event to listen for.
      * @param func - The callback function to execute when the event is emitted.
+     * @param isAppend - Append to event handlers as chain, default value is false
      */
-    listen(name: string, func: IListener): void;
+    listen(name: string, func: IListener, isAppend?: boolean): void;
     /**
      * Unsubscribes from an event. If a function is provided, only that function is removed.
      * @param name - The name of the event to unlisten to.

package/esm/foundation/service/event-center.js

@@ -72,6 +72,15 @@ export var EventCenter = /*#__PURE__*/function () {
         origin: getIframeOrigin(iframe)
       });
     }
+
+    /**
+     * Cleans iframes when web app close
+     */
+  }, {
+    key: "cleanIFrames",
+    value: function cleanIFrames() {
+      this.iframes = [];
+    }
   }, {
     key: "removeIFrame",
     value: function removeIFrame(iframe) {
@@ -99,15 +108,35 @@ export var EventCenter = /*#__PURE__*/function () {
       }
       var isJson = isJsonString(e.data);
       if (isJson) {
-        var _EventPayload = JSON.parse(e.data);
-        if (_EventPayload.name !== MessageName.APP_TO_SDK) {
+        var eventPayload = JSON.parse(e.data);
+        if (!this.checkEventCompliant(eventPayload)) {
           return;
         }
-        this._handleAppMessage(_EventPayload);
+        this._handleAppMessage(eventPayload);
       } else {
         console.error(ERRORMESSAGE.NOT_JSON_FORMAT);
       }
     }
+  }, {
+    key: "checkEventCompliant",
+    value: function checkEventCompliant(eventPayload) {
+      // connect element场景下，多子iframes共用AntomCore中生成的instanceId，此时将发送事件方instanceId与iframes中instanceId做比较看是否在其中
+      // 非connect场景下，直接将发送事件方instanceId与AntomCore的instanceId做比较
+      if (eventPayload.name !== MessageName.APP_TO_SDK) {
+        return false;
+      }
+      var iframesInstanceIds = this.iframes.map(function (iframe) {
+        var _iframe$ref;
+        if (!new URL((_iframe$ref = iframe.ref) === null || _iframe$ref === void 0 ? void 0 : _iframe$ref.src)) {
+          return;
+        }
+        return new URL(iframe.ref.src).searchParams.get('instanceId');
+      }).filter(Boolean);
+      if (eventPayload.instanceId !== this.instanceId && !iframesInstanceIds.includes(eventPayload.instanceId)) {
+        return false;
+      }
+      return true;
+    }
 
     /**
      * Processes the application message and emits the associated event.
@@ -126,11 +155,13 @@ export var EventCenter = /*#__PURE__*/function () {
      * Listens to an event by adding a callback function.
      * @param name - The name of the event to listen for.
      * @param func - The callback function to execute when the event is emitted.
+     * @param isAppend - Append to event handlers as chain, default value is false
      */
   }, {
     key: "listen",
     value: function listen(name, func) {
-      var eventList = this.events.get(name) || [];
+      var isAppend = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+      var eventList = isAppend ? this.events.get(name) || [] : [];
       eventList.push({
         func: func
       });

package/esm/index.d.ts

@@ -33,4 +33,5 @@ export declare class AMSEasyPay {
     private core;
     constructor(options: IoptionsParams);
     createComponent(params: IcreateComponent): void;
+    unmount(): void;
 }

package/esm/index.js

@@ -181,6 +181,11 @@ export var AMSEasyPay = /*#__PURE__*/function () {
         isAppWebview: params.isAppWebview
       });
     }
+  }, {
+    key: "unmount",
+    value: function unmount() {
+      this.core.destroy();
+    }
   }]);
   return AMSEasyPay;
 }();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alipay/ams-checkout",
-  "version": "1.25.0",
+  "version": "1.25.2",
   "description": "",
   "author": "",
   "main": "esm/index.js",