@cloudcare/rum-uniapp 2.1.20 → 2.1.22

package/cjs/boot/buildEnv.js

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

package/cjs/core/sdk.js

@@ -13,27 +13,28 @@ function getSDK() {
     if (uni && (typeof uni === "undefined" ? "undefined" : _typeof(uni)) === 'object' && typeof uni.request === 'function') {
       sdk = uni;
     }
-    if (wx && (typeof wx === "undefined" ? "undefined" : _typeof(wx)) === 'object' && typeof wx.request === 'function') {
+    if ((typeof wx === "undefined" ? "undefined" : _typeof(wx)) === 'object' && typeof wx.request === 'function') {
       // 微信
       tracker = wx;
-    } else if (my && (typeof my === "undefined" ? "undefined" : _typeof(my)) === 'object' && typeof my.request === 'function') {
+    } else if ((typeof my === "undefined" ? "undefined" : _typeof(my)) === 'object' && typeof my.request === 'function') {
       // 支付宝
       tracker = my;
-    } else if (tt && (typeof tt === "undefined" ? "undefined" : _typeof(tt)) === 'object' && typeof tt.request === 'function') {
+    } else if ((typeof tt === "undefined" ? "undefined" : _typeof(tt)) === 'object' && typeof tt.request === 'function') {
       // 头条
       tracker = tt;
-    } else if (dd && (typeof dd === "undefined" ? "undefined" : _typeof(dd)) === 'object' && typeof dd.request === 'function') {
+    } else if ((typeof dd === "undefined" ? "undefined" : _typeof(dd)) === 'object' && typeof dd.request === 'function') {
       // dingding
       tracker = dd;
-    } else if (qq && (typeof qq === "undefined" ? "undefined" : _typeof(qq)) === 'object' && typeof qq.request === 'function') {
+    } else if ((typeof qq === "undefined" ? "undefined" : _typeof(qq)) === 'object' && typeof qq.request === 'function') {
       // QQ 小程序、QQ 小游戏
       tracker = qq;
-    } else if (swan && (typeof swan === "undefined" ? "undefined" : _typeof(swan)) === 'object' && typeof swan.request === 'function') {
+    } else if ((typeof swan === "undefined" ? "undefined" : _typeof(swan)) === 'object' && typeof swan.request === 'function') {
       // 百度小程序
       tracker = swan;
     } else {
       tracker = uni;
     }
+    // tracker = uni
   } catch (err) {
     console.warn('unsupport platform, Fail to start');
   }

package/cjs/helper/tracekit.js

@@ -829,7 +829,6 @@ var computeStackTrace = exports.computeStackTrace = function computeStackTraceWr
 var ERROR_TYPES_RE = /^(?:[Uu]ncaught (?:exception: )?)?(?:((?:Eval|Internal|Range|Reference|Syntax|Type|URI|)Error): )?(.*)$/;
 function extractMessage(ex) {
   var message = ex && ex.message;
-  // console.log('message',message)
   if (!message) {
     return 'No error message';
   }

package/cjs/main.js

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.datafluxRum = void 0;
+var datafluxRum = exports.datafluxRum = {
+  a: 1,
+  b: 2
+};

package/cjs/rumEventsCollection/action/trackActions.js

@@ -26,17 +26,46 @@ function trackActions(lifeCycle, Vue) {
     };
   } 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 hasComponent = false;
+    if (Page) {
+      hasComponent = true;
+      var originPage = Page;
+      Page = function Page(page) {
+        var methods = (0, _utils.getMethods)(page);
+        methods.forEach(function (methodName) {
+          clickProxy(page, methodName, function (_action) {
+            action.create(_action.type, _action.name);
+          }, lifeCycle);
+        });
+        return originPage(page);
+      };
+    }
+    if (Component) {
+      hasComponent = true;
+      var originComponent = Component;
+      Component = function Component(component) {
+        var methods = (0, _utils.getMethods)(component.methods);
+        methods.forEach(function (methodName) {
+          clickProxy(component, methodName, function (_action) {
+            action.create(_action.type, _action.name);
+          });
+        });
+        return originComponent(component);
+      };
+    }
+    if (!hasComponent) {
+      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
 

package/cjs/rumEventsCollection/app/index.js

@@ -27,6 +27,7 @@ function rewriteApp(configuration, lifeCycle, Vue) {
     ;
     ['onLaunch', 'onShow', 'onHide'].forEach(function (methodName) {
       var userDefinedMethod = app[methodName]; // 暂存用户定义的方法
+
       app[methodName] = function (options) {
         if (methodName === 'onLaunch') {
           appInfo.isStartUp = true;

package/cjs/rumEventsCollection/page/index.js

@@ -17,7 +17,7 @@ function proxyPage(pageOptions, lifeCycle) {
   ['onReady', 'onShow', 'onLoad', 'onUnload', 'onHide'].forEach(function (methodName) {
     var userDefinedMethod = pageOptions[methodName];
     pageOptions[methodName] = function () {
-      var mpType = this.mpType || this.$vm.mpType;
+      var mpType = this.mpType || this.$vm && this.$vm.mpType;
       if (mpType !== 'page') {
         return userDefinedMethod && userDefinedMethod.apply(this, arguments);
       }
@@ -48,11 +48,19 @@ function rewritePage(configuration, lifeCycle, Vue) {
       return originVueExtend.call(this, vueOptions);
     };
   } else {
-    var originComponent = Component;
-    Component = function Component(pageOptions) {
-      proxyPage(pageOptions.methods, lifeCycle);
-      return originComponent.call(this, pageOptions);
-    };
+    if (Page) {
+      var originPage = Page;
+      Page = function Page(pageOptions) {
+        proxyPage(pageOptions, lifeCycle);
+        return originPage.call(this, pageOptions);
+      };
+    } else {
+      var originComponent = Component;
+      Component = function Component(pageOptions) {
+        proxyPage(pageOptions.methods, lifeCycle);
+        return originComponent.call(this, pageOptions);
+      };
+    }
   }
 }
 function newView(lifeCycle, route, startTime) {

package/esm/boot/buildEnv.js

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

package/esm/core/sdk.js

@@ -6,27 +6,28 @@ function getSDK() {
     if (uni && typeof uni === 'object' && typeof uni.request === 'function') {
       sdk = uni;
     }
-    if (wx && typeof wx === 'object' && typeof wx.request === 'function') {
+    if (typeof wx === 'object' && typeof wx.request === 'function') {
       // 微信
       tracker = wx;
-    } else if (my && typeof my === 'object' && typeof my.request === 'function') {
+    } else if (typeof my === 'object' && typeof my.request === 'function') {
       // 支付宝
       tracker = my;
-    } else if (tt && typeof tt === 'object' && typeof tt.request === 'function') {
+    } else if (typeof tt === 'object' && typeof tt.request === 'function') {
       // 头条
       tracker = tt;
-    } else if (dd && typeof dd === 'object' && typeof dd.request === 'function') {
+    } else if (typeof dd === 'object' && typeof dd.request === 'function') {
       // dingding
       tracker = dd;
-    } else if (qq && typeof qq === 'object' && typeof qq.request === 'function') {
+    } else if (typeof qq === 'object' && typeof qq.request === 'function') {
       // QQ 小程序、QQ 小游戏
       tracker = qq;
-    } else if (swan && typeof swan === 'object' && typeof swan.request === 'function') {
+    } else if (typeof swan === 'object' && typeof swan.request === 'function') {
       // 百度小程序
       tracker = swan;
     } else {
       tracker = uni;
     }
+    // tracker = uni
   } catch (err) {
     console.warn('unsupport platform, Fail to start');
   }

package/esm/helper/tracekit.js

@@ -825,7 +825,6 @@ export var computeStackTrace = function computeStackTraceWrapper() {
 var ERROR_TYPES_RE = /^(?:[Uu]ncaught (?:exception: )?)?(?:((?:Eval|Internal|Range|Reference|Syntax|Type|URI|)Error): )?(.*)$/;
 function extractMessage(ex) {
   var message = ex && ex.message;
-  // console.log('message',message)
   if (!message) {
     return 'No error message';
   }

package/esm/main.js

@@ -0,0 +1,4 @@
+export var datafluxRum = {
+  a: 1,
+  b: 2
+};

package/esm/rumEventsCollection/action/trackActions.js

@@ -20,17 +20,46 @@ export function trackActions(lifeCycle, Vue) {
     };
   } 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 hasComponent = false;
+    if (Page) {
+      hasComponent = true;
+      var originPage = Page;
+      Page = function Page(page) {
+        var methods = getMethods(page);
+        methods.forEach(methodName => {
+          clickProxy(page, methodName, function (_action) {
+            action.create(_action.type, _action.name);
+          }, lifeCycle);
+        });
+        return originPage(page);
+      };
+    }
+    if (Component) {
+      hasComponent = true;
+      var originComponent = Component;
+      Component = function Component(component) {
+        var methods = getMethods(component.methods);
+        methods.forEach(methodName => {
+          clickProxy(component, methodName, function (_action) {
+            action.create(_action.type, _action.name);
+          });
+        });
+        return originComponent(component);
+      };
+    }
+    if (!hasComponent) {
+      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
 

package/esm/rumEventsCollection/app/index.js

@@ -20,6 +20,7 @@ export function rewriteApp(configuration, lifeCycle, Vue) {
     ;
     ['onLaunch', 'onShow', 'onHide'].forEach(methodName => {
       var userDefinedMethod = app[methodName]; // 暂存用户定义的方法
+
       app[methodName] = function (options) {
         if (methodName === 'onLaunch') {
           appInfo.isStartUp = true;

package/esm/rumEventsCollection/page/index.js

@@ -11,7 +11,7 @@ function proxyPage(pageOptions, lifeCycle) {
   ['onReady', 'onShow', 'onLoad', 'onUnload', 'onHide'].forEach(methodName => {
     var userDefinedMethod = pageOptions[methodName];
     pageOptions[methodName] = function () {
-      var mpType = this.mpType || this.$vm.mpType;
+      var mpType = this.mpType || this.$vm && this.$vm.mpType;
       if (mpType !== 'page') {
         return userDefinedMethod && userDefinedMethod.apply(this, arguments);
       }
@@ -42,11 +42,19 @@ export function rewritePage(configuration, lifeCycle, Vue) {
       return originVueExtend.call(this, vueOptions);
     };
   } else {
-    var originComponent = Component;
-    Component = function Component(pageOptions) {
-      proxyPage(pageOptions.methods, lifeCycle);
-      return originComponent.call(this, pageOptions);
-    };
+    if (Page) {
+      var originPage = Page;
+      Page = function Page(pageOptions) {
+        proxyPage(pageOptions, lifeCycle);
+        return originPage.call(this, pageOptions);
+      };
+    } else {
+      var originComponent = Component;
+      Component = function Component(pageOptions) {
+        proxyPage(pageOptions.methods, lifeCycle);
+        return originComponent.call(this, pageOptions);
+      };
+    }
   }
 }
 function newView(lifeCycle, route, startTime) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudcare/rum-uniapp",
-    "version": "2.1.20",
+    "version": "2.1.22",
     "main": "cjs/index.js",
     "module": "esm/index.js",
     "miniprogram": "cjs",
@@ -12,7 +12,7 @@
         "ali-oss": "^6.12.0",
         "npm-run-all": "^4.1.5",
         "replace-in-file": "^6.1.0",
-        "webpack": "^5.37.0",
+        "webpack": "^5.91.0",
         "webpack-cli": "^4.7.0",
         "webpack-dev-server": "^3.11.2"
     },