@alipay/ams-checkout 1.43.0 → 1.44.0

package/esm/config/index.d.ts

@@ -6,10 +6,10 @@ export declare const sdkVersion: string;
  * @description: 目前应用层分为v1和v2，会存在两个应用版本号不是同步发布的情况。所以需要把默认的应用版本号配置抽离出来。
  * TODO 这里考虑直接换成packagejson.version
  */
-export declare const AMSCheckoutAppVersion = "1.43.0";
-export declare const AMSAutoDebitAppVersion = "1.43.0";
-export declare const AMSEasyPayAppVersion = "1.43.0";
-export declare const AMSCashierPaymentAppVersion = "1.43.0";
-export declare const AMSVaultingAppVersion = "1.43.0";
-export declare const AMSPaymentElementAppVersion = "1.43.0";
-export declare const ADDRESSElementAppVersion = "1.43.0";
+export declare const AMSCheckoutAppVersion = "1.44.0";
+export declare const AMSAutoDebitAppVersion = "1.44.0";
+export declare const AMSEasyPayAppVersion = "1.44.0";
+export declare const AMSCashierPaymentAppVersion = "1.44.0";
+export declare const AMSVaultingAppVersion = "1.44.0";
+export declare const AMSPaymentElementAppVersion = "1.44.0";
+export declare const ADDRESSElementAppVersion = "1.44.0";

package/esm/config/index.js

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

package/esm/constant/index.d.ts

@@ -251,6 +251,7 @@ export declare const EVENT: {
     };
     validateFieldsResult: {
         name: string;
+        forwardName: string;
         uniqueKey: string;
     };
 };

package/esm/constant/index.js

@@ -253,6 +253,7 @@ export var EVENT = {
   },
   validateFieldsResult: {
     name: 'validateFieldsResult',
+    forwardName: 'validateFieldsResultForward',
     uniqueKey: 'uservalidateFieldsResult'
   }
 };

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

@@ -15,6 +15,7 @@ export declare class AMSComponent extends CoreInstance {
     channelType: ComponentSignEnum[];
     productSceneVersion: string;
     timer: any;
+    private _validateResolveMap;
     constructor(options: IAMSComponentOptions);
     private parameterInitAndCheck;
     private pluginAppendIframe;

package/esm/core/component/index.js

@@ -36,6 +36,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  */
 import { v4 as uuid } from 'uuid';
 import { COMPONENTPLUGINID, ERRORMESSAGE, EVENT, SENDEVENT } from "../../constant";
+import PreloadHelper from "../../foundation/utils/preload_helper";
 import { ApplePayBusSubscriber } from "../../plugin/applepay";
 import ComponentApp from "../../plugin/component";
 import { ExtendPlugin } from "../../plugin/const";
@@ -50,7 +51,6 @@ import { SecurityBusSubscriber } from "../bus/ability/security";
 import { TrackerBusSubscriber } from "../bus/ability/tracker";
 import CoreInstance from "../instance/index";
 import { loadChannelPneumaticControl } from "./appPreloadProcessing";
-import PreloadHelper from "../../foundation/utils/preload_helper";
 export var getComponentSign = function getComponentSign(params) {
   var _params$paymentSessio = params.paymentSessionConfig,
     _params$paymentSessio2 = _params$paymentSessio === void 0 ? {} : _params$paymentSessio,
@@ -140,6 +140,7 @@ export var AMSComponent = /*#__PURE__*/function (_CoreInstance) {
     _defineProperty(_assertThisInitialized(_this2), "channelType", void 0);
     _defineProperty(_assertThisInitialized(_this2), "productSceneVersion", void 0);
     _defineProperty(_assertThisInitialized(_this2), "timer", void 0);
+    _defineProperty(_assertThisInitialized(_this2), "_validateResolveMap", new Map());
     var ComponentPlugin = new ComponentApp({
       appVersion: options.appVersion
     });
@@ -547,34 +548,54 @@ export var AMSComponent = /*#__PURE__*/function (_CoreInstance) {
         }
         var timeoutId;
         var validationPromise = new Promise(function (validationResolve) {
+          var eventCallbackId = uuid();
+          _this9._validateResolveMap.set(eventCallbackId, validationResolve);
           // 发送validateFields消息
           _this9._sendMessageToAPP({
             event: SENDEVENT.validateFields.name,
-            data: {}
+            data: {},
+            eventCallbackId: eventCallbackId
           });
-          // 接收收银台应用的返回validateFieldsResult消息
-          _this9._overrideSubscription(EVENT.validateFieldsResult.name, /*#__PURE__*/function () {
+          var isValidationResult = function isValidationResult(data) {
+            return _typeof(data) === 'object' && data !== null && typeof data.isValid === 'boolean';
+          };
+          var callback = /*#__PURE__*/function () {
             var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(payload) {
+              var currentEventCallbackId, currentResolve, result;
               return _regeneratorRuntime().wrap(function _callee2$(_context2) {
                 while (1) switch (_context2.prev = _context2.next) {
                   case 0:
+                    currentEventCallbackId = (payload === null || payload === void 0 ? void 0 : payload.eventCallbackId) || ''; // 事件一一对应，处理异步商户调用多次可能导致乱序的问题
+                    currentResolve = _this9._validateResolveMap.get(currentEventCallbackId);
+                    result = {
+                      isValid: false
+                    };
+                    if (isValidationResult(payload === null || payload === void 0 ? void 0 : payload.data)) {
+                      result = payload === null || payload === void 0 ? void 0 : payload.data;
+                    }
                     _this9.logger.logInfo({
                       title: 'sdk_event_validateFields'
                     }, {
-                      processResult: payload.isValid ? 'true' : 'false'
+                      processResult: result.isValid ? 'true' : 'false'
                     });
                     // 收银台应用保证数据格式，三端SDK负责透传
-                    validationResolve(payload);
-                  case 2:
+                    if (!!currentResolve) {
+                      currentResolve(result);
+                      _this9._validateResolveMap.delete(currentEventCallbackId);
+                    }
+                  case 6:
                   case "end":
                     return _context2.stop();
                 }
               }, _callee2);
             }));
-            return function (_x2) {
+            return function callback(_x2) {
               return _ref5.apply(this, arguments);
             };
-          }(), EVENT.validateFieldsResult.uniqueKey);
+          }();
+          // 接收收银台应用的返回validateFieldsResult消息
+          // validateFieldsResultForward处理订阅eventCallbackId为空的问题
+          _this9._overrideSubscription(EVENT.validateFieldsResult.forwardName, callback, EVENT.validateFieldsResult.uniqueKey);
         });
 
         // 兜底场景，三端约定超时时间15秒，兼容cpf网络校验超时场景

package/esm/plugin/component/channel.js

@@ -297,7 +297,6 @@ export var ApplePaySdk = /*#__PURE__*/function () {
                 title: 'a3753.b103030.c386485.d507498'
               });
             }
-            _this.abortSession();
             reject({
               errorCode: APPLEPAYERRORENUM.APPLE_PAY_CANCEL
             });

package/esm/plugin/component/index.js

@@ -1410,6 +1410,12 @@ var ComponentApp = /*#__PURE__*/function () {
         });
         return;
       }
+      if (data.context.event === EVENT.validateFieldsResult.name) {
+        // 将validateFieldsResult事件转发到subsribe处理，解决subsribe拿不到eventCallbackId的问题
+        this.AMSSDK._eventCenter.emit(EVENT.validateFieldsResult.forwardName, data.context);
+        return;
+      }
+
       // log event before sending the callback
       this.logEventCallback(data, 'sdk_event_event_callback');
       try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alipay/ams-checkout",
-  "version": "1.43.0",
+  "version": "1.44.0",
   "description": "",
   "author": "",
   "main": "esm/index.js",
@@ -16,8 +16,8 @@
   "scripts": {
     "build": "father build",
     "build:w": "father dev",
-    "ci": "npm run lint",
-    "cov": "jest --coverage",
+    "ci": "tnpm run cov",
+    "cov": "jest --coverage --silent",
     "dev": "father dev",
     "format": "prettier --write --no-error-on-unmatched-pattern \"**/*.{js,jsx,ts,tsx,md,json,css,less}\"",
     "lint": "eslint ./src",
@@ -47,6 +47,7 @@
     "uuid": "^9.0.0"
   },
   "devDependencies": {
+    "@ali/ci": "^4.72.0",
     "@babel/core": "^7.20.7",
     "@babel/preset-env": "^7.20.2",
     "@commitlint/cli": "^17.3.0",
@@ -55,13 +56,13 @@
     "@testing-library/react": "^9.5.0",
     "@types/jest": "^29.2.4",
     "@types/uuid": "^9.0.0",
-    "@typescript-eslint/eslint-plugin": "latest",
-    "@typescript-eslint/parser": "^5.60.0",
+    "@typescript-eslint/eslint-plugin": "^6.21.0",
+    "@typescript-eslint/parser": "^6.21.0",
     "babel-jest": "^29.3.1",
     "babel-loader": "^9.1.0",
     "babel-plugin-import": "^1.13.0",
-    "eslint": "^8.36.0",
-    "eslint-plugin-prettier": "latest",
+    "eslint": "^8.56.0",
+    "eslint-plugin-prettier": "^5.1.3",
     "father": "^4.2.3",
     "jest": "^29.5.0",
     "jest-environment-jsdom": "^29.3.1",
@@ -77,5 +78,9 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "ci": {
+    "resourceClass": "L",
+    "type": "aci"
   }
 }