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

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

@@ -12,8 +12,37 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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 axios from 'axios';
 import { ServiceProvider } from '..';
-import { errorEnum } from "./deps";
-import { appId, device, fomatGetwayError, get, hostSignMap, isPC, lightSandboxMap, queryParse, requestHost, safeJson, sdkVersion, sofaId, tntInstId } from "./deps";
+import { lightSandboxMap, appId, hostSignMap, requestHost, sofaId, tntInstId } from "../../../config/request";
+import { device, isPC, queryParse, safeJson } from "../../../util";
+import { fomatGetwayError } from "../../../request/utils";
+import { get } from "../../../util/get";
+import { sdkVersion } from "../../../config/index";
+import { errorEnum } from "../../../types";
+
+// import { errorEnum } from './deps';
+// import {
+//   appId,
+//   device,
+//   fomatGetwayError,
+//   get,
+//   hostSignMap,
+//   IoptionsParams,
+//   isPC,
+//   lightSandboxMap,
+//   LogExtra,
+//   LogPayload,
+//   LogService,
+//   PaymentContext,
+//   queryParse,
+//   RequestConfig,
+//   requestHost,
+//   safeJson,
+//   SDKMetaData,
+//   sdkVersion,
+//   Service,
+//   sofaId,
+//   tntInstId,
+// } from './deps'
 
 /**
  * @author congle.zzq <congle.zzq@alipay.com>
@@ -46,18 +75,13 @@ export var RequesterService = /*#__PURE__*/function () {
     key: "request",
     value: (function () {
       var _request = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(requestData, options) {
-        var logger, envInfo, _data, startTime, traceId, myRequest, _yield$myRequest, data, headers, resData, handleGetWayError, errorMessage, errorCode, _error$message, _error, timeoutCode, _errorCode;
+        var envInfo, _data, startTime, traceId, myRequest, _yield$myRequest, data, headers, resData, handleGetWayError, errorMessage, errorCode, _error$message, _error, timeoutCode, _errorCode;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              console.log('[DEBUG] request start', requestData, options);
-              logger = ServiceProvider.getInstance(this.instanceId).getService('Log');
-              logger.logInfo({
-                title: '[DEBUG] request start',
-                msg: JSON.stringify({
-                  requestData: requestData,
-                  options: options
-                })
+              console.log('[DEBUG] - request start', {
+                requestData: requestData,
+                options: options
               });
               envInfo = this.getEnvInfo(options);
               _data = [_objectSpread(_objectSpread({}, requestData), {}, {
@@ -68,65 +92,31 @@ export var RequesterService = /*#__PURE__*/function () {
               })];
               startTime = Date.now();
               traceId = '';
-              _context.prev = 7;
-              console.log('[DEBUG] createRequestInstance start');
-              logger.logInfo({
-                title: '[DEBUG] createRequestInstance start'
-              });
+              _context.prev = 5;
+              console.log('[DEBUG] - createRequestInstance start', options);
               myRequest = this.createRequestInstance(options);
-              console.log('[DEBUG] createRequestInstance completed', myRequest);
-              logger.logInfo({
-                title: '[DEBUG] createRequestInstance completed',
-                msg: JSON.stringify({
-                  myRequest: myRequest
-                })
-              });
-              console.log('[DEBUG] myRequest start');
-              logger.logInfo({
-                title: '[DEBUG] myRequest start'
-              });
-              _context.next = 17;
+              console.log('[DEBUG] - createRequestInstance completed', myRequest);
+              console.log('[DEBUG] - request payload:', _data);
+              _context.next = 12;
               return myRequest({
                 data: _data
               });
-            case 17:
+            case 12:
               _yield$myRequest = _context.sent;
               data = _yield$myRequest.data;
               headers = _yield$myRequest.headers;
-              console.log('[DEBUG] myRequest completed', data, headers);
-              logger.logInfo({
-                title: '[DEBUG] myRequest completed',
-                msg: JSON.stringify({
-                  data: data,
-                  headers: headers
-                })
-              });
               resData = data || {};
+              console.log('[DEBUG] - request response:', {
+                resData: resData,
+                headers: headers
+              });
               traceId = get(headers, 'Mgw-TraceId') || get(headers, 'mgw-traceid', '');
               resData.traceId = traceId || '';
-              console.log('[DEBUG] handleGetWayError start');
-              logger.logInfo({
-                title: '[DEBUG] handleGetWayError start'
-              });
               handleGetWayError = fomatGetwayError(headers, traceId);
-              console.log('[DEBUG] handleGetWayError completed', handleGetWayError);
-              logger.logInfo({
-                title: '[DEBUG] handleGetWayError completed',
-                msg: JSON.stringify({
-                  handleGetWayError: handleGetWayError
-                })
-              });
               if (!(handleGetWayError !== null && handleGetWayError !== void 0 && handleGetWayError.errorCode)) {
-                _context.next = 39;
+                _context.next = 25;
                 break;
               }
-              console.log('[DEBUG] handleGetWayError errorCode', handleGetWayError === null || handleGetWayError === void 0 ? void 0 : handleGetWayError.errorCode);
-              logger.logInfo({
-                title: '[DEBUG] handleGetWayError errorCode',
-                msg: JSON.stringify({
-                  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({
@@ -139,25 +129,12 @@ export var RequesterService = /*#__PURE__*/function () {
                 msg: errorMessage,
                 traceId: traceId
               });
-              console.log('[DEBUG] handleGetWayError error', {
-                errorMessage: errorMessage,
-                errorCode: errorCode,
-                success: false
-              });
-              logger.logInfo({
-                title: '[DEBUG] handleGetWayError error',
-                msg: JSON.stringify({
-                  errorMessage: errorMessage,
-                  errorCode: errorCode,
-                  success: false
-                })
-              });
               throw new Error(JSON.stringify({
                 errorMessage: errorMessage,
                 errorCode: errorCode,
                 success: false
               }));
-            case 39:
+            case 25:
               this.reportRequestTimeCost({
                 title: 'a3753.b101271.c388193.d521387',
                 name: options === null || options === void 0 ? void 0 : options['Operation-Type'],
@@ -168,31 +145,17 @@ export var RequesterService = /*#__PURE__*/function () {
                 msg: '',
                 traceId: traceId
               });
-              console.log('[DEBUG] request completed', resData);
-              logger.logInfo({
-                title: '[DEBUG] request completed',
-                msg: JSON.stringify({
-                  resData: resData
-                })
-              });
               return _context.abrupt("return", resData);
-            case 45:
-              _context.prev = 45;
-              _context.t0 = _context["catch"](7);
+            case 29:
+              _context.prev = 29;
+              _context.t0 = _context["catch"](5);
+              console.log('[DEBUG] - request error:', _context.t0);
               _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, 'Original error:', _context.t0);
-              logger.logInfo({
-                title: '[DEBUG] request error 1',
-                msg: JSON.stringify({
-                  _error: _error,
-                  originalError: _context.t0
-                })
-              });
               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({
@@ -204,32 +167,17 @@ export var RequesterService = /*#__PURE__*/function () {
                 code: _errorCode,
                 msg: JSON.stringify((_error === null || _error === void 0 ? void 0 : _error.message) || _context.t0)
               });
-              console.log('[DEBUG] request error 2', {
-                success: false,
-                errorCode: _errorCode,
-                traceId: traceId,
-                errorMessage: _error === null || _error === void 0 ? void 0 : _error.message
-              });
-              logger.logInfo({
-                title: '[DEBUG] request error 2',
-                msg: JSON.stringify({
-                  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,
                 traceId: traceId,
                 errorMessage: _error === null || _error === void 0 ? void 0 : _error.message
               }));
-            case 56:
+            case 37:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[7, 45]]);
+        }, _callee, this, [[5, 29]]);
       }));
       function request(_x, _x2) {
         return _request.apply(this, arguments);
@@ -278,109 +226,41 @@ export var RequesterService = /*#__PURE__*/function () {
   }, {
     key: "createRequestInstance",
     value: function createRequestInstance(options) {
-      var _options$timeout, _options$withCredenti;
-      console.log('[DEBUG] createRequestInstance start with options:', {
-        env: options.env,
-        'Operation-Type': options['Operation-Type'],
-        hostSign: options === null || options === void 0 ? void 0 : options.hostSign,
-        timeout: options.timeout,
-        method: options === null || options === void 0 ? void 0 : options.method,
-        withCredentials: options.withCredentials,
-        headers: Object.keys(options.headers || {})
-      });
-      var logger = ServiceProvider.getInstance(this.instanceId).getService('Log');
-      logger.logInfo({
-        title: '[DEBUG] createRequestInstance start',
-        msg: JSON.stringify({
-          env: options.env,
-          'Operation-Type': options['Operation-Type'],
-          hostSign: options === null || options === void 0 ? void 0 : options.hostSign,
-          timeout: options.timeout,
-          method: options === null || options === void 0 ? void 0 : options.method,
-          withCredentials: options.withCredentials,
-          headers: Object.keys(options.headers || {})
-        })
-      });
+      var _options$timeout, _options$withCredenti, _options$timeout2, _options$withCredenti2;
+      console.log('[DEBUG] - createRequestInstance options:', options);
       var date = new Date(); // 获取当前时间
       var timestamp = date.getTime(); // 获取时间戳
       var utcTimestamp = timestamp + date.getTimezoneOffset() * 60 * 1000; // 获取 UTC 时间戳
       var env = options.env || 'prod';
       var lightSandboxConfig = lightSandboxMap(options['Operation-Type'], env); // light_sandbox
-      console.log('[DEBUG] lightSandboxConfig:', lightSandboxConfig);
-      logger.logInfo({
-        title: '[DEBUG] lightSandboxConfig',
-        msg: JSON.stringify(lightSandboxConfig)
-      });
+      console.log('[DEBUG] - createRequestInstance lightSandboxConfig:', lightSandboxConfig);
       var baseURL = options.baseURL || lightSandboxConfig.baseURL || hostSignMap(options === null || options === void 0 ? void 0 : options.hostSign, env) || requestHost[env];
-      console.log('[DEBUG] baseURL:', baseURL);
-      logger.logInfo({
-        title: '[DEBUG] baseURL',
-        msg: baseURL
-      });
       var _headers = _objectSpread(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
         appId: lightSandboxConfig.appId || appId,
         workspaceId: options.env === 'pre' ? 'pre' : 'default'
       }, "x-cors-".concat(appId.toLowerCase(), "-default"), '1'), "version", '2.0'), 'sofa-group-name', lightSandboxConfig.sofaId || sofaId), 'Operation-Type', lightSandboxConfig['Operation-Type'] || options['Operation-Type'] || ''), 'Client-Time', utcTimestamp), "tntInstId", tntInstId), 'sdk-version', sdkVersion || ''), options.headers);
-
+      console.log('[DEBUG] - createRequestInstance headers:', _headers);
       // sandbox 影子链路
       if (this.sandboxFlag === 'true' || env === 'sandbox') {
         _headers['load-test'] = true;
         _headers.sofaPenAttrs = 'instMock=O&loadMode=2';
       }
       if (env !== 'dev') delete _headers['sofa-group-name'];
-      console.log('[DEBUG] request headers keys:', Object.keys(_headers));
-      logger.logInfo({
-        title: '[DEBUG] request headers keys',
-        msg: JSON.stringify(Object.keys(_headers))
-      });
-
-      // 确保 axios 库正确加载
-      if (typeof axios === 'undefined') {
-        console.log('[DEBUG] axios undefined');
-        logger.logError({
-          title: '[DEBUG] axios undefined'
-        });
-      }
-      console.log('[DEBUG] axios version:', axios.VERSION);
-      logger.logInfo({
-        title: '[DEBUG] axios version',
-        msg: axios.VERSION
-      });
-      var instance = axios.create({
+      console.log('[DEBUG] - createRequestInstance config:', {
         baseURL: baseURL,
         timeout: (_options$timeout = options.timeout) !== null && _options$timeout !== void 0 ? _options$timeout : 15000,
         headers: _headers,
         withCredentials: (_options$withCredenti = options.withCredentials) !== null && _options$withCredenti !== void 0 ? _options$withCredenti : true,
         method: (options === null || options === void 0 ? void 0 : options.method) || 'POST'
       });
-      console.log('[DEBUG] axios instance created with config:', {
-        baseURL: instance.defaults.baseURL,
-        timeout: instance.defaults.timeout,
-        method: instance.defaults.method,
-        withCredentials: instance.defaults.withCredentials
-      });
-      logger.logInfo({
-        title: '[DEBUG] axios instance created',
-        msg: JSON.stringify({
-          baseURL: instance.defaults.baseURL,
-          timeout: instance.defaults.timeout,
-          method: instance.defaults.method,
-          withCredentials: instance.defaults.withCredentials
-        })
-      });
-      console.log('[DEBUG] instance.request', instance.request);
-      logger.logInfo({
-        title: '[DEBUG] instance.request',
-        msg: JSON.stringify(instance.request)
-      });
-      console.log('[DEBUG] instance.request.bind(instance)', instance.request.bind(instance));
-      logger.logInfo({
-        title: '[DEBUG] instance.request.bind',
-        msg: JSON.stringify(instance.request.bind(instance))
+      var instance = axios.create({
+        baseURL: baseURL,
+        timeout: (_options$timeout2 = options.timeout) !== null && _options$timeout2 !== void 0 ? _options$timeout2 : 15000,
+        headers: _headers,
+        withCredentials: (_options$withCredenti2 = options.withCredentials) !== null && _options$withCredenti2 !== void 0 ? _options$withCredenti2 : true,
+        method: (options === null || options === void 0 ? void 0 : options.method) || 'POST'
       });
-
-      // return instance.request;
-      return instance.request.bind(instance);
+      return instance.request;
     }
   }]);
   return RequesterService;

package/package.json

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