@tmsfe/tms-core 0.0.33 → 0.0.34

package/package.json

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

package/src/index-proxy.js

@@ -7,7 +7,6 @@
 
 import syncApi from './syncfnmanager';
 import md5 from './md5';
-import CloudReport from './cloudReport';
 import { rpxToPx } from './rpx';
 import { serialize } from './objUtils';
 import * as stringUtils from './stringUtils';
@@ -40,7 +39,6 @@ function invoke(obj, funcName, args) {
 function initProxy(appObj, options) {
   app = appObj;
   initOptions = options;
-  CloudReport.init(options);
 }
 
 function awaitTMS() {
@@ -75,8 +73,7 @@ asyncFuncNames.forEach((funcName) => {
 // 返回对象的函数，并且对象的所有接口都可以以promise的形式返回
 const objFuncs = {};
 const objFuncNames = [
-  'getLogManager', 'getRealtimeLogManager', 'getReporter',
-  'getFastReporter', 'getEventDispatcher',
+  'getLogManager', 'getRealtimeLogManager', 'getReporter', 'getEventDispatcher',
 ];
 objFuncNames.forEach((funcName) => {
   objFuncs[funcName] = function (...args1) {
@@ -203,23 +200,10 @@ function getHomePage() {
   return initOptions.homePage;
 }
 
-function getCloudReport() {
-  if (tms) {
-    return tms.getCloudReport();
-  }
-  return CloudReport;
-}
-
-wx.onAppShow((options) => {
-  // 避免vendor分包加载太慢而错过onAppShow
-  wx.tmsAppShowOptions = options;
-});
-
 const api = {
   isProxy: true, // 方便定位问题时判断是否proxy
   initProxy,
   md5,
-  getCloudReport,
   getCarManager,
   getLocationManager,
   rpxToPx,

package/src/index.js

@@ -1,6 +1,5 @@
 import Request from './request';
-import FastReport from './fastreport';
-import CloudReport from './cloudReport';
+import Reporter from './report/index';
 import { getConfig } from './config';
 import syncApi from './syncfnmanager';
 import nav from './navigator';
@@ -8,7 +7,6 @@ import { getLogManager, getRealtimeLogManager } from './log';
 import { setEnvInfo, getEnvInfo, setAuthInfo, setAppPagePaths, isAppPageExist, getHomePage } from './env';
 import md5 from './md5';
 import { callCloudFunc } from './cloudService';
-import { cache as report, startListenApp } from './report';
 import EventDispatcher from './eventDispatcher';
 import { serialize } from './objUtils';
 import { rpxToPx } from './rpx';
@@ -66,18 +64,7 @@ const createRequest = (config = {}) => new Request(config);
  * @example
  * getReporter().report(reportData, reportNow);
  */
-const getReporter = () => ({ report });
-
-/**
- * @description 埋点上报(快速上报，不依赖用户userId标识)
- * @returns {Class} [FastReporter类](#class-fastreport)
- */
-const getFastReporter = () => FastReport;
-
-/**
- * @description 云函数埋点上报
- */
-const getCloudReport = () => CloudReport;
+const getReporter = () => Reporter;
 
 /**
  * @description 自定义事件机制
@@ -103,7 +90,6 @@ const getLocationBaseClass = () => LocationBase;
  * @returns {undefined} 无返回值.
  */
 const init = (options = {}) => {
-  startListenApp();
   const { appVersion, wxAppId, client, defaultHost, cloudEnvId, appEnv, appPagePaths, homePage } = options;
   const envInfo = {
     wxAppId,
@@ -114,7 +100,7 @@ const init = (options = {}) => {
   };
   setEnvInfo(envInfo);
   setAppPagePaths(appPagePaths, homePage);
-  CloudReport.init(envInfo);
+  Reporter.init(envInfo);
   Request.defaultHost = defaultHost;
   // 初始化云环境
   wx.cloud.init({ env: cloudEnvId });
@@ -140,8 +126,6 @@ const api = {
   getRealtimeLogManager,
   md5,
   getReporter,
-  getCloudReport,
-  getFastReporter,
   getLocationManager,
   getLocationBaseClass,
   getEventDispatcher,

package/src/report/formatV1.ts

@@ -0,0 +1,92 @@
+/**
+ * 格式化旧埋点
+ */
+
+// / <reference path='./types.ts'/>
+import helper from './helper';
+
+/**
+ * 获取埋点的基础字段
+ */
+function getBaseData(deviceData: IDeviceData): DataItem[] {
+  const arr = new Array<string>(helper.dataArrLen);
+  const { networkType, location } = deviceData;
+  const { appVersion, client } = helper.getInitOptions();
+  // todo: 如何区分新旧埋点？新：f20不为空，旧：f20为空
+  // ++++++++++++++++++++++++++字段列表++++++++++++++++++++++++++
+  // 0: log_time，日志入库时间
+  // 1: access_time，用户点击时间，服务端统一处理
+  // 2: user_ip，前端无需赋值
+  // 3: qimei，灯塔中的用户ID
+  // 4: imei，Android手机的imei IOS系统中的idfv 车联网中的wecarid
+  // 5: user_id，用户ID
+  // 6: qq_no，登录QQ的openid，
+  // 7: wechat_id，登录微信的openid
+  // 8: phone_no，手机号
+  // 9: platform，客户端请求来源，小程序是2
+  arr[9] = '2';
+  // 10: app_version，客户端|小程序版本号
+  arr[10] = appVersion;
+  // 11: channel，外部推广渠道或车辆所属渠道
+  // 12: net_type，wifi、3G、4G等
+  arr[12] = networkType;
+  // 13: product_id，手图APP、车联网等
+  arr[13] = '2';
+  // 14: busi_type，1: 定位、2: 检索、3: 导航、4: 车主服务、5: 小程序
+  arr[14] = '5';
+  // 15: request_id，请求ID，由接入层填充
+  // 16: session_id，这里表示渠道公共参数
+  arr[16] = helper.getLaunchFrom();
+  // 17: f17，province - 省份
+  arr[17] = location.province;
+  // 18: f18，city - 城市
+  arr[18] = location.cityName;
+  // 19: f19，当前小程序运行的宿主环境
+  arr[19] = helper.getSystemInfo().host;
+  // 28: f28，sinan、mycar等
+  arr[28] = client;
+  // 29: f29，小程序场景值
+  arr[29] = helper.getAppScene();
+  // 33: f33，系统信息
+  arr[33] = helper.getSystemInfoString();
+  // 36: f36，小程序启动时的参数
+  arr[36] = helper.getLaunchOptionsString();
+  // --------------------------字段列表--------------------------
+  return arr;
+}
+
+/**
+ * 拼接埋点数组
+ */
+function jointData(data: IOldParams, deviceData: IDeviceData): DataItem[] {
+  const arr = getBaseData(deviceData);
+  const keys = Object.keys(data) as any as number[];
+  for (const key of keys) {
+    arr[key] = helper.convert2String(data[key]);
+  }
+  return arr;
+}
+
+/**
+ * 格式化普通埋点数据
+ */
+function formatData(data: IOldParams): Promise<DataItem[]> {
+  return new Promise<DataItem[]>((resolve) => {
+    helper.getDeviceData().then((deviceData: IDeviceData) => {
+      const arr = jointData(data, deviceData);
+      resolve(arr);
+    });
+  });
+}
+
+/**
+ * 格式化快速上报埋点数据，不依赖用户位置
+ */
+function formatFastData(data: IOldParams): DataItem[] {
+  return jointData(data, helper.defaultDevice);
+}
+
+export default {
+  formatData,
+  formatFastData,
+};

package/src/report/formatV2.ts

@@ -0,0 +1,101 @@
+/**
+ * 格式化新埋点
+ */
+
+// / <reference path='./types.ts'/>
+import helper from './helper';
+
+/**
+ * 获取埋点的基础字段
+ */
+function getBaseData(deviceData: IDeviceData): { arr: DataItem[], nextIndex: number } {
+  const page = helper.getPageInfo() as IPage;
+  const { networkType, location } = deviceData;
+  const { appVersion, client } = helper.getInitOptions();
+  const arr = new Array<string>(helper.dataArrLen);
+  // todo: 如何区分新旧埋点？新：f20不为空，旧：f20为空
+  // ++++++++++++++++++++++++++字段列表++++++++++++++++++++++++++
+  // 0: log_time，日志入库时间
+  // 1: access_time，用户点击时间，服务端统一处理
+  // 2: user_ip，前端无需赋值
+  // 3: qimei，灯塔中的用户ID
+  // 4: imei，Android手机的imei IOS系统中的idfv 车联网中的wecarid
+  // 5: user_id，用户ID
+  // 6: qq_no，登录QQ的openid，
+  // 7: wechat_id，登录微信的openid
+  // 8: phone_no，手机号
+  // 9: platform，客户端请求来源，小程序是2
+  arr[9] = '2';
+  // 10: app_version，客户端|小程序版本号
+  arr[10] = appVersion;
+  // 11: channel，外部推广渠道或车辆所属渠道
+  // 12: net_type，wifi、3G、4G等
+  arr[12] = networkType;
+  // 13: product_id，手图APP、车联网等
+  arr[13] = '2';
+  // 14: busi_type，1: 定位、2: 检索、3: 导航、4: 车主服务、5: 小程序
+  arr[14] = '5';
+  // 15: request_id，请求ID，由接入层填充
+  // 16: session_id，标识用户一次访问过程的ID
+  // 17: f17，province - 省份
+  arr[17] = location.province;
+  // 18: f18，city - 城市
+  arr[18] = location.cityName;
+  // 19: f19，系统信息
+  arr[19] = helper.getSystemInfoString();
+  // 20: f20，sinan、mycar等
+  arr[20] = client;
+  // 21: f21，小程序场景值
+  arr[21] = helper.getAppScene();
+  // 22: f22，小程序启动时的参数
+  arr[22] = helper.getLaunchOptionsString();
+  // 23: f23，当前页面的url
+  arr[23] = page.route;
+  // 24: f24，当前页面的query
+  arr[24] = JSON.stringify(page.options);
+  // 25 ~ 30: 预留字典给后续扩展使用
+  // 31 ~ 40: 提供给开发自定义
+  // --------------------------字段列表--------------------------
+  return { arr, nextIndex: 31 };
+}
+
+/**
+ * 拼接埋点数组
+ */
+function jointData(data: any[], deviceData: IDeviceData): DataItem[] {
+  const { arr, nextIndex } = getBaseData(deviceData);
+  let index = nextIndex;
+  for (const item of data) {
+    if (index >= arr.length) {
+      console.error('埋点参数个数超出上限而被截断', data);
+      break;
+    }
+    arr[index] = helper.convert2String(item);
+    index += 1;
+  }
+  return arr;
+}
+
+/**
+ * 格式化上报埋点数据
+ */
+function formatData(data: any[]): Promise<DataItem[]> {
+  return new Promise<DataItem[]>((resolve) => {
+    helper.getDeviceData().then((deviceData: IDeviceData) => {
+      const arr = jointData(data, deviceData);
+      resolve(arr);
+    });
+  });
+}
+
+/**
+ * 格式化快速上报埋点数据，不依赖用户位置
+ */
+function formatFastData(data: any[]): DataItem[] {
+  return jointData(data, helper.defaultDevice);
+}
+
+export default {
+  formatData,
+  formatFastData,
+};

package/src/report/helper.ts

@@ -0,0 +1,217 @@
+/**
+ * 埋点辅助函数
+ */
+
+// / <reference path='./types.ts'/>
+import syncApi from '../syncfnmanager';
+
+function getTms(): any {
+  // 如果是在app.js的onLaunch中调用，则没有getApp().tms为空
+  return getApp()?.tms || wx.tms;
+}
+
+let initOptions: IInitOptions;
+
+/**
+ * 初始化
+ */
+function init(options: IInitOptions): void {
+  if (!initOptions) {
+    initOptions = options;
+  }
+}
+
+/**
+ * 获取初始化时的参数
+ */
+function getInitOptions(): IInitOptions {
+  return initOptions;
+}
+
+let systemInfo: ISystemInfo | null = null;
+
+/**
+ * 获取系统信息
+ */
+function getSystemInfo(): ISystemInfo {
+  if (systemInfo === null) {
+    const system = syncApi.getSystemInfoSync() as any;
+    // eslint-disable-next-line
+    const { model = '', version: wxVersion = '', platform = '', SDKVersion = '', host = '' } = system;
+    systemInfo = { model, wxVersion, platform, SDKVersion, host };
+  }
+  return systemInfo;
+}
+
+let systemString: string | null = null;
+
+/**
+ * 获取系统信息并格式化成字符串
+ */
+function getSystemInfoString(): string {
+  if (systemString === null) {
+    systemString = JSON.stringify(getSystemInfo());
+  }
+  return systemString;
+}
+
+/**
+ * 把值/对象转成字符串
+ * @param value
+ */
+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 getPageInfo(): IPage | null {
+  const pages = getCurrentPages();
+  // 首页未渲染
+  if (pages.length === 0) {
+    const launch = syncApi.getLaunchOptionsSync() as any;
+    return { route: launch.path, options: launch.query };
+  }
+  const page = pages.pop();
+  // 插件页
+  if (!page) {
+    return null;
+  }
+  return page;
+}
+
+let launchOptions: string | null = null;
+
+/**
+ * 获取小程序启动参数
+ */
+function getLaunchOptionsString(): string {
+  if (launchOptions === null) {
+    const obj = syncApi.getLaunchOptionsSync() as any;
+    launchOptions = obj.query ? JSON.stringify(obj.query) : '';
+  }
+  return launchOptions;
+}
+
+/**
+ * 获取小程序启动时的from参数
+ */
+function getLaunchFrom(): string {
+  const obj = syncApi.getLaunchOptionsSync() as any;
+  return obj.query?.from as string || '';
+}
+
+/**
+ * 获取小程序启动场景值
+ */
+function getAppScene(): string {
+  const { scene = -1 } = syncApi.getLaunchOptionsSync() as any;
+  return scene.toString();
+}
+
+// 是否爬虫
+let isCrawler: boolean | null = null;
+
+/**
+ * 判断当前是否需要发埋点（爬虫和插件页不发）
+ */
+function canReport(): boolean {
+  if (isCrawler === null) {
+    const scene = getAppScene();
+    isCrawler = scene === '1129' || scene === '1030';
+  }
+  // 小程序爬虫，不上报
+  if (isCrawler) {
+    return false;
+  }
+  // 插件页不上报埋点
+  return getPageInfo() !== null;
+}
+
+/**
+ * 埋点数组的长度
+ */
+const dataArrLen = 41;
+
+const defaultDevice = {
+  networkType: null,
+  location: {
+    province: null,
+    cityName: null,
+  },
+} as any as IDeviceData;
+
+let networkPromise: Promise<string> | null = null;
+
+function getNetworkType(): Promise<string> {
+  if (networkPromise === null) {
+    networkPromise = new Promise((resolve) => {
+      wx.getNetworkType({
+        success: (res: any) => resolve(res.networkType),
+        fail: () => resolve('unknown'),
+      });
+    });
+  }
+  return networkPromise;
+}
+
+let locPromise: Promise<ILocation> | null = null;
+
+function getLocation(): Promise<ILocation> {
+  if (locPromise === null) {
+    locPromise = new Promise<ILocation>((resolve) => {
+      const LOC = getTms().getLocationManager();
+      LOC.getIpLocation()
+        .then((res: any) => {
+          const ad = res.ad_info;
+          resolve({ province: ad.province, cityName: ad.city });
+        })
+        .catch(() => {
+          resolve({ province: '', cityName: '' });
+        });
+    });
+  }
+  return locPromise;
+}
+
+let devicePromise: Promise<IDeviceData> | null = null;
+
+/**
+ * 获取设备信息(网络状况，位置信息)
+ */
+function getDeviceData(): Promise<IDeviceData> {
+  if (devicePromise === null) {
+    devicePromise = new Promise<IDeviceData>((resolve) => {
+      Promise.all([getNetworkType(), getLocation()]).then((res) => {
+        const [networkType, location] = res;
+        resolve({ networkType, location });
+      });
+    });
+  }
+  return devicePromise;
+}
+
+export default {
+  init,
+  getTms,
+  getInitOptions,
+  getSystemInfo,
+  getSystemInfoString,
+  convert2String,
+  getPageInfo,
+  getLaunchOptionsString,
+  getLaunchFrom,
+  getAppScene,
+  canReport,
+  dataArrLen,
+  defaultDevice,
+  getDeviceData,
+};

package/src/report/index.ts

@@ -0,0 +1,64 @@
+/**
+ * 埋点
+ */
+
+// / <reference path='./types.ts'/>
+import helper from './helper';
+import sender from './sender';
+import formatV1 from './formatV1';
+import formatV2 from './formatV2';
+
+/**
+ * 初始化
+ */
+function init(options: IInitOptions): void {
+  helper.init(options);
+}
+
+/**
+ * 旧埋点
+ * @param data { 27: xxxx, 34: xxx }
+ */
+function report(data: IOldParams = {}): void {
+  if (helper.canReport()) {
+    formatV1.formatData(data).then(arr => sender.queue(arr));
+  }
+}
+
+/**
+ * 旧埋点，快速上报，不依赖用户位置
+ * @param data { 27: xxxx, 34: xxx }
+ */
+function fastReport(data: IOldParams = {}): void {
+  if (helper.canReport()) {
+    const arr = formatV1.formatFastData(data);
+    sender.send(arr);
+  }
+}
+
+/**
+ * 新埋点
+ */
+function report2(...data: any[]): void {
+  if (helper.canReport()) {
+    formatV2.formatData(data).then(arr => sender.queue(arr));
+  }
+}
+
+/**
+ * 新埋点，快速上报，不依赖用户位置
+ */
+function fastReport2(...data: any[]): void {
+  if (helper.canReport()) {
+    const arr = formatV2.formatFastData(data);
+    sender.send(arr);
+  }
+}
+
+export default {
+  init,
+  report,
+  fastReport,
+  report2,
+  fastReport2,
+};

package/src/report/sender.ts

@@ -0,0 +1,98 @@
+/**
+ * 负责发送埋点
+ */
+
+// / <reference path='./types.ts'/>
+import helper from './helper';
+
+// 缓存队列
+const cacheArr = new Array<DataItem[]>();
+const max = 50; // 超过最大限制就马上发送
+const delay = 3000; // 延迟N毫秒再聚合发送
+let timer = 0; // 计时器
+
+// 检查队列埋点，是否超过上限需要马上发送或者启动计时器
+function checkQueue(isSendFail: boolean): void {
+  if (!isSendFail && cacheArr.length >= max) {
+    batchSendData();
+  } else {
+    startTimer();
+  }
+}
+
+// 启动计时器
+function startTimer(): void {
+  if (timer !== 0 || cacheArr.length === 0) {
+    return;
+  }
+  timer = setTimeout(() => {
+    timer = 0;
+    batchSendData();
+  }, delay);
+}
+
+// 停止计时器
+function stopTimer(): void {
+  if (timer !== 0) {
+    clearTimeout(timer);
+    timer = 0;
+  }
+}
+
+// 批量发送埋点
+function batchSendData(): void {
+  if (cacheArr.length === 0) {
+    return;
+  }
+
+  const batch = cacheArr.splice(0, max);
+  const request = helper.getTms().createRequest();
+  request.post('basic/event/upload', { batch })
+    .then((res: any) => {
+      if (res.errCode !== 0) {
+        requestFail(batch);
+      } else {
+        startTimer();
+      }
+    })
+    .catch((e: any) => {
+      console.error(e);
+      requestFail(batch);
+    });
+}
+
+// 发送失败就再加回队列
+function requestFail(batch: DataItem[][]): void {
+  batch.forEach(item => cacheArr.push(item));
+  checkQueue(true);
+}
+
+/**
+ * 立刻发送埋点
+ * @param arr
+ */
+function send(arr: DataItem[]): void {
+  stopTimer();
+  cacheArr.unshift(arr); // 如果队列中很多，排前面比较稳妥
+  batchSendData();
+}
+
+/**
+ * 添加埋点到队列中，等待聚合发送
+ * @param arr
+ */
+function queue(arr: DataItem[]): void {
+  cacheArr.push(arr);
+  checkQueue(false);
+}
+
+// 小程序关闭时马上发送所有埋点
+wx.onAppHide(() => {
+  stopTimer();
+  batchSendData();
+});
+
+export default {
+  send,
+  queue,
+};

package/src/report/types.ts

@@ -0,0 +1,44 @@
+/* eslint-disable */
+
+type DataItem = string | null | undefined;
+
+/**
+ * 初始化参数对象
+ */
+interface IInitOptions {
+  client: string, // sinan、mycar等
+  appVersion: string,
+}
+
+/**
+ * 页面对象
+ */
+interface IPage {
+  route: string,
+  options: object,
+}
+
+/**
+ * 旧的埋点参数类型
+ */
+interface IOldParams {
+  [key: number]: any,
+}
+
+interface ISystemInfo {
+  model: string,
+  wxVersion: string,
+  platform: '',
+  SDKVersion: '',
+  host: '',
+}
+
+interface ILocation {
+  province: string,
+  cityName: string,
+}
+
+interface IDeviceData {
+  networkType: string,
+  location: ILocation,
+}

package/src/cloudReport.ts

@@ -1,199 +0,0 @@
-/**
- * 调用云函数上报埋点
- */
-
-import syncApi from './syncfnmanager';
-
-type DataType =  string | null;
-
-interface IInitOptions {
-  client: string, // sinan、mycar等
-  appVersion: string,
-  cloudEnvId: string,
-}
-
-interface IPage {
-  route: string,
-  options: object,
-}
-
-const openidIndex = 7; // openId的下标，由云函数填充
-
-let initOptions: IInitOptions;
-
-function init(options: IInitOptions): void {
-  if (!initOptions) {
-    initOptions = options;
-    wx.cloud.init({ env: options.cloudEnvId });
-  }
-}
-
-function getSystemInfoString(): string {
-  const system = syncApi.getSystemInfoSync();
-  // @ts-ignore
-  // eslint-disable-next-line
-  const { model = '', version: wxVersion = '', platform = '', SDKVersion = '', host = '' } = system;
-  const info = { model, wxVersion, platform, SDKVersion, host };
-  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();
-  const randomStr = random.slice(2, 7);
-  const sourceId = 7; // 6 未知 7 云函数 8 出行 9 我的车
-  const seqId = `${timestamp}${sourceId}${randomStr}`;
-  return { timestamp, seqId };
-}
-
-function getPageInfo(): IPage | null {
-  const pages = getCurrentPages();
-  // 首页未渲染
-  if (pages.length === 0) {
-    const launch = syncApi.getLaunchOptionsSync();
-    return { route: launch.path, options: launch.query };
-  }
-  const page = pages.pop();
-  // 插件页
-  if (!page) {
-    return null;
-  }
-  return page;
-}
-
-/**
- * 获取埋点的基础字段
- * @param page
- * @param seqId 请求ID
- */
-function getBaseData(page: IPage, seqId: string): { arr: DataType[], nextIndex: number } {
-  const pageQuery = encodeURIComponent(JSON.stringify(page.options));
-  const pageUrl = page.route;
-  const { appVersion, client } = initOptions;
-  const system = getSystemInfoString();
-  // @ts-ignore
-  const { scene = -1 } = syncApi.getLaunchOptionsSync();
-
-  const arr = new Array(41);
-  // 0: log_time
-  // 1: access_time，用户点击时间，服务端统一处理
-  // 2: user_ip，前端无需赋值
-  // 3: qimei，灯塔中的用户ID
-  // 4: imei，Android手机的imei IOS系统中的idfv 车联网中的wecarid
-  // 5: user_id，用户ID
-  // 6: qq_no，登录QQ的openid，
-  // 7: wechat_id，登录微信的openid，由云函数填充
-  // 8: phone_no，手机号
-  // 9: platform，客户端请求来源，小程序是2
-  arr[9] = '2';
-  // 10: app_version，客户端|小程序版本号
-  arr[10] = appVersion;
-  // 11: channel，外部推广渠道或车辆所属渠道
-  // 12: net_type，wifi、3G、4G等
-  // 13: product_id，手图APP、车联网等
-  // 14: busi_type，1: 定位、2: 检索、3: 导航、4: 车主服务、5: 小程序
-  arr[14] = '5';
-  // 15: request_id，请求ID
-  arr[15] = seqId;
-  // 16: session_id，标识用户一次访问过程的ID
-  // 17: f17 - province，省份
-  // 18: f18 - city，城市
-  // 19: f19 - 系统信息
-  arr[19] = system;
-  // 20: f20 - sinan、mycar等
-  arr[20] = client;
-  // 21: f21 - 小程序场景值
-  arr[21] = scene.toString();
-  // 22: f22 - 标记是云函数上报
-  arr[22] = 'cloud';
-  // 23: f23 - 当前页面的url
-  arr[23] = pageUrl;
-  // 24: f24 - 当前页面的query
-  arr[24] = pageQuery;
-  // 25 ~ 30: 预留字典给后续扩展使用
-  // 31 ~ 40: 提供给开发自定义
-  return { arr, nextIndex: 31 };
-}
-
-function formatData(page: IPage, seqId: string, data: any[]): DataType[] {
-  const { arr, nextIndex } = getBaseData(page, seqId);
-  let index = nextIndex;
-  for (const item of data) {
-    if (index >= arr.length) {
-      console.error('埋点参数个数超出上限而被截断', data);
-      break;
-    }
-    arr[index] = convert2String(item);
-    index += 1;
-  }
-  return arr;
-}
-
-function report(...data: any[]): void {
-  console.log('云埋点', data);
-  const page = getPageInfo();
-  if (page === null) {
-    console.log('插件页不上报埋点');
-    return;
-  }
-  // @ts-ignore
-  const { scene = -1 } = syncApi.getLaunchOptionsSync();
-  // 小程序爬虫产生的日志
-  if (scene === 1129 || scene === 1030) {
-    console.warn('小程序爬虫，不上报');
-  } else {
-    const { timestamp, seqId } = getSeqInfo();
-    const arr = formatData(page, seqId, data);
-    doCallCloudFunc(arr, timestamp, seqId, openidIndex);
-  }
-}
-
-function doCallCloudFunc(arr: DataType[], timestamp: number, seqId: string, openidIndex: number): void {
-  const { cloudEnvId, appVersion } = initOptions;
-  const onFail = (err: any) => {
-    console.error('云埋点失败：', arr, err);
-  };
-  wx.cloud.callFunction({
-    name: 'report',
-    data: {
-      openidIndex,
-      params: { seqId, timestamp, appVersion, batch: [arr] },
-    },
-    config: { env: cloudEnvId },
-    success: (res: any) => {
-      const body = JSON.parse(res.result.body);
-      if (body.errCode !== 0) {
-        onFail(res);
-      }
-    },
-    fail: onFail,
-  });
-}
-
-/**
- * 调用云函数将已经组装完整的埋点数据arr发出去
- * @param arr
- */
-function callCloudFunc(arr: string[]): void {
-  const { timestamp, seqId } = getSeqInfo();
-  doCallCloudFunc(arr, timestamp, seqId, openidIndex);
-}
-
-export default {
-  init,
-  report,
-  callCloudFunc,
-  convert2String,
-  getSystemInfoString,
-};

package/src/fastreport.js

@@ -1,51 +0,0 @@
-/**
- * @copyright 2020-present, Tencent, Inc. All rights reserved.
- * @author Fenggang.Sun <fenggangsun@tencent.com>
- * @file 快速上报数据，不处理过多逻辑，保证快速上报
- */
-import { getEnvInfo, getAuthInfo } from './env';
-import CloudReport from './cloudReport';
-
-const handleParamOfDifferentType = (param) => {
-  const data = new Array(41);
-  Object.keys(param).forEach((key) => {
-    data[key] = CloudReport.convert2String(param[key]);
-  });
-  return data;
-};
-
-const defAssign = (value, defaultValue) => (value || defaultValue);
-
-/**
- * @class FastReport
- * @classdesc 快速上报模块，不依赖用户标识和位置
- */
-export default class FastReport {
-  /**
-   * @memberof FastReport
-   * @description 快速上报
-   * @param {Object} param 埋点数据
-   */
-  static report(param = {}) {
-    if (!param[27]) {
-      return Promise.reject('invalid report param');
-    }
-    const env = getEnvInfo();
-    const data = handleParamOfDifferentType(param);
-    data[9] = '2';
-    data[10] = defAssign(data[10], env.appVersion);
-    data[26] = defAssign(data[26], data[27]?.[0]);
-    data[28] = env.client;
-    if (!data[29]) {
-      const appShowScene = wx.getStorageSync('appShowScene');
-      if (appShowScene) {
-        data[29] = String(appShowScene);
-      }
-    }
-    data[33] = CloudReport.getSystemInfoString();
-    getAuthInfo().then((user) => {
-      data[5] = user.uid;
-      CloudReport.callCloudFunc(data);
-    });
-  }
-};

package/src/report.js

@@ -1,433 +0,0 @@
-import Request from './request';
-import getLocInstance from './location/index';
-import { getAuthInfo } from './env';
-
-const R = new Request();
-const ReportInterval = 3000; // 轮训上报间隔
-const ReportDataQueue = []; // 上报数据队列
-let ReportTaskId = -1; // 轮训上报id
-
-let appShowOptions = null; // 设置小程序onShow参数
-function getAppShowOptions() {
-  if (appShowOptions === null) {
-    try {
-      appShowOptions = wx.getLaunchOptionsSync();
-    } catch (_) {
-      appShowOptions = {};
-    }
-  }
-  return appShowOptions;
-}
-
-function getTMS() {
-  return getApp({ allowDefault: true }).tms;
-}
-
-// 缓存系统信息，避免每次都重新获取系统信息
-let systemPromise = null;
-/**
- * 获取系统信息
- * @private
- * @returns {object} 系统信息
- */
-const getSystemPromise = () => {
-  if (systemPromise === null) {
-    systemPromise = new Promise((resolve) => {
-      wx.getSystemInfo({
-        success: (systemInfo) => {
-          const { model, version: wxVersion, platform, SDKVersion, host } = systemInfo;
-          resolve({ model, wxVersion, platform, SDKVersion, host });
-        },
-        fail: () => {
-          resolve({});
-        },
-      });
-    });
-  }
-  return systemPromise;
-};
-
-let networkPromise = null;
-/**
- * 获取网络信息
- * @private
- * @returns {string} 网络信息
- */
-const getNetworkType = () => {
-  if (networkPromise === null) {
-    networkPromise = new Promise((resolve) => {
-      wx.getNetworkType({
-        success: (netInfo) => {
-          resolve(netInfo.networkType);
-        },
-        fail: () => {
-          resolve('unknown');
-        },
-      });
-    });
-  }
-  return networkPromise;
-};
-
-let ProvinceInfoCache = null;
-/**
- * 获取省市信息
- * @private
- */
-const getProvinceInfo = () => {
-  if (!ProvinceInfoCache) {
-    ProvinceInfoCache = new Promise(async (resolve) => {
-      try {
-        const loc = await getLocInstance().getLocationDetailSilent();
-        resolve({
-          cityName: loc.cityName,
-          province: loc.province,
-        });
-      } catch (_) {
-        // 获取位置失败时，尝试获取本地存储的位置信息
-        const loc = getLocInstance().getUserLocation();
-        if (loc?.cityName) {
-          resolve(loc);
-        } else {
-          resolve({ cityName: '', province: '' });
-        }
-      }
-    });
-  }
-  return ProvinceInfoCache;
-};
-
-let ProvinceInfoCacheByIp = null;
-/**
- * 调接口获取省市信息
- * @private
- */
-const getProvinceInfoByIp = () => {
-  if (!ProvinceInfoCacheByIp) {
-    ProvinceInfoCacheByIp = new Promise(async (resolve) => {
-      try {
-        const loc = await getLocInstance().getIpLocation();
-        const { city, province } = loc.ad_info;
-        resolve({ cityName: city, province });
-      } catch (_) {
-        resolve({ cityName: '', province: '' });
-      }
-    });
-  }
-  return ProvinceInfoCacheByIp;
-};
-
-// 用于缓存用户唯一标识userId
-let userId = '';
-/**
- * 获取用户唯一标识userId
- * @private
- * @returns {string} userId
- */
-const getUserId = async () => {
-  if (userId) {
-    return userId;
-  }
-
-  ({ userId } = await getAuthInfo());
-  return userId;
-};
-
-let launchFrom = '';
-/**
- * 获取用户启动小程序时的渠道来源值
- * @private
- * @returns {string} 用户启动小程序时的渠道来源值
- */
-const getLaunchFrom = () => {
-  if (launchFrom) {
-    return launchFrom;
-  }
-
-  try {
-    const LaunchOptions = wx.getLaunchOptionsSync() || {};
-    const { query = {} } = LaunchOptions;
-    launchFrom = (query.from || '');
-
-    return launchFrom;
-  } catch (_) {
-    return '';
-  }
-};
-
-/**
- * 将上报的对象类型的数据转换成数组类型
- * @private
- * @param {object} reportData 需要上报的数据
- * @returns {array} 数组格式的上报数据
- */
-const getReportDataList = (reportData = {}) => {
-  const reportList = [];
-  reportList.length = 40;
-  Object.keys(reportData).forEach((key) => {
-    const reportIndex = Number(key);
-    reportList[reportIndex] = reportData[key];
-  });
-
-  return reportList;
-};
-
-// 小程序版本号
-let verNum = null;
-function getMiniProgramVersion() {
-  if (verNum === null) {
-    const { miniProgram: { version } = {} } = wx.getAccountInfoSync() || {};
-    verNum = version;
-  }
-  return verNum;
-}
-
-/**
- * 格式化上报数据
- * @private
- * @param {object} reportData 需要上报的数据
- * @param {object} deviceData 设备数据(系统信息，网络状况，位置信息)
- * @returns {array} 格式化后的上报数据
- */
-const formatReportData = async (reportData, deviceData) => {
-  const [system, netType, provinceInfo] = deviceData;
-  const param = Array.isArray(reportData.param) ? reportData.param : getReportDataList(reportData);
-  const { client } = await getTMS().getEnvInfo();
-
-  param[5] = await getUserId();
-  param[10] = getMiniProgramVersion(); // 上报小程序版本号
-  param[16] = getLaunchFrom(); // 渠道公共参数
-  param[17] = param[17] || provinceInfo?.province;
-  param[18] = param[18] || provinceInfo?.cityName;
-  param[19] = system?.host; // 上报宿主app信息 { appId, env, version }
-  param[28] = client;
-
-  // 默认上报数据
-  const defaultReportData = {
-    9: '2',
-    12: netType,
-    13: '2',
-    29: getAppShowOptions().scene, // 打开小程序的场景值
-    33: JSON.stringify(system),    // 数据字符串化
-    36: getAppShowOptions(),       // 打开小程序的场景值及参数
-  };
-  // 对部分空数据使用默认数据填充
-  const handleDefaultData = (paramItem, defaultData) => {
-    const arr = [paramItem, paramItem === 0, paramItem === false];
-    return (arr.some(item => !!item)) ? paramItem : (defaultData || '');
-  };
-
-  Object.keys(defaultReportData).forEach((index) => {
-    const paramItem = param[index];
-    param[index] = handleDefaultData(paramItem, defaultReportData[index]);
-  });
-
-  // 所有上报数据都转换为字符串
-  param.forEach((reportItem, index) => {
-    if (reportItem && typeof reportItem !== 'string') {
-      param[index] = `${JSON.stringify(reportItem)}`;
-    } else {
-      param[index] = handleDefaultData(reportItem, '');
-    }
-  });
-
-  return param.map(item => (item !== null ? encodeURIComponent(item) : item));
-};
-
-/**
- * 格式化上报到小程序后台的数据(自定义分析使用)
- * @private
- * @param {array} data 埋点数据
- * @returns {object} 格式化的数据
- */
-const formatAnalyticsData = async (data) => {
-  const analyticsData = {};
-  const { 10: version, 29: scene } = data;
-  analyticsData[10] = version; // 小程序版本号
-  analyticsData[29] = scene;   // 小程序场景值
-  analyticsData[17] = decodeURIComponent(data[17]); // 用户所在省份
-  analyticsData[18] = decodeURIComponent(data[18]); // 用户所在城市
-
-  // 将30-40位埋点字段补充到上报数据中
-  for (let i = 30; i < 41; i += 1) {
-    analyticsData[i] = decodeURIComponent(data[i] || '');
-    // 如果第33列是设备信息，则忽略
-    if (data[33] && data[33].indexOf('model') > -1) {
-      analyticsData[33] = '';
-    }
-  }
-  const { client } = await getTMS().getEnvInfo();
-
-  return { analyticsData, eventName: `${client}_${data[27]}` };
-};
-
-/**
- * 上报数据到小程序后台
- * @private
- * @param {array} list 需要上报的数据列表
- * @returns {void}
- */
-const reportAnalytics = (list = []) => {
-  try {
-    list.forEach((item) => {
-      const { eventName, analyticsData } = formatAnalyticsData(item);
-      wx.reportAnalytics(eventName, analyticsData);
-    });
-  } catch (_) {}
-};
-
-/**
- * @description report 方法 将上报数据缓存到内存中
- * @name report
- * @param {object} reportData 需要上报的数据
- * @param {boolean} reportNow 是否立即上报
- * @param {boolean} locPoi 是否通过微信接口获取poi
- * @returns {Void} 无返回值
- */
-const cache = (reportData, reportNow, locPoi = true) => {
-  // 如果是微信爬虫 | 自动化测试场景，则不进行数据上报
-  const DO_NOT_NEED_REPORT_SCENES = [1030, 1129];
-  if (DO_NOT_NEED_REPORT_SCENES.includes(getAppShowOptions().scene)) {
-    return Promise.resolve();
-  }
-
-  const task = [getSystemPromise(), getNetworkType()];
-  if (locPoi) {
-    task.push(getProvinceInfo());
-  } else {
-    task.push(getProvinceInfoByIp());
-  }
-  return Promise.all(task)
-    .then(async (deviceData) => {
-      // 先对上报数据进行预处理
-      const result = await formatReportData(reportData, deviceData);
-      // 将需要上报的数据缓存在队列中
-      ReportDataQueue.push(result);
-    })
-    .then(() => {
-      if (reportNow) {
-        return sendData();
-      }
-      return { cache: true };
-    });
-};
-
-/**
- * 发送数据到服务端
- * @private
- * @returns {promise} 发送请求
- */
-const sendData = async () => {
-  // 没有数据时，不发送上报请求
-  if (ReportDataQueue.length === 0) {
-    return Promise.resolve();
-  }
-
-  const cacheReportData = [...ReportDataQueue];
-  return R.post('basic/event/upload', { userId: await getUserId(), batch: cacheReportData })
-    .then((res = {}) => {
-      const { errCode } = res || {};
-      // 已经发送成功，则将本次发送的数据从数据队列中删除
-      if (errCode === 0) {
-        ReportDataQueue.splice(0, cacheReportData.length);
-        reportAnalytics(cacheReportData); // 将数据上报至小程序后台
-      }
-    });
-};
-
-/**
- * 开启轮询上报定时器
- * @private
- * @param {boolean} clearTimerAfterSend 是发送完数据后否清除定时器标识
- * @returns {void}
- */
-const startSendTimer = (clearTimerAfterSend) => {
-  clearInterval(ReportTaskId);
-  ReportTaskId = setInterval(async () => {
-    sendData();
-    if (clearTimerAfterSend) {
-      clearInterval(ReportTaskId);
-    }
-  }, ReportInterval);
-};
-
-/**
- * 停止定时器
- * @private
- * @returns {void}
- */
-const stopSendTimer = () => {
-  clearInterval(ReportTaskId);
-};
-
-/**
- * 发送上报数据到服务端
- * @private
- * @param {boolean} reportNow 是否立即上报
- * @param {boolean} clearTimerAfterSend 是否发送之后清除定时器
- * @returns {void}
- */
-const report = (reportNow = false, clearTimerAfterSend = false) => {
-  if (reportNow) {
-    if (ReportDataQueue.length > 0) {
-      sendData();
-    }
-    if (!clearTimerAfterSend) {
-      startSendTimer(clearTimerAfterSend);
-    } else {
-      stopSendTimer();
-    }
-  } else {
-    startSendTimer(clearTimerAfterSend);
-  }
-};
-
-/**
- * 更新小程序onShow参数
- * @private
- * @param {object} options 小程序onShow参数
- * @returns {void}
- */
-const setAppShowOptions = (options) => {
-  appShowOptions = 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) => {
-    doAppShow(options);
-  });
-
-  /**
-   * 监听小程序onHide事件
-   * @private
-   */
-  wx.onAppHide(() => {
-    // onHide时立即上报，并清除定时器
-    report(true, true);
-  });
-};
-
-export {
-  cache,
-  startListenApp,
-};