@alipay/ams-checkout 1.36.0 → 1.38.0

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.36.0",
+  "version": "1.38.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"
   }