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

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.1762138227-dev.0",
+  "version": "0.0.1762138227-dev.1",
   "description": "",
   "author": "",
   "main": "esm/index.js",