@tmsfe/tms-core 0.0.178 → 0.0.180

package/package.json

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

package/src/encrypt/encrypt-util.ts

@@ -317,7 +317,7 @@ const cryptRuleUtil = {
   // 远程加密服务是否开启
   isServerOpen: (): boolean => !!wx.$_publicKey,
   // 检查path是否符合下发的路由前缀
-  pathInUnablePrefix: (path: string): boolean => {
+  pathInEnablePrefix: (path: string): boolean => {
     if (!wx.$_publicKey) {
       return false;
     }
@@ -392,8 +392,8 @@ const isCryptoRuleMath = (path: string, reqData: any): BaseResp<boolean> => {
   if (!cryptRuleUtil.isServerOpen()) {
     return new baseUtil.BaseRespFac(false, false, '服务端加密未开启');
   }
-  // 请求路由满足服务端下发的不加密规则，不走加密
-  if (cryptRuleUtil.pathInUnablePrefix(path)) {
+  // 请求路由不满足服务端下发的加密规则，不走加密
+  if (!cryptRuleUtil.pathInEnablePrefix(path)) {
     return new baseUtil.BaseRespFac(false, false, '未命中服务端加密规则');
   }
   // 请求接口是加密性能埋点上报接口，不加密

package/src/navbarUtils.js

@@ -135,6 +135,7 @@ const calNavBarHeight = (menuTop, menuHeight, statusBarHeight, apiCategory) => {
  * @returns {Object} data.enterOptions             启动参数
  * @returns {Object} data.enterOptions.apiCategory API 类别（不同apiCategory场景下的API有不同限制，UI也有不同）
  */
+/* eslint-disable */
 const getNavBarConfigData = () => { // eslint-disable-line require-jsdoc
   const systemInfo = getSysInfo();
   const { brand, getSystemInfoSuccess, platform } = systemInfo;
@@ -151,7 +152,9 @@ const getNavBarConfigData = () => { // eslint-disable-line require-jsdoc
     statusBarHeight = isIOS ? StatusBarHeightOnIOS : StatusBarHeightOnAndroid;
   }
 
-  const enable = compareVersion(version, '7.0.0') >= 0 || brand === 'devtools' || platform === 'ohos'; // 微信版本是否支持自定义顶栏，不支持时自动隐藏
+  const isPCShowNavBar = getPCNavbarShowStatus(systemInfo);
+  // 手机端微信版本version格式为7.0.0，电脑端为4.0.3.93，compareVersion(version, '7.0.0') >= 0只处理了手机端是否展示自定义导航栏
+  const enable = compareVersion(version, '7.0.0') >= 0 || brand === 'devtools' || platform === 'ohos' || isPCShowNavBar; // 微信版本是否支持自定义顶栏，不支持时自动隐藏
   const enterOptions = getEnterOptions();
   if (enable) {
     return { enable, ...calculateNavBarLayout(isIOS, statusBarHeight, enterOptions.apiCategory) };
@@ -160,6 +163,20 @@ const getNavBarConfigData = () => { // eslint-disable-line require-jsdoc
   return { enable };
 };
 
+// 电脑端是否展示导航栏
+const getPCNavbarShowStatus = (systemInfo) => {
+  const { SDKVersion, platform } = systemInfo;
+  if (['windows', 'mac'].includes(platform)) {
+    try {
+      return compareVersion(SDKVersion, '3.6.1') >= 0;
+    } catch (_) {
+      return true;
+    }
+  } else {
+    return false;
+  }
+};
+
 // 获取需要对外暴露的启动参数
 const getEnterOptions = () => {
   const options = wx.getEnterOptionsSync();

package/src/request.js

@@ -9,7 +9,7 @@
  * 框架判断在不同的运行环境，切换调用不同运行环境提供的方法。
  */
 import md5 from './md5';
-import { getEnvInfo, getAuthInfo } from './env';
+import { getEnvInfo } from './env';
 import { safeJsonParse } from './objUtils';
 import { encryptObjInit } from './encrypt/index';
 import reporter from './report/index';
@@ -125,8 +125,8 @@ const composeParam = async (param = {}, withAuth = true, baseParam = {}) => {
 const modifyAuthParam = async (param, withAuth) => {
   const requestParam = { ...param };
   if (withAuth) {
-    const { userId, token, openId } = await getAuthInfo();
-    requestParam.userId = userId;
+    const { uid, token, openId } = await wx.tmsLoginPromise;
+    requestParam.userId = uid;
     requestParam.token = token;
     requestParam.openId = openId;
     return requestParam;
@@ -364,8 +364,10 @@ export default class Request {
    * @param {object} header 自定义的请求头
    * @returns {Promise} 接口返回结果
    */
-  async createRequestTask(path, param = {}, method = 'POST', header = {}) {
-    const requestParam = await composeParam(param, this.withAuth, this.baseParam);
+  async createRequestTask(path, param = {}, method = 'POST', header = {}, hasRetry = false) {
+    // maplbs接口不需要token
+    const withAuth = path.includes('maplbs/ws') ? false : this.withAuth;
+    const requestParam = await composeParam(param, withAuth, this.baseParam);
     const data = sign(requestParam, this.secretKey);
     return new Promise((resolve, reject) => {
       const requestTime = Date.now();
@@ -404,21 +406,109 @@ export default class Request {
         }
       };
 
+      const success = async (res) => {
+        printLog(true, res.data);
+        // format 业务errcode，用于判断是否做重试
+        const { errCode } = formatResErrCode(path, res.data);
+        // 处理token失效情况(errcode=35)
+        const needRetryLogin = !hasRetry && errCode === 35 && isPathNeedRetryLogin(path);
+        if (needRetryLogin) {
+          try {
+            // 调用runtime的login方法刷新token
+            await loginRefresh();
+            // 刷新后重试请求
+            const retryRes = await this.createRequestTask(path, param, method, header, true);
+            resolve(retryRes);
+            return;
+          } catch (e) {
+            // 刷新token失败，直接返回原错误
+            resolve(res);
+            return;
+          }
+        }
+        resolve(res);
+      };
+      const fail = (err) => {
+        printLog(false, err);
+        reject(err);
+      };
+
       wx.request({
         url: this.makeUrl(path),
         header,
         method,
         data,
         enableHttp2: true,
-        success: (res) => {
-          printLog(true, res.data);
-          resolve(res);
-        },
-        fail: (err) => {
-          printLog(false, err);
-          reject(err);
-        },
+        success,
+        fail,
       });
     });
   }
 }
+
+/**
+ * 判断指定路径是否需要token失效重试
+ * @param {string} path 请求路径
+ * @returns {boolean} 是否需要重试
+ */
+const isPathNeedRetryLogin = (path) => {
+  // 定义不需要重试的路由白名单
+  const noRetryPaths = [
+    'user/login',       // 登录接口本身
+    'basic/event/upload', // 事件上报接口
+  ];
+
+  // 检查路径是否在白名单中
+  return !noRetryPaths.some(noRetryPath => path.includes(noRetryPath));
+};
+
+
+let refreshFlag = false;
+async function loginRefresh() {
+  if (!refreshFlag) {
+    // 调用runtime的login方法刷新token
+    const { tms } = getApp();
+    wx.tmsLoginPromise = undefined;
+    try {
+      refreshFlag = true;
+      await tms.login();
+      // 登录成功，清除Promise
+      refreshFlag = false;
+    } catch (err) {
+      // 登录失败重试
+      setTimeout(() => {
+        refreshFlag = false;
+      }, 100);
+    }
+  }
+}
+
+// 统一返回格式
+function formatResErrCode(path, res) {
+  // 比如apollo/config接口在sinan-service层因鉴权失败等原因，
+  // 返回的结果是不带res.resData的，所以取res，有errCode可以让后续走到错误流程中去
+  const resData = res.resData || res;
+
+  // 接入层转发的Apollo接口
+  if (path === 'marketing/apollo/config') {
+    return {
+      errCode: resData.status,
+    };
+  }
+
+  // 接入层转发的代驾、顺风车、飞机、im接口
+  if (/^(dd|hitchride|integration|im\/server)\//.test(path)) {
+    return {
+      errCode: resData.code,
+    };
+  }
+
+  // 接入层转发公共交通接口
+  if (path.startsWith('v2/bus')) {
+    return {
+      errCode: resData.errCode,
+    };
+  }
+
+  return res;
+}

package/src/runtime/index.js

@@ -7,6 +7,7 @@
  */
 import Login from './login';
 import Car from './car';
+import { setAuthInfo } from '../env';
 import getOpenAppTrafficData from './getopenapptrafficdata';
 
 const { loginFn, getOpenId, getMycarPubOpenId, getSinanPubOpenId, getPhone, registerPhone } = Login;
@@ -79,6 +80,7 @@ const login = async () => {
   const res = await loginFn();
   const loginInfo = { ...res, userId: res.uid };
   __resolver__.getLoginInfo(loginInfo);
+  setAuthInfo(loginInfo);
   return loginInfo;
 };