@alipay/ams-checkout 1.31.1 → 1.33.0

package/esm/config/index.d.ts

@@ -5,10 +5,10 @@ export declare const sdkVersion: string;
 /**
  * @description: 目前应用层分为v1和v2，会存在两个应用版本号不是同步发布的情况。所以需要把默认的应用版本号配置抽离出来。
  */
-export declare const AMSCheckoutAppVersion = "1.31.1";
-export declare const AMSAutoDebitAppVersion = "1.31.1";
-export declare const AMSEasyPayAppVersion = "1.31.1";
-export declare const AMSCashierPaymentAppVersion = "1.31.1";
-export declare const AMSVaultingAppVersion = "1.31.1";
-export declare const AMSPaymentElementAppVersion = "1.31.1";
-export declare const ADDRESSElementAppVersion = "1.31.1";
+export declare const AMSCheckoutAppVersion = "1.33.0";
+export declare const AMSAutoDebitAppVersion = "1.33.0";
+export declare const AMSEasyPayAppVersion = "1.33.0";
+export declare const AMSCashierPaymentAppVersion = "1.33.0";
+export declare const AMSVaultingAppVersion = "1.33.0";
+export declare const AMSPaymentElementAppVersion = "1.33.0";
+export declare const ADDRESSElementAppVersion = "1.33.0";

package/esm/config/index.js

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

package/esm/constant/index.d.ts

@@ -112,6 +112,9 @@ export declare const EVENT: {
         name: string;
         uniqueKey: string;
     };
+    destroy: {
+        name: string;
+    };
     closeCallback: {
         name: string;
         uniqueKey: string;

package/esm/constant/index.js

@@ -112,6 +112,9 @@ export var EVENT = {
     name: 'onClose',
     uniqueKey: 'userOnClose'
   },
+  destroy: {
+    name: 'onDestroy'
+  },
   // 标记 SDK 回调事件
   closeCallback: {
     name: 'onCloseCallback',

package/esm/foundation/core/index.js

@@ -151,6 +151,9 @@ export var AntomSDKCore = /*#__PURE__*/function () {
           return _ref2.apply(this, arguments);
         };
       }());
+      eventCenter.listen(EVENT.destroy.name, function (data) {
+        _this.destroy();
+      });
       eventCenter.listen(EVENT.closeCallback.name, function () {
         var _options$onClose;
         (_options$onClose = options.onClose) === null || _options$onClose === void 0 || _options$onClose.call(options);

package/esm/foundation/product-processor/easysafepay/deps.d.ts

@@ -16,3 +16,5 @@ export type { RequesterService } from '../../service/requester/requester';
 export type { SecurityService } from '../../service/security';
 export { ProductInfoCacheUtil } from '../../utils/payment_product_utils';
 export * as WebAppUrlUtil from '../../utils/web_app_url_utils';
+export { eventCodeEnum } from '../../../types';
+export { EVENT } from '../../../constant';

package/esm/foundation/product-processor/easysafepay/deps.js

@@ -9,4 +9,6 @@ export { ServiceProvider } from "../../service";
 export { LogService } from "../../service/log";
 export { ProductInfoCacheUtil } from "../../utils/payment_product_utils";
 import * as _WebAppUrlUtil from "../../utils/web_app_url_utils";
-export { _WebAppUrlUtil as WebAppUrlUtil };
+export { _WebAppUrlUtil as WebAppUrlUtil };
+export { eventCodeEnum } from "../../../types";
+export { EVENT } from "../../../constant";

package/esm/foundation/product-processor/easysafepay/index.d.ts

@@ -4,11 +4,14 @@ export declare class EasySafePayProcessor implements ProductProcessor {
     private initConfig;
     private logger;
     private securityService;
+    private eventCenter;
     private instanceId;
     private hostSign;
     private allowSubmitPayCallAhead;
     private channelBehavior?;
     private SECURITY_SDK_INIT_TIMEOUT;
+    private SDK_REQUEST_TIMEOUT;
+    private LOAD_APP_RESOURCES_TIMEOUT;
     init(config: IoptionsParams, instanceId: string, sdkMetaData: SDKMetaData): void;
     startBizFlow(paymentContext: PaymentContext): Promise<BizFlowStartBehavior>;
     private buildWebAppUrl;

package/esm/foundation/product-processor/easysafepay/index.js

@@ -17,7 +17,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import PreloadHelper from "../../../foundation/utils/preload_helper";
-import { ChannelCustomize, DisplayTypeEnum, getBackScheme, isPC, PaymentMethodCategoryTypeEnum, ProductInfoCacheUtil, ProductSceneEnum, RiskSdkInfoEnum, ServiceProvider, uuid, WebAppUrlUtil } from "./deps";
+import { ChannelCustomize, DisplayTypeEnum, getBackScheme, isPC, PaymentMethodCategoryTypeEnum, ProductInfoCacheUtil, ProductSceneEnum, RiskSdkInfoEnum, ServiceProvider, uuid, WebAppUrlUtil, EVENT, eventCodeEnum } from "./deps";
 export var EasySafePayProcessor = /*#__PURE__*/function () {
   function EasySafePayProcessor() {
     _classCallCheck(this, EasySafePayProcessor);
@@ -25,6 +25,7 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
     _defineProperty(this, "initConfig", void 0);
     _defineProperty(this, "logger", void 0);
     _defineProperty(this, "securityService", void 0);
+    _defineProperty(this, "eventCenter", void 0);
     _defineProperty(this, "instanceId", void 0);
     // 服务端接口区域信息，请求时决定API域名
     _defineProperty(this, "hostSign", void 0);
@@ -32,6 +33,8 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
     _defineProperty(this, "allowSubmitPayCallAhead", void 0);
     _defineProperty(this, "channelBehavior", void 0);
     _defineProperty(this, "SECURITY_SDK_INIT_TIMEOUT", 18000);
+    _defineProperty(this, "SDK_REQUEST_TIMEOUT", 15000);
+    _defineProperty(this, "LOAD_APP_RESOURCES_TIMEOUT", 15000);
   }
   _createClass(EasySafePayProcessor, [{
     key: "init",
@@ -40,6 +43,7 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
       this.instanceId = instanceId;
       this.logger = ServiceProvider.getInstance(this.instanceId).getService('Log');
       this.securityService = ServiceProvider.getInstance(this.instanceId).getService('Security');
+      this.eventCenter = ServiceProvider.getInstance(this.instanceId).getService('EventCenter');
 
       // preload web app
       PreloadHelper.preloadWebApp(ProductSceneEnum.EASY_PAY, PaymentMethodCategoryTypeEnum.WALLET, this.initConfig.environment);
@@ -162,9 +166,12 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
     key: "sendRequestAndWaitWebLaunch",
     value: function sendRequestAndWaitWebLaunch() {
       var _this = this;
-      var eventCenter = ServiceProvider.getInstance(this.instanceId).getService('EventCenter');
-      var webLaunchPromise = new Promise(function (resolve) {
-        eventCenter.listen('onLaunch', function (res) {
+      var webLaunchPromise = new Promise(function (resolve, reject) {
+        var t = setTimeout(function () {
+          reject(new Error('Load resource timeout'));
+        }, _this.LOAD_APP_RESOURCES_TIMEOUT);
+        _this.eventCenter.listen('onLaunch', function (res) {
+          clearTimeout(t);
           resolve(res);
         });
       });
@@ -177,7 +184,7 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
           submitRes = _ref2[1],
           _webLaunchRes = _ref2[2];
         var logMetaData = _this.logger.getLogConfig().mdata;
-        eventCenter.dispatchToApp({
+        _this.eventCenter.dispatchToApp({
           event: 'renderComponent',
           data: {
             sessionResult: (_this$paymentContext = _this.paymentContext) === null || _this$paymentContext === void 0 ? void 0 : _this$paymentContext.paymentSessionObj,
@@ -207,6 +214,14 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
             })
           }
         });
+      }).catch(function (error) {
+        _this.eventCenter.emit(EVENT.destroy.name, {});
+        _this.eventCenter.emit(EVENT.eventCallback.name, {
+          code: eventCodeEnum.SDK_INTERNAL_ERROR,
+          result: {
+            message: error === null || error === void 0 ? void 0 : error.message
+          }
+        });
       });
     }
   }, {
@@ -270,25 +285,26 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
               _context2.t0 = requester;
               _context2.t1 = submitParams;
               _context2.t2 = this.initConfig.environment;
-              _context2.next = 19;
+              _context2.t3 = this.SDK_REQUEST_TIMEOUT;
+              _context2.next = 20;
               return this.acquireApdidToken();
-            case 19:
-              _context2.t3 = _context2.sent;
-              _context2.t4 = {
-                deviceId: _context2.t3
+            case 20:
+              _context2.t4 = _context2.sent;
+              _context2.t5 = {
+                deviceId: _context2.t4
               };
-              _context2.t5 = this.hostSign;
-              _context2.t6 = {
+              _context2.t6 = this.hostSign;
+              _context2.t7 = {
                 env: _context2.t2,
-                timeout: 15000,
-                envInfo: _context2.t4,
-                hostSign: _context2.t5,
+                timeout: _context2.t3,
+                envInfo: _context2.t5,
+                hostSign: _context2.t6,
                 needEnvInfo: true,
                 'Operation-Type': 'com.ipay.iexpcashier.cashier.submitPayByPaymentSession'
               };
-              _context2.next = 25;
-              return _context2.t0.request.call(_context2.t0, _context2.t1, _context2.t6);
-            case 25:
+              _context2.next = 26;
+              return _context2.t0.request.call(_context2.t0, _context2.t1, _context2.t7);
+            case 26:
               res = _context2.sent;
               this.logger.logInfo({
                 title: 'sdk_event_submitPayEnd'
@@ -298,23 +314,23 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                 rpcTraceId: res.traceId
               });
               return _context2.abrupt("return", res);
-            case 30:
-              _context2.prev = 30;
-              _context2.t7 = _context2["catch"](13);
+            case 31:
+              _context2.prev = 31;
+              _context2.t8 = _context2["catch"](13);
               this.logger.logError({
                 title: 'sdk_event_submitPay_failed'
               }, {
                 config: JSON.stringify(submitParams.paymentSessionConfig),
-                errorMessage: _context2.t7,
+                errorMessage: JSON.stringify(_context2.t8),
                 requestId: requestBizId,
-                rpcTraceId: _context2.t7 === null || _context2.t7 === void 0 ? void 0 : _context2.t7.traceId
+                rpcTraceId: _context2.t8 === null || _context2.t8 === void 0 ? void 0 : _context2.t8.traceId
               });
-              throw _context2.t7;
-            case 34:
+              return _context2.abrupt("return", null);
+            case 35:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[13, 30]]);
+        }, _callee2, this, [[13, 31]]);
       }));
       function processSubmitPay() {
         return _processSubmitPay.apply(this, arguments);

package/esm/foundation/service/log/types.d.ts

@@ -5,6 +5,7 @@
 export interface LogPayload {
     title?: string;
     msg?: string;
+    errorMessage?: string;
     name?: string;
     label?: string;
     time?: number;

package/esm/foundation/service/requester/requester.js

@@ -86,7 +86,7 @@ export var RequesterService = /*#__PURE__*/function () {
                 time: Date.now() - startTime,
                 success: false,
                 code: errorCode,
-                msg: errorMessage,
+                errorMessage: errorMessage,
                 traceId: traceId
               });
               throw new Error(JSON.stringify({
@@ -102,7 +102,7 @@ export var RequesterService = /*#__PURE__*/function () {
                 time: Date.now() - startTime,
                 success: true,
                 code: 'SUCCESS',
-                msg: '',
+                errorMessage: '',
                 traceId: traceId
               });
               return _context.abrupt("return", resData);
@@ -124,13 +124,14 @@ export var RequesterService = /*#__PURE__*/function () {
                 time: Date.now() - startTime,
                 success: false,
                 code: _errorCode,
-                msg: JSON.stringify((_error === null || _error === void 0 ? void 0 : _error.message) || _context.t0)
+                errorMessage: JSON.stringify((_error === null || _error === void 0 ? void 0 : _error.errorMessage) || _context.t0)
               });
               return _context.abrupt("return", Promise.reject({
                 success: false,
                 errorCode: _errorCode,
                 traceId: traceId,
-                errorMessage: _error === null || _error === void 0 ? void 0 : _error.message
+                stack: _context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.stack,
+                errorMessage: _error === null || _error === void 0 ? void 0 : _error.errorMessage
               }));
             case 31:
             case "end":

package/package.json

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