@alipay/ams-checkout 0.0.1755258862-dev.4 → 0.0.1755258862-dev.5

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

@@ -53,16 +53,10 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              console.log('[DEBUG] - startBizFlow - START', {
-                paymentContext: paymentContext
-              });
-              this.logger.logInfo({
-                title: '[DEBUG] - startBizFlow - START',
-                msg: JSON.stringify(paymentContext)
-              });
-
+              console.log('[DEBUG] - startBizFlow begin with paymentContext:', paymentContext);
               // 放在最前面的逻辑
               // 在PC场景下，几乎所有渠道都是没有拉端的逻辑的，所以需要改成1.0， 这个是历史原因
+              console.log('[DEBUG] - startBizFlow check isPC:', isPC());
               if (isPC()) {
                 // 非TOSS渠道，在PC场景需要改成1.0
                 if ('BANKTRANSFER_QUICKPAY' !== ((_paymentContext$payme = paymentContext.paymentSessionObj) === null || _paymentContext$payme === void 0 || (_paymentContext$payme = _paymentContext$payme.paymentMethodInfoView) === null || _paymentContext$payme === void 0 ? void 0 : _paymentContext$payme.paymentMethodType)) {
@@ -77,45 +71,22 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
               requireFastSdk = paymentContext.paymentSessionObj.action.requireFastSdk;
               authUrlInfo = ((_paymentContext$payme2 = paymentContext.paymentSessionObj) === null || _paymentContext$payme2 === void 0 ? void 0 : _paymentContext$payme2.authUrlInfo) || {};
               this.channelBehavior = ChannelCustomize.getChannelBehavior(paymentContext.paymentSessionObj);
-              console.log('[DEBUG] - startBizFlow - variables initialized', {
-                productSceneVersion: productSceneVersion,
-                paymentMethodCategoryType: paymentMethodCategoryType,
-                autoDebitWithToken: autoDebitWithToken,
-                requireFastSdk: requireFastSdk,
-                hostSign: this.hostSign
-              });
-              this.logger.logInfo({
-                title: '[DEBUG] - startBizFlow - variables initialized',
-                msg: JSON.stringify({
-                  productSceneVersion: productSceneVersion,
-                  paymentMethodCategoryType: paymentMethodCategoryType,
-                  autoDebitWithToken: autoDebitWithToken,
-                  requireFastSdk: requireFastSdk,
-                  hostSign: this.hostSign
-                })
-              });
               // 首次支付
               isFirstTimeToPay = !autoDebitWithToken; // 处理ESP1.0极速外跳支付场景
+              console.log('[DEBUG] - startBizFlow check fastSdk conditions:', {
+                productSceneVersion: productSceneVersion,
+                isFirstTimeToPay: isFirstTimeToPay,
+                requireFastSdk: requireFastSdk
+              });
               if (!(productSceneVersion === '1.0' && isFirstTimeToPay && requireFastSdk)) {
-                _context.next = 18;
+                _context.next = 15;
                 break;
               }
-              console.log('[DEBUG] - startBizFlow - ESP1.0 fast redirect scenario');
-              this.logger.logInfo({
-                title: '[DEBUG] - startBizFlow - ESP1.0 fast redirect scenario'
-              });
-              // EASY_PAY 1.0首次支付，requireFastSdk为true，不需要接口请求
               return _context.abrupt("return", this.buildRedirectResult(authUrlInfo));
-            case 18:
+            case 15:
               // 下面的场景是需要渲染UI的渠道, 打开WebUrl
               webAppUrl = this.buildWebAppUrl();
-              console.log('[DEBUG] - startBizFlow - webAppUrl built', {
-                webAppUrl: webAppUrl
-              });
-              this.logger.logInfo({
-                title: '[DEBUG] - startBizFlow - webAppUrl built',
-                msg: webAppUrl
-              });
+              console.log('[DEBUG] - startBizFlow webAppUrl:', webAppUrl);
               // const webAppUrl = 'http://svc-9kvjxwjf68cptha8.cloudide.svc.et15-sqa.alipay.net:5173/src/component-app/index.html';
               resultPayload = {
                 url: webAppUrl,
@@ -126,28 +97,14 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                 hostSign: this.hostSign,
                 productSceneVersion: productSceneVersion
               });
-              console.log('[DEBUG] - startBizFlow - product info saved');
-              this.logger.logInfo({
-                title: '[DEBUG] - startBizFlow - START'
-              });
+              // 返回结果之前，发送 sessionData，并且等待Web应用启动的事件，内部是异步处理，不阻塞。
               this.sendRequestAndWaitWebLaunch();
-              console.log('[DEBUG] - startBizFlow - sendRequestAndWaitWebLaunch completed');
-              this.logger.logInfo({
-                title: '[DEBUG] - startBizFlow - sendRequestAndWaitWebLaunch completed'
-              });
               // 返回结果，RENDER，让外层去处理iframe加载等逻辑
-              console.log('[DEBUG] - startBizFlow - returning RENDER behavior', {
-                resultPayload: resultPayload
-              });
-              this.logger.logInfo({
-                title: '[DEBUG] - startBizFlow - returning RENDER behavior',
-                msg: JSON.stringify(resultPayload)
-              });
               return _context.abrupt("return", {
                 behaviorType: 'RENDER',
                 payload: resultPayload
               });
-            case 31:
+            case 21:
             case "end":
               return _context.stop();
           }
@@ -214,51 +171,24 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
     key: "sendRequestAndWaitWebLaunch",
     value: function sendRequestAndWaitWebLaunch() {
       var _this = this;
-      console.log('[DEBUG] - sendRequestAndWaitWebLaunch - START');
-      this.logger.logInfo({
-        title: '[DEBUG] - sendRequestAndWaitWebLaunch - START'
-      });
+      console.log('[DEBUG] - sendRequestAndWaitWebLaunch start');
       var eventCenter = ServiceProvider.getInstance(this.instanceId).getService('EventCenter');
-      console.log('[DEBUG] - sendRequestAndWaitWebLaunch - eventCenter initialized');
-      this.logger.logInfo({
-        title: '[DEBUG] - sendRequestAndWaitWebLaunch - eventCenter initialized'
-      });
       var webLaunchPromise = new Promise(function (resolve) {
         eventCenter.listen('onLaunch', function (res) {
-          console.log('[DEBUG] - sendRequestAndWaitWebLaunch - onLaunch event received', res);
-          _this.logger.logInfo({
-            title: '[DEBUG] - sendRequestAndWaitWebLaunch - onLaunch event received',
-            msg: res
-          });
           resolve(res);
         });
       });
 
       // 等请求和 Web启动都Ready之后，发送renderComponent
-      console.log('[DEBUG] - sendRequestAndWaitWebLaunch - waiting for promises');
-      this.logger.logInfo({
-        title: '[DEBUG] - sendRequestAndWaitWebLaunch - waiting for promises'
-      });
+      console.log('[DEBUG] - sendRequestAndWaitWebLaunch waiting for promises');
       Promise.all([this.initSecuritySDK(), this.processSubmitPay(), webLaunchPromise]).then(function (_ref) {
         var _this$paymentContext, _this$paymentContext2, _this$paymentContext$, _this$paymentContext$2, _this$paymentContext$3, _this$paymentContext$4;
         var _ref2 = _slicedToArray(_ref, 3),
           _initSecurityRes = _ref2[0],
           submitRes = _ref2[1],
           _webLaunchRes = _ref2[2];
-        {}
-        _this.logger.logInfo({
-          title: '[DEBUG] - sendRequestAndWaitWebLaunch - all promises resolved'
-        });
+        console.log('[DEBUG] - sendRequestAndWaitWebLaunch all promises resolved');
         var logMetaData = _this.logger.getLogConfig().mdata;
-        console.log('[DEBUG] - sendRequestAndWaitWebLaunch - logMetaData', logMetaData);
-        _this.logger.logInfo({
-          title: '[DEBUG] - sendRequestAndWaitWebLaunch - logMetaData',
-          msg: JSON.stringify(logMetaData)
-        });
-        console.log('[DEBUG] - sendRequestAndWaitWebLaunch - dispatching renderComponent');
-        _this.logger.logInfo({
-          title: '[DEBUG] - sendRequestAndWaitWebLaunch - dispatching renderComponent'
-        });
         eventCenter.dispatchToApp({
           event: 'renderComponent',
           data: {
@@ -289,8 +219,6 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
             })
           }
         });
-      }, function (error) {
-        console.log('[DEBUG] - sendRequestAndWaitWebLaunch - ERROR', error);
       });
     }
   }, {
@@ -302,16 +230,17 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              console.log('[DEBUG] processSubmitPay start');
-              this.logger.logInfo({
-                title: '[DEBUG] processSubmitPay start'
-              });
+              console.log('[DEBUG] - processSubmitPay start');
               submitParams = {
                 paymentSessionData: ((_this$paymentContext3 = this.paymentContext) === null || _this$paymentContext3 === void 0 ? void 0 : _this$paymentContext3.paymentSessionId) || '',
                 paymentSessionConfig: (_this$paymentContext4 = this.paymentContext) === null || _this$paymentContext4 === void 0 || (_this$paymentContext4 = _this$paymentContext4.paymentSessionObj) === null || _this$paymentContext4 === void 0 ? void 0 : _this$paymentContext4.paymentSessionConfig
               };
               _ref3 = submitParams.paymentSessionConfig || {}, _ref3$productSceneVer = _ref3.productSceneVersion, productSceneVersion = _ref3$productSceneVer === void 0 ? '' : _ref3$productSceneVer;
               _ref4 = ((_this$paymentContext5 = this.paymentContext) === null || _this$paymentContext5 === void 0 ? void 0 : _this$paymentContext5.paymentSessionObj) || {}, _ref4$action = _ref4.action, _ref4$action2 = _ref4$action === void 0 ? {} : _ref4$action, _ref4$action2$enableS = _ref4$action2.enableSignAgreement, enableSignAgreement = _ref4$action2$enableS === void 0 ? false : _ref4$action2$enableS, _ref4$action2$autoDeb = _ref4$action2.autoDebitWithToken, autoDebitWithToken = _ref4$action2$autoDeb === void 0 ? false : _ref4$action2$autoDeb;
+              console.log('[DEBUG] - processSubmitPay check productSceneVersion:', {
+                productSceneVersion: productSceneVersion,
+                autoDebitWithToken: autoDebitWithToken
+              });
               if (productSceneVersion === '2.0' && !autoDebitWithToken) {
                 ///EasyPay 2.0 首次传signAgreement字段
                 submitParams['signAgreement'] = enableSignAgreement;
@@ -326,15 +255,16 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
               }
               this.allowSubmitPayCallAhead = this.channelBehavior.allowSubmitPayCallAhead;
               //console.log('[web-sdk] allowSubmitPayCallAhead =', this.allowSubmitPayCallAhead);
+              console.log('[DEBUG] - processSubmitPay check allowSubmitPayCallAhead:', this.allowSubmitPayCallAhead);
               if (this.allowSubmitPayCallAhead) {
-                _context2.next = 9;
+                _context2.next = 10;
                 break;
               }
               return _context2.abrupt("return", {
                 message: 'sdk no need to make submitPay request',
                 success: true
               });
-            case 9:
+            case 10:
               requestBizId = uuid(); // 下面真实发请求
               this.logger.logInfo({
                 title: 'sdk_event_submitPay'
@@ -354,13 +284,21 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
               extParams.complianceSDK = true;
               submitParams.extParams = extParams;
               requester = ServiceProvider.getInstance(this.instanceId).getService('Requester');
-              _context2.prev = 15;
+              _context2.prev = 16;
+              console.log('[DEBUG] - processSubmitPay making request with params:', submitParams);
+              // console.log('[web-sdk] DO call submitPay');
+              console.log('[DEBUG] - processSubmitPay request config:', {
+                env: this.initConfig.environment,
+                timeout: 15000,
+                hostSign: this.hostSign,
+                'Operation-Type': 'com.ipay.iexpcashier.cashier.submitPayByPaymentSession'
+              });
               _context2.t0 = requester;
               _context2.t1 = submitParams;
               _context2.t2 = this.initConfig.environment;
-              _context2.next = 21;
+              _context2.next = 24;
               return this.acquireApdidToken();
-            case 21:
+            case 24:
               _context2.t3 = _context2.sent;
               _context2.t4 = {
                 deviceId: _context2.t3
@@ -374,9 +312,9 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                 needEnvInfo: true,
                 'Operation-Type': 'com.ipay.iexpcashier.cashier.submitPayByPaymentSession'
               };
-              _context2.next = 27;
+              _context2.next = 30;
               return _context2.t0.request.call(_context2.t0, _context2.t1, _context2.t6);
-            case 27:
+            case 30:
               res = _context2.sent;
               this.logger.logInfo({
                 title: 'sdk_event_submitPayEnd'
@@ -385,15 +323,11 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                 requestId: requestBizId,
                 rpcTraceId: res.traceId
               });
-              console.log('[DEBUG] processSubmitPay completed', res);
-              this.logger.logInfo({
-                title: '[DEBUG] processSubmitPay completed',
-                msg: JSON.stringify(res)
-              });
+              console.log('[DEBUG] - processSubmitPay request success:', res);
               return _context2.abrupt("return", res);
-            case 34:
-              _context2.prev = 34;
-              _context2.t7 = _context2["catch"](15);
+            case 36:
+              _context2.prev = 36;
+              _context2.t7 = _context2["catch"](16);
               this.logger.logError({
                 title: 'sdk_event_submitPay_failed'
               }, {
@@ -402,17 +336,13 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                 requestId: requestBizId,
                 rpcTraceId: _context2.t7 === null || _context2.t7 === void 0 ? void 0 : _context2.t7.traceId
               });
-              console.log('[DEBUG] processSubmitPay ERROR', _context2.t7);
-              this.logger.logError({
-                title: '[DEBUG] processSubmitPay ERROR',
-                msg: _context2.t7
-              });
+              console.log('[DEBUG] - processSubmitPay request failed:', _context2.t7);
               throw _context2.t7;
-            case 40:
+            case 41:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[15, 34]]);
+        }, _callee2, this, [[16, 36]]);
       }));
       function processSubmitPay() {
         return _processSubmitPay.apply(this, arguments);
@@ -453,11 +383,8 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              console.log('[DEBUG] initSecuritySDK start');
-              this.logger.logInfo({
-                title: '[DEBUG] initSecuritySDK start'
-              });
-              _context4.prev = 2;
+              console.log('[DEBUG] - initSecuritySDK start');
+              _context4.prev = 1;
               productSceneVersion = this.paymentContext.paymentSessionObj.paymentSessionConfig.productSceneVersion;
               nonCompliant = (_this$paymentContext$8 = this.paymentContext.paymentSessionObj.action) === null || _this$paymentContext$8 === void 0 ? void 0 : _this$paymentContext$8.nonCompliant;
               nonInitSecuritySDK = (_this$paymentContext$9 = this.paymentContext.paymentSessionObj.action) === null || _this$paymentContext$9 === void 0 ? void 0 : _this$paymentContext$9.nonInitSecuritySDK;
@@ -489,6 +416,7 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                   }
                 }
               }
+              console.log('[DEBUG] - initSecuritySDK shouldInitSecuritySDK:', shouldInitSecuritySDK);
               if (!shouldInitSecuritySDK) {
                 _context4.next = 12;
                 break;
@@ -496,31 +424,24 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
               _context4.next = 12;
               return this.securityService.initSecurity(this.SECURITY_SDK_INIT_TIMEOUT);
             case 12:
-              console.log('[DEBUG] initSecuritySDK completed');
-              this.logger.logInfo({
-                title: '[DEBUG] initSecuritySDK completed'
-              });
               this.logger.logInfo({
                 title: 'a3753.b101271.c388193.d514078'
               }, {
                 riskSdkInfo: shouldInitSecuritySDK ? RiskSdkInfoEnum.NEED : RiskSdkInfoEnum.NO_NEED
               });
-              _context4.next = 21;
+              console.log('[DEBUG] - initSecuritySDK completed');
+              _context4.next = 19;
               break;
-            case 17:
-              _context4.prev = 17;
-              _context4.t0 = _context4["catch"](2);
-              console.log('[DEBUG] initSecuritySDK ERROR');
-              this.logger.logError({
-                title: '[DEBUG] initSecuritySDK ERROR',
-                msg: _context4.t0
-              });
+            case 16:
+              _context4.prev = 16;
+              _context4.t0 = _context4["catch"](1);
               // do nothing when init security failed
-            case 21:
+              console.log('[DEBUG] - initSecuritySDK catch');
+            case 19:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[2, 17]]);
+        }, _callee4, this, [[1, 16]]);
       }));
       function initSecuritySDK() {
         return _initSecuritySDK.apply(this, arguments);

package/esm/foundation/service/requester/requester.d.ts

@@ -1,4 +1,6 @@
-import { IoptionsParams, PaymentContext, RequestConfig, SDKMetaData, Service } from './deps';
+import { PaymentContext, Service } from '../../index';
+import type { IoptionsParams, RequestConfig } from '../../../types';
+import type { SDKMetaData } from '../../index';
 /**
  * @author congle.zzq <congle.zzq@alipay.com>
  * @date 2024/9/18