@tmsfe/tms-core 0.0.41 → 0.0.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tms-core",
-  "version": "0.0.41",
+  "version": "0.0.44",
   "description": "tms运行时框架",
   "repository": {
     "type": "git",

package/src/index-proxy.js

@@ -63,7 +63,7 @@ const asyncFuncNames = [
   // 这行是tms-runtime的
   'getPhone', 'login', 'getLoginInfo', 'getOpenId', 'getMycarPubOpenId', 'getSinanPubOpenId',
   // tms-core
-  'setAuthInfo', 'getConfig', 'navigateToWebview', 'callCloudFunc',
+  'setAuthInfo', 'getConfig', 'navigateToWebview', 'callCloudFunc', 'getEncryptUserInfo',
   'setUserLocation', 'getUserLocation', 'getMpOpenId', 'getOuterOpenId',
 ];
 asyncFuncNames.forEach((funcName) => {

package/src/index.js

@@ -37,7 +37,7 @@ import {
 } from './ipxHelper';
 import getLocInstance from './location/index';
 import LocationBase from './location/base';
-import { getMpOpenId, getOuterOpenId } from './mpInfo';
+import { getMpOpenId, getOuterOpenId, getEncryptUserInfo } from './mpInfo';
 import * as storage from './storage';
 
 /**
@@ -173,6 +173,9 @@ const api = {
   getMpOpenId, // 变更为 getOuterOpenId
   getOuterOpenId,
 
+  /* 获取加密的用户信息 */
+  getEncryptUserInfo,
+
   /** rpx转px */
   rpxToPx,
 

package/src/mpInfo.js

@@ -32,7 +32,23 @@ async function getOuterOpenId(apiKey) {
   return openId;
 }
 
+async function getEncryptUserInfo(mpId = '', queryTypes = '') {
+  if (!mpId) return Promise.reject('缺少服务标志mpId');
+  if (!queryTypes) return Promise.reject('缺少需要加密的用户信息字段描述');
+  return new Request().get('user/info/encrypt', { mpId, queryTypes })
+    .then((res) => {
+      const { resData, errCode, errMsg } = res || {};
+      if (errCode === 0) {
+        // 请求成功
+        return resData;
+      }
+      return Promise.reject(errMsg);
+    })
+    .catch(e => Promise.reject('请求发生错误，请重试'));
+}
+
 export {
   getMpOpenId,
   getOuterOpenId,
+  getEncryptUserInfo,
 };

package/src/report/formatV2.ts

@@ -51,9 +51,9 @@ function getBaseData(deviceData: IDeviceData): { arr: DataItem[], nextIndex: num
   // 22: f22，小程序启动时的url和参数
   arr[22] = helper.getLaunchOptionsString();
   // 23: f23，当前页面的url
-  arr[23] = page.route;
+  arr[23] = page?.route;
   // 24: f24，当前页面的query
-  arr[24] = JSON.stringify(page.options);
+  arr[24] = JSON.stringify(page?.options);
   // 25 ~ 30: 预留字段给后续扩展使用
   // 31 ~ 40: 提供给开发自定义
   // --------------------------字段列表--------------------------

package/src/report/helper.ts

@@ -47,7 +47,7 @@ function getSystemInfo(): ISystemInfo {
   if (systemInfo === null) {
     const system = syncApi.getSystemInfoSync() as any;
     // eslint-disable-next-line
-    const { model = '', version: wxVersion = '', platform = '', SDKVersion = '', host = '' } = system;
+    const { model = '', version: wxVersion = '', platform = '', SDKVersion = '', host } = system;
     systemInfo = { model, wxVersion, platform, SDKVersion, host };
   }
   return systemInfo;
@@ -70,6 +70,9 @@ function getSystemInfoString(): string {
  * @param value
  */
 function convert2String(value: any): string {
+  if (value === null || value === undefined) {
+    return '';
+  }
   const type = typeof value;
   if (type === 'string') {
     return value;
@@ -90,12 +93,8 @@ function getPageInfo(): IPage | null {
     const launch = syncApi.getLaunchOptionsSync() as any;
     return { route: launch.path, options: launch.query };
   }
-  const page = pages.pop();
-  // 插件页
-  if (!page) {
-    return null;
-  }
-  return page;
+  // 如果最后一个为空，则当前是在插件页，继续找上一个页面
+  return pages.reverse().find((t: IPage) => t);
 }
 
 let launchOptions: string | null = null;
@@ -139,11 +138,7 @@ function canReport(): boolean {
     isCrawler = scene === '1129' || scene === '1030';
   }
   // 小程序爬虫，不上报
-  if (isCrawler) {
-    return false;
-  }
-  // 插件页不上报埋点
-  return getPageInfo() !== null;
+  return !isCrawler;
 }
 
 /**

package/src/report/proxy/component.ts

@@ -6,15 +6,19 @@ import helper from './helper';
 
 let originalComponent: any = null;
 
-// 劫持其他事件
-function proxyHandle(componentName: string, methods: any, methodName: string): void {
+// 劫持绑定事件
+function proxyBindEvent(componentName: string, methods: any, methodName: string): void {
   const original = methods[methodName];
+  if (!original) {
+    return;
+  }
   // eslint-disable-next-line no-param-reassign
   methods[methodName] = function (...args: any[]): any {
+    const extend = helper.getEventExtend(args[0]) ; // 把触发事件附加数据也带上
     // 执行原函数之后再发埋点
     return helper.executeFunc(this, original, args, () => {
-      const data = helper.serializeData(this.data);
-      helper.reportData(`Component_${componentName}`, methodName, data);
+      const data = helper.deepClone(this.data);
+      helper.reportData(`Component_${componentName}`, methodName, data, extend);
     });
   };
 }
@@ -30,7 +34,7 @@ function init(): void {
       // tmsReportEvents是由工具在编译时分析出的要上报的事件列表
       const methods = options.methods || {};
       for (const name of options.tmsReportEvents) {
-        proxyHandle(options.tmsComponentName, methods, name);
+        proxyBindEvent(options.tmsComponentName, methods, name);
       }
     }
     originalComponent(options);

package/src/report/proxy/helper.ts

@@ -45,7 +45,6 @@ function executeFunc(context: any, func: Function, args: any[], doneCallback: Fu
   });
 }
 
-const maxDepth = 5;
 const maxArrLen = 10;
 const maxStrLen = 30;
 const maxFieldLen = 20;
@@ -78,9 +77,10 @@ function isArrayType(obj: any): { isArray: boolean, value: any } {
  * 深表克隆
  * @param obj
  * @param depth 当前克隆的深度
+ * @param maxDepth 最大克隆深度
  */
-function deepClone(obj: any, depth: number): any {
-  if (depth >= maxDepth) {
+function deepClone(obj: any, depth = 0, maxDepth = 5): any {
+  if (depth > maxDepth) {
     return undefined;
   }
   const res1 = isBasicsType(obj);
@@ -89,7 +89,7 @@ function deepClone(obj: any, depth: number): any {
   }
   const res2 = isArrayType(obj);
   if (res2.isArray) {
-    return res2.value.map((t: any) => deepClone(t, depth + 1));
+    return res2.value.map((t: any) => deepClone(t, depth + 1, maxDepth));
   }
   const names = Object.getOwnPropertyNames(obj).slice(0, maxFieldLen);
   const newObj = {};
@@ -107,27 +107,44 @@ function deepClone(obj: any, depth: number): any {
     const res2 = isArrayType(value);
     if (res2.isArray) {
       // @ts-ignore
-      newObj[name] = res2.value.map((t: any) => deepClone(t, depth + 1));
+      newObj[name] = res2.value.map((t: any) => deepClone(t, depth + 1, maxDepth));
       continue;
     }
     // @ts-ignore
-    newObj[name] = deepClone(value, depth + 1);
+    newObj[name] = deepClone(value, depth + 1, maxDepth);
   }
   return newObj;
 }
 
 /**
- * 序列化data
- * @param data
+ * 获取触发绑定事件的携带数据
+ * @param event
  */
-function serializeData(data: any): string {
-  const obj = deepClone(data, 0);
-  return JSON.stringify(obj);
+function getEventExtend(event: any): string {
+  if (!event) {
+    return '';
+  }
+  const { currentTarget, mark, detail } = event;
+  const obj = {};
+  // 一般把数据放在dataset或者mark中
+  const dataset = currentTarget?.dataset;
+  if (dataset && Object.keys(dataset).length) {
+    Object.assign(obj, { dataset });
+  }
+  if (mark && Object.keys(mark).length) {
+    Object.assign(obj, { mark });
+  }
+  // 如果以上都没有，那可能就是在detail中
+  if (detail && Object.keys(obj).length === 0) {
+    Object.assign(obj, { detail });
+  }
+  return deepClone(obj);
 }
 
 export default {
   reportData,
   emptyFunc,
   executeFunc,
-  serializeData,
+  deepClone,
+  getEventExtend,
 };

package/src/report/proxy/page.ts

@@ -23,34 +23,41 @@ function proxyLifeMethod(pageOptions: any, methodName: string): void {
   const original = pageOptions[methodName] || helper.emptyFunc;
   // eslint-disable-next-line no-param-reassign
   pageOptions[methodName] = function (...args: any[]): any {
-    let elapsed: number | '' = ''; // 页面曝光时间
-    let showCount: number | '' = ''; // 曝光次数
+    let exposureTime = 0; // 页面曝光时长
+    let showCount = 0; // 曝光次数
     if (methodName === 'onShow') {
       this.tmsPageShowCount = (this.tmsPageShowCount || 0) + 1;
       this.tmsPageShowTime = Date.now();
       showCount = this.tmsPageShowCount;
     } else if (methodName === 'onHide' || methodName === 'onUnload') {
-      elapsed = Date.now() - this.tmsPageShowTime;
+      exposureTime = Date.now() - this.tmsPageShowTime;
       this.tmsPageShowTime = 0;
       showCount = this.tmsPageShowCount;
     }
-    // 执行原函数之后再发埋点
-    return helper.executeFunc(this, original, args, () => {
-      const data = helper.serializeData(this.data);
-      helper.reportData(`Page_${methodName}`, data, showCount, elapsed);
-    });
+
+    // 生命周期函数先发埋点，避免次过程用户退出而丢失埋点
+    const options = helper.deepClone(args[0], 0, 1);
+    const showInfo = showCount ? { showCount, exposureTime } : null;
+    helper.reportData(`Page_${methodName}`, options, showInfo);
+
+    // 执行原函数
+    return helper.executeFunc(this, original, args, helper.emptyFunc);
   };
 }
 
-// 劫持其他事件
-function proxyHandle(pageOptions: any, methodName: string): void {
-  const original = pageOptions[methodName] || helper.emptyFunc;
+// 劫持绑定事件
+function proxyBindEvent(pageOptions: any, methodName: string): void {
+  const original = pageOptions[methodName];
+  if (!original) {
+    return;
+  }
   // eslint-disable-next-line no-param-reassign
   pageOptions[methodName] = function (...args: any[]): any {
+    const extend = helper.getEventExtend(args[0]) ; // 把触发事件附加数据也带上
     // 执行原函数之后再发埋点
     return helper.executeFunc(this, original, args, () => {
-      const data = helper.serializeData(this.data);
-      helper.reportData(`Page_${methodName}`, data);
+      const data = helper.deepClone(this.data);
+      helper.reportData(`Page_${methodName}`, data, extend);
     });
   };
 }
@@ -68,7 +75,7 @@ function init(): void {
       }
       // tmsReportEvents是由工具在编译时分析出的要上报的事件列表
       for (const methodName of options.tmsReportEvents) {
-        proxyHandle(options, methodName);
+        proxyBindEvent(options, methodName);
       }
     }
     originalPage(options);

package/src/report/types.ts

@@ -30,7 +30,8 @@ interface ISystemInfo {
   wxVersion: string,
   platform: string,
   SDKVersion: string,
-  host: object | '',
+  // 开发环境下为空
+  host: object,
 }
 
 interface ILocation {