@alipay/ams-checkout 0.0.1755253657-dev.0 → 0.0.1755253657-dev.2

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

@@ -177,19 +177,24 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
     key: "sendRequestAndWaitWebLaunch",
     value: function sendRequestAndWaitWebLaunch() {
       var _this = this;
+      console.log('[DEBUG] sendRequestAndWaitWebLaunch start');
       var webLaunchPromise = new Promise(function (resolve, reject) {
+        console.log('[DEBUG] sendRequestAndWaitWebLaunch webLaunchPromise start');
         var t = setTimeout(function () {
+          console.log('[DEBUG] sendRequestAndWaitWebLaunch webLaunchPromise timeout');
           reject(new Error('Load resource timeout'));
         }, _this.LOAD_APP_RESOURCES_TIMEOUT);
         _this.eventCenter.listen('onLaunch', function (res) {
           clearTimeout(t);
           resolve(res);
+          console.log('[DEBUG] sendRequestAndWaitWebLaunch webLaunchPromise onLaunch');
           _this.logger.logInfo({
             title: 'sdk_event_webAppOnLaunch'
           });
         });
+        console.log('[DEBUG] sendRequestAndWaitWebLaunch completed');
       });
-
+      console.log('[DEBUG] sendRequestAndWaitWebLaunch start Promise all');
       // 等请求和 Web启动都Ready之后，发送renderComponent
       Promise.all([this.initSecuritySDK(), this.processQuery(), this.processSubmitPay(), webLaunchPromise]).then(function (_ref) {
         var _this$paymentContext, _this$paymentContext2, _this$paymentContext$, _this$paymentContext$2, _this$paymentContext$3, _this$paymentContext3, _this$paymentContext$4;
@@ -198,6 +203,7 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
           queryRes = _ref2[1],
           submitRes = _ref2[2],
           _webLaunchRes = _ref2[3];
+        console.log('[DEBUG] sendRequestAndWaitWebLaunch  success', _initSecurityRes, queryRes, submitRes, _webLaunchRes);
         var logMetaData = _this.logger.getLogConfig().mdata;
         var data = {
           sessionResult: (_this$paymentContext = _this.paymentContext) === null || _this$paymentContext === void 0 ? void 0 : _this$paymentContext.paymentSessionObj,
@@ -230,14 +236,18 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
         if (queryRes) {
           data.queryResult = queryRes;
         }
+        console.log('[DEBUG] sendRequestAndWaitWebLaunch  enter.dispatchToApp start', data);
         _this.eventCenter.dispatchToApp({
           event: 'renderComponent',
           data: data
         });
+        console.log('[DEBUG] sendRequestAndWaitWebLaunch  enter.dispatchToApp completed');
+        console.log('[DEBUG] sendRequestAndWaitWebLaunch completed');
         _this.logger.logInfo({
           title: 'sdk_event_renderComponent'
         });
       }).catch(function (error) {
+        console.log('[DEBUG] sendRequestAndWaitWebLaunch  ERROR', error);
         _this.eventCenter.emit(EVENT.destroy.name, {});
         _this.eventCenter.emit(EVENT.eventCallback.name, {
           code: eventCodeEnum.SDK_INTERNAL_ERROR,
@@ -256,6 +266,7 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
+              console.log('[DEBUG] processQuery start');
               queryParams = {
                 paymentSessionData: ((_this$paymentContext4 = this.paymentContext) === null || _this$paymentContext4 === void 0 ? void 0 : _this$paymentContext4.paymentSessionId) || '',
                 paymentSessionConfig: (_this$paymentContext5 = this.paymentContext) === null || _this$paymentContext5 === void 0 || (_this$paymentContext5 = _this$paymentContext5.paymentSessionObj) === null || _this$paymentContext5 === void 0 ? void 0 : _this$paymentContext5.paymentSessionConfig
@@ -265,18 +276,23 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
               isFirstTimeToPay = !((_this$paymentContext8 = this.paymentContext) !== null && _this$paymentContext8 !== void 0 && (_this$paymentContext8 = _this$paymentContext8.paymentSessionObj.action) !== null && _this$paymentContext8 !== void 0 && _this$paymentContext8.autoDebitWithToken);
               needQueryRender = true;
               try {
+                console.log('[DEBUG] processQuery JSON.parse(extendInfo) start', extendInfo);
                 extendInfoData = JSON.parse(extendInfo);
                 needQueryRender = isEmpty(extendInfoData.needQueryRender) || extendInfoData.needQueryRender === true;
+                console.log('[DEBUG] processQuery JSON.parse(extendInfo) completed', needQueryRender);
               } catch (error) {
+                console.log('[DEBUG] processQuery JSON.parse(extendInfo) ERROR', error);
                 console.log(error);
               }
               this.allowQueryCall = needQueryRender && isFirstTimeToPay && needAccountConfirmPage;
+              console.log('[DEBUG] processQuery allowQueryCall', this.allowQueryCall);
               if (this.allowQueryCall) {
-                _context2.next = 9;
+                _context2.next = 12;
                 break;
               }
+              console.log('[DEBUG] processQuery allowQueryCall NO', this.allowQueryCall);
               return _context2.abrupt("return", null);
-            case 9:
+            case 12:
               requestBizId = uuid();
               this.logger.logInfo({
                 title: 'sdk_event_sdkQuery'
@@ -284,8 +300,11 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                 config: JSON.stringify(queryParams.paymentSessionConfig),
                 requestId: requestBizId
               });
+              console.log('[DEBUG] processQuery ServiceProvider.getInstance start');
               requester = ServiceProvider.getInstance(this.instanceId).getService('Requester');
-              _context2.prev = 12;
+              console.log('[DEBUG] processQuery ServiceProvider.getInstance completed', requester);
+              _context2.prev = 17;
+              console.log('[DEBUG] processQuery requester.request<CashierSdkActionQuerySessionResult start');
               _context2.t0 = requester;
               _context2.t1 = _objectSpread(_objectSpread({}, queryParams), {}, {
                 actionType: 'init',
@@ -294,9 +313,9 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
               });
               _context2.t2 = this.initConfig.environment;
               _context2.t3 = this.SDK_REQUEST_TIMEOUT;
-              _context2.next = 19;
+              _context2.next = 25;
               return this.acquireApdidToken();
-            case 19:
+            case 25:
               _context2.t4 = _context2.sent;
               _context2.t5 = {
                 deviceId: _context2.t4
@@ -310,10 +329,11 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                 needEnvInfo: true,
                 'Operation-Type': 'com.ipay.iexpcashier.sdkAction.query'
               };
-              _context2.next = 25;
+              _context2.next = 31;
               return _context2.t0.request.call(_context2.t0, _context2.t1, _context2.t7);
-            case 25:
+            case 31:
               res = _context2.sent;
+              console.log('[DEBUG] processQuery requester.request<CashierSdkActionQuerySessionResult completed', res);
               this.logger.logInfo({
                 title: 'sdk_event_sdkQueryEnd'
               }, {
@@ -321,10 +341,12 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                 requestId: requestBizId,
                 rpcTraceId: res.traceId
               });
+              console.log('[DEBUG] processQuery completed', res);
               return _context2.abrupt("return", res);
-            case 30:
-              _context2.prev = 30;
-              _context2.t8 = _context2["catch"](12);
+            case 38:
+              _context2.prev = 38;
+              _context2.t8 = _context2["catch"](17);
+              console.log('[DEBUG] processQuery ERROR', _context2.t8);
               this.logger.logError({
                 title: 'sdk_event_sdkQuery_failed'
               }, {
@@ -334,11 +356,11 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                 rpcTraceId: _context2.t8 === null || _context2.t8 === void 0 ? void 0 : _context2.t8.traceId
               });
               return _context2.abrupt("return", null);
-            case 34:
+            case 43:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[12, 30]]);
+        }, _callee2, this, [[17, 38]]);
       }));
       function processQuery() {
         return _processQuery.apply(this, arguments);
@@ -354,6 +376,7 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
+              console.log('DEBUG] processSubmitPay start');
               submitParams = {
                 paymentSessionData: ((_this$paymentContext9 = this.paymentContext) === null || _this$paymentContext9 === void 0 ? void 0 : _this$paymentContext9.paymentSessionId) || '',
                 paymentSessionConfig: (_this$paymentContext10 = this.paymentContext) === null || _this$paymentContext10 === void 0 || (_this$paymentContext10 = _this$paymentContext10.paymentSessionObj) === null || _this$paymentContext10 === void 0 ? void 0 : _this$paymentContext10.paymentSessionConfig
@@ -374,15 +397,22 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
               }
               this.allowSubmitPayCallAhead = this.channelBehavior.allowSubmitPayCallAhead;
               //console.log('[web-sdk] allowSubmitPayCallAhead =', this.allowSubmitPayCallAhead);
+
+              console.log('DEBUG] processSubmitPay allowSubmitPayCallAhead start', this.allowSubmitPayCallAhead);
               if (this.allowSubmitPayCallAhead) {
-                _context3.next = 7;
+                _context3.next = 10;
                 break;
               }
+              //console.log('[web-sdk] DO NOT call submitPay');
+              console.log('DEBUG] processSubmitPay allowSubmitPayCallAhead ', {
+                message: 'sdk no need to make submitPay request',
+                success: true
+              });
               return _context3.abrupt("return", {
                 message: 'sdk no need to make submitPay request',
                 success: true
               });
-            case 7:
+            case 10:
               requestBizId = uuid(); // 下面真实发请求
               this.logger.logInfo({
                 title: 'sdk_event_submitPay'
@@ -390,6 +420,7 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                 config: JSON.stringify(submitParams.paymentSessionConfig),
                 requestId: requestBizId
               });
+              console.log('DEBUG] processSubmitPay channelBehavior?.buildSubmitPayExtParams start');
               // 由渠道定制点来构建额外参数
               extParams = ((_this$channelBehavior2 = this.channelBehavior) === null || _this$channelBehavior2 === void 0 || (_this$channelBehavior3 = _this$channelBehavior2.buildSubmitPayExtParams) === null || _this$channelBehavior3 === void 0 ? void 0 : _this$channelBehavior3.call(_this$channelBehavior2, {
                 instanceId: this.instanceId,
@@ -400,13 +431,19 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                 env: this.initConfig.environment,
                 sdkVersion: this.paymentContext.sdkMetaData.sdkVersion,
                 notRedirectAfterComplete: ((_this$paymentContext12 = this.paymentContext) === null || _this$paymentContext12 === void 0 || (_this$paymentContext12 = _this$paymentContext12.startBizFlowOptions) === null || _this$paymentContext12 === void 0 || (_this$paymentContext12 = _this$paymentContext12.submitPayRequestExtra) === null || _this$paymentContext12 === void 0 ? void 0 : _this$paymentContext12.notRedirectAfterComplete) === true
-              })) || {}; // 二次支付不再需要该参数
+              })) || {};
+              console.log('DEBUG] processSubmitPay channelBehavior?.buildSubmitPayExtParams completed', extParams);
+
+              // 二次支付不再需要该参数
               if (!autoDebitWithToken) {
                 extParams.complianceSDK = true;
               }
               submitParams.extParams = extParams;
+              console.log('DEBUG] processSubmitPay ServiceProvider.getInstance start');
               requester = ServiceProvider.getInstance(this.instanceId).getService('Requester');
-              _context3.prev = 13;
+              console.log('DEBUG] processSubmitPay ServiceProvider.getInstance completed', requester);
+              _context3.prev = 20;
+              console.log('DEBUG] processSubmitPay requester.request<CashierSubmitPayResult start');
               _context3.t0 = requester;
               _context3.t1 = _objectSpread(_objectSpread({}, submitParams), {}, {
                 integrationType: 'SDK',
@@ -414,9 +451,9 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
               });
               _context3.t2 = this.initConfig.environment;
               _context3.t3 = this.SDK_REQUEST_TIMEOUT;
-              _context3.next = 20;
+              _context3.next = 28;
               return this.acquireApdidToken();
-            case 20:
+            case 28:
               _context3.t4 = _context3.sent;
               _context3.t5 = {
                 deviceId: _context3.t4
@@ -430,10 +467,11 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                 needEnvInfo: true,
                 'Operation-Type': 'com.ipay.iexpcashier.cashier.submitPayByPaymentSession'
               };
-              _context3.next = 26;
+              _context3.next = 34;
               return _context3.t0.request.call(_context3.t0, _context3.t1, _context3.t7);
-            case 26:
+            case 34:
               res = _context3.sent;
+              console.log('DEBUG] processSubmitPay requester.request<CashierSubmitPayResult completed', res);
               this.logger.logInfo({
                 title: 'sdk_event_submitPayEnd'
               }, {
@@ -441,10 +479,12 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                 requestId: requestBizId,
                 rpcTraceId: res.traceId
               });
+              console.log('DEBUG] processSubmitPay completed', res);
               return _context3.abrupt("return", res);
-            case 31:
-              _context3.prev = 31;
-              _context3.t8 = _context3["catch"](13);
+            case 41:
+              _context3.prev = 41;
+              _context3.t8 = _context3["catch"](20);
+              console.log('DEBUG] processSubmitPay ERROR', _context3.t8);
               this.logger.logError({
                 title: 'sdk_event_submitPay_failed'
               }, {
@@ -454,11 +494,11 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                 rpcTraceId: _context3.t8 === null || _context3.t8 === void 0 ? void 0 : _context3.t8.traceId
               });
               return _context3.abrupt("return", null);
-            case 35:
+            case 46:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[13, 31]]);
+        }, _callee3, this, [[20, 41]]);
       }));
       function processSubmitPay() {
         return _processSubmitPay.apply(this, arguments);
@@ -499,13 +539,15 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              _context5.prev = 0;
+              console.log('[DEBUG] initSecuritySDK start');
+              _context5.prev = 1;
               productSceneVersion = this.paymentContext.paymentSessionObj.paymentSessionConfig.productSceneVersion;
               nonInitSecuritySDK = (_this$paymentContext$11 = (_this$paymentContext$12 = this.paymentContext.paymentSessionObj.action) === null || _this$paymentContext$12 === void 0 ? void 0 : _this$paymentContext$12.nonInitSecuritySDK) !== null && _this$paymentContext$11 !== void 0 ? _this$paymentContext$11 : false;
               signButtonDisplay = (_this$paymentContext$13 = (_this$paymentContext$14 = this.paymentContext.paymentSessionObj.action) === null || _this$paymentContext$14 === void 0 ? void 0 : _this$paymentContext$14.signButtonDisplay) !== null && _this$paymentContext$13 !== void 0 ? _this$paymentContext$13 : false;
               userSignAgreement = (_this$paymentContext$15 = (_this$paymentContext$16 = this.paymentContext.paymentSessionObj.action) === null || _this$paymentContext$16 === void 0 ? void 0 : _this$paymentContext$16.userSignAgreement) !== null && _this$paymentContext$15 !== void 0 ? _this$paymentContext$15 : false;
               isFirstTimeToPay = !this.paymentContext.paymentSessionObj.action.autoDebitWithToken;
               shouldInitSecuritySDK = false;
+              console.log("[DEBUG] initSecuritySDK -- productSceneVersion:".concat(productSceneVersion, " | nonInitSecuritySDK:").concat(nonInitSecuritySDK, " | signButtonDisplay:").concat(signButtonDisplay, " | userSignAgreement:").concat(userSignAgreement, " | isFirstTimeToPay:").concat(isFirstTimeToPay));
               if (nonInitSecuritySDK) {
                 // 钱包不依赖风控
                 // console.log('[web-sdk][security-sdk] DO NOT init security sdk when nonInitSecuritySDK is true');
@@ -527,27 +569,33 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                 }
               }
               if (!shouldInitSecuritySDK) {
-                _context5.next = 11;
+                _context5.next = 15;
                 break;
               }
-              _context5.next = 11;
+              console.log("[DEBUG] securityService.initSecurity start ", this.SECURITY_SDK_INIT_TIMEOUT);
+              _context5.next = 14;
               return this.securityService.initSecurity(this.SECURITY_SDK_INIT_TIMEOUT);
-            case 11:
+            case 14:
+              console.log("[DEBUG] securityService.initSecurity completed ");
+            case 15:
+              console.log('[DEBUG] initSecuritySDK completed');
               this.logger.logInfo({
                 title: 'a3753.b101271.c388193.d514078'
               }, {
                 riskSdkInfo: shouldInitSecuritySDK ? RiskSdkInfoEnum.NEED : RiskSdkInfoEnum.NO_NEED
               });
-              _context5.next = 16;
+              _context5.next = 22;
               break;
-            case 14:
-              _context5.prev = 14;
-              _context5.t0 = _context5["catch"](0);
-            case 16:
+            case 19:
+              _context5.prev = 19;
+              _context5.t0 = _context5["catch"](1);
+              console.log('[DEBUG] initSecuritySDK ERROR');
+              // do nothing when init security failed
+            case 22:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[0, 14]]);
+        }, _callee5, this, [[1, 19]]);
       }));
       function initSecuritySDK() {
         return _initSecuritySDK.apply(this, arguments);

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

@@ -50,6 +50,7 @@ export var RequesterService = /*#__PURE__*/function () {
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
+              console.log('[DEBUG] request start', requestData, options);
               envInfo = this.getEnvInfo(options);
               _data = [_objectSpread(_objectSpread({}, requestData), {}, {
                 envInfo: envInfo,
@@ -59,24 +60,31 @@ export var RequesterService = /*#__PURE__*/function () {
               })];
               startTime = Date.now();
               traceId = '';
-              _context.prev = 4;
+              _context.prev = 5;
+              console.log('[DEBUG] createRequestInstance start');
               myRequest = this.createRequestInstance(options);
-              _context.next = 8;
+              console.log('[DEBUG] createRequestInstance completed', myRequest);
+              console.log('[DEBUG] myRequest start');
+              _context.next = 12;
               return myRequest({
                 data: _data
               });
-            case 8:
+            case 12:
               _yield$myRequest = _context.sent;
               data = _yield$myRequest.data;
               headers = _yield$myRequest.headers;
+              console.log('[DEBUG] myRequest completed', data, headers);
               resData = data || {};
               traceId = get(headers, 'Mgw-TraceId') || get(headers, 'mgw-traceid', '');
               resData.traceId = traceId || '';
+              console.log('[DEBUG] handleGetWayError start');
               handleGetWayError = fomatGetwayError(headers, traceId);
+              console.log('[DEBUG] handleGetWayError completed', handleGetWayError);
               if (!(handleGetWayError !== null && handleGetWayError !== void 0 && handleGetWayError.errorCode)) {
-                _context.next = 20;
+                _context.next = 29;
                 break;
               }
+              console.log('[DEBUG] handleGetWayError errorCode', handleGetWayError === null || handleGetWayError === void 0 ? void 0 : handleGetWayError.errorCode);
               errorMessage = (resData === null || resData === void 0 ? void 0 : resData.errorMessage) || (handleGetWayError === null || handleGetWayError === void 0 ? void 0 : handleGetWayError.errorMessage);
               errorCode = handleGetWayError === null || handleGetWayError === void 0 ? void 0 : handleGetWayError.errorCode;
               this.reportRequestTimeCost({
@@ -89,12 +97,17 @@ export var RequesterService = /*#__PURE__*/function () {
                 errorMessage: errorMessage,
                 traceId: traceId
               });
+              console.log('[DEBUG] handleGetWayError error', {
+                errorMessage: errorMessage,
+                errorCode: errorCode,
+                success: false
+              });
               throw new Error(JSON.stringify({
                 errorMessage: errorMessage,
                 errorCode: errorCode,
                 success: false
               }));
-            case 20:
+            case 29:
               this.reportRequestTimeCost({
                 title: 'a3753.b101271.c388193.d521387',
                 name: options === null || options === void 0 ? void 0 : options['Operation-Type'],
@@ -105,16 +118,18 @@ export var RequesterService = /*#__PURE__*/function () {
                 errorMessage: '',
                 traceId: traceId
               });
+              console.log('[DEBUG] request completed', resData);
               return _context.abrupt("return", resData);
-            case 24:
-              _context.prev = 24;
-              _context.t0 = _context["catch"](4);
+            case 34:
+              _context.prev = 34;
+              _context.t0 = _context["catch"](5);
               _error = safeJson(_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message, {
                 success: false,
                 errorCode: errorEnum.SYSTEM,
                 traceId: traceId,
                 errorMessage: _context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message
               });
+              console.log('[DEBUG] request error 1', _error);
               timeoutCode = _context.t0 !== null && _context.t0 !== void 0 && (_error$message = _context.t0.message) !== null && _error$message !== void 0 && _error$message.includes('timeout') ? errorEnum.TIMEOUT : '';
               _errorCode = (_error === null || _error === void 0 ? void 0 : _error.errorCode) || timeoutCode;
               this.reportRequestTimeCost({
@@ -126,6 +141,12 @@ export var RequesterService = /*#__PURE__*/function () {
                 code: _errorCode,
                 errorMessage: JSON.stringify((_error === null || _error === void 0 ? void 0 : _error.errorMessage) || _context.t0)
               });
+              console.log('[DEBUG] request error 2', {
+                success: false,
+                errorCode: _errorCode,
+                traceId: traceId,
+                errorMessage: _error === null || _error === void 0 ? void 0 : _error.message
+              });
               return _context.abrupt("return", Promise.reject({
                 success: false,
                 errorCode: _errorCode,
@@ -133,11 +154,11 @@ export var RequesterService = /*#__PURE__*/function () {
                 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 43:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[4, 24]]);
+        }, _callee, this, [[5, 34]]);
       }));
       function request(_x, _x2) {
         return _request.apply(this, arguments);

package/package.json

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