@alipay/ams-checkout 0.0.1755258862-dev.7 → 0.0.1756796178-dev.0

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

@@ -12,20 +12,8 @@ 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 { 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 { PaymentContext, Service } from '../../index';
-// import { sdkVersion } from '../../../config/index';
-// import type { LogService } from '../log';
-// import type { IoptionsParams, RequestConfig } from '../../../types';
-// import type { LogExtra, LogPayload } from '../log/types';
-// import type { SDKMetaData } from '../../index';
-// import { errorEnum } from '../../../types';
-
 import { errorEnum } from "./deps";
-import { device, fomatGetwayError, get, isPC, queryParse, safeJson, sdkVersion } from "./deps";
+import { appId, device, fomatGetwayError, get, hostSignMap, lightSandboxMap, queryParse, requestHost, safeJson, sdkVersion, sofaId, tntInstId } from "./deps";
 
 /**
  * @author congle.zzq <congle.zzq@alipay.com>
@@ -62,10 +50,6 @@ 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: requestData,
-                options: options
-              });
               envInfo = this.getEnvInfo(options);
               _data = [_objectSpread(_objectSpread({}, requestData), {}, {
                 envInfo: envInfo,
@@ -75,29 +59,22 @@ export var RequesterService = /*#__PURE__*/function () {
               })];
               startTime = Date.now();
               traceId = '';
-              _context.prev = 5;
-              console.log('[DEBUG] - createRequestInstance start', options);
+              _context.prev = 4;
               myRequest = this.createRequestInstance(options);
-              console.log('[DEBUG] - createRequestInstance completed', myRequest);
-              console.log('[DEBUG] - request payload:', _data);
-              _context.next = 12;
+              _context.next = 8;
               return myRequest({
                 data: _data
               });
-            case 12:
+            case 8:
               _yield$myRequest = _context.sent;
               data = _yield$myRequest.data;
               headers = _yield$myRequest.headers;
               resData = data || {};
-              console.log('[DEBUG] - request response:', {
-                resData: resData,
-                headers: headers
-              });
               traceId = get(headers, 'Mgw-TraceId') || get(headers, 'mgw-traceid', '');
               resData.traceId = traceId || '';
               handleGetWayError = fomatGetwayError(headers, traceId);
               if (!(handleGetWayError !== null && handleGetWayError !== void 0 && handleGetWayError.errorCode)) {
-                _context.next = 25;
+                _context.next = 20;
                 break;
               }
               errorMessage = (resData === null || resData === void 0 ? void 0 : resData.errorMessage) || (handleGetWayError === null || handleGetWayError === void 0 ? void 0 : handleGetWayError.errorMessage);
@@ -109,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({
@@ -117,7 +94,7 @@ export var RequesterService = /*#__PURE__*/function () {
                 errorCode: errorCode,
                 success: false
               }));
-            case 25:
+            case 20:
               this.reportRequestTimeCost({
                 title: 'a3753.b101271.c388193.d521387',
                 name: options === null || options === void 0 ? void 0 : options['Operation-Type'],
@@ -125,14 +102,13 @@ export var RequesterService = /*#__PURE__*/function () {
                 time: Date.now() - startTime,
                 success: true,
                 code: 'SUCCESS',
-                msg: '',
+                errorMessage: '',
                 traceId: traceId
               });
               return _context.abrupt("return", resData);
-            case 29:
-              _context.prev = 29;
-              _context.t0 = _context["catch"](5);
-              console.log('[DEBUG] - request error:', _context.t0);
+            case 24:
+              _context.prev = 24;
+              _context.t0 = _context["catch"](4);
               _error = safeJson(_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message, {
                 success: false,
                 errorCode: errorEnum.SYSTEM,
@@ -148,19 +124,20 @@ 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 37:
+            case 31:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[5, 29]]);
+        }, _callee, this, [[4, 24]]);
       }));
       function request(_x, _x2) {
         return _request.apply(this, arguments);
@@ -172,7 +149,7 @@ export var RequesterService = /*#__PURE__*/function () {
     value: function getEnvInfo(options) {
       var _options$envInfo;
       var envInfo = _objectSpread(_objectSpread({
-        terminalType: isPC() ? 'WEB' : 'WAP',
+        terminalType: device.isMobile ? 'WAP' : 'WEB',
         browserInfo: {
           browserJavaScriptEnabled: true,
           browserLanguage: navigator.language,
@@ -209,97 +186,31 @@ export var RequesterService = /*#__PURE__*/function () {
   }, {
     key: "createRequestInstance",
     value: function createRequestInstance(options) {
-      var _options$timeout, _options$withCredenti, _options$timeout2, _options$withCredenti2;
-      console.log('[DEBUG] - createRequestInstance options:', options);
+      var _options$timeout, _options$withCredenti;
       var date = new Date(); // 获取当前时间
       var timestamp = date.getTime(); // 获取时间戳
       var utcTimestamp = timestamp + date.getTimezoneOffset() * 60 * 1000; // 获取 UTC 时间戳
       var env = options.env || 'prod';
-      var _queryParse2 = queryParse(),
-        _light_sandbox = _queryParse2._light_sandbox,
-        groupId = _queryParse2.groupId,
-        host = _queryParse2.requestHost;
-      var requestHost = {
-        local: 'http://imgs-63.sggz00b.dev.alipay.net/mgw.htm',
-        dev: host || 'http://imgs-63.sggz00b.dev.alipay.net/mgw.htm',
-        sit: host || 'http://imgs-9.sggz00a.test.alipay.net/mgw.htm',
-        pre: 'https://imgs-sea-pre.alipay.com/mgw.htm',
-        prod: 'https://imgs-sea-global.alipay.com/mgw.htm',
-        sandbox: 'https://imgs-sea-global.alipay.com/mgw.htm'
-      };
-      var tntInstId = 'ALIPW3SG';
-      var appId = 'ANTOM_PAYMENT_WEB';
-      var sofaId = groupId || 'GROUP_20240627151021';
-      var hostSignMap = function hostSignMap(hostSign, env) {
-        var map = {
-          SG: 'https://imgs-sea-global.alipay.com/mgw.htm',
-          US: 'https://imgs-na-global.alipay.com/mgw.htm',
-          DE: 'https://imgs-de-global.alipay.com/mgw.htm'
-        };
-        var preMap = {
-          SG: 'https://imgs-sea-pre.alipay.com/mgw.htm',
-          US: 'https://imgs-pre.alipay.com/mgw.htm',
-          DE: 'https://imgs-de-pre.alipay.com/mgw.htm'
-        };
-        if (env === 'prod' || env === 'sandbox' || env === 'light_sandbox') {
-          return map[hostSign || 'SG'];
-        } else if (env === 'pre') {
-          return preMap[hostSign || 'SG'];
-        } else return '';
-      };
-      var lightSandboxMap = function lightSandboxMap() {
-        var operationType = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
-        var env = arguments.length > 1 ? arguments[1] : undefined;
-        var map = {
-          pre: 'https://imgs-sea-pre.alipay.com/mgw.htm',
-          sit: host || 'http://imgs-9.sggz00a.test.alipay.net/mgw.htm',
-          dev: host || 'http://imgs-13.sggz00b.stable.alipay.net/mgw.htm'
-        };
-        var typeMap = {
-          'com.ipay.iexpcashier.sdkAction.query': 'com.ipay.iopensandbox.sdk.paymentSession.query'
-        };
-        var appId = 'SDK_MOCK_SANDBOX';
-        var sofaId = groupId || 'GROUP_20230315210531';
-        if (typeMap[operationType] && env === 'light_sandbox' || _light_sandbox === 'true') return {
-          appId: appId,
-          sofaId: sofaId,
-          baseURL: map[env],
-          'Operation-Type': typeMap[operationType]
-        };else return {
-          appId: '',
-          sofaId: '',
-          baseURL: '',
-          'Operation-Type': ''
-        };
-      };
       var lightSandboxConfig = lightSandboxMap(options['Operation-Type'], env); // light_sandbox
-      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];
       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] - createRequestInstance config:', {
+      var instance = axios.create({
         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'
       });
-      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;
     }
   }]);

package/esm/foundation/utils/preload_helper.d.ts

@@ -4,10 +4,10 @@ export default class PreloadHelper {
     static isWebAppPreloaded: boolean;
     static isSecuritySDKPreloaded: boolean;
     private static securitySdkMap;
-    static preloadWebApp(productScene: ProductSceneEnum, paymentMethodCategoryType: PaymentMethodCategoryTypeEnum, environment?: string): void;
+    static preloadWebApp(productScene: ProductSceneEnum, paymentMethodCategoryType: PaymentMethodCategoryTypeEnum, environment?: string, useV2?: boolean): void;
     static preloadSecuritySDK(product: ProductSceneEnum, securityRegion?: string): void;
     static getSecuritySdk(scene: any): Security;
-    static buildWebAppPreloadUrl(productScene: ProductSceneEnum, paymentMethodCategoryType: PaymentMethodCategoryTypeEnum, environment: string): {
+    static buildWebAppPreloadUrl(productScene: ProductSceneEnum, paymentMethodCategoryType: PaymentMethodCategoryTypeEnum, environment: string, useV2?: boolean): {
         preloadUrl: string;
         containerId: string;
     };

package/esm/foundation/utils/preload_helper.js

@@ -8,7 +8,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { sdkVersion } from "../../config";
 import { createPreloadIframe } from "../service/container/utils";
 import { ProductSceneEnum } from "../../types";
-import { getWebAppUrl } from "../utils/web_app_url_utils";
+import { getWebAppUrl, getWebAppV2Url } from "../utils/web_app_url_utils";
 import { ProductInfoCacheUtil } from "../utils/payment_product_utils";
 import { getWebAppVersion } from "./payment_context_utils";
 import { getSecurityConfigStorageKey, getSecurityHost, getSecurityScene, Security } from "../../util/security";
@@ -22,12 +22,13 @@ var PreloadHelper = /*#__PURE__*/function () {
     key: "preloadWebApp",
     value: function preloadWebApp(productScene, paymentMethodCategoryType) {
       var environment = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'prod';
+      var useV2 = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
       try {
         if (this.isWebAppPreloaded) {
           console.log('[web-sdk] web app already preloaded');
           return;
         }
-        var _this$buildWebAppPrel = this.buildWebAppPreloadUrl(productScene, paymentMethodCategoryType, environment),
+        var _this$buildWebAppPrel = this.buildWebAppPreloadUrl(productScene, paymentMethodCategoryType, environment, useV2),
           preloadUrl = _this$buildWebAppPrel.preloadUrl,
           containerId = _this$buildWebAppPrel.containerId;
         var preloadIframe = createPreloadIframe(containerId);
@@ -89,6 +90,7 @@ var PreloadHelper = /*#__PURE__*/function () {
   }, {
     key: "buildWebAppPreloadUrl",
     value: function buildWebAppPreloadUrl(productScene, paymentMethodCategoryType, environment) {
+      var useV2 = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
       var productSceneVersion = productScene === ProductSceneEnum.EASY_PAY ? '2.0' : '1.0';
       var previousProductInfo = ProductInfoCacheUtil.getPreviousProductInfo(productScene);
       if (previousProductInfo) {
@@ -101,16 +103,16 @@ var PreloadHelper = /*#__PURE__*/function () {
         webAppVersion: ''
       };
       sdkMetaData.webAppVersion = getWebAppVersion(sdkMetaData);
-      // TEST: Testing Purpose
-      sdkMetaData.webAppVersion = "1.31.0";
-      var preloadUrl = getWebAppUrl({
+      var preloadUrlParams = {
         environment: environment,
         sdkMetaData: sdkMetaData,
         paymentMethodCategoryType: paymentMethodCategoryType,
         isPreload: true,
+        productScene: productScene,
         productSceneVersion: productSceneVersion,
         query: undefined
-      });
+      };
+      var preloadUrl = useV2 ? getWebAppV2Url(preloadUrlParams) : getWebAppUrl(preloadUrlParams);
       return {
         preloadUrl: preloadUrl,
         containerId: containerId

package/esm/foundation/utils/redirect_utils.js

@@ -69,26 +69,42 @@ export var redirect = function redirect(payload, instanceId) {
         successCallback(payload, type, evokeAppBy.url, serviceProvider);
       }
     });
+    var callApplinkUrl = function callApplinkUrl() {
+      try {
+        callAppLib.open({
+          link: payload.applinkUrl,
+          fallback: function fallback() {
+            failCallback(payload, RedirectType.ApplinkUrl, payload.applinkUrl, serviceProvider);
+            // Applink evoke failed, try to use scheme url
+            callSchemeUrl();
+          }
+        });
+      } catch (error) {
+        failCallback(payload, RedirectType.ApplinkUrl, payload.applinkUrl, serviceProvider);
+        // Applink evoke failed, try to use scheme url
+        callSchemeUrl();
+      }
+    };
     var callSchemeUrl = function callSchemeUrl() {
-      callAppLib.open({
-        scheme: payload.schemeUrl,
-        fallback: function fallback() {
-          failCallback(payload, RedirectType.SchemeUrl, payload.schemeUrl, serviceProvider);
-          if (!payload.url) return failCallback(payload, RedirectType.NormalUrl, '', serviceProvider);
-          successCallback(payload, RedirectType.NormalUrl, payload.url, serviceProvider);
-          window.location.href = payload.url;
-        }
-      });
+      try {
+        callAppLib.open({
+          scheme: payload.schemeUrl,
+          fallback: function fallback() {
+            failCallback(payload, RedirectType.SchemeUrl, payload.schemeUrl, serviceProvider);
+            if (!payload.url) return failCallback(payload, RedirectType.NormalUrl, '', serviceProvider);
+            successCallback(payload, RedirectType.NormalUrl, payload.url, serviceProvider);
+            window.location.href = payload.url;
+          }
+        });
+      } catch (error) {
+        failCallback(payload, RedirectType.SchemeUrl, payload.schemeUrl, serviceProvider);
+        if (!payload.url) return failCallback(payload, RedirectType.NormalUrl, '', serviceProvider);
+        successCallback(payload, RedirectType.NormalUrl, payload.url, serviceProvider);
+        window.location.href = payload.url;
+      }
     };
     if (payload.applinkUrl) {
-      callAppLib.open({
-        link: payload.applinkUrl,
-        fallback: function fallback() {
-          failCallback(payload, RedirectType.ApplinkUrl, payload.applinkUrl, serviceProvider);
-          // Applink evoke failed, try to use scheme url
-          callSchemeUrl();
-        }
-      });
+      callApplinkUrl();
     } else if (payload.schemeUrl) {
       callSchemeUrl();
     }
@@ -116,7 +132,7 @@ var successCallback = function successCallback(payload, type, url, serviceProvid
 };
 var failCallback = function failCallback(payload, type, url, serviceProvider) {
   serviceProvider.getService('EventCenter').emit(EVENT.eventCallback.name, {
-    code: eventCodeEnum.SDK_CALL_URL_ERROR,
+    code: eventCodeEnum.SDK_LAUNCH_PAYMENT_APP_ERROR,
     message: "Failed to open app,applinkUrl: ".concat(payload === null || payload === void 0 ? void 0 : payload.applinkUrl, " schemeUrl: ").concat(payload === null || payload === void 0 ? void 0 : payload.schemeUrl, " normalUrl: ").concat(payload === null || payload === void 0 ? void 0 : payload.url)
   });
   serviceProvider.getService('Log').logInfo({

package/esm/foundation/utils/web_app_url_utils.d.ts

@@ -1,4 +1,5 @@
-import { DisplayTypeEnum, PaymentMethodCategoryTypeEnum } from '../../types';
+import { ESP_PAGE_NAME } from '../../constant/easysafepay';
+import { DisplayTypeEnum, IPaymentSessionMetaData, PaymentMethodCategoryTypeEnum, ProductSceneEnum } from '../../types';
 import { SDKMetaData } from '../index';
 /**
  * Tell the SDK which version of the Web App to load.
@@ -16,6 +17,16 @@ export interface WebAppMatchConfig {
     mid?: string;
     greyscale?: string;
 }
+/**
+ * Tell the SDK which Web App URL to load.
+ * Sent by server inside paymentSession.
+ */
+export interface WebAppUrlMatchConfig {
+    minSDKVersion: string;
+    url: string;
+    doubleFa: string;
+    mids?: string[];
+}
 export interface QueryParams {
     displayType: DisplayTypeEnum;
     locale: string;
@@ -27,20 +38,79 @@ export interface QueryParams {
 export declare const getWebAppUrlInfo: (params: {
     environment: string;
     sdkMetaData: SDKMetaData;
+    productScene: ProductSceneEnum;
     productSceneVersion: string;
     paymentMethodCategoryType: PaymentMethodCategoryTypeEnum;
     isPreload?: boolean;
     query: QueryParams;
+    v2Url?: string;
 }) => {
     path: string;
     locationSearch: string;
 };
+export declare const getWebAppV2Url: (params: {
+    environment: string;
+    sdkMetaData: SDKMetaData;
+    productScene: ProductSceneEnum;
+    productSceneVersion: string;
+    paymentMethodCategoryType: PaymentMethodCategoryTypeEnum;
+    isPreload?: boolean;
+    query: QueryParams;
+    mid?: string;
+    extendInfo?: string;
+}) => string;
 export declare const getWebAppUrl: (params: {
     environment: string;
     sdkMetaData: SDKMetaData;
+    productScene: ProductSceneEnum;
     productSceneVersion: string;
     paymentMethodCategoryType: PaymentMethodCategoryTypeEnum;
     isPreload?: boolean;
     query: QueryParams;
+    v2Url?: string;
 }) => string;
 export declare const parseWebAppMatchConfig: (extendInfo: string) => WebAppMatchConfig[];
+export declare const parseWebAppUrlMatchConfig: (extendInfo: string) => WebAppUrlMatchConfig[];
+/**
+ * Save the current checkout URL to localStorage for the specified product scene.
+ *
+ * @param productScene - The product scene for which the checkout URL should be saved.
+ */
+export declare const saveLocalCheckoutUrl: (productScene: ProductSceneEnum, url: string) => void;
+/**
+ * 获取从外部动态下发的V2AppUrl.
+ *
+ * @param config - sessionData解析来的checkoutInfo列表.
+ */
+export declare const getMatchedWebAppV2Url: (productScene: ProductSceneEnum, mid: string, configs: WebAppUrlMatchConfig[], env: string) => string;
+/**
+ * 获取ESP从sessionData.checkoutInfo内动态下发的Url.
+ */
+export declare const matchEasySafePayV2Url: (params: {
+    configs: WebAppUrlMatchConfig[];
+    mid: string;
+    env: string;
+    pageName: ESP_PAGE_NAME;
+}) => string;
+/**
+ * Retrieve the saved checkout URL from localStorage for the specified product scene.
+ * If no url is found, a default checkout url string is returned.
+ *
+ * @param productScene - The product scene for which the checkout URL should be retrieved.
+ */
+export declare const getLocalCheckoutUrl: (productScene: ProductSceneEnum, environment: string) => string;
+/**
+ * Provide default checkout URL for the specified product scene.
+ * Return URL for 'EASY_PAY' product scene, while for other product scenes, it returns an empty string as they are not currently in use
+ *
+ * @param productScene - The product scene for which the default checkout URL should be provided.
+ */
+export declare const defaultCheckoutUrl: (productScene: ProductSceneEnum, environment?: string) => string;
+/**
+ * V2应用EasySafePay 热更新兜底URL构建规则
+ * 1. 兜底URL版本与sdk版本保持一致
+ * 2. DEV环境下html新增版本前缀
+ **/
+export declare const getDefaultEasySafePayPageUrl: (pageName: ESP_PAGE_NAME, env: string) => string;
+/**通过sessionData获取doubleFa,于createComponent时传递给WEB应用*/
+export declare const getDoubleFaUrlFromSession: (paymentSessionObj: IPaymentSessionMetaData, env?: string) => string;