@alipay/ams-checkout 1.37.0 → 1.39.0

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

@@ -13,17 +13,28 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { ERRORMESSAGE } from "../../../constant";
 import { IElementStatus } from "../../../foundation";
 import { getIframeUrl } from "../../../plugin/component/cashierApp";
-import { DisplayTypeEnum, RedirectType, TargetEnum, terminalTypeEnum } from "../../../types";
+import { DisplayTypeEnum, eventCodeEnum, RedirectType, TargetEnum, terminalTypeEnum } from "../../../types";
 import { device } from "../../../util/index";
 import CallApp from "../../../util/intl-callapp/es/main";
 import { getComponentSign, parseSessionData } from "../index";
-import { ELEMENT_ENVIRONMENT } from "./type";
-var formatElementOption = function formatElementOption(options) {
+import { ELEMENT_ENVIRONMENT, EventCallbackCode } from "./type";
+export var formatElementOption = function formatElementOption(options) {
   var environment = options.environment;
   return _objectSpread(_objectSpread({}, options), {}, {
     environment: (environment || ELEMENT_ENVIRONMENT.PROD).toLocaleLowerCase()
   });
 };
+export var validateElementOption = function validateElementOption(options) {
+  if (!options.sessionData) {
+    var _options$onEventCallb;
+    options === null || options === void 0 || (_options$onEventCallb = options.onEventCallback) === null || _options$onEventCallb === void 0 || _options$onEventCallb.call(options, {
+      code: EventCallbackCode.SDK_CREATE_COMPONENT_ERROR,
+      message: 'sessionData is empty'
+    });
+    return false;
+  }
+  return true;
+};
 
 /**
  * 校验渲染条件
@@ -138,6 +149,7 @@ export function generateIframeSrc(_ref3) {
 export function handleRedirect(data) {
   var _data$isDestroy, _data$isCallApp, _data$callAppDetectSu;
   var fromFastSdk = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  var eventCallback = arguments.length > 2 ? arguments[2] : undefined;
   console.log('local payment sdk new element redirect arg ----', this);
   var _data = typeof data === 'string' ? {
     normalUrl: data
@@ -171,10 +183,10 @@ export function handleRedirect(data) {
   //   .send();
   var successCallback = function successCallback(type, url, durationInSeconds) {
     // TODO
-    // event.dispatchToSDK(EVENT.eventCallback.name, {
-    //   code: eventCodeEnum.SDK_CALL_URL_SUCCESS,
-    //   message: `Successfully opened the app,${type}: ${url}`,
-    // });
+    eventCallback({
+      code: eventCodeEnum.SDK_CALL_URL_SUCCESS,
+      message: "Successfully opened the app,".concat(type, ": ").concat(url)
+    });
     var extra = {
       redirectInfo: JSON.stringify(_data),
       openType: type,
@@ -194,10 +206,10 @@ export function handleRedirect(data) {
     //     .send();
   };
   var failCallback = function failCallback(type, url, durationInSeconds) {
-    // event.dispatchToSDK(EVENT.eventCallback.name, {
-    //   code: eventCodeEnum.SDK_CALL_URL_ERROR,
-    //   message: `Failed to open app,applinkUrl: ${_data?.applinkUrl} schemeUrl: ${_data?.schemeUrl} normalUrl: ${_data?.normalUrl}`,
-    // });
+    eventCallback({
+      code: eventCodeEnum.SDK_LAUNCH_PAYMENT_APP_ERROR,
+      message: "Failed to open app,applinkUrl: ".concat(_data === null || _data === void 0 ? void 0 : _data.applinkUrl, " schemeUrl: ").concat(_data === null || _data === void 0 ? void 0 : _data.schemeUrl, " normalUrl: ").concat(_data === null || _data === void 0 ? void 0 : _data.normalUrl)
+    });
     var extra = {
       redirectInfo: JSON.stringify(_data),
       openType: type,
@@ -253,21 +265,9 @@ export function handleRedirect(data) {
     return;
   }
   redirect({
-    applinkUrl: _data === null || _data === void 0 ? void 0 : _data.applinkUrl
-  }).then(function () {
-    successCallback(RedirectType.ApplinkUrl, _data === null || _data === void 0 ? void 0 : _data.applinkUrl);
-  }).catch(function () {
-    if (_data !== null && _data !== void 0 && _data.applinkUrl) failCallback(RedirectType.ApplinkUrl, _data === null || _data === void 0 ? void 0 : _data.applinkUrl);
-    return redirect({
-      schemeUrl: _data === null || _data === void 0 ? void 0 : _data.schemeUrl
-    });
-  }).then(function () {
-    successCallback(RedirectType.SchemeUrl, _data === null || _data === void 0 ? void 0 : _data.schemeUrl);
-  }).catch(function () {
-    if (_data !== null && _data !== void 0 && _data.schemeUrl) failCallback(RedirectType.SchemeUrl, _data === null || _data === void 0 ? void 0 : _data.schemeUrl);
-    return redirect({
-      normalUrl: _data === null || _data === void 0 ? void 0 : _data.normalUrl
-    });
+    applinkUrl: _data === null || _data === void 0 ? void 0 : _data.applinkUrl,
+    schemeUrl: _data === null || _data === void 0 ? void 0 : _data.schemeUrl,
+    normalUrl: _data === null || _data === void 0 ? void 0 : _data.normalUrl
   }).then(function () {
     successCallback(RedirectType.NormalUrl, _data === null || _data === void 0 ? void 0 : _data.normalUrl);
   }).catch(function () {
@@ -288,7 +288,7 @@ export function redirect(data) {
         window.location.href = normalUrl;
         return;
       }
-      reject(ERRORMESSAGE.SDK_CALL_URL_ERROR.REDIRECT_ERROR);
+      reject(ERRORMESSAGE.SDK_LAUNCH_PAYMENT_APP_ERROR.CALL_APP_URL_ERROR);
     };
     var callAppFunc = function callAppFunc() {
       if (!schemeUrl && !applinkUrl) {
@@ -474,5 +474,4 @@ export var isElementPad = function isElementPad() {
 };
 export var isElementPC = function isElementPC() {
   return !isElementMobile();
-};
-export { formatElementOption };
+};

package/esm/core/component/oldElement/type.d.ts

@@ -10,6 +10,9 @@ export declare enum ElementPaymentEvent {
     SIZE_CHANGE = "onSizeChange",
     LAUNCH = "onLaunch",
     CALLBACK = "callback",
+    /**
+     * @deprecated 已废弃 请使用eventCallback
+     */
     SEND_MUITI_APP_EVENT_TO_SDK = "sendMuitiAppEventToSdk",
     LOG = "log",
     HANDLE_PAYMENT = "handlePayment"

package/esm/core/instance/index.js

@@ -435,7 +435,7 @@ var AMSSDK = /*#__PURE__*/function () {
             window.location.href = normalUrl;
             return;
           }
-          reject(ERRORMESSAGE.SDK_CALL_URL_ERROR.REDIRECT_ERROR);
+          reject(ERRORMESSAGE.SDK_LAUNCH_PAYMENT_APP_ERROR.CALL_APP_URL_ERROR);
         };
         var callAppFunc = function callAppFunc() {
           if (!schemeUrl && !applinkUrl) {

package/esm/foundation/service/container/index.d.ts

@@ -35,5 +35,7 @@ export declare class ContainerService implements Service {
     private changeCloseBtnVisibility;
     private handleMaskCloseBtnShow;
     private handleCloseButtonTheme;
+    private handlePopupWindow;
+    private handlePopWindow;
     getWebApp(): HTMLIFrameElement;
 }

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

@@ -195,19 +195,7 @@ export var ContainerService = /*#__PURE__*/function () {
         });
       });
       this.eventCenter.listen(EVENT.popupWindow.name, function (data) {
-        var _this$displayInfo2;
-        if (data.paymentElementOldModel) return;
-        insertStyleSheet();
-        _this.popupManager.popup(_objectSpread({
-          platform: (_this$displayInfo2 = _this.displayInfo) === null || _this$displayInfo2 === void 0 ? void 0 : _this$displayInfo2.platform
-        }, data)).then(function () {
-          _this.eventCenter.addIFrame(_this.popupManager.popupApp);
-        }).catch(function (error) {
-          _this.logService.logError({
-            title: (error === null || error === void 0 ? void 0 : error.title) || 'sdk_error_create_pop_up'
-          }, error);
-          _this.eventCenter.emit(EVENT.error.name, ERRORMESSAGE.CREATECOMPONENT_ERROR.LOAD_APP_TIMEOUT);
-        });
+        _this.handlePopupWindow(data);
       });
       this.eventCenter.listen(EVENT.popWindow.name, function () {
         _this.popupManager.pop();
@@ -216,7 +204,7 @@ export var ContainerService = /*#__PURE__*/function () {
         _this.handleSizeChanged(_objectSpread({}, data));
       });
       this.eventCenter.listen(EVENT.showCloseButton.name, function (data) {
-        _this.handleCloseButtonTheme(data.theme);
+        _this.handleCloseButtonTheme(data.style);
         _this.changeCloseBtnVisibility(true);
       });
       this.eventCenter.listen(EVENT.hideCloseButton.name, function () {
@@ -266,9 +254,9 @@ export var ContainerService = /*#__PURE__*/function () {
   }, {
     key: "handleSizeChanged",
     value: function handleSizeChanged(data) {
-      var _this$displayInfo3 = this.displayInfo,
-        appendAliasContainerId = _this$displayInfo3.appendAliasContainerId,
-        selector = _this$displayInfo3.selector;
+      var _this$displayInfo2 = this.displayInfo,
+        appendAliasContainerId = _this$displayInfo2.appendAliasContainerId,
+        selector = _this$displayInfo2.selector;
       var cashierId = appendAliasContainerId ? "".concat(COMPONENT_CONTAINER_ID, "-").concat((selector === null || selector === void 0 ? void 0 : selector.indexOf('#')) === -1 ? selector : selector.slice(1)) : COMPONENT_CONTAINER_ID;
       if (!this.webApp || !this.displayInfo) {
         return;
@@ -329,9 +317,9 @@ export var ContainerService = /*#__PURE__*/function () {
     key: "focusScrollFixed",
     value: function focusScrollFixed(focus) {
       // 获取iframe dom元素
-      var _this$displayInfo4 = this.displayInfo,
-        appendAliasContainerId = _this$displayInfo4.appendAliasContainerId,
-        selector = _this$displayInfo4.selector;
+      var _this$displayInfo3 = this.displayInfo,
+        appendAliasContainerId = _this$displayInfo3.appendAliasContainerId,
+        selector = _this$displayInfo3.selector;
       var cashierId = appendAliasContainerId ? "".concat(COMPONENT_CONTAINER_ID, "-").concat((selector === null || selector === void 0 ? void 0 : selector.indexOf('#')) === -1 ? selector : selector.slice(1)) : COMPONENT_CONTAINER_ID;
       if (!this.webApp || !this.displayInfo) {
         return;
@@ -407,12 +395,12 @@ export var ContainerService = /*#__PURE__*/function () {
     }
   }, {
     key: "handleCloseButtonTheme",
-    value: function handleCloseButtonTheme(theme) {
-      if (!theme) return;
+    value: function handleCloseButtonTheme(style) {
+      if (!style) return;
       var closeBlock = document.getElementById(COMPONENT_CLOSE_BLOCK_ID);
       var closeButtonImg = closeBlock === null || closeBlock === void 0 ? void 0 : closeBlock.querySelector('img');
       var maskCloseBlock = document.getElementById(COMPONENT_CLOSE_MASK_BLOCK_ID);
-      if (theme === 'light') {
+      if (style === 'light') {
         closeButtonImg === null || closeButtonImg === void 0 || closeButtonImg.setAttribute('src', closeImgLight);
         closeBlock === null || closeBlock === void 0 || closeBlock.classList.add("".concat(COMPONENT_CLOSE_BLOCK_ID, "-light"));
         maskCloseBlock === null || maskCloseBlock === void 0 || maskCloseBlock.classList.add("".concat(COMPONENT_CLOSE_MASK_BLOCK_ID, "-light"));
@@ -422,6 +410,41 @@ export var ContainerService = /*#__PURE__*/function () {
         maskCloseBlock === null || maskCloseBlock === void 0 || maskCloseBlock.classList.remove("".concat(COMPONENT_CLOSE_MASK_BLOCK_ID, "-light"));
       }
     }
+
+    // SDK主动打开弹框
+  }, {
+    key: "handlePopupWindow",
+    value: function handlePopupWindow(data) {
+      var _this$displayInfo4,
+        _this3 = this;
+      if (data.paymentElementOldModel) return;
+      insertStyleSheet();
+      this.popupManager.popup(_objectSpread({
+        platform: (_this$displayInfo4 = this.displayInfo) === null || _this$displayInfo4 === void 0 ? void 0 : _this$displayInfo4.platform,
+        showCloseOnLoading: data.showCloseOnLoading,
+        onCloseOnLoading: function onCloseOnLoading() {
+          return _this3.handlePopWindow(data);
+        }
+      }, data)).then(function () {
+        _this3.eventCenter.addIFrame(_this3.popupManager.popupApp);
+      }).catch(function (error) {
+        _this3.logService.logError({
+          title: (error === null || error === void 0 ? void 0 : error.title) || 'sdk_error_create_pop_up'
+        }, error);
+        _this3.eventCenter.emit(EVENT.error.name, ERRORMESSAGE.CREATECOMPONENT_ERROR.LOAD_APP_TIMEOUT);
+      });
+    }
+
+    // SDK主动关闭弹框
+  }, {
+    key: "handlePopWindow",
+    value: function handlePopWindow(data) {
+      this.popupManager.pop();
+      this.eventCenter.dispatchToApp({
+        event: EVENT.popWindow.name,
+        data: data
+      });
+    }
   }, {
     key: "getWebApp",
     value: function getWebApp() {

package/esm/foundation/service/container/popup.d.ts

@@ -1,4 +1,12 @@
 import { PlatformEnum } from '../../../types';
+export type IPopUpParams = {
+    url: string;
+    widthPadding: number;
+    heightPadding: number;
+    platform: PlatformEnum;
+    showCloseOnLoading: boolean;
+    onCloseOnLoading: () => void;
+};
 /**
  * @author 谦彧 <zhangmian.zm@alipay.com>
  * @date 2024/9/22
@@ -7,11 +15,6 @@ export declare class PopupManager {
     private popupUrlQuery;
     popupApp: HTMLIFrameElement;
     setPopupUrlQuery(queryParams: string): void;
-    popup(data: {
-        url: string;
-        widthPadding: number;
-        heightPadding: number;
-        platform: PlatformEnum;
-    }): Promise<void>;
+    popup(data: IPopUpParams): Promise<void>;
     pop(): void;
 }

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

@@ -53,7 +53,9 @@ export var PopupManager = /*#__PURE__*/function () {
                 widthPadding: data === null || data === void 0 ? void 0 : data.widthPadding,
                 device: data === null || data === void 0 ? void 0 : data.platform,
                 url: pageUrl,
-                loadingConfig: undefined
+                loadingConfig: undefined,
+                showCloseOnLoading: data.showCloseOnLoading,
+                onCloseOnLoading: data.onCloseOnLoading
               });
             case 11:
               this.popupApp = _context.sent;

package/esm/foundation/utils/redirect_utils.js

@@ -69,26 +69,42 @@ export var redirect = function redirect(payload, instanceId) {
         successCallback(payload, type, evokeAppBy.url, serviceProvider);
       }
     });
+    var callApplinkUrl = function callApplinkUrl() {
+      try {
+        callAppLib.open({
+          link: payload.applinkUrl,
+          fallback: function fallback() {
+            failCallback(payload, RedirectType.ApplinkUrl, payload.applinkUrl, serviceProvider);
+            // Applink evoke failed, try to use scheme url
+            callSchemeUrl();
+          }
+        });
+      } catch (error) {
+        failCallback(payload, RedirectType.ApplinkUrl, payload.applinkUrl, serviceProvider);
+        // Applink evoke failed, try to use scheme url
+        callSchemeUrl();
+      }
+    };
     var callSchemeUrl = function callSchemeUrl() {
-      callAppLib.open({
-        scheme: payload.schemeUrl,
-        fallback: function fallback() {
-          failCallback(payload, RedirectType.SchemeUrl, payload.schemeUrl, serviceProvider);
-          if (!payload.url) return failCallback(payload, RedirectType.NormalUrl, '', serviceProvider);
-          successCallback(payload, RedirectType.NormalUrl, payload.url, serviceProvider);
-          window.location.href = payload.url;
-        }
-      });
+      try {
+        callAppLib.open({
+          scheme: payload.schemeUrl,
+          fallback: function fallback() {
+            failCallback(payload, RedirectType.SchemeUrl, payload.schemeUrl, serviceProvider);
+            if (!payload.url) return failCallback(payload, RedirectType.NormalUrl, '', serviceProvider);
+            successCallback(payload, RedirectType.NormalUrl, payload.url, serviceProvider);
+            window.location.href = payload.url;
+          }
+        });
+      } catch (error) {
+        failCallback(payload, RedirectType.SchemeUrl, payload.schemeUrl, serviceProvider);
+        if (!payload.url) return failCallback(payload, RedirectType.NormalUrl, '', serviceProvider);
+        successCallback(payload, RedirectType.NormalUrl, payload.url, serviceProvider);
+        window.location.href = payload.url;
+      }
     };
     if (payload.applinkUrl) {
-      callAppLib.open({
-        link: payload.applinkUrl,
-        fallback: function fallback() {
-          failCallback(payload, RedirectType.ApplinkUrl, payload.applinkUrl, serviceProvider);
-          // Applink evoke failed, try to use scheme url
-          callSchemeUrl();
-        }
-      });
+      callApplinkUrl();
     } else if (payload.schemeUrl) {
       callSchemeUrl();
     }
@@ -116,7 +132,7 @@ var successCallback = function successCallback(payload, type, url, serviceProvid
 };
 var failCallback = function failCallback(payload, type, url, serviceProvider) {
   serviceProvider.getService('EventCenter').emit(EVENT.eventCallback.name, {
-    code: eventCodeEnum.SDK_CALL_URL_ERROR,
+    code: eventCodeEnum.SDK_LAUNCH_PAYMENT_APP_ERROR,
     message: "Failed to open app,applinkUrl: ".concat(payload === null || payload === void 0 ? void 0 : payload.applinkUrl, " schemeUrl: ").concat(payload === null || payload === void 0 ? void 0 : payload.schemeUrl, " normalUrl: ").concat(payload === null || payload === void 0 ? void 0 : payload.url)
   });
   serviceProvider.getService('Log').logInfo({

package/esm/plugin/component/index.js

@@ -1573,7 +1573,7 @@ var ComponentApp = /*#__PURE__*/function () {
       };
       var failCallback = function failCallback(type, url, durationInSeconds) {
         _this8.dispatchToSDK(EVENT.eventCallback.name, {
-          code: eventCodeEnum.SDK_CALL_URL_ERROR,
+          code: eventCodeEnum.SDK_LAUNCH_PAYMENT_APP_ERROR,
           message: "Failed to open app,applinkUrl: ".concat(_data === null || _data === void 0 ? void 0 : _data.applinkUrl, " schemeUrl: ").concat(_data === null || _data === void 0 ? void 0 : _data.schemeUrl, " normalUrl: ").concat(_data === null || _data === void 0 ? void 0 : _data.normalUrl)
         });
         var extra = {

package/esm/types/index.d.ts

@@ -641,8 +641,18 @@ export declare enum eventCodeEnum {
     SDK_CREATEPAYMENT_PARAMETER_ERROR = "SDK_CREATEPAYMENT_PARAMETER_ERROR",
     SDK_INIT_PARAMETER_ERROR = "SDK_INIT_PARAMETER_ERROR",
     SDK_CREATECOMPONENT_ERROR = "SDK_CREATECOMPONENT_ERROR",
-    SDK_CALL_URL_ERROR = "SDK_CALL_URL_ERROR",
+    /**
+    * 拉取WEB应用&收银台失败
+    */
+    SDK_LAUNCH_PAYMENT_APP_ERROR = "SDK_LAUNCH_PAYMENT_APP_ERROR",
+    /**
+    * 拉取WEB应用&收银台成功
+    */
     SDK_CALL_URL_SUCCESS = "SDK_CALL_URL_SUCCESS",
+    /**
+    @deprecated 已废弃 请使用SDK_LAUNCH_PAYMENT_APP_ERROR
+    */
+    SDK_CALL_URL_ERROR = "SDK_CALL_URL_ERROR",
     SDK_PAYMENT_SUCCESSFUL = "SDK_PAYMENT_SUCCESSFUL",
     SDK_PAYMENT_FAIL = "SDK_PAYMENT_FAIL",
     SDK_PAYMENT_ERROR = "SDK_PAYMENT_ERROR",

package/esm/types/index.js

@@ -182,8 +182,9 @@ export var eventCodeEnum = /*#__PURE__*/function (eventCodeEnum) {
   eventCodeEnum["SDK_CREATEPAYMENT_PARAMETER_ERROR"] = "SDK_CREATEPAYMENT_PARAMETER_ERROR";
   eventCodeEnum["SDK_INIT_PARAMETER_ERROR"] = "SDK_INIT_PARAMETER_ERROR";
   eventCodeEnum["SDK_CREATECOMPONENT_ERROR"] = "SDK_CREATECOMPONENT_ERROR";
-  eventCodeEnum["SDK_CALL_URL_ERROR"] = "SDK_CALL_URL_ERROR";
+  eventCodeEnum["SDK_LAUNCH_PAYMENT_APP_ERROR"] = "SDK_LAUNCH_PAYMENT_APP_ERROR";
   eventCodeEnum["SDK_CALL_URL_SUCCESS"] = "SDK_CALL_URL_SUCCESS";
+  eventCodeEnum["SDK_CALL_URL_ERROR"] = "SDK_CALL_URL_ERROR";
   eventCodeEnum["SDK_PAYMENT_SUCCESSFUL"] = "SDK_PAYMENT_SUCCESSFUL";
   eventCodeEnum["SDK_PAYMENT_FAIL"] = "SDK_PAYMENT_FAIL";
   eventCodeEnum["SDK_PAYMENT_ERROR"] = "SDK_PAYMENT_ERROR";

package/esm/util/redirect.js

@@ -16,7 +16,7 @@ export function redirect(data) {
         window.location.href = normalUrl;
         return;
       }
-      reject(ERRORMESSAGE.SDK_CALL_URL_ERROR.REDIRECT_ERROR);
+      reject(ERRORMESSAGE.SDK_LAUNCH_PAYMENT_APP_ERROR.CALL_APP_URL_ERROR);
     };
     var callAppFunc = function callAppFunc() {
       if (!schemeUrl && !applinkUrl) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alipay/ams-checkout",
-  "version": "1.37.0",
+  "version": "1.39.0",
   "description": "",
   "author": "",
   "main": "esm/index.js",
@@ -16,14 +16,32 @@
   "scripts": {
     "build": "father build",
     "build:w": "father dev",
-    "dev": "father dev",
     "ci": "npm run lint",
     "cov": "jest --coverage",
+    "dev": "father dev",
     "format": "prettier --write --no-error-on-unmatched-pattern \"**/*.{js,jsx,ts,tsx,md,json,css,less}\"",
     "lint": "eslint ./src",
     "test": "jest --silent",
     "tsc": "tsc --noEmit"
   },
+  "commitlint": {
+    "extends": [
+      "@commitlint/config-conventional"
+    ]
+  },
+  "lint-staged": {
+    "*.{js,jsx}": [
+      "eslint --fix",
+      "prettier --write"
+    ],
+    "*.{ts,tsx}": [
+      "eslint --fix",
+      "prettier --parser=typescript --write"
+    ],
+    "*.{md,json}": [
+      "prettier --write"
+    ]
+  },
   "dependencies": {
     "axios": "^1.3.4",
     "uuid": "^9.0.0"
@@ -31,6 +49,8 @@
   "devDependencies": {
     "@babel/core": "^7.20.7",
     "@babel/preset-env": "^7.20.2",
+    "@commitlint/cli": "^17.3.0",
+    "@commitlint/config-conventional": "^17.3.0",
     "@testing-library/jest-dom": "^5.1.1",
     "@testing-library/react": "^9.5.0",
     "@types/jest": "^29.2.4",
@@ -52,7 +72,9 @@
     "ts-node": "^10.9.1",
     "typescript": "^4.9.5"
   },
-  "engines": {},
+  "engines": {
+    "install-node": "18"
+  },
   "publishConfig": {
     "access": "public"
   }