@alipay/ams-checkout 0.0.1761220900-dev.1 → 0.0.1762138227-dev.1

package/esm/config/index.d.ts

@@ -6,11 +6,11 @@ export declare const sdkVersion: string;
  * @description: 目前应用层分为v1和v2，会存在两个应用版本号不是同步发布的情况。所以需要把默认的应用版本号配置抽离出来。
  * TODO 这里考虑直接换成packagejson.version
  */
-export declare const AMSCheckoutAppVersion = "1.45.0";
-export declare const AMSAutoDebitAppVersion = "1.45.0";
-export declare const AMSEasyPayAppVersion = "1.45.0";
-export declare const AMSCashierPaymentAppVersion = "1.45.0";
-export declare const AMSVaultingAppVersion = "1.45.0";
-export declare const AMSPaymentElementAppVersion = "1.45.0";
-export declare const ADDRESSElementAppVersion = "1.45.0";
-export declare const AUTHElementAppVersion = "1.45.0";
+export declare const AMSCheckoutAppVersion = "1.46.0";
+export declare const AMSAutoDebitAppVersion = "1.46.0";
+export declare const AMSEasyPayAppVersion = "1.46.0";
+export declare const AMSCashierPaymentAppVersion = "1.46.0";
+export declare const AMSVaultingAppVersion = "1.46.0";
+export declare const AMSPaymentElementAppVersion = "1.46.0";
+export declare const ADDRESSElementAppVersion = "1.46.0";
+export declare const AUTHElementAppVersion = "1.46.0";

package/esm/config/index.js

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

package/esm/constant/index.d.ts

@@ -98,7 +98,7 @@ export declare const ERRORMESSAGE: {
         code: string;
         message: string;
     };
-    INITALIZE_TIMEOUT: {
+    INITIALIZE_TIMEOUT: {
         code: string;
         API: {
             code: string;

package/esm/constant/index.js

@@ -98,14 +98,14 @@ export var ERRORMESSAGE = {
     code: 'UI_STATE_ERROR',
     message: 'An error occurred. The transaction cannot be initiated.'
   },
-  INITALIZE_TIMEOUT: {
-    code: 'INITALIZE_TIMEOUT',
+  INITIALIZE_TIMEOUT: {
+    code: 'INITIALIZE_TIMEOUT',
     API: {
-      code: 'INITALIZE_API_TIMEOUT',
+      code: 'INITIALIZE_API_TIMEOUT',
       message: 'An error occurred. The transaction cannot be initiated.'
     },
     WEB: {
-      code: 'INITALIZE_WEB_TIMEOUT',
+      code: 'INITIALIZE_WEB_TIMEOUT',
       message: 'An error occurred; the transaction cannot be initiated.'
     }
   },
@@ -287,7 +287,7 @@ export var EVENT = {
   },
   // Element支付完成后事件
   submitPromiseCallback: {
-    name: 'submitPromiseCallback'
+    name: 'onSubmitPayCallback'
   },
   validateFieldsResult: {
     name: 'validateFieldsResult',

package/esm/core/component/element/elementController/index.js

@@ -195,7 +195,7 @@ var ElementController = /*#__PURE__*/function () {
           title: 'sdk_event_web_app_timeout'
         });
         resolve({
-          error: ERRORMESSAGE.INITALIZE_TIMEOUT.WEB
+          error: ERRORMESSAGE.INITIALIZE_TIMEOUT.WEB
         });
       }, TIMEOUT_DURATION);
     }
@@ -642,7 +642,7 @@ var ElementController = /*#__PURE__*/function () {
               _context5.t0 = _context5["catch"](1);
               this.handleInitializationError();
               readyCallback({
-                error: _objectSpread(_objectSpread({}, ERRORMESSAGE.INITALIZE_TIMEOUT.API), {}, {
+                error: _objectSpread(_objectSpread({}, ERRORMESSAGE.INITIALIZE_TIMEOUT.API), {}, {
                   traceId: _context5.t0 === null || _context5.t0 === void 0 ? void 0 : _context5.t0.traceId
                 })
               });

package/esm/foundation/core/index.js

@@ -269,7 +269,7 @@ export var AntomSDKCore = /*#__PURE__*/function () {
     value: function () {
       var _startBizFlow = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(options) {
         var _this$paymentContext$, _this$paymentContext$2, _this$paymentContext$3;
-        var paymentSession, displayInfo, _convertPaymentSessio2, paymentSessionId, paymentSessionMetaData, mid, webAppMatchConfig, webAppVersion, productScene, paymentMethod, _this$bizFlowStartBeh, payload, eventCenter, data;
+        var paymentSession, displayInfo, _convertPaymentSessio2, paymentSessionId, paymentSessionMetaData, mid, webAppMatchConfig, webAppVersion, productScene, paymentMethod, _this$bizFlowStartBeh, payload, eventCenter, data, normalUrl;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -350,14 +350,18 @@ export var AntomSDKCore = /*#__PURE__*/function () {
               return _context4.abrupt("return");
             case 36:
               if (!(this.bizFlowStartBehavior.behaviorType === 'REDIRECT')) {
-                _context4.next = 45;
+                _context4.next = 49;
                 break;
               }
               payload = (_this$bizFlowStartBeh = this.bizFlowStartBehavior) === null || _this$bizFlowStartBeh === void 0 ? void 0 : _this$bizFlowStartBeh.payload;
-              if (!options.isNativeAppWebview) {
-                _context4.next = 43;
+              console.log('sdk 打印', payload);
+              console.log('sdk 触发', options);
+              //Sessiondata中authUrlInfo的openInApp为true，说明端内打开，不需要处理isNativeAppWebview的外跳事件逻辑
+              if (!(options.isNativeAppWebview && !!!payload.openInApp)) {
+                _context4.next = 46;
                 break;
               }
+              console.log('sdk 打印跳转', options);
               eventCenter = ServiceProvider.getInstance(this.instanceId).getService('EventCenter');
               data = {
                 normalUrl: (payload === null || payload === void 0 ? void 0 : payload.url) || '',
@@ -371,10 +375,16 @@ export var AntomSDKCore = /*#__PURE__*/function () {
                 }
               });
               return _context4.abrupt("return");
-            case 43:
+            case 46:
+              if (payload.url && payload.openInApp && options.isNativeAppWebview) {
+                //Sessiondata中authUrlInfo的openInApp为true，normalUrl存在，isNativeAppWebview为true，拼接source=embedded
+                normalUrl = new URL(payload.url);
+                normalUrl.searchParams.set('source', 'embedded');
+                payload.url = normalUrl.toString();
+              }
               redirect(payload, this.instanceId);
               return _context4.abrupt("return");
-            case 45:
+            case 49:
             case "end":
               return _context4.stop();
           }

package/esm/foundation/index.d.ts

@@ -62,6 +62,7 @@ export interface RedirectBehaviorPayload {
     browserLinkTarget?: TargetEnum;
     isCallApp?: boolean;
     callAppDetectSuccessDelay?: number;
+    openInApp?: boolean;
 }
 /**
  * Provide some capability, such as MonitorService, EventBusService, SecurityService

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

@@ -153,13 +153,15 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
         data = {
           url: authUrlInfo === null || authUrlInfo === void 0 ? void 0 : authUrlInfo.authUrl,
           schemeUrl: authUrlInfo === null || authUrlInfo === void 0 ? void 0 : authUrlInfo.authUrl,
-          applinkUrl: authUrlInfo === null || authUrlInfo === void 0 ? void 0 : authUrlInfo.authUrl
+          applinkUrl: authUrlInfo === null || authUrlInfo === void 0 ? void 0 : authUrlInfo.authUrl,
+          openInApp: (authUrlInfo === null || authUrlInfo === void 0 ? void 0 : authUrlInfo.openInApp) || false
         };
       } else {
         data = {
           url: authUrlInfo === null || authUrlInfo === void 0 ? void 0 : authUrlInfo.normalUrl,
           schemeUrl: authUrlInfo === null || authUrlInfo === void 0 ? void 0 : authUrlInfo.schemeUrl,
-          applinkUrl: authUrlInfo === null || authUrlInfo === void 0 ? void 0 : authUrlInfo.applinkUrl
+          applinkUrl: authUrlInfo === null || authUrlInfo === void 0 ? void 0 : authUrlInfo.applinkUrl,
+          openInApp: (authUrlInfo === null || authUrlInfo === void 0 ? void 0 : authUrlInfo.openInApp) || false
         };
       }
       var result = {

package/esm/loader/Proxy.js

@@ -15,7 +15,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
  * Proxy代理层
  * **/
 import ProxyPolyfillBuilder from 'proxy-polyfill/src/proxy';
-import { instanceApiMap } from "./constant";
+import { EConstructorName, instanceApiMap } from "./constant";
 import { supportsDefineProperty, supportsProxy } from "./utils/common";
 import { setDebugContext } from "./utils/debugger";
 import { loadSdk, newActualInstance } from "./utils/loadSDK";
@@ -29,6 +29,7 @@ import { consoleLogger, logger } from "./utils/logger";
 
 // eslint-disable-next-line
 export function createBaseProxy(constructorName) {
+  var _this = this;
   var _newProxyInstance = function _newProxyInstance(self) {
     return new Proxy(self, {
       get: function get(target, prop) {
@@ -49,6 +50,7 @@ export function createBaseProxy(constructorName) {
           } else {
             // SDK未加载，记录调用
             return new Promise(function (resolve, reject) {
+              consoleLogger.log("Cache API [".concat(constructorName, ".").concat(prop, "]"));
               self.pendingCalls.push({
                 method: prop,
                 args: args,
@@ -88,6 +90,7 @@ export function createBaseProxy(constructorName) {
           } else {
             // SDK未加载，记录调用
             return new Promise(function (resolve, reject) {
+              consoleLogger.log("Cache API [".concat(constructorName, ".").concat(prop, "]"));
               self.pendingCalls.push({
                 method: prop,
                 args: args,
@@ -123,6 +126,81 @@ export function createBaseProxy(constructorName) {
     });
     return instanceForError;
   };
+
+  // 使用Promise.then来抛出错误对象 构造一个虚拟错误对象来模拟产品实例,其中所有的API都会在.then中返回错误对象
+  var throwErrorWithPromise = function throwErrorWithPromise(errorObj) {
+    var message = errorObj.error.message;
+    var instanceForError = _newInstanceForError(errorObj);
+    _this.actualInstance = instanceForError;
+    _this.hasActualInstance = true;
+    _this.executePendingCalls();
+    logger.logError({
+      title: message
+    }, {
+      errorMessage: message,
+      constructorName: constructorName
+    });
+    consoleLogger.error(message);
+  };
+
+  // 使用onEventCallback向外抛出SDK内部错误
+  var throwErrorWithOnEventCallback = function throwErrorWithOnEventCallback(errorObj, newProps) {
+    var onEventCallbackFn = newProps === null || newProps === void 0 ? void 0 : newProps.onEventCallback;
+    var message = errorObj.message;
+    if (typeof onEventCallbackFn === 'function') {
+      onEventCallbackFn === null || onEventCallbackFn === void 0 || onEventCallbackFn.call(null, errorObj);
+    }
+    logger.logError({
+      title: message
+    }, {
+      errorMessage: message,
+      constructorName: constructorName
+    });
+    consoleLogger.error(message);
+  };
+  var onCreateInstanceError = function onCreateInstanceError(newProps) {
+    // 不同实例进行不同的错误处理方案
+    if (constructorName === EConstructorName.AMSElement) {
+      throwErrorWithPromise({
+        error: {
+          code: 'INTERNAL_ERROR',
+          message: 'create_actual_instance_error'
+        },
+        status: 'FAIL'
+      });
+    } else if (constructorName === EConstructorName.AMSEasyPay) {
+      throwErrorWithOnEventCallback({
+        code: 'SDK_INTERNAL_ERROR',
+        message: 'create_actual_instance_error'
+      }, newProps);
+    } else {
+      throwErrorWithOnEventCallback({
+        code: 'SDK_INTERNAL_ERROR',
+        message: 'create_actual_instance_error'
+      }, newProps);
+    }
+  };
+  var onLoadSDKError = function onLoadSDKError(newProps) {
+    if (constructorName === EConstructorName.AMSElement) {
+      throwErrorWithPromise({
+        error: {
+          code: 'INITIALIZE_WEB_TIMEOUT',
+          message: 'load_sdk_resource_error'
+        },
+        status: 'FAIL'
+      });
+    } else if (constructorName === EConstructorName.AMSEasyPay) {
+      throwErrorWithOnEventCallback({
+        code: 'SDK_INTERNAL_ERROR',
+        message: 'load_sdk_resource_error'
+      }, newProps);
+    } else {
+      throwErrorWithOnEventCallback({
+        code: 'SDK_INTERNAL_ERROR',
+        message: 'load_sdk_resource_error'
+      }, newProps);
+    }
+  };
   var BaseProxy = /*#__PURE__*/function () {
     // 返回代理实例对象
     function BaseProxy(newProps, debugProps) {
@@ -150,7 +228,7 @@ export function createBaseProxy(constructorName) {
     _createClass(BaseProxy, [{
       key: "loadSDKAndCreateInstance",
       value: function loadSDKAndCreateInstance(constructorName, newProps) {
-        var _this = this;
+        var _this2 = this;
         loadSdk().then(function () {
           try {
             var actualInstance = newActualInstance(constructorName, newProps);
@@ -158,7 +236,7 @@ export function createBaseProxy(constructorName) {
             logger.logInfo({
               title: 'report_customized_performance_m5'
             }, {
-              m5: Date.now() - _this.startTime
+              m5: Date.now() - _this2.startTime
             });
             logger.logInfo({
               title: 'create_actual_instance_success'
@@ -166,48 +244,14 @@ export function createBaseProxy(constructorName) {
               constructorName: constructorName
             });
             consoleLogger.log('create_actual_instance_success');
-            _this.actualInstance = actualInstance;
-            _this.hasActualInstance = true;
-            _this.executePendingCalls();
+            _this2.actualInstance = actualInstance;
+            _this2.hasActualInstance = true;
+            _this2.executePendingCalls();
           } catch (error) {
-            //创建实例失败时,构造一个虚拟错误对象来模拟产品实例,其中所有的API都会在.then中返回错误对象
-            var instanceForError = _newInstanceForError({
-              error: {
-                code: 'INTERNAL_ERROR',
-                message: 'create_actual_instance_error'
-              },
-              status: 'FAIL'
-            });
-            _this.actualInstance = instanceForError;
-            _this.hasActualInstance = true;
-            _this.executePendingCalls();
-            logger.logError({
-              title: 'create_actual_instance_error'
-            }, {
-              errorMessage: error,
-              constructorName: constructorName
-            });
-            consoleLogger.error('create_actual_instance_error');
+            onCreateInstanceError(newProps);
           }
-        }).catch(function (error) {
-          //SDK加载失败时,构造一个虚拟错误对象来模拟产品实例,其中所有的API都会在.then中返回错误对象
-          var instanceForError = _newInstanceForError({
-            error: {
-              code: 'INITIALIZE_WEB_TIMEOUT',
-              message: 'load_sdk_resource_error'
-            },
-            status: 'FAIL'
-          });
-          _this.actualInstance = instanceForError;
-          _this.hasActualInstance = true;
-          _this.executePendingCalls();
-          logger.logError({
-            title: 'load_sdk_resource_error'
-          }, {
-            errorMessage: error,
-            constructorName: constructorName
-          });
-          consoleLogger.error('load_sdk_resource_error');
+        }).catch(function () {
+          onLoadSDKError(newProps);
         });
       }
 

package/package.json

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