@tmsfe/tms-core 0.0.126 → 0.0.128

package/package.json

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

package/src/report/formatV2.ts

@@ -64,7 +64,9 @@ function getBaseData(page: IPage, deviceData: IDeviceData): { arr: DataItem[], n
   arr[25] = page.depth;
   // 26: f26，一次小程序生命周期中的埋点统一标记
   arr[26] = helper.getLifeReportKey();
-  // 27 ~ 30: 预留字段给后续扩展使用
+  // 27: f27，生成用户唯一id，方便追踪未登录接口
+  arr[27] = helper.getTmsUUID();
+  // 28 ~ 30: 预留字段给后续扩展使用
   // 31 ~ 40: 提供给开发自定义
   // --------------------------字段列表--------------------------
   return { arr, nextIndex: 31 };

package/src/report/helper.ts

@@ -103,6 +103,31 @@ function getNowString(): string {
   return `${year}${month}${day}${hours}${minutes}${seconds}${ms}`;
 }
 
+let uuid = '';
+
+/**
+ * 生成用户唯一id，方便追踪未登录接口
+ */
+function getTmsUUID(): string {
+  if (uuid) {
+    return uuid;
+  }
+
+  const key = 'tms.user.uuid';
+  uuid = wx.getStorageSync(key);
+  if (!uuid) {
+    const str = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx';
+    uuid = str.replace(/[xy]/g, (c) => {
+      const r = (Math.random() * 16) | 0;
+      const v = c === 'x' ? r : (r & 0x3) | 0x8;
+      return v.toString(16);
+    });
+    wx.setStorageSync(key, uuid);
+  }
+
+  return uuid;
+}
+
 let lifeReportKey = '';
 
 /**
@@ -181,7 +206,7 @@ function getAppScene(): number {
 let isCrawler: boolean | null = null;
 
 /**
- * 判断当前是否需要发埋点（爬虫和插件页不发）
+ * 判断当前是否需要发埋点（爬虫和插自动化测试下打开的不发）
  */
 function canReport(): boolean {
   if (isCrawler === null) {
@@ -271,6 +296,7 @@ function post(api: string, params: any): Promise<{ errCode: number, errMsg: stri
 export default {
   init,
   post,
+  getTmsUUID,
   getClientName,
   getAppVersion,
   getSystemInfo,

package/src/runtime/index.js

@@ -96,7 +96,10 @@ const login = async () => {
  */
 async function setPaypointAuth(param = {}) {
   const request = getRequestInstnce();
-  const userInfo = await getLoginInfo();
+  const [userInfo, mycarPubOpenId] = await Promise.all([
+    getLoginInfo(),
+    getMycarPubOpenId(),
+  ]);
 
   const req = {
     traceSource: param.traceSource || 1, // 请求类型
@@ -106,7 +109,7 @@ async function setPaypointAuth(param = {}) {
     subAppId: param.appId || 'wx735359beafd78b9f', // 默认使用我的车的小程序号发布号发布
     appId: param.wechaId || 'wx29d15d946a7f2351', // 默认使用我的车的公众号id
     ...userInfo,
-    openId: userInfo.mycarPubOpenId,
+    openId: mycarPubOpenId,
   };
 
   const res = await request.post('paypoint/setpayauth', req);
@@ -173,7 +176,10 @@ async function getPermissionList(param = {}) {
  */
 async function terminatePaypointPermisson(param = {}) {
   const request = getRequestInstnce();
-  const userInfo = await getLoginInfo();
+  const [userInfo, mycarPubOpenId] = await Promise.all([
+    getLoginInfo(),
+    getMycarPubOpenId(),
+  ]);
 
   const data = {
     traceSource: param.traceSource || 1, // 请求来源
@@ -185,7 +191,7 @@ async function terminatePaypointPermisson(param = {}) {
     reason: param.reason || '其他',
     serviceId: param.serviceId,
     ...userInfo,
-    openId: userInfo.mycarPubOpenId,
+    openId: mycarPubOpenId,
   };
 
   const res = await request.post('paypoint/terminatePaypointPermisson', data);

package/src/runtime/login.ts

@@ -82,7 +82,12 @@ async function login() {
     // @ts-ignore
     const { trafficEntrence: registerSource, scene: sceneId } = getOpenAppTrafficData();
 
-    userData = await getApp().tms.createRequest({ withAuth: false }).post('user/login', { code, registerSource, sceneId });
+    userData = await getApp().tms.createRequest({ withAuth: false }).post('user/login', {
+      code,
+      sceneId,
+      registerSource,
+      apiVer: 1, // 1表示不需要再去请求mycarPubOpenId，能快100ms
+    });
   } catch (e) {
     console.error(e); // eslint-disable-line
   }
@@ -156,12 +161,27 @@ let getMycarPubOpenIdProm;
  * 获取失败时，返回rejected Promise，rejected数据为错误对象
  */
 const getMycarPubOpenId = () => {
-  if (getMycarPubOpenIdProm) { // 避免重复获取
+  if (getMycarPubOpenIdProm) {
+    return getMycarPubOpenIdProm;
+  }
+
+  // 优先用缓存的
+  const key = 'tms.pubOpenId';
+  const pubOpenId = wx.getStorageSync(key);
+  if (pubOpenId) {
+    getMycarPubOpenIdProm = Promise.resolve(pubOpenId);
     return getMycarPubOpenIdProm;
   }
 
+  // 从接口请求
   getMycarPubOpenIdProm = getOaPubOpenId('mycar')
-    .then(openId => openId || Promise.reject(new Error('No mycarPubOpenId found')))
+    .then((pubOpenId) => {
+      if (pubOpenId) {
+        wx.setStorageSync(key, pubOpenId);
+        return pubOpenId;
+      }
+      return Promise.reject(new Error('No mycarPubOpenId found'));
+    })
     .catch((e) => {
       getMycarPubOpenIdProm = null;
       return Promise.reject(e);