@alipay/ams-checkout 0.0.1710212811-dev.28 → 0.0.1710212811-dev.29

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

@@ -1,5 +1,5 @@
 import ComponentApp from '../../plugin/component';
-import { componentSignEnum, IAppendParams, IcreateComponent, IoptionsParams, IpaymentSessionMetaData, Iselector, Isubmit, PaymentMethodTypeEnum, SubPaymentMethodTypeEnum } from '../../types';
+import { componentSignEnum, IcreateComponent, IoptionsParams, IpaymentSessionMetaData, Iselector, Isubmit, PaymentMethodTypeEnum, SubPaymentMethodTypeEnum } from '../../types';
 import CoreInstance from '../instance/index';
 export declare const getComponentSign: (params: IpaymentSessionMetaData) => componentSignEnum;
 export declare const parseSessionData: (sessionData: string) => [IpaymentSessionMetaData, string];
@@ -7,7 +7,6 @@ export declare class AMSComponent extends CoreInstance {
     _componentApp: ComponentApp;
     channelType: componentSignEnum[];
     productSceneVersion: string;
-    _appendParams: IAppendParams;
     constructor(options: IoptionsParams);
     private parameterInitAndCheck;
     private pluginAppendIframe;
@@ -29,7 +28,6 @@ export declare class AMSComponent extends CoreInstance {
      * @param params - The data source created by the component, necessary sessionData, optional appearance configuration, and refer to the documentation for other parameters and detailed information.
      */
     createComponent(params: IcreateComponent): Promise<void>;
-    private getBusActionNames;
     private createComponentProcess;
     preloadComponent(channelType: any, productSceneVersion: any): void;
     clearPreloadIframe(isTimeOut?: boolean): void;

package/esm/core/component/index.js

@@ -116,7 +116,6 @@ export var AMSComponent = /*#__PURE__*/function (_CoreInstance) {
     _defineProperty(_assertThisInitialized(_this), "_componentApp", void 0);
     _defineProperty(_assertThisInitialized(_this), "channelType", void 0);
     _defineProperty(_assertThisInitialized(_this), "productSceneVersion", void 0);
-    _defineProperty(_assertThisInitialized(_this), "_appendParams", void 0);
     var ComponentPlugin = new ComponentApp();
     ComponentPlugin.setRender(createIframeNode);
     ComponentPlugin.setPreloadRender(createPreloadIframeNode);
@@ -326,32 +325,12 @@ export var AMSComponent = /*#__PURE__*/function (_CoreInstance) {
         return _this4.createComponentProcess(appendParams);
       });
     }
-  }, {
-    key: "getBusActionNames",
-    value: function getBusActionNames(appendParams) {
-      var _appendParams$iframeN;
-      if (!appendParams) {
-        return null;
-      }
-      var actionNames = null;
-      var paymentSessionConfig = appendParams === null || appendParams === void 0 || (_appendParams$iframeN = appendParams.iframeNodesParams) === null || _appendParams$iframeN === void 0 || (_appendParams$iframeN = _appendParams$iframeN.paymentSessionMetaData) === null || _appendParams$iframeN === void 0 ? void 0 : _appendParams$iframeN.paymentSessionConfig;
-      if (paymentSessionConfig) {
-        var _appendParams$iframeN2;
-        var pluginKey = paymentSessionConfig.productScene + paymentSessionConfig.productSceneVersion + paymentSessionConfig.paymentMethodCategoryType;
-        var paymentMethodType = appendParams === null || appendParams === void 0 || (_appendParams$iframeN2 = appendParams.iframeNodesParams) === null || _appendParams$iframeN2 === void 0 || (_appendParams$iframeN2 = _appendParams$iframeN2.paymentSessionMetaData) === null || _appendParams$iframeN2 === void 0 || (_appendParams$iframeN2 = _appendParams$iframeN2.paymentSessionFactor) === null || _appendParams$iframeN2 === void 0 || (_appendParams$iframeN2 = _appendParams$iframeN2.paymentMethodInfo) === null || _appendParams$iframeN2 === void 0 ? void 0 : _appendParams$iframeN2.paymentMethodType;
-        if (paymentMethodType) {
-          pluginKey = pluginKey + paymentMethodType;
-        }
-        actionNames = this._getPlugin(pluginKey);
-      }
-      return actionNames;
-    }
   }, {
     key: "createComponentProcess",
     value: function createComponentProcess(appendParams) {
       var _this$getBusActionNam;
       this._appendParams = appendParams;
-      var actionName = (_this$getBusActionNam = this.getBusActionNames(appendParams)) === null || _this$getBusActionNam === void 0 ? void 0 : _this$getBusActionNam.createComponent;
+      var actionName = (_this$getBusActionNam = this.getBusActionNames()) === null || _this$getBusActionNam === void 0 ? void 0 : _this$getBusActionNam.createComponent;
       if (actionName && BusManager.isSubscribed(actionName)) {
         // 执行出错了，在通用拦截器返回
         BusManager.publish(new BusMessage(actionName, JSON.stringify({
@@ -439,7 +418,7 @@ export var AMSComponent = /*#__PURE__*/function (_CoreInstance) {
     value: function mountComponentProcess(appendParams) {
       var _this$getBusActionNam2;
       this._appendParams = appendParams;
-      var actionName = (_this$getBusActionNam2 = this.getBusActionNames(appendParams)) === null || _this$getBusActionNam2 === void 0 ? void 0 : _this$getBusActionNam2.mountComponent;
+      var actionName = (_this$getBusActionNam2 = this.getBusActionNames()) === null || _this$getBusActionNam2 === void 0 ? void 0 : _this$getBusActionNam2.mountComponent;
       if (actionName && BusManager.isSubscribed(actionName)) {
         // 执行出错了，在通用拦截器返回
         BusManager.publish(new BusMessage(actionName, JSON.stringify({
@@ -466,22 +445,24 @@ export var AMSComponent = /*#__PURE__*/function (_CoreInstance) {
         try {
           var _this7$getBusActionNa;
           var eventCallbackId = uuid();
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          _this7._eventCenter.once(eventCallbackId, function (_data) {
-            resolve(_data);
-          });
           _this7.logger.logInfo({
             title: 'sdk_event_apiSubmit'
           });
-          var actionName = (_this7$getBusActionNa = _this7.getBusActionNames(_this7._appendParams)) === null || _this7$getBusActionNa === void 0 ? void 0 : _this7$getBusActionNa.submit;
+          var actionName = (_this7$getBusActionNa = _this7.getBusActionNames()) === null || _this7$getBusActionNa === void 0 ? void 0 : _this7$getBusActionNa.submit;
           if (actionName && BusManager.isSubscribed(actionName)) {
             // 执行出错了，在通用拦截器返回
-            BusManager.publish(new BusMessage(actionName, JSON.stringify({
+            BusManager.publishForResult(new BusMessage(actionName, JSON.stringify({
               appendParams: _this7._appendParams,
               options: _this7.originOptions,
               data: data
-            })));
+            }))).then(function (busMessage) {
+              resolve(busMessage === null || busMessage === void 0 ? void 0 : busMessage.getJSONObject());
+            });
           } else {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            _this7._eventCenter.once(eventCallbackId, function (_data) {
+              resolve(_data);
+            });
             _this7._componentApp.dispatchToApp({
               context: {
                 event: 'submitPay',

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

@@ -1,7 +1,8 @@
-import type { AMSCheckoutOptions, InitSecurityConfig, IoptionsParams } from '../../types/index';
+import type { AMSCheckoutOptions, IAppendParams, InitSecurityConfig, IoptionsParams } from '../../types/index';
 import { EventCenter } from '../../util/index';
 import { Logger } from '../../util/logger';
 import { Security } from '../../util/security';
+import { ComponentActionNamesType } from 'src/plugin/type';
 export default class AMSSDK {
     options: AMSCheckoutOptions;
     originOptions: IoptionsParams;
@@ -9,6 +10,7 @@ export default class AMSSDK {
     _eventCenter: EventCenter;
     _instanceId: string;
     _storageId: string;
+    _appendParams: IAppendParams;
     protected securitySdkMap: Map<string, Security>;
     protected plugins: Map<string, any>;
     constructor(options: IoptionsParams);
@@ -73,4 +75,5 @@ export default class AMSSDK {
      * @description Overlay Subscription
      */
     protected _overrideSubscription(name: string, func: any, funcKey: string): void;
+    protected getBusActionNames(): ComponentActionNamesType;
 }

package/esm/core/instance/index.js

@@ -26,6 +26,7 @@ import CallApp from "../../util/intl-callapp/es/main";
 import { LogConfig, Logger } from "../../util/logger";
 import { compareVersion } from "../../util/versionCompare";
 import { getSecurityConfigStorageKey, getSecurityHost, getSecurityScene, Security, SecurityRegionEnum } from "../../util/security";
+import { BusManager, BusMessage } from "../bus";
 var AMSSDK = /*#__PURE__*/function () {
   function AMSSDK(options) {
     _classCallCheck(this, AMSSDK);
@@ -35,6 +36,7 @@ var AMSSDK = /*#__PURE__*/function () {
     _defineProperty(this, "_eventCenter", void 0);
     _defineProperty(this, "_instanceId", void 0);
     _defineProperty(this, "_storageId", void 0);
+    _defineProperty(this, "_appendParams", void 0);
     _defineProperty(this, "securitySdkMap", void 0);
     _defineProperty(this, "plugins", void 0);
     this._instanceId = uuid();
@@ -103,9 +105,17 @@ var AMSSDK = /*#__PURE__*/function () {
   }, {
     key: "unmount",
     value: function unmount() {
+      var _this$getBusActionNam;
       this.logger.logInfo({
         title: 'sdk_event_apiOnDestroy'
       }).send();
+      var actionName = (_this$getBusActionNam = this.getBusActionNames()) === null || _this$getBusActionNam === void 0 ? void 0 : _this$getBusActionNam.destoryComponent;
+      if (actionName && BusManager.isSubscribed(actionName)) {
+        // 执行出错了，在通用拦截器返回
+        BusManager.publish(new BusMessage(actionName, JSON.stringify({
+          options: this.originOptions
+        })));
+      }
       var _iterator = _createForOfIteratorHelper(this.plugins.values()),
         _step;
       try {
@@ -387,6 +397,27 @@ var AMSSDK = /*#__PURE__*/function () {
       this._eventCenter.off(name, func, funcKey);
       this._eventCenter.on(name, func, funcKey);
     }
+  }, {
+    key: "getBusActionNames",
+    value: function getBusActionNames() {
+      var _appendParams$iframeN;
+      var appendParams = this._appendParams;
+      if (!appendParams) {
+        return null;
+      }
+      var actionNames = null;
+      var paymentSessionConfig = appendParams === null || appendParams === void 0 || (_appendParams$iframeN = appendParams.iframeNodesParams) === null || _appendParams$iframeN === void 0 || (_appendParams$iframeN = _appendParams$iframeN.paymentSessionMetaData) === null || _appendParams$iframeN === void 0 ? void 0 : _appendParams$iframeN.paymentSessionConfig;
+      if (paymentSessionConfig) {
+        var _appendParams$iframeN2;
+        var pluginKey = paymentSessionConfig.productScene + paymentSessionConfig.productSceneVersion + paymentSessionConfig.paymentMethodCategoryType;
+        var paymentMethodType = appendParams === null || appendParams === void 0 || (_appendParams$iframeN2 = appendParams.iframeNodesParams) === null || _appendParams$iframeN2 === void 0 || (_appendParams$iframeN2 = _appendParams$iframeN2.paymentSessionMetaData) === null || _appendParams$iframeN2 === void 0 || (_appendParams$iframeN2 = _appendParams$iframeN2.paymentSessionFactor) === null || _appendParams$iframeN2 === void 0 || (_appendParams$iframeN2 = _appendParams$iframeN2.paymentMethodInfo) === null || _appendParams$iframeN2 === void 0 ? void 0 : _appendParams$iframeN2.paymentMethodType;
+        if (paymentMethodType) {
+          pluginKey = pluginKey + paymentMethodType;
+        }
+        actionNames = this._getPlugin(pluginKey);
+      }
+      return actionNames;
+    }
   }]);
   return AMSSDK;
 }();

package/esm/plugin/type.d.ts

@@ -5,8 +5,8 @@ export interface ComponentActionNamesType {
     canMakePayments?: string;
     optional_init?: string;
     createComponent?: string;
-    submit?: string;
     mountComponent?: string;
+    submit?: string;
     destoryComponent?: string;
 }
 export type IExtendPluginItem = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alipay/ams-checkout",
-  "version": "0.0.1710212811-dev.28",
+  "version": "0.0.1710212811-dev.29",
   "description": "",
   "author": "",
   "main": "esm/index.js",