@cloudcare/rum-uniapp 2.1.4 → 2.1.7

package/cjs/boot/buildEnv.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.buildEnv = void 0;
 var buildEnv = {
-  sdkVersion: '2.1.4',
+  sdkVersion: '2.1.7',
   sdkName: 'df_uniapp_rum_sdk'
 };
 exports.buildEnv = buildEnv;

package/cjs/boot/rum.entry.js

@@ -45,6 +45,11 @@ var makeRum = function makeRum(startRumImpl) {
       addActionStrategy = _startRumImpl.addAction;
       isAlreadyInitialized = true;
     },
+    initVue3: function initVue3(userConfiguration) {
+      this.init({}, (0, _utils.extend)({
+        isVue2: false
+      }, userConfiguration));
+    },
     getInternalContext: function getInternalContext(startTime) {
       return _getInternalContext(startTime);
     },

package/cjs/core/configuration.js

@@ -37,8 +37,9 @@ var DEFAULT_CONFIGURATION = {
   trackInteractions: false,
   traceType: _enums.TraceType.DDTRACE,
   traceId128Bit: false,
-  allowedTracingOrigins: [] // 新增
-
+  allowedTracingOrigins: [],
+  // 新增
+  isVue2: true
 };
 exports.DEFAULT_CONFIGURATION = DEFAULT_CONFIGURATION;
 
@@ -82,6 +83,10 @@ function commonInit(userConfiguration, buildEnv) {
     transportConfiguration.sampleRate = userConfiguration.sampleRate;
   }
 
+  if ('isVue2' in userConfiguration) {
+    transportConfiguration.isVue2 = userConfiguration.isVue2;
+  }
+
   return (0, _utils.extend2Lev)(DEFAULT_CONFIGURATION, transportConfiguration);
 }
 

package/cjs/core/downloadProxy.js

@@ -12,14 +12,16 @@ var _utils = require("../helper/utils");
 
 var _enums = require("../helper/enums");
 
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
 var downloadProxySingleton;
 var beforeSendCallbacks = [];
 var onRequestCompleteCallbacks = [];
 var originalDownloadRequest;
 
-function startDownloadProxy() {
+function startDownloadProxy(userConfiguration) {
   if (!downloadProxySingleton) {
-    proxyDownload();
+    proxyDownload(userConfiguration);
     downloadProxySingleton = {
       beforeSend: function beforeSend(callback) {
         beforeSendCallbacks.push(callback);
@@ -42,7 +44,7 @@ function resetDownloadProxy() {
   }
 }
 
-function proxyDownload() {
+function proxyDownload(userConfiguration) {
   originalDownloadRequest = _sdk.sdk.downloadFile;
 
   _sdk.sdk.downloadFile = function () {
@@ -58,23 +60,27 @@ function proxyDownload() {
     dataflux_xhr.startTime = (0, _utils.now)();
     var originalSuccess = arguments[0].success;
 
-    arguments[0].success = function () {
-      reportXhr(arguments[0]);
+    if (typeof originalSuccess === 'function') {
+      arguments[0].success = function () {
+        reportXhr(arguments[0]);
 
-      if (originalSuccess) {
-        originalSuccess.apply(_this, arguments);
-      }
-    };
+        if (originalSuccess) {
+          originalSuccess.apply(_this, arguments);
+        }
+      };
+    }
 
     var originalFail = arguments[0].fail;
 
-    arguments[0].fail = function () {
-      reportXhr(arguments[0]);
+    if (typeof originalFail === 'function') {
+      arguments[0].fail = function () {
+        reportXhr(arguments[0]);
 
-      if (originalFail) {
-        originalFail.apply(_this, arguments);
-      }
-    };
+        if (originalFail) {
+          originalFail.apply(_this, arguments);
+        }
+      };
+    }
 
     var hasBeenReported = false;
 
@@ -100,6 +106,35 @@ function proxyDownload() {
     beforeSendCallbacks.forEach(function (callback) {
       callback(dataflux_xhr);
     });
-    return originalDownloadRequest.apply(this, arguments);
+    var result = originalDownloadRequest.apply(this, arguments); // 判断结果是否为promise
+
+    var isPromise = function isPromise(obj) {
+      return !!obj && (_typeof(obj) === "object" || typeof obj === "function") && typeof obj.then === "function";
+    };
+
+    if (isPromise(result) && userConfiguration.isVue2) {
+      // vue2 版本，success, fail 都在then返回
+      return result.then(function (res) {
+        if (res[0]) {
+          reportXhr(res[0]);
+        } else {
+          reportXhr(res[1]);
+        }
+
+        return res;
+      });
+    } else if (isPromise(result) && !userConfiguration.isVue2) {
+      return new Promise(function (resolve, reject) {
+        result.then(function (res) {
+          reportXhr(res);
+          resolve(res);
+        })["catch"](function (err) {
+          reportXhr(err);
+          reject(err);
+        });
+      });
+    } else {
+      return result;
+    }
   };
 }

package/cjs/core/errorCollection.js

@@ -120,10 +120,10 @@ function startAutomaticErrorCollection(configuration) {
 }
 
 function trackNetworkError(configuration, errorObservable) {
-  (0, _xhrProxy.startXhrProxy)().onRequestComplete(function (context) {
+  (0, _xhrProxy.startXhrProxy)(configuration).onRequestComplete(function (context) {
     return handleCompleteRequest(context.type, context);
   });
-  (0, _downloadProxy.startDownloadProxy)().onRequestComplete(function (context) {
+  (0, _downloadProxy.startDownloadProxy)(configuration).onRequestComplete(function (context) {
     return handleCompleteRequest(context.type, context);
   });
 

package/cjs/core/xhrProxy.js

@@ -12,14 +12,16 @@ var _utils = require("../helper/utils");
 
 var _enums = require("../helper/enums");
 
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
 var xhrProxySingleton;
 var beforeSendCallbacks = [];
 var onRequestCompleteCallbacks = [];
 var originalXhrRequest;
 
-function startXhrProxy() {
+function startXhrProxy(userConfiguration) {
   if (!xhrProxySingleton) {
-    proxyXhr();
+    proxyXhr(userConfiguration);
     xhrProxySingleton = {
       beforeSend: function beforeSend(callback) {
         beforeSendCallbacks.push(callback);
@@ -42,7 +44,7 @@ function resetXhrProxy() {
   }
 }
 
-function proxyXhr() {
+function proxyXhr(userConfiguration) {
   originalXhrRequest = _sdk.sdk.request;
 
   _sdk.sdk.request = function () {
@@ -59,23 +61,27 @@ function proxyXhr() {
     dataflux_xhr.startTime = (0, _utils.now)();
     var originalSuccess = arguments[0].success;
 
-    arguments[0].success = function () {
-      reportXhr(arguments[0]);
+    if (typeof originalSuccess === 'function') {
+      arguments[0].success = function () {
+        reportXhr(arguments[0]);
 
-      if (originalSuccess) {
-        originalSuccess.apply(_this, arguments);
-      }
-    };
+        if (originalSuccess) {
+          originalSuccess.apply(_this, arguments);
+        }
+      };
+    }
 
     var originalFail = arguments[0].fail;
 
-    arguments[0].fail = function () {
-      reportXhr(arguments[0]);
+    if (typeof originalFail === 'function') {
+      arguments[0].fail = function () {
+        reportXhr(arguments[0]);
 
-      if (originalFail) {
-        originalFail.apply(_this, arguments);
-      }
-    };
+        if (originalFail) {
+          originalFail.apply(_this, arguments);
+        }
+      };
+    }
 
     var hasBeenReported = false;
 
@@ -98,6 +104,35 @@ function proxyXhr() {
     beforeSendCallbacks.forEach(function (callback) {
       callback(dataflux_xhr);
     });
-    return originalXhrRequest.call(this, dataflux_xhr.option);
+    var result = originalXhrRequest.call(this, dataflux_xhr.option); // 判断结果是否为promise
+
+    var isPromise = function isPromise(obj) {
+      return !!obj && (_typeof(obj) === "object" || typeof obj === "function") && typeof obj.then === "function";
+    };
+
+    if (isPromise(result) && userConfiguration.isVue2) {
+      // vue2 版本，success, fail 都在then返回
+      return result.then(function (res) {
+        if (res[0]) {
+          reportXhr(res[0]);
+        } else {
+          reportXhr(res[1]);
+        }
+
+        return res;
+      });
+    } else if (isPromise(result) && !userConfiguration.isVue2) {
+      return new Promise(function (resolve, reject) {
+        result.then(function (res) {
+          reportXhr(res);
+          resolve(res);
+        })["catch"](function (err) {
+          reportXhr(err);
+          reject(err);
+        });
+      });
+    } else {
+      return result;
+    }
   };
 }

package/cjs/rumEventsCollection/action/trackActions.js

@@ -15,57 +15,41 @@ var _trackPageActiveites = require("../trackPageActiveites");
 
 var _enums = require("../../helper/enums");
 
+var _sdk = require("../../core/sdk");
+
+var WHITE_METHOD = ['setup'];
+
 function trackActions(lifeCycle, Vue) {
   var action = startActionManagement(lifeCycle); // New views trigger the discard of the current pending Action
 
   lifeCycle.subscribe(_lifeCycle.LifeCycleEventType.VIEW_CREATED, function () {
     action.discardCurrent();
   });
-  var originVueExtend = Vue.extend;
-
-  Vue.extend = function (vueOptions) {
-    // methods 方法
-    if (vueOptions.methods) {
-      var vueMethods = Object.keys(vueOptions.methods);
-      vueMethods.forEach(function (methodName) {
-        clickProxy(vueOptions.methods, methodName, function (_action) {
-          action.create(_action.type, _action.name);
-        }, lifeCycle);
-      });
-    }
 
-    var originMethods = (0, _utils.getMethods)(vueOptions);
-    originMethods.forEach(function (methodName) {
-      clickProxy(vueOptions, methodName, function (_action) {
-        action.create(_action.type, _action.name);
-      }, lifeCycle);
-    });
-    return originVueExtend.call(this, vueOptions);
-  }; // var originPage = Page
-  // Page = function (page) {
-  // 	const methods = getMethods(page)
-  // 	methods.forEach((methodName) => {
-  // 		clickProxy(
-  // 			page,
-  // 			methodName,
-  // 			function (_action) {
-  // 				action.create(_action.type, _action.name)
-  // 			},
-  // 			lifeCycle,
-  // 		)
-  // 	})
-  // 	return originPage(page)
-  // }
-  // var originComponent = Component
-  // Component = function (component) {
-  // 	const methods = getMethods(component)
-  // 	methods.forEach((methodName) => {
-  // 		clickProxy(component, methodName, function (_action) {
-  // 			action.create(_action.type, _action.name)
-  // 		})
-  // 	})
-  // 	return originComponent(component)
-  // }
+  if (Vue && Vue.extend) {
+    var originVueExtend = Vue.extend;
+
+    Vue.extend = function (vueOptions) {
+      proxyInstance(vueOptions, action, lifeCycle);
+      return originVueExtend.call(this, vueOptions);
+    };
+  } else {
+    if (!_sdk.tracker) return;
+    var originCreatePage = _sdk.tracker.createPage;
+
+    _sdk.tracker.createPage = function (page) {
+      // methods 方法
+      proxyInstance(page, action, lifeCycle);
+      return originCreatePage.call(this, page);
+    };
+
+    var originCreateComponent = _sdk.tracker.createComponent;
+
+    _sdk.tracker.createComponent = function (component) {
+      proxyInstance(component, action, lifeCycle);
+      return originCreateComponent.call(this, component);
+    };
+  } // var originVueExtend = Vue.extend
 
 
   return {
@@ -75,11 +59,31 @@ function trackActions(lifeCycle, Vue) {
   };
 }
 
-function clickProxy(page, methodName, callback, lifeCycle) {
-  var oirginMethod = page[methodName];
+function proxyInstance(options, action, lifeCycle) {
+  // methods 方法
+  if (options.methods) {
+    var vueMethods = Object.keys(options.methods);
+    vueMethods.forEach(function (methodName) {
+      clickProxy(options.methods, methodName, function (_action) {
+        action.create(_action.type, _action.name);
+      }, lifeCycle);
+    });
+  }
+
+  var originMethods = (0, _utils.getMethods)(options);
+  originMethods.forEach(function (methodName) {
+    clickProxy(options, methodName, function (_action) {
+      action.create(_action.type, _action.name);
+    }, lifeCycle);
+  });
+}
+
+function clickProxy(origin, methodName, callback, lifeCycle) {
+  if (WHITE_METHOD.indexOf(methodName) > -1) return;
+  var originMethod = origin[methodName];
 
-  page[methodName] = function () {
-    var result = oirginMethod.apply(this, arguments);
+  origin[methodName] = function () {
+    var result = originMethod.apply(this, arguments);
     var action = {};
 
     if ((0, _utils.isObject)(arguments[0])) {

package/cjs/rumEventsCollection/page/index.js

@@ -12,51 +12,64 @@ var _trackEventCounts2 = require("../trackEventCounts");
 
 var _lifeCycle = require("../../core/lifeCycle");
 
-var _sdk = require("../../core/sdk");
-
 // 劫持原小程序App方法
 var THROTTLE_VIEW_UPDATE_PERIOD = 3000;
 exports.THROTTLE_VIEW_UPDATE_PERIOD = THROTTLE_VIEW_UPDATE_PERIOD;
 
-function rewritePage(configuration, lifeCycle, Vue) {
-  var originVueExtend = Vue.extend;
-
-  Vue.extend = function (vueOptions) {
-    // 合并方法，插入记录脚本
-    var currentView,
-        startTime = (0, _utils.now)();
-    ['onReady', 'onShow', 'onLoad', 'onUnload', 'onHide'].forEach(function (methodName) {
-      var userDefinedMethod = vueOptions[methodName];
-
-      vueOptions[methodName] = function () {
-        if (this.mpType !== 'page') {
-          return userDefinedMethod && userDefinedMethod.apply(this, arguments);
-        } // 只处理page类型
-
-
-        if (methodName === 'onShow' || methodName === 'onLoad') {
-          if (typeof currentView === 'undefined') {
-            var activePage = (0, _utils.getActivePage)();
-            currentView = newView(lifeCycle, activePage && activePage.route, startTime);
-          }
+function proxyPage(pageOptions, lifeCycle) {
+  // 合并方法，插入记录脚本
+  var currentView,
+      startTime = (0, _utils.now)();
+  ['onReady', 'onShow', 'onLoad', 'onUnload', 'onHide'].forEach(function (methodName) {
+    var userDefinedMethod = pageOptions[methodName];
+
+    pageOptions[methodName] = function () {
+      var mpType = this.mpType || this.$vm.mpType;
+
+      if (mpType !== 'page') {
+        return userDefinedMethod && userDefinedMethod.apply(this, arguments);
+      } // 只处理page类型
+
+
+      if (methodName === 'onShow' || methodName === 'onLoad') {
+        if (typeof currentView === 'undefined') {
+          var activePage = (0, _utils.getActivePage)();
+          currentView = newView(lifeCycle, activePage && activePage.route, startTime);
         }
+      }
 
-        currentView && currentView.setLoadEventEnd(methodName);
+      currentView && currentView.setLoadEventEnd(methodName);
 
-        if ((methodName === 'onUnload' || methodName === 'onHide' || methodName === 'onShow') && currentView) {
-          currentView.triggerUpdate();
+      if ((methodName === 'onUnload' || methodName === 'onHide' || methodName === 'onShow') && currentView) {
+        currentView.triggerUpdate();
 
-          if (methodName === 'onUnload' || methodName === 'onHide') {
-            currentView.end();
-            currentView = undefined;
-          }
+        if (methodName === 'onUnload' || methodName === 'onHide') {
+          currentView.end();
+          currentView = undefined;
         }
+      }
 
-        return userDefinedMethod && userDefinedMethod.apply(this, arguments);
-      };
-    });
-    return originVueExtend.call(this, vueOptions);
-  };
+      return userDefinedMethod && userDefinedMethod.apply(this, arguments);
+    };
+  });
+}
+
+function rewritePage(configuration, lifeCycle, Vue) {
+  if (Vue && Vue.extend) {
+    var originVueExtend = Vue.extend;
+
+    Vue.extend = function (vueOptions) {
+      proxyPage(vueOptions, lifeCycle);
+      return originVueExtend.call(this, vueOptions);
+    };
+  } else {
+    var originComponent = Component;
+
+    Component = function Component(pageOptions) {
+      proxyPage(pageOptions.methods, lifeCycle);
+      return originComponent.call(this, pageOptions);
+    };
+  }
 }
 
 function newView(lifeCycle, route, startTime) {

package/cjs/rumEventsCollection/requestCollection.js

@@ -47,7 +47,7 @@ function getHeaderString(header) {
 }
 
 function trackXhr(lifeCycle, configuration, tracer) {
-  var xhrProxy = (0, _xhrProxy.startXhrProxy)();
+  var xhrProxy = (0, _xhrProxy.startXhrProxy)(configuration);
   xhrProxy.beforeSend(function (context) {
     if ((0, _resourceUtils.isAllowedRequestUrl)(configuration, context.url)) {
       tracer.traceXhr(context);
@@ -79,7 +79,7 @@ function trackXhr(lifeCycle, configuration, tracer) {
 }
 
 function trackDownload(lifeCycle, configuration) {
-  var dwonloadProxy = (0, _downloadProxy.startDownloadProxy)();
+  var dwonloadProxy = (0, _downloadProxy.startDownloadProxy)(configuration);
   dwonloadProxy.beforeSend(function (context) {
     if ((0, _resourceUtils.isAllowedRequestUrl)(configuration, context.url)) {
       context.requestIndex = getNextRequestIndex();

package/cjs/rumEventsCollection/setDataCollection.js

@@ -9,6 +9,8 @@ var _lifeCycle = require("../core/lifeCycle");
 
 var _utils = require("../helper/utils");
 
+var _sdk = require("../core/sdk");
+
 function resetSetData(data, callback, lifeCycle, mpInstance) {
   var pendingStartTimestamp = (0, _utils.now)();
 
@@ -26,36 +28,56 @@ function resetSetData(data, callback, lifeCycle, mpInstance) {
   return _callback;
 }
 
-function startSetDataColloction(lifeCycle, Vue) {
-  var originVueExtend = Vue.extend;
-
-  Vue.extend = function (vueOptions) {
-    var userDefinedMethod = vueOptions['onLoad'];
+function proxyPage(pageOptions, lifeCycle) {
+  var userDefinedMethod = pageOptions['onLoad'];
 
-    vueOptions['onLoad'] = function () {
-      var mpInstance = this.$scope;
-      var setData = mpInstance.setData; // 重写setData
+  pageOptions['onLoad'] = function () {
+    var mpInstance = this.$scope;
+    var setData = mpInstance.setData;
 
-      if (typeof setData === 'function') {
-        try {
-          // 这里暂时这么处理 只读属性 会抛出错误
-          mpInstance.setData = function (data, callback) {
+    if (typeof setData === 'function') {
+      try {
+        // 这里暂时这么处理 只读属性 会抛出错误
+        mpInstance.setData = function (data, callback) {
+          return setData.call(mpInstance, data, resetSetData(data, callback, lifeCycle, mpInstance));
+        };
+      } catch (err) {
+        Object.defineProperty(mpInstance.__proto__, 'setData', {
+          configurable: false,
+          enumerable: false,
+          value: function value(data, callback) {
             return setData.call(mpInstance, data, resetSetData(data, callback, lifeCycle, mpInstance));
-          };
-        } catch (err) {
-          Object.defineProperty(mpInstance.__proto__, 'setData', {
-            configurable: false,
-            enumerable: false,
-            value: function value(data, callback) {
-              return setData.call(mpInstance, data, resetSetData(data, callback, lifeCycle, mpInstance));
-            }
-          });
-        }
+          }
+        });
       }
+    }
+
+    return userDefinedMethod && userDefinedMethod.apply(this, arguments);
+  };
+}
 
-      return userDefinedMethod && userDefinedMethod.apply(this, arguments);
+function startSetDataColloction(lifeCycle, Vue) {
+  if (Vue && Vue.extend) {
+    var originVueExtend = Vue.extend;
+
+    Vue.extend = function (vueOptions) {
+      proxyPage(vueOptions, lifeCycle);
+      return originVueExtend.call(this, vueOptions);
     };
+  } else {
+    if (!_sdk.tracker) return;
+    var originCreatePage = _sdk.tracker.createPage;
 
-    return originVueExtend.call(this, vueOptions);
-  };
+    _sdk.tracker.createPage = function (pageOptions) {
+      proxyPage(pageOptions, lifeCycle);
+      return originCreatePage.call(this, pageOptions);
+    };
+
+    var originCreateComponent = _sdk.tracker.createComponent;
+
+    _sdk.tracker.createComponent = function (component) {
+      proxyPage(component, lifeCycle);
+      return originCreateComponent.call(this, component);
+    };
+  }
 }

package/esm/boot/buildEnv.js

@@ -1,4 +1,4 @@
 export var buildEnv = {
-  sdkVersion: '2.1.4',
+  sdkVersion: '2.1.7',
   sdkName: 'df_uniapp_rum_sdk'
 };

package/esm/boot/rum.entry.js

@@ -1,4 +1,4 @@
-import { isPercentage, extend2Lev, now, createContextManager, defineGlobal, getGlobalObject, isString, isObject } from '../helper/utils';
+import { isPercentage, extend2Lev, extend, now, createContextManager, defineGlobal, getGlobalObject, isString, isObject } from '../helper/utils';
 import { startRum } from './rum';
 import { ActionType } from '../helper/enums';
 export var makeRum = function makeRum(startRumImpl) {
@@ -33,6 +33,11 @@ export var makeRum = function makeRum(startRumImpl) {
       addActionStrategy = _startRumImpl.addAction;
       isAlreadyInitialized = true;
     },
+    initVue3: function initVue3(userConfiguration) {
+      this.init({}, extend({
+        isVue2: false
+      }, userConfiguration));
+    },
     getInternalContext: function getInternalContext(startTime) {
       return _getInternalContext(startTime);
     },

package/esm/core/configuration.js

@@ -26,8 +26,9 @@ export var DEFAULT_CONFIGURATION = {
   trackInteractions: false,
   traceType: TraceType.DDTRACE,
   traceId128Bit: false,
-  allowedTracingOrigins: [] // 新增
-
+  allowedTracingOrigins: [],
+  // 新增
+  isVue2: true
 };
 
 function trim(str) {
@@ -70,6 +71,10 @@ export function commonInit(userConfiguration, buildEnv) {
     transportConfiguration.sampleRate = userConfiguration.sampleRate;
   }
 
+  if ('isVue2' in userConfiguration) {
+    transportConfiguration.isVue2 = userConfiguration.isVue2;
+  }
+
   return extend2Lev(DEFAULT_CONFIGURATION, transportConfiguration);
 }
 

package/esm/core/downloadProxy.js

@@ -5,9 +5,9 @@ var downloadProxySingleton;
 var beforeSendCallbacks = [];
 var onRequestCompleteCallbacks = [];
 var originalDownloadRequest;
-export function startDownloadProxy() {
+export function startDownloadProxy(userConfiguration) {
   if (!downloadProxySingleton) {
-    proxyDownload();
+    proxyDownload(userConfiguration);
     downloadProxySingleton = {
       beforeSend: function beforeSend(callback) {
         beforeSendCallbacks.push(callback);
@@ -29,7 +29,7 @@ export function resetDownloadProxy() {
   }
 }
 
-function proxyDownload() {
+function proxyDownload(userConfiguration) {
   originalDownloadRequest = sdk.downloadFile;
 
   sdk.downloadFile = function () {
@@ -45,23 +45,27 @@ function proxyDownload() {
     dataflux_xhr.startTime = now();
     var originalSuccess = arguments[0].success;
 
-    arguments[0].success = function () {
-      reportXhr(arguments[0]);
+    if (typeof originalSuccess === 'function') {
+      arguments[0].success = function () {
+        reportXhr(arguments[0]);
 
-      if (originalSuccess) {
-        originalSuccess.apply(_this, arguments);
-      }
-    };
+        if (originalSuccess) {
+          originalSuccess.apply(_this, arguments);
+        }
+      };
+    }
 
     var originalFail = arguments[0].fail;
 
-    arguments[0].fail = function () {
-      reportXhr(arguments[0]);
+    if (typeof originalFail === 'function') {
+      arguments[0].fail = function () {
+        reportXhr(arguments[0]);
 
-      if (originalFail) {
-        originalFail.apply(_this, arguments);
-      }
-    };
+        if (originalFail) {
+          originalFail.apply(_this, arguments);
+        }
+      };
+    }
 
     var hasBeenReported = false;
 
@@ -87,6 +91,35 @@ function proxyDownload() {
     beforeSendCallbacks.forEach(function (callback) {
       callback(dataflux_xhr);
     });
-    return originalDownloadRequest.apply(this, arguments);
+    var result = originalDownloadRequest.apply(this, arguments); // 判断结果是否为promise
+
+    var isPromise = function isPromise(obj) {
+      return !!obj && (typeof obj === "object" || typeof obj === "function") && typeof obj.then === "function";
+    };
+
+    if (isPromise(result) && userConfiguration.isVue2) {
+      // vue2 版本，success, fail 都在then返回
+      return result.then(function (res) {
+        if (res[0]) {
+          reportXhr(res[0]);
+        } else {
+          reportXhr(res[1]);
+        }
+
+        return res;
+      });
+    } else if (isPromise(result) && !userConfiguration.isVue2) {
+      return new Promise(function (resolve, reject) {
+        result.then(function (res) {
+          reportXhr(res);
+          resolve(res);
+        }).catch(function (err) {
+          reportXhr(err);
+          reject(err);
+        });
+      });
+    } else {
+      return result;
+    }
   };
 }

package/esm/core/errorCollection.js

@@ -91,10 +91,10 @@ export function startAutomaticErrorCollection(configuration) {
   return errorObservable;
 }
 export function trackNetworkError(configuration, errorObservable) {
-  startXhrProxy().onRequestComplete(function (context) {
+  startXhrProxy(configuration).onRequestComplete(function (context) {
     return handleCompleteRequest(context.type, context);
   });
-  startDownloadProxy().onRequestComplete(function (context) {
+  startDownloadProxy(configuration).onRequestComplete(function (context) {
     return handleCompleteRequest(context.type, context);
   });
 

package/esm/core/xhrProxy.js

@@ -5,9 +5,9 @@ var xhrProxySingleton;
 var beforeSendCallbacks = [];
 var onRequestCompleteCallbacks = [];
 var originalXhrRequest;
-export function startXhrProxy() {
+export function startXhrProxy(userConfiguration) {
   if (!xhrProxySingleton) {
-    proxyXhr();
+    proxyXhr(userConfiguration);
     xhrProxySingleton = {
       beforeSend: function beforeSend(callback) {
         beforeSendCallbacks.push(callback);
@@ -29,7 +29,7 @@ export function resetXhrProxy() {
   }
 }
 
-function proxyXhr() {
+function proxyXhr(userConfiguration) {
   originalXhrRequest = sdk.request;
 
   sdk.request = function () {
@@ -46,23 +46,27 @@ function proxyXhr() {
     dataflux_xhr.startTime = now();
     var originalSuccess = arguments[0].success;
 
-    arguments[0].success = function () {
-      reportXhr(arguments[0]);
+    if (typeof originalSuccess === 'function') {
+      arguments[0].success = function () {
+        reportXhr(arguments[0]);
 
-      if (originalSuccess) {
-        originalSuccess.apply(_this, arguments);
-      }
-    };
+        if (originalSuccess) {
+          originalSuccess.apply(_this, arguments);
+        }
+      };
+    }
 
     var originalFail = arguments[0].fail;
 
-    arguments[0].fail = function () {
-      reportXhr(arguments[0]);
+    if (typeof originalFail === 'function') {
+      arguments[0].fail = function () {
+        reportXhr(arguments[0]);
 
-      if (originalFail) {
-        originalFail.apply(_this, arguments);
-      }
-    };
+        if (originalFail) {
+          originalFail.apply(_this, arguments);
+        }
+      };
+    }
 
     var hasBeenReported = false;
 
@@ -85,6 +89,35 @@ function proxyXhr() {
     beforeSendCallbacks.forEach(function (callback) {
       callback(dataflux_xhr);
     });
-    return originalXhrRequest.call(this, dataflux_xhr.option);
+    var result = originalXhrRequest.call(this, dataflux_xhr.option); // 判断结果是否为promise
+
+    var isPromise = function isPromise(obj) {
+      return !!obj && (typeof obj === "object" || typeof obj === "function") && typeof obj.then === "function";
+    };
+
+    if (isPromise(result) && userConfiguration.isVue2) {
+      // vue2 版本，success, fail 都在then返回
+      return result.then(function (res) {
+        if (res[0]) {
+          reportXhr(res[0]);
+        } else {
+          reportXhr(res[1]);
+        }
+
+        return res;
+      });
+    } else if (isPromise(result) && !userConfiguration.isVue2) {
+      return new Promise(function (resolve, reject) {
+        result.then(function (res) {
+          reportXhr(res);
+          resolve(res);
+        }).catch(function (err) {
+          reportXhr(err);
+          reject(err);
+        });
+      });
+    } else {
+      return result;
+    }
   };
 }

package/esm/rumEventsCollection/action/trackActions.js

@@ -3,57 +3,39 @@ import { LifeCycleEventType } from '../../core/lifeCycle';
 import { trackEventCounts } from '../trackEventCounts';
 import { waitIdlePageActivity } from '../trackPageActiveites';
 import { ActionType } from '../../helper/enums';
+import { tracker } from '../../core/sdk';
+var WHITE_METHOD = ['setup'];
 export function trackActions(lifeCycle, Vue) {
   var action = startActionManagement(lifeCycle); // New views trigger the discard of the current pending Action
 
   lifeCycle.subscribe(LifeCycleEventType.VIEW_CREATED, function () {
     action.discardCurrent();
   });
-  var originVueExtend = Vue.extend;
-
-  Vue.extend = function (vueOptions) {
-    // methods 方法
-    if (vueOptions.methods) {
-      var vueMethods = Object.keys(vueOptions.methods);
-      vueMethods.forEach(methodName => {
-        clickProxy(vueOptions.methods, methodName, function (_action) {
-          action.create(_action.type, _action.name);
-        }, lifeCycle);
-      });
-    }
 
-    var originMethods = getMethods(vueOptions);
-    originMethods.forEach(methodName => {
-      clickProxy(vueOptions, methodName, function (_action) {
-        action.create(_action.type, _action.name);
-      }, lifeCycle);
-    });
-    return originVueExtend.call(this, vueOptions);
-  }; // var originPage = Page
-  // Page = function (page) {
-  // 	const methods = getMethods(page)
-  // 	methods.forEach((methodName) => {
-  // 		clickProxy(
-  // 			page,
-  // 			methodName,
-  // 			function (_action) {
-  // 				action.create(_action.type, _action.name)
-  // 			},
-  // 			lifeCycle,
-  // 		)
-  // 	})
-  // 	return originPage(page)
-  // }
-  // var originComponent = Component
-  // Component = function (component) {
-  // 	const methods = getMethods(component)
-  // 	methods.forEach((methodName) => {
-  // 		clickProxy(component, methodName, function (_action) {
-  // 			action.create(_action.type, _action.name)
-  // 		})
-  // 	})
-  // 	return originComponent(component)
-  // }
+  if (Vue && Vue.extend) {
+    var originVueExtend = Vue.extend;
+
+    Vue.extend = function (vueOptions) {
+      proxyInstance(vueOptions, action, lifeCycle);
+      return originVueExtend.call(this, vueOptions);
+    };
+  } else {
+    if (!tracker) return;
+    var originCreatePage = tracker.createPage;
+
+    tracker.createPage = function (page) {
+      // methods 方法
+      proxyInstance(page, action, lifeCycle);
+      return originCreatePage.call(this, page);
+    };
+
+    var originCreateComponent = tracker.createComponent;
+
+    tracker.createComponent = function (component) {
+      proxyInstance(component, action, lifeCycle);
+      return originCreateComponent.call(this, component);
+    };
+  } // var originVueExtend = Vue.extend
 
 
   return {
@@ -63,11 +45,31 @@ export function trackActions(lifeCycle, Vue) {
   };
 }
 
-function clickProxy(page, methodName, callback, lifeCycle) {
-  var oirginMethod = page[methodName];
+function proxyInstance(options, action, lifeCycle) {
+  // methods 方法
+  if (options.methods) {
+    var vueMethods = Object.keys(options.methods);
+    vueMethods.forEach(methodName => {
+      clickProxy(options.methods, methodName, function (_action) {
+        action.create(_action.type, _action.name);
+      }, lifeCycle);
+    });
+  }
+
+  var originMethods = getMethods(options);
+  originMethods.forEach(methodName => {
+    clickProxy(options, methodName, function (_action) {
+      action.create(_action.type, _action.name);
+    }, lifeCycle);
+  });
+}
+
+function clickProxy(origin, methodName, callback, lifeCycle) {
+  if (WHITE_METHOD.indexOf(methodName) > -1) return;
+  var originMethod = origin[methodName];
 
-  page[methodName] = function () {
-    var result = oirginMethod.apply(this, arguments);
+  origin[methodName] = function () {
+    var result = originMethod.apply(this, arguments);
     var action = {};
 
     if (isObject(arguments[0])) {

package/esm/rumEventsCollection/page/index.js

@@ -1,48 +1,63 @@
-import { extend, now, throttle, UUID, isNumber, getActivePage } from '../../helper/utils';
+import { type, now, throttle, UUID, isNumber, getActivePage } from '../../helper/utils';
 import { trackEventCounts } from '../trackEventCounts';
-import { LifeCycleEventType } from '../../core/lifeCycle';
-import { sdk } from '../../core/sdk'; // 劫持原小程序App方法
+import { LifeCycleEventType } from '../../core/lifeCycle'; // 劫持原小程序App方法
 
 export var THROTTLE_VIEW_UPDATE_PERIOD = 3000;
-export function rewritePage(configuration, lifeCycle, Vue) {
-  var originVueExtend = Vue.extend;
-
-  Vue.extend = function (vueOptions) {
-    // 合并方法，插入记录脚本
-    var currentView,
-        startTime = now();
-    ['onReady', 'onShow', 'onLoad', 'onUnload', 'onHide'].forEach(methodName => {
-      var userDefinedMethod = vueOptions[methodName];
-
-      vueOptions[methodName] = function () {
-        if (this.mpType !== 'page') {
-          return userDefinedMethod && userDefinedMethod.apply(this, arguments);
-        } // 只处理page类型
-
-
-        if (methodName === 'onShow' || methodName === 'onLoad') {
-          if (typeof currentView === 'undefined') {
-            var activePage = getActivePage();
-            currentView = newView(lifeCycle, activePage && activePage.route, startTime);
-          }
+
+function proxyPage(pageOptions, lifeCycle) {
+  // 合并方法，插入记录脚本
+  var currentView,
+      startTime = now();
+  ['onReady', 'onShow', 'onLoad', 'onUnload', 'onHide'].forEach(methodName => {
+    var userDefinedMethod = pageOptions[methodName];
+
+    pageOptions[methodName] = function () {
+      var mpType = this.mpType || this.$vm.mpType;
+
+      if (mpType !== 'page') {
+        return userDefinedMethod && userDefinedMethod.apply(this, arguments);
+      } // 只处理page类型
+
+
+      if (methodName === 'onShow' || methodName === 'onLoad') {
+        if (typeof currentView === 'undefined') {
+          var activePage = getActivePage();
+          currentView = newView(lifeCycle, activePage && activePage.route, startTime);
         }
+      }
 
-        currentView && currentView.setLoadEventEnd(methodName);
+      currentView && currentView.setLoadEventEnd(methodName);
 
-        if ((methodName === 'onUnload' || methodName === 'onHide' || methodName === 'onShow') && currentView) {
-          currentView.triggerUpdate();
+      if ((methodName === 'onUnload' || methodName === 'onHide' || methodName === 'onShow') && currentView) {
+        currentView.triggerUpdate();
 
-          if (methodName === 'onUnload' || methodName === 'onHide') {
-            currentView.end();
-            currentView = undefined;
-          }
+        if (methodName === 'onUnload' || methodName === 'onHide') {
+          currentView.end();
+          currentView = undefined;
         }
+      }
 
-        return userDefinedMethod && userDefinedMethod.apply(this, arguments);
-      };
-    });
-    return originVueExtend.call(this, vueOptions);
-  };
+      return userDefinedMethod && userDefinedMethod.apply(this, arguments);
+    };
+  });
+}
+
+export function rewritePage(configuration, lifeCycle, Vue) {
+  if (Vue && Vue.extend) {
+    var originVueExtend = Vue.extend;
+
+    Vue.extend = function (vueOptions) {
+      proxyPage(vueOptions, lifeCycle);
+      return originVueExtend.call(this, vueOptions);
+    };
+  } else {
+    var originComponent = Component;
+
+    Component = function Component(pageOptions) {
+      proxyPage(pageOptions.methods, lifeCycle);
+      return originComponent.call(this, pageOptions);
+    };
+  }
 }
 
 function newView(lifeCycle, route, startTime) {

package/esm/rumEventsCollection/requestCollection.js

@@ -31,7 +31,7 @@ function getHeaderString(header) {
 }
 
 export function trackXhr(lifeCycle, configuration, tracer) {
-  var xhrProxy = startXhrProxy();
+  var xhrProxy = startXhrProxy(configuration);
   xhrProxy.beforeSend(function (context) {
     if (isAllowedRequestUrl(configuration, context.url)) {
       tracer.traceXhr(context);
@@ -62,7 +62,7 @@ export function trackXhr(lifeCycle, configuration, tracer) {
   return xhrProxy;
 }
 export function trackDownload(lifeCycle, configuration) {
-  var dwonloadProxy = startDownloadProxy();
+  var dwonloadProxy = startDownloadProxy(configuration);
   dwonloadProxy.beforeSend(function (context) {
     if (isAllowedRequestUrl(configuration, context.url)) {
       context.requestIndex = getNextRequestIndex();

package/esm/rumEventsCollection/setDataCollection.js

@@ -1,5 +1,6 @@
 import { LifeCycleEventType } from '../core/lifeCycle';
 import { now } from '../helper/utils';
+import { tracker } from '../core/sdk';
 
 function resetSetData(data, callback, lifeCycle, mpInstance) {
   var pendingStartTimestamp = now();
@@ -18,36 +19,56 @@ function resetSetData(data, callback, lifeCycle, mpInstance) {
   return _callback;
 }
 
-export function startSetDataColloction(lifeCycle, Vue) {
-  var originVueExtend = Vue.extend;
-
-  Vue.extend = function (vueOptions) {
-    var userDefinedMethod = vueOptions['onLoad'];
+function proxyPage(pageOptions, lifeCycle) {
+  var userDefinedMethod = pageOptions['onLoad'];
 
-    vueOptions['onLoad'] = function () {
-      var mpInstance = this.$scope;
-      var setData = mpInstance.setData; // 重写setData
+  pageOptions['onLoad'] = function () {
+    var mpInstance = this.$scope;
+    var setData = mpInstance.setData;
 
-      if (typeof setData === 'function') {
-        try {
-          // 这里暂时这么处理 只读属性 会抛出错误
-          mpInstance.setData = function (data, callback) {
+    if (typeof setData === 'function') {
+      try {
+        // 这里暂时这么处理 只读属性 会抛出错误
+        mpInstance.setData = function (data, callback) {
+          return setData.call(mpInstance, data, resetSetData(data, callback, lifeCycle, mpInstance));
+        };
+      } catch (err) {
+        Object.defineProperty(mpInstance.__proto__, 'setData', {
+          configurable: false,
+          enumerable: false,
+          value: function value(data, callback) {
             return setData.call(mpInstance, data, resetSetData(data, callback, lifeCycle, mpInstance));
-          };
-        } catch (err) {
-          Object.defineProperty(mpInstance.__proto__, 'setData', {
-            configurable: false,
-            enumerable: false,
-            value: function value(data, callback) {
-              return setData.call(mpInstance, data, resetSetData(data, callback, lifeCycle, mpInstance));
-            }
-          });
-        }
+          }
+        });
       }
+    }
 
-      return userDefinedMethod && userDefinedMethod.apply(this, arguments);
+    return userDefinedMethod && userDefinedMethod.apply(this, arguments);
+  };
+}
+
+export function startSetDataColloction(lifeCycle, Vue) {
+  if (Vue && Vue.extend) {
+    var originVueExtend = Vue.extend;
+
+    Vue.extend = function (vueOptions) {
+      proxyPage(vueOptions, lifeCycle);
+      return originVueExtend.call(this, vueOptions);
     };
+  } else {
+    if (!tracker) return;
+    var originCreatePage = tracker.createPage;
 
-    return originVueExtend.call(this, vueOptions);
-  };
+    tracker.createPage = function (pageOptions) {
+      proxyPage(pageOptions, lifeCycle);
+      return originCreatePage.call(this, pageOptions);
+    };
+
+    var originCreateComponent = tracker.createComponent;
+
+    tracker.createComponent = function (component) {
+      proxyPage(component, lifeCycle);
+      return originCreateComponent.call(this, component);
+    };
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cloudcare/rum-uniapp",
-	"version": "2.1.4",
+	"version": "2.1.7",
 	"main": "cjs/index.js",
 	"module": "esm/index.js",
 	"miniprogram": "cjs",