@tmsfe/tms-core 0.0.180 → 0.0.182

package/package.json

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

package/src/report/helper.ts

@@ -42,10 +42,10 @@ let systemInfo: ISystemInfo;
  */
 function getSystemInfo(): ISystemInfo {
   if (!systemInfo) {
-    const system = wx.getSystemInfoSync() as any;
+    const currentSystemInfo = wx.getSystemInfoSync() as any;
     // eslint-disable-next-line
-    const { model = '', version: wxVersion = '', platform = '', SDKVersion = '', host } = system;
-    systemInfo = { model, wxVersion, platform, SDKVersion, host };
+    const { model = '', version: wxVersion = '', platform = '', SDKVersion = '', host, benchmarkLevel, system, memorySize } = currentSystemInfo;
+    systemInfo = { model, wxVersion, platform, SDKVersion, host, benchmarkLevel, system, memorySize };
   }
   return systemInfo;
 }

package/src/report/types.ts

@@ -48,6 +48,9 @@ export interface ISystemInfo {
   SDKVersion: string,
   // 开发环境下为空
   host: object,
+  benchmarkLevel: number,
+  system: string,
+  memorySize: number,
 }
 
 export interface ILocation {

package/src/request.js

@@ -9,7 +9,7 @@
  * 框架判断在不同的运行环境，切换调用不同运行环境提供的方法。
  */
 import md5 from './md5';
-import { getEnvInfo } from './env';
+import { getEnvInfo, getAuthInfo } from './env';
 import { safeJsonParse } from './objUtils';
 import { encryptObjInit } from './encrypt/index';
 import reporter from './report/index';
@@ -125,10 +125,18 @@ const composeParam = async (param = {}, withAuth = true, baseParam = {}) => {
 const modifyAuthParam = async (param, withAuth) => {
   const requestParam = { ...param };
   if (withAuth) {
-    const { uid, token, openId } = await wx.tmsLoginPromise;
-    requestParam.userId = uid;
-    requestParam.token = token;
-    requestParam.openId = openId;
+    // 优先使用wx.tmsLoginPromise获取鉴权信息，否则调用getAuthInfo()
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
+    const authInfo = wx.tmsLoginPromise
+      ? await wx.tmsLoginPromise
+      : await getAuthInfo();
+
+    // 统一处理鉴权参数赋值
+    Object.assign(requestParam, {
+      userId: authInfo.uid || authInfo.userId,
+      token: authInfo.token,
+      openId: authInfo.openId,
+    });
     return requestParam;
   }
   delete requestParam.userId;
@@ -459,28 +467,28 @@ const isPathNeedRetryLogin = (path) => {
   ];
 
   // 检查路径是否在白名单中
-  return !noRetryPaths.some(noRetryPath => path.includes(noRetryPath));
+  return noRetryPaths.every(noRetryPath => !path.includes(noRetryPath));
 };
 
-
-let refreshFlag = false;
+let refreshPromise;
 async function loginRefresh() {
-  if (!refreshFlag) {
+  if (!refreshPromise) {
     // 调用runtime的login方法刷新token
     const { tms } = getApp();
     wx.tmsLoginPromise = undefined;
     try {
-      refreshFlag = true;
-      await tms.login();
+      refreshPromise = tms.login();
+      await refreshPromise;
       // 登录成功，清除Promise
-      refreshFlag = false;
+      refreshPromise = undefined;
     } catch (err) {
       // 登录失败重试
       setTimeout(() => {
-        refreshFlag = false;
+        refreshPromise = undefined;
       }, 100);
     }
   }
+  return await refreshPromise;
 }
 
 // 统一返回格式