@tmsfe/tms-core 0.0.179 → 0.0.181

package/package.json

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

package/src/request.js

@@ -125,10 +125,18 @@ 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;
-    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;
@@ -364,8 +372,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 +414,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.every(noRetryPath => !path.includes(noRetryPath));
+};
+
+let refreshPromise;
+async function loginRefresh() {
+  if (!refreshPromise) {
+    // 调用runtime的login方法刷新token
+    const { tms } = getApp();
+    wx.tmsLoginPromise = undefined;
+    try {
+      refreshPromise = tms.login();
+      await refreshPromise;
+      // 登录成功，清除Promise
+      refreshPromise = undefined;
+    } catch (err) {
+      // 登录失败重试
+      setTimeout(() => {
+        refreshPromise = undefined;
+      }, 100);
+    }
+  }
+  return await refreshPromise;
+}
+
+// 统一返回格式
+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;
 };