@tmsfe/tms-core 0.0.215 → 0.0.217

package/package.json

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

package/src/request.js

@@ -14,6 +14,7 @@ import { safeJsonParse } from './objUtils';
 import { encryptObjInit } from './encrypt/index';
 import reporter from './report/index';
 import logger from './logger';
+import storage from './storage';
 
 // 微信底层错误重试码 600001-微信cronet组件错误 600003-网络中断 5-接口超时
 export const RETRY_WX_ERR_NOS = [600001, 600003, 5];
@@ -431,6 +432,12 @@ export default class Request {
         return await this.invokeRequest(path, param, method, header);
       }
 
+      // 重试case2：token即将过期，静默刷新token，token有效期剩余不足一小时会返回X-Twt-Expire为1
+      const needSilentRefreshLogin = res?.header?.['X-Twt-Expire'] === 1;
+      if (needSilentRefreshLogin) {
+        loginRefresh();
+      }
+
       // 重试case3：处理网关框架码重试 requestRetryFlag?.gwCodeReTryPath由七彩石配置
       const { requestRetryFlag } = wx.tmsFlagMap || {};
       // X-Gateway-Code必须首字母大写，否则真机取不到
@@ -656,14 +663,25 @@ const isPathNeedRetryLogin = (path) => {
 const isGatewayCodeNeedRetry = gatewayCode => (gatewayCode > 1 && gatewayCode <= 999) || +gatewayCode === 5000;
 
 let refreshPromise;
+let lastRefreshTime = 0;
+const REFRESH_COOLDOWN = 60 * 1000; // 60秒冷却期
 async function loginRefresh() {
+  // 冷却期内不重复刷新
+  if (Date.now() - lastRefreshTime < REFRESH_COOLDOWN) {
+    return;
+  }
   if (!refreshPromise) {
     // 调用runtime的login方法刷新token
     const { tms } = getApp();
     wx.tmsLoginPromise = undefined;
+    // 刷新登录态时清除缓存，确保重新走登录流程
+    storage.removeItem('sinanCacheUserInfo');
     try {
       refreshPromise = tms.login();
-      await refreshPromise;
+      const loginInfo = await refreshPromise;
+      // 刷新登录后写缓存
+      storage.setItem('sinanCacheUserInfo', loginInfo);
+      lastRefreshTime = Date.now(); // 记录最后成功刷新时间
       // 登录成功，清除Promise
       refreshPromise = undefined;
     } catch (err) {

package/src/runtime/login.ts

@@ -54,9 +54,14 @@ const loginFn = async () => {
           userData = await login();
         }
         if (userData.errCode === 0) {
-          userInfo = userData.resData.userInfo;
-          // 缓存登录信息
-          wx.setStorageSync('sinanCacheUserInfo', userInfo);
+          userInfo = userData.resData.userInfo || {};
+          // 登录信息，附带 expire 和时间校准字段
+          userInfo = {
+            ...userInfo,
+            expire: userInfo.expire,
+            loginTime: userInfo.loginTime,
+            localTime: Date.now(),
+          };
         }
       } catch (e) {}
       resolve(userInfo);

package/src/storage.js

@@ -98,6 +98,7 @@ function getCacheData(key, version, defaultData = null) {
 export {
   getItem,
   setItem,
+  removeItem,
   setCacheData,
   getCacheData,
 };