@tmsfe/tms-core 0.0.28 → 0.0.32

package/package.json

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

package/src/cloudReport.ts

@@ -22,10 +22,9 @@ const openidIndex = 7; // openId的下标，由云函数填充
 let initOptions: IInitOptions;
 
 function init(options: IInitOptions): void {
-  console.log('IInitOptions', options)
   if (!initOptions) {
     initOptions = options;
-    wx.cloud.init({env: options.cloudEnvId});
+    wx.cloud.init({ env: options.cloudEnvId });
   }
 }
 
@@ -38,6 +37,17 @@ function getSystemInfoString(): string {
   return encodeURIComponent(JSON.stringify(info));
 }
 
+function convert2String(value: any): string {
+  const type = typeof value;
+  if (type === 'string') {
+    return value;
+  }
+  if (type === 'object') {
+    return JSON.stringify(value);
+  }
+  return String(value);
+}
+
 function getSeqInfo(): { timestamp: number, seqId: string } {
   const timestamp = Date.now();
   const random = Math.random().toString();
@@ -121,19 +131,10 @@ function formatData(page: IPage, seqId: string, data: any[]): DataType[] {
   let index = nextIndex;
   for (const item of data) {
     if (index >= arr.length) {
-      console.error(data);
-      throw new Error('埋点参数个数超出上限');
-    }
-    const type = typeof item;
-    let value: string;
-    if (type === 'string') {
-      value = item;
-    } else if (type === 'object') {
-      value = JSON.stringify(item);
-    } else {
-      value = String(item);
+      console.error('埋点参数个数超出上限而被截断', data);
+      break;
     }
-    arr[index] = value;
+    arr[index] = convert2String(item);
     index += 1;
   }
   return arr;
@@ -186,11 +187,13 @@ function doCallCloudFunc(arr: DataType[], timestamp: number, seqId: string, open
  */
 function callCloudFunc(arr: string[]): void {
   const { timestamp, seqId } = getSeqInfo();
-  doCallCloudFunc(arr, timestamp, seqId, -1);
+  doCallCloudFunc(arr, timestamp, seqId, openidIndex);
 }
 
 export default {
   init,
   report,
   callCloudFunc,
+  convert2String,
+  getSystemInfoString,
 };

package/src/fastreport.js

@@ -3,28 +3,14 @@
  * @author Fenggang.Sun <fenggangsun@tencent.com>
  * @file 快速上报数据，不处理过多逻辑，保证快速上报
  */
-import Request from './request';
-import { getEnvInfo } from './env';
-import Sync from './syncfnmanager';
-
-let simulatedUserIdCache; // 模拟用户id在内存里的缓存
-
-const getSystemInfo = () => {
-  const system = Sync.getSystemInfoSync();
-  const { model = '', version: wxVersion = '', platform = '', SDKVersion = '', host = '' } = system;
-
-  return { model, wxVersion, platform, SDKVersion, host };
-};
+import { getEnvInfo, getAuthInfo } from './env';
+import CloudReport from './cloudReport';
 
 const handleParamOfDifferentType = (param) => {
   const data = new Array(41);
   Object.keys(param).forEach((key) => {
-    const valType = typeof param[key];
-    if (valType === 'string') data[key] = param[key];
-    else if (valType === 'object') data[key] = JSON.stringify(param[key]);
-    else data[key] = String(param[key]);
+    data[key] = CloudReport.convert2String(param[key]);
   });
-
   return data;
 };
 
@@ -39,52 +25,27 @@ export default class FastReport {
    * @memberof FastReport
    * @description 快速上报
    * @param {Object} param 埋点数据
-   * @param {Boolean} simulatedUserId 是否上报模拟用户Id
-   * @param {Number} simulatedUserIdIndex 上报模拟用户ID时放在哪个字段
-   * @param {Boolean} reportShowScene 是否上报小程序onShow场景值
-   * @param {Boolean} appVer 是否上报小程序版本
-   * @returns {Promsie} 返回上报结果
    */
-  static report(param = {}, simulatedUserId = true, simulatedUserIdIndex = 40, reportShowScene = true, appVer = true) {
-    if (!param[27]) return Promise.reject('invalid report param');
+  static report(param = {}) {
+    if (!param[27]) {
+      return Promise.reject('invalid report param');
+    }
     const env = getEnvInfo();
     const data = handleParamOfDifferentType(param);
     data[9] = '2';
-    data[33] = encodeURIComponent(JSON.stringify(getSystemInfo()));
-    if (appVer) {
-      data[10] = defAssign(data[10], env.appVersion);
-    }
+    data[10] = defAssign(data[10], env.appVersion);
     data[26] = defAssign(data[26], data[27]?.[0]);
     data[28] = env.client;
-    if (reportShowScene && !data[29]) {
+    if (!data[29]) {
       const appShowScene = wx.getStorageSync('appShowScene');
-      if (appShowScene) data[29] = String(appShowScene);
+      if (appShowScene) {
+        data[29] = String(appShowScene);
+      }
     }
-    if (simulatedUserId && !data[simulatedUserIdIndex]) {
-      data[simulatedUserIdIndex] = FastReport.getSimulatedUserId();
-    }
-
-    return new Request().post('basic/event/upload', { batch: [data] })
-      .catch(() => null);
-  }
-
-  /**
-   * @memberof FastReport
-   * @description 获取模拟的用户身份标识
-   * @returns {String} 用户的临时标识
-   */
-  static getSimulatedUserId() {
-    // 优先使用内存级缓存
-    if (simulatedUserIdCache) return simulatedUserIdCache;
-    const key = 'SimulatedUserKey';
-    // 读取本地缓存记录的值
-    simulatedUserIdCache = wx.getStorageSync(key);
-    if (simulatedUserIdCache) return simulatedUserIdCache;
-    // 生成新的值
-    const nonce = Math.random().toString(36)
-      .substr(2, 10);
-    simulatedUserIdCache = `${Date.now()}_${nonce}`;
-    wx.setStorage({ key, data: simulatedUserIdCache });
-    return simulatedUserIdCache;
+    data[33] = CloudReport.getSystemInfoString();
+    getAuthInfo().then((user) => {
+      data[5] = user.uid;
+      CloudReport.callCloudFunc(data);
+    });
   }
 };

package/src/index-proxy.js

@@ -210,6 +210,11 @@ function getCloudReport() {
   return CloudReport;
 }
 
+wx.onAppShow((options) => {
+  // 避免vendor分包加载太慢而错过onAppShow
+  wx.tmsAppShowOptions = options;
+});
+
 const api = {
   isProxy: true, // 方便定位问题时判断是否proxy
   initProxy,

package/src/report.js

@@ -299,7 +299,7 @@ const cache = (reportData, reportNow, locPoi = true) => {
   }
   return Promise.all(task)
     .then(async (deviceData) => {
-      // 先对上报数据进行预处理
+    // 先对上报数据进行预处理
       const result = await formatReportData(reportData, deviceData);
       // 将需要上报的数据缓存在队列中
       ReportDataQueue.push(result);
@@ -342,6 +342,7 @@ const sendData = async () => {
  * @returns {void}
  */
 const startSendTimer = (clearTimerAfterSend) => {
+  clearInterval(ReportTaskId);
   ReportTaskId = setInterval(async () => {
     sendData();
     if (clearTimerAfterSend) {
@@ -395,15 +396,25 @@ const setAppShowOptions = (options) => {
  * init之后再监听
  */
 const startListenApp = () => {
+  const doAppShow = (options) => {
+    // 更新onShow参数
+    setAppShowOptions(options);
+    // 上报数据
+    report(true);
+  };
+
+  // 避免vendor分包加载太慢而错过onAppShow
+  if (wx.tmsAppShowOptions) {
+    doAppShow(wx.tmsAppShowOptions);
+    wx.tmsAppShowOptions = null;
+  }
+
   /**
    * 监听小程序onShow事件
    * @private
    */
   wx.onAppShow((options) => {
-    // 更新onShow参数
-    setAppShowOptions(options);
-    // 上报数据
-    report(true);
+    doAppShow(options);
   });
 
   /**