@alipay/ams-checkout 0.0.1708315090-dev.2 → 0.0.1708315090-dev.5

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

@@ -17,7 +17,7 @@ export declare class AMSComponent extends CoreInstance {
      */
     createComponent(params: IcreateComponent): Promise<void>;
     preloadComponent(channelType: any, productSceneVersion: any): void;
-    clearPreloadIframe(): void;
+    clearPreloadIframe(isTimeOut?: boolean): void;
     /**
      * @description Create and render components in the specified element area
      * @param params - The data source created by the component, necessary sessionData, optional appearance configurations, and refer to the documentation for other parameters and detailed information.

package/esm/core/component/index.js

@@ -161,12 +161,31 @@ export var AMSComponent = /*#__PURE__*/function (_CoreInstance) {
         _ref2$paymentSessionM4 = _ref2$paymentSessionM.productSceneVersion,
         productSceneVersion = _ref2$paymentSessionM4 === void 0 ? '' : _ref2$paymentSessionM4;
       var channelType = "".concat(productScene, "_").concat(paymentMethodCategoryType);
-      if (productScene && productSceneVersion) {
+      if (productScene && paymentMethodCategoryType && productSceneVersion) {
+        if (this.channelType.includes(channelType) && this.productSceneVersion === productSceneVersion) {
+          this.logger.logInfo({
+            title: 'preload_match'
+          }, {
+            preloadChannel: this.channelType,
+            preloadVersion: this.productSceneVersion,
+            sessionDataChannel: channelType,
+            sessionDataVersion: productSceneVersion
+          });
+        } else {
+          this.logger.logInfo({
+            title: 'preload_no_match'
+          }, {
+            preloadChannel: this.channelType,
+            preloadVersion: this.productSceneVersion,
+            sessionDataChannel: channelType,
+            sessionDataVersion: productSceneVersion
+          });
+        }
         var previousChannel = {
           channelType: channelType === componentSignEnum.VAULTING_CARD ? componentSignEnum.CASHIER_PAYMENT_CARD : channelType,
           productSceneVersion: productSceneVersion
         };
-        localStorage.setItem('previousChannel', JSON.stringify(previousChannel));
+        localStorage.setItem('antom_checkout_previousChannel', JSON.stringify(previousChannel));
       }
     }
     /**
@@ -203,25 +222,41 @@ export var AMSComponent = /*#__PURE__*/function (_CoreInstance) {
       var _this3 = this;
       this.channelType = channelType;
       this.productSceneVersion = productSceneVersion;
-      var MAX_CLEAR_TIME = 10000;
+      var MAX_CLEAR_TIME = 90000;
       if (Array.isArray(channelType)) {
         for (var i = 0; i < channelType.length; i++) {
           this._componentApp.appendPreloadIframeNodes(channelType[i], productSceneVersion);
         }
+      } else {
+        this.logger.logError({
+          title: 'performance_optimization_channelType_error'
+        }, {
+          channelType: channelType
+        });
       }
       setTimeout(function () {
-        _this3.clearPreloadIframe();
+        _this3.clearPreloadIframe(true);
       }, MAX_CLEAR_TIME);
     }
   }, {
     key: "clearPreloadIframe",
     value: function clearPreloadIframe() {
+      var isTimeOut = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
       if (Array.isArray(this.channelType)) {
         for (var i = 0; i < this.channelType.length; i++) {
           var iframe = document.getElementById("ams-checkout-component-".concat(this.channelType[i], "-").concat(this.productSceneVersion));
           iframe && document.body.removeChild(iframe);
         }
       }
+      if (!isTimeOut) {
+        this.logger.logInfo({
+          title: 'performance_optimization_clearPreloadIframe'
+        });
+      } else {
+        this.logger.logInfo({
+          title: 'performance_optimization_clearPreloadIframe_timeout'
+        });
+      }
     }
     /**
      * @description Create and render components in the specified element area
@@ -232,6 +267,7 @@ export var AMSComponent = /*#__PURE__*/function (_CoreInstance) {
     key: "mountComponent",
     value: function mountComponent(params, selector) {
       var _this4 = this;
+      this.clearPreloadIframe();
       return this.parameterInitAndCheck({
         params: params,
         renderDisplayType: renderDisplayTypeEnum.inline,

package/esm/index.js

@@ -22,6 +22,8 @@ import ApplePayComponent from "./core/applepay";
 import { AMSComponent } from "./core/component/index";
 import { componentSignEnum } from "./types";
 import { productSceneEnum } from "./types/index";
+import { Logger, LogConfig } from "./util/logger";
+var logger = new Logger(LogConfig, true);
 export * from "./types";
 export var AMSCheckout = /*#__PURE__*/function (_AMSComponent) {
   _inherits(AMSCheckout, _AMSComponent);
@@ -67,7 +69,7 @@ export var AMSEasyPay = /*#__PURE__*/function (_AMSCheckout2) {
     });
     var currentProductSceneVersion = '1.0';
     try {
-      var previousChannelStr = localStorage.getItem('previousChannel');
+      var previousChannelStr = localStorage.getItem('antom_checkout_previousChannel');
       var previousChannel = JSON.parse(previousChannelStr) || {};
       var _ref = previousChannel || {},
         _ref$channelType = _ref.channelType,
@@ -78,7 +80,11 @@ export var AMSEasyPay = /*#__PURE__*/function (_AMSCheckout2) {
         currentProductSceneVersion = productSceneVersion;
       }
     } catch (error) {
-      console.log(error);
+      logger.logError({
+        title: 'performance_optimization_get_previousChannel_error'
+      }, {
+        error: error
+      });
     }
     return _super4.call(this, _options, [componentSignEnum.EASY_PAY_WALLET], currentProductSceneVersion);
   }
@@ -94,7 +100,7 @@ export var AMSCashierPayment = /*#__PURE__*/function (_AMSCheckout3) {
     });
     var currentChannelType;
     try {
-      var previousChannelStr = localStorage.getItem('previousChannel');
+      var previousChannelStr = localStorage.getItem('antom_checkout_previousChannel');
       var previousChannel = JSON.parse(previousChannelStr) || {};
       var _ref2 = previousChannel || {},
         _ref2$channelType = _ref2.channelType,
@@ -105,7 +111,11 @@ export var AMSCashierPayment = /*#__PURE__*/function (_AMSCheckout3) {
         currentChannelType = [componentSignEnum.CASHIER_PAYMENT_CARD, componentSignEnum.CASHIER_PAYMENT_APM];
       }
     } catch (error) {
-      console.log(error);
+      logger.logError({
+        title: 'performance_optimization_get_previousChannel_error'
+      }, {
+        error: error
+      });
     }
     return _super5.call(this, _options, currentChannelType);
   }

package/esm/plugin/component/index.js

@@ -294,6 +294,12 @@ var ComponentApp = /*#__PURE__*/function () {
     value: function appendPreloadIframeNodes(componentSign, productSceneVersion) {
       var virtualPreloadIframe = this.createPreloadApp(componentSign, productSceneVersion);
       this.createPreloadIframeNode(virtualPreloadIframe);
+      this.AMSSDK.logger.logInfo({
+        title: 'performance_optimization_preload'
+      }, {
+        componentSign: componentSign,
+        productSceneVersion: productSceneVersion
+      });
     }
   }, {
     key: "setParameterDefaultValues",
@@ -357,8 +363,8 @@ var ComponentApp = /*#__PURE__*/function () {
       // eslint-disable-next-line no-async-promise-executor
       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, _this5$_renderParams6;
-          var envInfo, params, _this5$_renderParams$, extendInfo, enableVaultingApiOptimize, extendInfoData, _this5$_renderParams$2, _this5$_renderParams$3, paymentSessionFactor, _this5$_renderParams7, _ref3, _ref3$productSceneVer, productSceneVersion, _ref3$productScene, productScene, _ref4, _ref4$action, _ref4$action2, _ref4$action2$autoDeb, autoDebitWithToken, _this5$_renderParams8, _action$web, _action$wap, action, signType;
+          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;
           return _regeneratorRuntime().wrap(function _callee2$(_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
@@ -391,81 +397,78 @@ var ComponentApp = /*#__PURE__*/function () {
                   success: true
                 }));
               case 7:
-                // 绑卡跳过actionQuery接口
-                // paymentSessionFactor 该字段没值则走不跳过接口逻辑
-                _this5$_renderParams$2 = (_this5$_renderParams5 = _this5._renderParams) === null || _this5$_renderParams5 === void 0 ? void 0 : _this5$_renderParams5.paymentSessionMetaData, _this5$_renderParams$3 = _this5$_renderParams$2.paymentSessionFactor, paymentSessionFactor = _this5$_renderParams$3 === void 0 ? null : _this5$_renderParams$3;
-                if (!(componentSignEnum.VAULTING_CARD === _this5._componentSign && (_this5$_renderParams6 = _this5._renderParams) !== null && _this5$_renderParams6 !== void 0 && (_this5$_renderParams6 = _this5$_renderParams6.paymentSessionMetaData) !== null && _this5$_renderParams6 !== void 0 && (_this5$_renderParams6 = _this5$_renderParams6.action) !== null && _this5$_renderParams6 !== void 0 && _this5$_renderParams6.skipSdkQuery && enableVaultingApiOptimize && paymentSessionFactor)) {
-                  _context2.next = 10;
+                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;
                   break;
                 }
                 return _context2.abrupt("return", resolve({
                   message: 'sdk no need to make query request',
                   success: true
                 }));
-              case 10:
+              case 9:
                 if (!(componentSignEnum.CASHIER_PAYMENT_CARD === _this5._componentSign || componentSignEnum.VAULTING_CARD === _this5._componentSign)) {
-                  _context2.next = 16;
+                  _context2.next = 15;
                   break;
                 }
                 params.paymentMethodType = 'CARD';
-                _context2.next = 14;
+                _context2.next = 13;
                 return _this5.getDeviceIdAndLog();
-              case 14:
+              case 13:
                 envInfo.deviceId = _context2.sent;
                 if (window.navigator.userAgent.indexOf('miniProgram') > -1) {
                   envInfo.extendInfo = {
                     WAP_SUB_TYPE: 'WECHAT_MINI_PROGRAM'
                   };
                 }
-              case 16:
+              case 15:
                 if (!(componentSignEnum.EASY_PAY_WALLET === _this5._componentSign)) {
-                  _context2.next = 24;
+                  _context2.next = 23;
                   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$_renderParams7 = _this5._renderParams) === null || _this5$_renderParams7 === void 0 ? void 0 : _this5$_renderParams7.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;
                 if (!(productScene === productSceneEnum.EASY_PAY && productSceneVersion === '2.0' && !autoDebitWithToken)) {
-                  _context2.next = 21;
+                  _context2.next = 20;
                   break;
                 }
                 return _context2.abrupt("return", resolve({
                   message: 'sdk no need to make query request',
                   success: true
                 }));
-              case 21:
-                _context2.next = 23;
+              case 20:
+                _context2.next = 22;
                 return _this5.getDeviceIdAndLog();
-              case 23:
+              case 22:
                 envInfo.deviceId = _context2.sent;
-              case 24:
+              case 23:
                 if (!(componentSignEnum.AUTO_DEBIT_WALLET === _this5._componentSign)) {
-                  _context2.next = 34;
+                  _context2.next = 33;
                   break;
                 }
-                action = ((_this5$_renderParams8 = _this5._renderParams) === null || _this5$_renderParams8 === void 0 || (_this5$_renderParams8 = _this5$_renderParams8.paymentSessionMetaData) === null || _this5$_renderParams8 === void 0 ? void 0 : _this5$_renderParams8.action) || {};
+                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 = 29;
+                  _context2.next = 28;
                   break;
                 }
                 return _context2.abrupt("return", resolve({
                   message: 'sdk no need to make query request',
                   success: true
                 }));
-              case 29:
+              case 28:
                 if (!(!signType || signType !== 'REDIRECT')) {
-                  _context2.next = 31;
+                  _context2.next = 30;
                   break;
                 }
                 return _context2.abrupt("return", resolve({
                   success: false
                 }));
-              case 31:
-                _context2.next = 33;
+              case 30:
+                _context2.next = 32;
                 return _this5.getDeviceIdAndLog();
-              case 33:
+              case 32:
                 envInfo.deviceId = _context2.sent;
-              case 34:
+              case 33:
                 _this5.AMSSDK.logger.logInfo({
                   title: 'sdk_event_sdkQuery'
                 }, {
@@ -497,7 +500,7 @@ var ComponentApp = /*#__PURE__*/function () {
                     paymentSessionConfig: JSON.stringify(params.paymentSessionConfig)
                   }).send();
                 });
-              case 36:
+              case 35:
               case "end":
                 return _context2.stop();
             }
@@ -650,7 +653,14 @@ var ComponentApp = /*#__PURE__*/function () {
         path = _getIframeUrl.path,
         locationSearch = _getIframeUrl.locationSearch;
       preloadIframe.src = "".concat(path, "?").concat(locationSearch);
-      console.log(preloadIframe.src, '--preloadIframe.src');
+      if (!path) {
+        this.AMSSDK.logger.logError({
+          title: 'performance_optimization_preload_path_error'
+        }, {
+          path: path,
+          locationSearch: locationSearch
+        });
+      }
       return preloadIframe;
     }
     /**

package/package.json

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