@alipay/ams-checkout 0.0.1708315090-dev.6 → 0.0.1708315090-dev.7

package/esm/core/component/index.js

@@ -222,7 +222,7 @@ export var AMSComponent = /*#__PURE__*/function (_CoreInstance) {
       var _this3 = this;
       this.channelType = channelType;
       this.productSceneVersion = productSceneVersion;
-      var MAX_CLEAR_TIME = 90000;
+      var MAX_CLEAR_TIME = 10000;
       if (Array.isArray(channelType)) {
         for (var i = 0; i < channelType.length; i++) {
           this._componentApp.appendPreloadIframeNodes(channelType[i], productSceneVersion);

package/esm/plugin/component/index.js

@@ -22,6 +22,7 @@ import { queryPaymentInfo, submitPayInfo } from "../../service";
 import { componentSignEnum, eventCodeEnum, messageName, platformEnum, productSceneEnum, RedirectType, renderDisplayTypeEnum, targetEnum } from "../../types";
 import { getType, isJsonString, isPC } from "../../util";
 import { isLocalMock } from "../../util/mock";
+import { matchVersion } from "../../util/versionCompare";
 import { createIframe, createPreloadIframe, getAppDomain, getIframeUrl } from "./cashierApp";
 import { addInlineLoading, createInlineBaseElement } from "./component.inline.style";
 import { addPopupLoading, createBaseElement, createMockup, createRetentionPopup, handleDeclareInfo as _handleDeclareInfo, hideRetentionPopup, removeRetentionPopup as _removeRetentionPopup } from "./component.popup.style";
@@ -347,7 +348,6 @@ var ComponentApp = /*#__PURE__*/function () {
         return Promise.reject(error);
       });
     }
-
     /**
      * @description Interface request
      */
@@ -364,7 +364,7 @@ var ComponentApp = /*#__PURE__*/function () {
       this._actionQueryPromise = new Promise( /*#__PURE__*/function () {
         var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(resolve, reject) {
           var _this5$_renderParams, _this5$_renderParams2, _this5$_renderParams3, _this5$_renderParams4, _this5$_renderParams5;
-          var envInfo, params, _this5$_renderParams$, extendInfo, enableVaultingApiOptimize, extendInfoData, _this5$_renderParams6, _ref3, _ref3$productSceneVer, productSceneVersion, _ref3$productScene, productScene, _ref4, _ref4$action, _ref4$action2, _ref4$action2$autoDeb, autoDebitWithToken, _this5$_renderParams7, _action$web, _action$wap, action, signType;
+          var envInfo, params, _this5$_renderParams$, extendInfo, enableVaultingApiOptimize, enableEasypayApiOptimize, _this5$_renderParams$2, skipSdkQuery, skipSdkQueryConfig, extendInfoData, ifSkip, _this5$_renderParams6, _ref3, _ref3$productSceneVer, productSceneVersion, _ref3$productScene, productScene, _ref4, _ref4$action, _ref4$action2, _ref4$action2$autoDeb, autoDebitWithToken, _this5$_renderParams7, _action$web, _action$wap, action, signType;
           return _regeneratorRuntime().wrap(function _callee2$(_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
@@ -382,93 +382,128 @@ var ComponentApp = /*#__PURE__*/function () {
                  */
                 _this5$_renderParams$ = (_this5$_renderParams4 = _this5._renderParams) === null || _this5$_renderParams4 === void 0 ? void 0 : _this5$_renderParams4.paymentSessionMetaData, extendInfo = _this5$_renderParams$.extendInfo;
                 enableVaultingApiOptimize = false;
+                enableEasypayApiOptimize = false;
+                _this5$_renderParams$2 = (_this5$_renderParams5 = _this5._renderParams) === null || _this5$_renderParams5 === void 0 || (_this5$_renderParams5 = _this5$_renderParams5.paymentSessionMetaData) === null || _this5$_renderParams5 === void 0 ? void 0 : _this5$_renderParams5.action, skipSdkQuery = _this5$_renderParams$2.skipSdkQuery, skipSdkQueryConfig = _this5$_renderParams$2.skipSdkQueryConfig;
                 try {
                   extendInfoData = JSON.parse(extendInfo);
                   enableVaultingApiOptimize = extendInfoData.enableVaultingApiOptimize || false;
+                  enableEasypayApiOptimize = extendInfoData.enableEasypayApiOptimize || false;
                 } catch (error) {
                   console.log(error);
                 }
+                /**
+                 * @description Simulated or unnecessary scenarios
+                 */
                 if (!isLocalMock()) {
-                  _context2.next = 7;
+                  _context2.next = 9;
                   break;
                 }
                 return _context2.abrupt("return", resolve({
                   message: 'sdk no need to make query request',
                   success: true
                 }));
-              case 7:
-                if (!(componentSignEnum.VAULTING_CARD === _this5._componentSign && (_this5$_renderParams5 = _this5._renderParams) !== null && _this5$_renderParams5 !== void 0 && (_this5$_renderParams5 = _this5$_renderParams5.paymentSessionMetaData) !== null && _this5$_renderParams5 !== void 0 && (_this5$_renderParams5 = _this5$_renderParams5.action) !== null && _this5$_renderParams5 !== void 0 && _this5$_renderParams5.skipSdkQuery && enableVaultingApiOptimize)) {
-                  _context2.next = 9;
+              case 9:
+                if (!(componentSignEnum.VAULTING_CARD === _this5._componentSign)) {
+                  _context2.next = 17;
+                  break;
+                }
+                if (!(skipSdkQueryConfig && enableVaultingApiOptimize)) {
+                  _context2.next = 15;
+                  break;
+                }
+                // 优先判断skipSdkQueryConfig
+                ifSkip = matchVersion(skipSdkQueryConfig, _this5._appVersion);
+                if (!ifSkip) {
+                  _context2.next = 15;
+                  break;
+                }
+                resolve({
+                  message: 'sdk no need to make query request',
+                  success: true
+                });
+                return _context2.abrupt("return");
+              case 15:
+                if (!(skipSdkQuery && enableVaultingApiOptimize)) {
+                  _context2.next = 17;
                   break;
                 }
                 return _context2.abrupt("return", resolve({
                   message: 'sdk no need to make query request',
                   success: true
                 }));
-              case 9:
+              case 17:
                 if (!(componentSignEnum.CASHIER_PAYMENT_CARD === _this5._componentSign || componentSignEnum.VAULTING_CARD === _this5._componentSign)) {
-                  _context2.next = 15;
+                  _context2.next = 23;
                   break;
                 }
                 params.paymentMethodType = 'CARD';
-                _context2.next = 13;
+                _context2.next = 21;
                 return _this5.getDeviceIdAndLog();
-              case 13:
+              case 21:
                 envInfo.deviceId = _context2.sent;
                 if (window.navigator.userAgent.indexOf('miniProgram') > -1) {
                   envInfo.extendInfo = {
                     WAP_SUB_TYPE: 'WECHAT_MINI_PROGRAM'
                   };
                 }
-              case 15:
+              case 23:
                 if (!(componentSignEnum.EASY_PAY_WALLET === _this5._componentSign)) {
-                  _context2.next = 23;
+                  _context2.next = 33;
                   break;
                 }
                 _ref3 = params.paymentSessionConfig || {}, _ref3$productSceneVer = _ref3.productSceneVersion, productSceneVersion = _ref3$productSceneVer === void 0 ? '' : _ref3$productSceneVer, _ref3$productScene = _ref3.productScene, productScene = _ref3$productScene === void 0 ? '' : _ref3$productScene;
-                _ref4 = ((_this5$_renderParams6 = _this5._renderParams) === null || _this5$_renderParams6 === void 0 ? void 0 : _this5$_renderParams6.paymentSessionMetaData) || {}, _ref4$action = _ref4.action, _ref4$action2 = _ref4$action === void 0 ? {} : _ref4$action, _ref4$action2$autoDeb = _ref4$action2.autoDebitWithToken, autoDebitWithToken = _ref4$action2$autoDeb === void 0 ? false : _ref4$action2$autoDeb;
+                _ref4 = ((_this5$_renderParams6 = _this5._renderParams) === null || _this5$_renderParams6 === void 0 ? void 0 : _this5$_renderParams6.paymentSessionMetaData) || {}, _ref4$action = _ref4.action, _ref4$action2 = _ref4$action === void 0 ? {} : _ref4$action, _ref4$action2$autoDeb = _ref4$action2.autoDebitWithToken, autoDebitWithToken = _ref4$action2$autoDeb === void 0 ? false : _ref4$action2$autoDeb; // easyPay跳过actionQuery接口
+                if (!(skipSdkQuery && enableEasypayApiOptimize)) {
+                  _context2.next = 28;
+                  break;
+                }
+                return _context2.abrupt("return", resolve({
+                  message: 'sdk no need to make query request',
+                  success: true
+                }));
+              case 28:
                 if (!(productScene === productSceneEnum.EASY_PAY && productSceneVersion === '2.0' && !autoDebitWithToken)) {
-                  _context2.next = 20;
+                  _context2.next = 30;
                   break;
                 }
                 return _context2.abrupt("return", resolve({
                   message: 'sdk no need to make query request',
                   success: true
                 }));
-              case 20:
-                _context2.next = 22;
+              case 30:
+                _context2.next = 32;
                 return _this5.getDeviceIdAndLog();
-              case 22:
+              case 32:
                 envInfo.deviceId = _context2.sent;
-              case 23:
+              case 33:
                 if (!(componentSignEnum.AUTO_DEBIT_WALLET === _this5._componentSign)) {
-                  _context2.next = 33;
+                  _context2.next = 43;
                   break;
                 }
                 action = ((_this5$_renderParams7 = _this5._renderParams) === null || _this5$_renderParams7 === void 0 || (_this5$_renderParams7 = _this5$_renderParams7.paymentSessionMetaData) === null || _this5$_renderParams7 === void 0 ? void 0 : _this5$_renderParams7.action) || {};
                 signType = isPC() ? action === null || action === void 0 || (_action$web = action.web) === null || _action$web === void 0 ? void 0 : _action$web.signType : action === null || action === void 0 || (_action$wap = action.wap) === null || _action$wap === void 0 ? void 0 : _action$wap.signType;
                 if (!(signType === 'SMS')) {
-                  _context2.next = 28;
+                  _context2.next = 38;
                   break;
                 }
                 return _context2.abrupt("return", resolve({
                   message: 'sdk no need to make query request',
                   success: true
                 }));
-              case 28:
+              case 38:
                 if (!(!signType || signType !== 'REDIRECT')) {
-                  _context2.next = 30;
+                  _context2.next = 40;
                   break;
                 }
                 return _context2.abrupt("return", resolve({
                   success: false
                 }));
-              case 30:
-                _context2.next = 32;
+              case 40:
+                _context2.next = 42;
                 return _this5.getDeviceIdAndLog();
-              case 32:
+              case 42:
                 envInfo.deviceId = _context2.sent;
-              case 33:
+              case 43:
                 _this5.AMSSDK.logger.logInfo({
                   title: 'sdk_event_sdkQuery'
                 }, {
@@ -500,7 +535,7 @@ var ComponentApp = /*#__PURE__*/function () {
                     paymentSessionConfig: JSON.stringify(params.paymentSessionConfig)
                   }).send();
                 });
-              case 35:
+              case 45:
               case "end":
                 return _context2.stop();
             }

package/esm/types/index.d.ts

@@ -133,6 +133,11 @@ export interface IpaymentSessionMetaData {
     action?: {
         autoDebitWithToken: boolean;
         skipSdkQuery: boolean;
+        skipSdkQueryConfig?: {
+            value: boolean;
+            version: string;
+            platform: string;
+        };
     };
     paymentSessionFactor?: {
         applePay?: {

package/esm/util/versionCompare.d.ts

@@ -8,3 +8,5 @@
  * @param v2
  */
 export declare function compareVersion(v1: string, v2: string): 1 | -1 | 0;
+export declare function isVersionInRange(currentVersion: any, minVersion: any, maxVersion: any): boolean;
+export declare function matchVersion(config: any, currentVersion: any): boolean;

package/esm/util/versionCompare.js

@@ -1,3 +1,9 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 /**
  * @author 谦彧 <zhangmian.zm@alipay.com>
  * @date 2023/11/1
@@ -47,4 +53,71 @@ export function compareVersion(v1, v2) {
   } else {
     return 1;
   }
+}
+export function isVersionInRange(currentVersion, minVersion, maxVersion) {
+  function splitVersion(version) {
+    return version.split('.').map(function (num) {
+      return parseInt(num, 10);
+    });
+  }
+  function compareVersions(v1, v2) {
+    for (var i = 0; i < Math.max(v1.length, v2.length); i++) {
+      var num1 = v1[i] === undefined ? 0 : v1[i];
+      var num2 = v2[i] === undefined ? 0 : v2[i];
+      if (num1 > num2) return 1;
+      if (num1 < num2) return -1;
+    }
+    return 0;
+  }
+  var current = splitVersion(currentVersion);
+  var min = minVersion ? splitVersion(minVersion) : null;
+  var max = maxVersion ? splitVersion(maxVersion) : null;
+  if (min && compareVersions(current, min) < 0) {
+    // 当前版本小于最小允许版本
+    return false;
+  }
+  if (max && compareVersions(current, max) > 0) {
+    // 当前版本大于最大允许版本
+    return false;
+  }
+  // 当前版本在允许的版本范围内
+  return true;
+}
+export function matchVersion(config, currentVersion) {
+  var value = config.value,
+    version = config.version,
+    platform = config.platform;
+  var CURRENT_PLATFORM = 'WEB';
+  var isMatchVersion = false;
+  var isMatchPlatform = false;
+
+  // 平台判断
+  if (platform) {
+    var platformList = platform.split('|').map(function (platform) {
+      return platform.toLocaleUpperCase();
+    });
+    isMatchPlatform = platformList.includes(CURRENT_PLATFORM);
+  } else {
+    // 没有表示平台全匹配
+    isMatchPlatform = true;
+  }
+  // 版本判断
+  if (!version) {
+    // 为空全匹配
+    isMatchVersion = true;
+  } else if (version.indexOf('|') !== -1) {
+    // | 范围匹配
+    var _version$split = version.split('|'),
+      _version$split2 = _slicedToArray(_version$split, 2),
+      _version$split2$ = _version$split2[0],
+      minVersion = _version$split2$ === void 0 ? '' : _version$split2$,
+      _version$split2$2 = _version$split2[1],
+      maxVersion = _version$split2$2 === void 0 ? '' : _version$split2$2;
+    isMatchVersion = isVersionInRange(currentVersion, minVersion, maxVersion);
+  } else if (version.indexOf(',') !== -1) {
+    // , 枚举匹配
+    var versionList = version.split(',');
+    isMatchVersion = versionList.includes(currentVersion);
+  }
+  return value && isMatchPlatform && isMatchVersion;
 }

package/package.json

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