gio-miniprogram-sdk 4.0.1 → 4.1.0

package/src/{pluginsOut/frameworks → adapters}/gioTaobaoAdapter.ts

@@ -2,14 +2,17 @@
  * 名称：淘宝小程序单发插件
  * 用途：用于提供淘宝小程序云函数和云应用的请求方法。
  */
+import { EVENT, EXTEND_EVENT } from '@@/types/base';
 import { GrowingIOType } from '@@/types/growingIO';
+import { head, unset } from '@@/utils/glodash';
+import EMIT_MSG from '@@/constants/emitMsg';
 
 let ut;
 class GioTaobaoAdapter {
   constructor(public growingIO: GrowingIOType) {
     const { utils, emitter } = this.growingIO;
     ut = utils;
-    emitter.on('OPTION_INITIALIZED', (growingIO: GrowingIOType) => {
+    emitter.on(EMIT_MSG.OPTION_INITIALIZED, (growingIO: GrowingIOType) => {
       const { inPlugin, dataStore } = growingIO;
       if (inPlugin) {
         ut.getGlobal().Component = function (...args: any[]) {
@@ -17,7 +20,7 @@ class GioTaobaoAdapter {
         };
       }
     });
-    emitter.on('minipLifecycle', ({ event }) => {
+    emitter.on(EMIT_MSG.MINIP_LIFECYCLE, ({ event }) => {
       const { dataStore, vdsConfig } = this.growingIO;
       const widgetName = `小部件${vdsConfig.appId}`;
       switch (event) {
@@ -29,10 +32,12 @@ class GioTaobaoAdapter {
                 .map((k) => `${k}=${relationAppInfo[k]}`)
                 .join('&');
               dataStore.scene = sceneInfo.sceneId ?? '';
-              dataStore.sendVisit({
-                path: widgetName,
-                query,
-                title: widgetName
+              dataStore.trackersExecute((trackingId: string) => {
+                dataStore.sendVisit(trackingId, {
+                  path: widgetName,
+                  query,
+                  title: widgetName
+                });
               });
             };
             this.getRelationAppInfo((relationAppInfo: any) =>
@@ -41,9 +46,14 @@ class GioTaobaoAdapter {
           }
           break;
         case 'Page didMount':
-          dataStore.sendPage({
-            path: widgetName,
-            title: widgetName
+          dataStore.trackersExecute((trackingId: string) => {
+            const { trackPage } = dataStore.getTrackerVds(trackingId);
+            if (trackPage) {
+              dataStore.sendPage(trackingId, {
+                path: widgetName,
+                title: widgetName
+              });
+            }
           });
           break;
         default:
@@ -69,30 +79,31 @@ class GioTaobaoAdapter {
   };
 
   // 单条发送无延迟
-  singleInvoke = () => {
+  singleInvoke = (trackingId: string) => {
     const { vdsConfig, emitter, uploader } = this.growingIO;
+    const hoardingQueue = uploader.getHoardingQueue(trackingId);
+    const requestQueue = uploader.getRequestQueue(trackingId);
     // 过滤掉重试超过3次的请求(直接丢弃)
-    uploader.hoardingQueue = [...uploader.hoardingQueue].filter(
-      (o) => (uploader.retryIds[o.requestId] || 0) < uploader.retryLimit
-    );
-    uploader.requestQueue = [...uploader.requestQueue].filter(
+    uploader.requestQueue[trackingId] = [...requestQueue].filter(
       (o) => (uploader.retryIds[o.requestId] || 0) < uploader.retryLimit
     );
-    if (ut.isEmpty([...uploader.hoardingQueue, ...uploader.requestQueue])) {
+    if (ut.isEmpty([...hoardingQueue, ...requestQueue])) {
       return;
     }
-    let requestData =
-      uploader.hoardingQueue.shift() ?? uploader.requestQueue.shift();
+    const eventData: EXTEND_EVENT =
+      hoardingQueue.shift() ?? requestQueue.shift();
+    let requestData = { ...eventData };
+    unset(requestData, ['requestId', 'trackingId']);
     // 开启debug模式时，打印事件日志
     if (vdsConfig.debug) {
       console.log('[GrowingIO Debug]:', JSON.stringify(requestData, null, 2));
     }
-    emitter.emit('onSendBefore', { requestData });
-    this.cloudFuncInvoke(requestData);
+    emitter.emit(EMIT_MSG.ON_SEND_BEFORE, { requestData });
+    this.cloudFuncInvoke(eventData, requestData);
   };
 
   // 云函数调用
-  cloudFuncInvoke = (requestData) => {
+  cloudFuncInvoke = (eventData: EXTEND_EVENT, requestData: EVENT) => {
     const { vdsConfig, emitter, uploader } = this.growingIO;
     const { serverUrl, projectId, tbConfig } = vdsConfig;
     const app = ut.niceTry(() => getApp() ?? $global);
@@ -114,18 +125,18 @@ class GioTaobaoAdapter {
           uploader.requestingNum -= 1;
           // 这里的返回值只是调用了api是否成功，真正是否上报成功不知道，要去淘宝控制台看
           if (res.success) {
-            emitter.emit('onSendAfter', { result: res });
+            emitter.emit(EMIT_MSG.ON_SEND_AFTER, { result: res, requestData });
           } else {
-            uploader.requestFailFn(requestData);
+            uploader.requestFailFn(eventData);
             ut.consoleText(`请求失败! ${JSON.stringify(res)}`, 'error');
           }
-          uploader.initiateRequest();
+          uploader.initiateRequest(eventData.trackingId);
         })
         .catch((e) => {
           uploader.requestingNum -= 1;
-          uploader.requestFailFn(requestData);
+          uploader.requestFailFn(eventData);
           ut.consoleText(`请求失败! ${JSON.stringify(e)}`, 'error');
-          uploader.initiateRequest();
+          uploader.initiateRequest(eventData.trackingId);
         });
     } else {
       ut.consoleText(
@@ -136,12 +147,13 @@ class GioTaobaoAdapter {
   };
 
   // 云应用调用
-  tbCloudAppInvoke(requestData) {
+  tbCloudAppInvoke(eventsQueue: EXTEND_EVENT[], requestData: EVENT) {
     const { vdsConfig, emitter, uploader } = this.growingIO;
     const { serverUrl, projectId, tbConfig } = vdsConfig;
     const app = ut.niceTry(() => getApp() ?? $global);
     const cloud = tbConfig.cloud ?? app.cloud;
     if (cloud?.application?.httpRequest) {
+      const trackingId = head(eventsQueue).trackingId;
       uploader.requestingNum += 1;
       cloud.application
         .httpRequest({
@@ -157,30 +169,22 @@ class GioTaobaoAdapter {
           uploader.requestingNum -= 1;
           // 这里的返回值只是调用了api是否成功，真正是否上报成功不知道，要看云应用的服务端是不是真的转发成功
           if (res.success) {
-            emitter.emit('onSendAfter', { result: res });
+            emitter.emit(EMIT_MSG.ON_SEND_AFTER, { result: res, requestData });
           } else {
-            if (ut.isArray(requestData)) {
-              requestData.forEach((o: any) => {
-                uploader.requestFailFn(o);
-              });
-            } else {
-              uploader.requestFailFn(requestData);
-            }
+            eventsQueue.forEach((o: any) => {
+              uploader.requestFailFn(o);
+            });
             ut.consoleText(`请求失败! ${JSON.stringify(res)}`, 'error');
           }
-          uploader.initiateRequest();
+          uploader.initiateRequest(trackingId);
         })
         .catch((e) => {
           uploader.requestingNum -= 1;
-          if (ut.isArray(requestData)) {
-            requestData.forEach((o: any) => {
-              uploader.requestFailFn(o);
-            });
-          } else {
-            uploader.requestFailFn(requestData);
-          }
+          eventsQueue.forEach((o: any) => {
+            uploader.requestFailFn(o);
+          });
           ut.consoleText(`请求失败! ${JSON.stringify(e)}`, 'error');
-          uploader.initiateRequest();
+          uploader.initiateRequest(trackingId);
         });
     } else {
       ut.consoleText(

package/src/{pluginsOut/frameworks → adapters}/gioTaroAdapter.ts

@@ -12,6 +12,7 @@ import {
   TARO_EVENT_VUE_FUNC3_REG
 } from '@@/constants/regex';
 import { GrowingIOType } from '@@/types/growingIO';
+import EMIT_MSG from '@@/constants/emitMsg';
 
 let ut;
 const HANDLER = {
@@ -34,7 +35,7 @@ class GioTaroAdapter {
     const { utils, emitter, minipInstance } = this.growingIO;
     ut = utils;
     this.exposedNames = {};
-    emitter.on('minipLifecycle', ({ event }) => {
+    emitter.on(EMIT_MSG.MINIP_LIFECYCLE, ({ event }) => {
       if (['Page onShow', 'Page onReady'].includes(event)) {
         if (this.taro && this.taroVersion === '3') {
           // 提前存储页面节点信息用来获取dataset
@@ -66,9 +67,8 @@ class GioTaroAdapter {
       this.taroVersion = '3';
       this.taroVue = taroVue;
       if (this.taroVue) {
-        const mainVersion = Number.parseInt(
-          ut.head(ut.split(this.taroVue.version, '.')),
-          10
+        const mainVersion = Number(
+          ut.head(ut.split(this.taroVue.version, '.'))
         );
         this.taroVueVersion = mainVersion;
         ut.consoleText(`Taro version 3, Vue version ${mainVersion}`, 'info');

package/src/{pluginsOut/frameworks → adapters}/gioUniAppAdapter.ts

@@ -2,6 +2,7 @@
  * 名称：uniapp代理插件
  * 用途：用于重写uniapp框架下的创建App/Page/Component方法实现代理Hook；并获取uniapp框架下的自定义方法真实方法名获取。
  */
+import { UNIAPP_FUNC_REG } from '@@/constants/regex';
 import { GrowingIOType } from '@@/types/growingIO';
 
 const ONCE = '~';
@@ -23,11 +24,7 @@ class GioUniAppAdapter {
       this.uniVue = this.growingIO?.vdsConfig?.uniVue;
     }
     console.log('Vue version: ', this.uniVue.version);
-    if (this.growingIO?.vdsConfig?.subpackage) return false;
-    const mainVersion = Number.parseInt(
-      ut.head(ut.split(this.uniVue.version, '.')),
-      10
-    );
+    const mainVersion = Number(ut.head(ut.split(this.uniVue.version, '.')));
     switch (mainVersion) {
       case 2:
         this.uniVue2Proxy(this.uniVue);
@@ -112,6 +109,38 @@ class GioUniAppAdapter {
       dataStore: { eventHooks },
       minipInstance
     } = this.growingIO;
+    // 重写对象遍历逻辑，优先hook methods最后才是原生
+    eventHooks.objectTraverse = (target: any, fn: any) => {
+      if (ut.has(target, 'methods')) {
+        Object.getOwnPropertyNames(target.methods).forEach((k: string) => {
+          fn(k, target.methods);
+        });
+      }
+      if (ut.has(target, 'lifetimes')) {
+        Object.getOwnPropertyNames(target.lifetimes).forEach((k: string) => {
+          fn(k, target.lifetimes);
+        });
+      }
+      if (ut.has(target, 'pageLifetimes')) {
+        Object.getOwnPropertyNames(target.pageLifetimes).forEach(
+          (k: string) => {
+            fn(k, target.pageLifetimes);
+          }
+        );
+      }
+      Object.getOwnPropertyNames(target).forEach((k: string) => {
+        if (
+          !ut.niceTry(
+            () =>
+              !target?.methods[k] &&
+              !target?.lifetimes[k] &&
+              !target?.pageLifetimes[k]
+          )
+        ) {
+          fn(k, target);
+        }
+      });
+    };
     eventHooks.nativeGrowing();
     // 需要单独处理getPageTitle，防止在vue中onShow里拿的是错误的
     const originGetter = minipInstance.getPageTitle;
@@ -180,7 +209,7 @@ class GioUniAppAdapter {
           const methodKeys = ut
             .keys(this.$scope)
             .filter(
-              (k) => /^e[0-9]+$/.test(k) && ut.isFunction(this.$scope[k])
+              (k) => UNIAPP_FUNC_REG.test(k) && ut.isFunction(this.$scope[k])
             );
           methodKeys.forEach((k, i) => {
             const originFunc = this.$scope[k].value;

package/src/constants/config.ts

@@ -15,7 +15,7 @@ export const DEFAULT_SETTINGS = {
   extraParams: { type: 'array', default: [] },
   // 是否开启分享跟踪
   followShare: { type: 'boolean', default: true },
-  // 是否开启强制登录
+  // 是否开启强制登录；多实例时仅主实例生效(其他实例无条件服从主实例)
   forceLogin: { type: 'boolean', default: false },
   // 或略上报字段
   ignoreFields: { type: 'array', default: [] },
@@ -47,6 +47,8 @@ export const DEFAULT_SETTINGS = {
       path: undefined
     }
   },
+  // 是否自动采集页面访问事件
+  trackPage: { type: 'boolean', default: true },
   // uniapp vue实例
   uniVue: { type: ['object', 'function'], default: false },
   // 上报间隔（1秒）
@@ -55,35 +57,48 @@ export const DEFAULT_SETTINGS = {
   version: { type: 'string', default: '1.0.0' }
 };
 
-// 通过gdp(xxxx)允许调用的通用方法
-export const HANDLERS = [
-  'clearGeneralProps', // 移除埋点通用属性
+// 不管实例直接调用的方法
+export const DIRECT_HANDLERS = [
+  'getPlugins', // 获取所有已加载插件
+  'getDeviceId', // 获取设备id
+  'updateImpression' // 手动更新曝光
+];
+
+// 多实例的方法
+export const INSTANCE_HANDLERS = [
+  'clearGeneralProps', // 清除埋点通用属性
   'clearTrackTimer', // 清除所有事件计时器
-  'clearUserId', // 清除登录用户ID
-  'getDeviceId', // 获取设备ID（匿名用户ID）
+  'clearUserId', // 清除用户id
+  'getABTest', // 获取AB实验数据
   'getGioInfo', // 内嵌页打通信息
-  'getOption', // 获取当前配置项状态
-  'identify', // 强制登录
-  'init', // 初始化SDK
-  'registerPlugins', // 手动注册插件
+  'getOption', // 获取当前SDK配置项状态
+  'identify', // 强制登录设置设备id
   'removeTimer', // 移除事件计时器
+  'sendPage', // 手动发page事件
+  'sendVisit', // 手动发visit事件
   'setGeneralProps', // 设置埋点通用属性
-  'setLocation', // 手动设置位置信息（2022/4/29新增api，原getLocation废弃）
-  'setOption', // 动态修改配置项
+  'setLocation', // 手动设置位置信息
+  'setOption', // 设置配置项
   'setPageAttributes', // 设置页面属性
   'setUserAttributes', // 设置用户属性
-  'setUserId', // 设置登录用户ID
-  'track', // 埋点
+  'setUserId', // 设置用户id
+  'track', // 上报埋点
   'trackTimerEnd', // 停止事件计时器并上报事件
   'trackTimerPause', // 暂停事件计时器
   'trackTimerResume', // 恢复事件计时器
-  'trackTimerStart', // 初始化事件计时器
-  'updateImpression', // 手动更新曝光监听
-  'getABTest' // 获取ABTest数据
+  'trackTimerStart' // 初始化事件计时器
+];
+
+// 直接调用的通用方法
+export const HANDLERS = [
+  'init', // 初始化SDK
+  'registerPlugins', // 手动注册插件
+  ...DIRECT_HANDLERS,
+  ...INSTANCE_HANDLERS
 ];
 
 // 允许通过setOption修改的配置项
-export const ALLOWED_MODIFY_OPTIONS = {
+export const ALLOW_SET_OPTIONS = {
   autotrack: '无埋点',
   dataCollect: '数据采集',
   debug: '调试模式',
@@ -134,3 +149,17 @@ export const PLATFORMTYPES = [
   'xhs',
   'quickapp'
 ];
+
+// 各个需要拼接的在存储中的key后缀
+export const STORAGE_KEYS: any = {
+  gsid: '_growing_gsid_',
+  originalSource: '_gdp_original_source_',
+  userId: '_growing_userId_',
+  userKey: '_growing_userKey_',
+  gioId: '_growing_gioId_',
+  plugin_gsid: '_growing_plugin_gsid_',
+  plugin_originalSource: '_gdp_plugin_original_source_',
+  plugin_userId: '_growing_plugin_userId_',
+  plugin_userKey: '_growing_plugin_userKey_',
+  plugin_gioId: '_growing_plugin_gioId_'
+};

package/src/constants/emitMsg.ts

@@ -0,0 +1,23 @@
+export default {
+  GIOID_UPDATE: 'GIOID_UPDATE', // gioId变更事件
+  MINIP_LIFECYCLE: 'MINIP_LIFECYCLE', // 小程序生命周期
+  ON_COMMIT_REQUEST: 'ON_COMMIT_REQUEST', // 小程序事件提交队列
+  ON_COMPOSE_AFTER: 'ON_COMPOSE_AFTER', // 插件生命周期：构建事件后
+  ON_COMPOSE_BEFORE: 'ON_COMPOSE_BEFORE', // 插件生命周期：构建事件前
+  ON_ERROR: 'ON_ERROR', // 插件生命周期：插件执行错误
+  ON_INSTALL: 'ON_INSTALL', // 插件生命周期：插件被正确加载
+  ON_SDK_INITIALIZE_BEFORE: 'ON_SDK_INITIALIZE_BEFORE', // SDK开始初始化之前
+  ON_SEND_AFTER: 'ON_SEND_AFTER', // 插件生命周期：发送事件后
+  ON_SEND_BEFORE: 'ON_SEND_BEFORE', // 插件生命周期：发送事件前
+  OPTION_CHANGE: 'OPTION_CHANGE', // 设置变更事件
+  OPTION_INITIALIZED: 'OPTION_INITIALIZED', // 配置项初始化完成
+  SCENE_UPDATE: 'SCENE_UPDATE', // scene变更事件
+  SDK_INITIALIZED: 'SDK_INITIALIZED', // SDK初始化完成发送事件之前
+  SESSIONID_UPDATE: 'SESSIONID_UPDATE', // sessionId变更事件
+  SET_USERID: 'SET_USERID', // setUserId事件
+  SET_USERKEY: 'SET_USERKEY', // setUserKey事件
+  UID_UPDATE: 'UID_UPDATE', // uId（设备Id）变更事件
+  UN_EXECUTE_CALL: 'UN_EXECUTE_CALL', // SDK加载完成但没有初始化时的调用事件
+  USERID_UPDATE: 'USERID_UPDATE', // userId变更事件
+  USERKEY_UPDATE: 'USERKEY_UPDATE' // userKey变更事件
+};

package/src/constants/regex.ts

@@ -8,7 +8,6 @@ export const ABTEST_DATA_REG = /^\d+_gdp_abtd$/;
 export const ID_REG = /^\d{1,10}$/;
 export const IMP_DATA_REG = /^gioTrack(.+)/;
 export const IMP_EVENTNAME_REG = /^[a-zA-Z_][0-9a-zA-Z_]{0,100}$/;
-export const QUICKAPP_PARAM_REG = /^text.*/;
 export const SWAN_XID_REG = /^_[0-9a-z]+/;
 export const TARO_XID_REG = /^_n_[0-9]+$/;
 export const TARO_EVENT_PROPS_REG = /^__reactProps\$[a-z0-9]+$/i;

package/src/core/dataStore/eventContextBuilder.ts

@@ -6,27 +6,34 @@ class EventContextBuilder {
   constructor(public growingIO: GrowingIOType) {}
 
   // 通用字段组装
-  main = (params?: any) => {
+  main = (trackingId: string, params?: any) => {
+    // 预置事件或者默认就是发给主实例的事件不需要传trackingId
+    if (!trackingId) {
+      trackingId = this.growingIO.trackingId;
+    }
     const {
       sdkVersion,
-      vdsConfig,
       platformConfig,
       minipInstance,
       userStore,
-      dataStore: { scene, eventHooks, locationData, lastVisitEvent }
+      dataStore,
+      dataStore: { scene, eventHooks, lastVisitEvent, lastPageEvent }
     } = this.growingIO;
+    const { version, dataSourceId, appId, idMapping, ignoreFields } =
+      dataStore.getTrackerVds(trackingId);
+    const locationData = dataStore.locationData[trackingId];
     const { systemInfo = {}, network = {} } = minipInstance;
-    const { brand, model, platform, language, version } = systemInfo;
+    const { brand, model, platform, language } = systemInfo;
     // 事件主要内容组装
     const context: any = {
       appChannel: `scn:${scene || 'NA'}`,
-      appVersion: vdsConfig.version,
-      dataSourceId: vdsConfig.dataSourceId,
+      appVersion: version,
+      dataSourceId: dataSourceId,
       deviceBrand: brand,
-      deviceId: userStore.uid,
+      deviceId: userStore.getUid(),
       deviceModel: model,
       deviceType: getOS(platform, platformConfig.name),
-      domain: vdsConfig.appId,
+      domain: appId,
       language: language,
       latitude: locationData?.latitude,
       longitude: locationData?.longitude,
@@ -36,34 +43,38 @@ class EventContextBuilder {
         ? eventHooks.currentPage?.path
         : lastVisitEvent.path, // 如果页面中的path取不到，说明页面没初始化，还在app的生命周期中（appOnLoad/appOnShow），需要拿visit的path补上
       platform: platformConfig.platform,
-      platformVersion: platformConfig.name + (version ? ` ${version}` : ''),
+      platformVersion:
+        platformConfig.name +
+        (systemInfo.version ? ` ${systemInfo.version}` : ''),
       query: eventHooks.currentPage?.path
         ? eventHooks.currentPage?.query
         : lastVisitEvent.query, // 如果页面中的path取不到，说明页面没初始化，还在app的生命周期中（appOnLoad/appOnShow），需要拿visit的query补上
       screenHeight: getScreenHeight(systemInfo),
       screenWidth: getScreenWidth(systemInfo),
       sdkVersion,
-      sessionId: userStore.sessionId,
+      sessionId: userStore.getSessionId(trackingId),
       title:
+        lastPageEvent[trackingId]?.title || // 除visit,page事件外，其他事件都用lastpage中的title以保持一致
         eventHooks.currentPage?.title ||
         minipInstance.getPageTitle(minipInstance.getCurrentPage()),
       timestamp: Date.now(),
       timezoneOffset: new Date().getTimezoneOffset(),
-      userId: userStore.userId
+      userId: userStore.getUserId(trackingId)
     };
-    if (vdsConfig.idMapping) {
-      context.userKey = userStore.userKey;
+    if (idMapping) {
+      context.userKey = userStore.getUserKey(trackingId);
     }
-    if (!isEmpty(vdsConfig.ignoreFields)) {
-      vdsConfig.ignoreFields.forEach((o) => {
+    if (!isEmpty(ignoreFields)) {
+      ignoreFields.forEach((o) => {
         unset(context, o);
       });
     }
     // 此时可能存在数据为空的字段，在数据组装完成后由转换方法移除空值字段
     if (!isEmpty(params)) {
-      return { ...context, ...params };
+      return { ...context, ...params, trackingId };
+    } else {
+      return { ...context, trackingId };
     }
-    return context;
   };
 }
 

package/src/core/dataStore/eventHooks/appEffects.ts

@@ -10,6 +10,7 @@ import {
   isNil
 } from '@@/utils/glodash';
 import { qsStringify } from '@@/utils/tools';
+import EMIT_MSG from '@@/constants/emitMsg';
 
 class AppEffects {
   constructor(public growingIO: GrowingIOType) {}
@@ -24,14 +25,15 @@ class AppEffects {
       uploader,
       dataStore,
       dataStore: {
+        trackersExecute,
         shareOut,
-        keepAlive,
         lastCloseTime,
         eventHooks,
-        saveStorageInfo
+        saveStorageInfo,
+        setOriginalSource
       }
     }: GrowingIOType = this.growingIO;
-    emitter.emit('minipLifecycle', {
+    emitter.emit(EMIT_MSG.MINIP_LIFECYCLE, {
       event: `App ${event}`,
       timestamp: eventTime,
       params: args[0] ?? {}
@@ -41,7 +43,7 @@ class AppEffects {
     }
     const appListeners = platformConfig.listeners.app;
     // 向插件广播事件
-    emitter.emit('onComposeBefore', {
+    emitter.emit(EMIT_MSG.ON_COMPOSE_BEFORE, {
       event: `App ${event}`,
       params: args[0] ?? {}
     });
@@ -54,25 +56,33 @@ class AppEffects {
         const { path, query } = this.enterParamsParse(args[0]);
         if (!shareOut && vdsConfig.originalSource) {
           // 保存初始来源信息
-          dataStore.setOriginalSource({ path, query });
+          trackersExecute((trackingId: string) => {
+            setOriginalSource(trackingId, { path, query });
+          });
         }
         // 以下条件均会被认为是一次新的访问
         // 没有关闭时间说明是新访问
         if (!lastCloseTime) {
           // 保存进入小程序的参数
-          this.growingIO.dataStore.lastVisitEvent = { path, query };
-          this.buildVisitEvent({ path, query });
+          dataStore.lastVisitEvent = { path, query };
+          trackersExecute((trackingId: string) => {
+            this.buildVisitEvent(trackingId, { path, query });
+          });
         } else if (
           // 两次打开间隔时间超过keepAlive设定(默认5分钟)
-          Date.now() - lastCloseTime > keepAlive ||
+          Date.now() - lastCloseTime > vdsConfig.keepAlive ||
           // 两次打开时的场景值不一样（即从不同的来源进入小程序）
           (dataStore.lastScene && dataStore.scene !== dataStore.lastScene)
         ) {
           // 重置sessionId
-          userStore.sessionId = '';
+          trackersExecute((trackingId: string) => {
+            userStore.setSessionId(trackingId);
+          });
           // 需要按自然逻辑发visit时，清掉pagetime，防止取值错误（会在page中重新生成）
           eventHooks.currentPage.time = undefined;
-          this.buildVisitEvent({ path, query });
+          trackersExecute((trackingId: string) => {
+            this.buildVisitEvent(trackingId, { path, query });
+          });
         }
         break;
       }
@@ -82,11 +92,14 @@ class AppEffects {
         dataStore.lastCloseTime = Date.now();
         saveStorageInfo();
         userStore.saveUserInfo();
-        this.buildCloseEvent();
-        // forceLogin不生效时强制把请求队列中的事件全部发送
-        if (!vdsConfig.forceLogin) {
-          uploader.initiateRequest(true);
-        }
+        trackersExecute((trackingId: string) => {
+          this.buildCloseEvent(trackingId);
+          // forceLogin不生效时强制把请求队列中的事件全部发送
+          if (!vdsConfig.forceLogin) {
+            uploader.initiateRequest(trackingId, true);
+          }
+        });
+
         break;
       }
       default:
@@ -173,45 +186,51 @@ class AppEffects {
   };
 
   // 构建访问事件
-  buildVisitEvent = (props: any) => {
-    const { dataStore, vdsConfig, minipInstance } = this.growingIO;
+  buildVisitEvent = (trackingId: string, props?: any) => {
     const {
-      originalSourceName,
-      getOriginalSource,
-      eventContextBuilder,
-      eventInterceptor
-    } = dataStore;
-    const originalSource = getOriginalSource();
+      dataStore: {
+        getOriginalSource,
+        eventContextBuilder,
+        eventInterceptor,
+        eventHooks
+      },
+      minipInstance,
+      vdsConfig
+    } = this.growingIO;
+    const originalSource = getOriginalSource(trackingId);
     // 生命周期中调用构建使用参数赋值，补发场景调用构建使用上一次的值
     const query = props?.query || '';
     let event = {
       eventType: 'VISIT',
-      ...eventContextBuilder({
+      ...eventContextBuilder(trackingId, {
         // params.path是生命周期值或者是已有的值
         path: props?.path || '',
         // params.query是对象说明是生命周期调用，否则是补发调用
-        query: typeOf(query) === 'string' ? query : qsStringify(query)
+        query: typeOf(query) === 'string' ? query : qsStringify(query),
+        // visit事件要单独设一次title以覆盖eventContextBuilder中的lastPage的可能的title错误值
+        title:
+          eventHooks.currentPage?.title ||
+          minipInstance.getPageTitle(minipInstance.getCurrentPage()),
+        timestamp: eventHooks.currentPage.time
+          ? eventHooks.currentPage.time - 1
+          : +Date.now()
       })
     };
     // 配置使用初始来源时，visit使用初始来源数据
     if (vdsConfig.originalSource && !isNil(originalSource)) {
       event = { ...event, ...originalSource };
-      // 采集开关开启状态下的第一个visit消费过初始来源信息后删除
-      if (vdsConfig.dataCollect) {
-        minipInstance.removeStorageSync(originalSourceName);
-      }
     }
     eventInterceptor(event);
   };
 
   // 构建关闭事件
-  buildCloseEvent = () => {
+  buildCloseEvent = (trackingId: string) => {
     const {
       dataStore: { eventContextBuilder, eventInterceptor }
     } = this.growingIO;
     const event = {
       eventType: 'APP_CLOSED',
-      ...eventContextBuilder()
+      ...eventContextBuilder(trackingId)
     };
     eventInterceptor(event);
   };