@tmsfe/tms-core 0.0.199 → 0.0.202

package/package.json

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

package/src/report/helper.ts

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

package/src/request.js

@@ -407,7 +407,7 @@ export default class Request {
       const res = await this.invokeRequest(path, param, method, header);
       // format 业务errcode，用于判断是否做重试
       const { errCode } = formatResErrCode(path, res.data);
-      // 处理token失效情况(errcode=35)
+      // 重试case1：处理token失效情况(errcode=35)
       const needRetryLogin = errCode === 35 && isPathNeedRetryLogin(path);
       if (needRetryLogin) {
         // 调用runtime的login方法刷新token
@@ -415,9 +415,24 @@ export default class Request {
         // 刷新后重试一次请求
         return await this.invokeRequest(path, param, method, header);
       }
+
+      // 重试case3：处理网关框架码重试 requestRetryFlag?.gatewayCode由七彩石配置
+      const { requestRetryFlag } = wx.tmsFlagMap || {};
+      // X-Gateway-Code必须首字母大写，否则真机取不到
+      const gatewayCode = res?.header?.['X-Gateway-Code'];
+      if (requestRetryFlag?.gatewayCode && isGatewayCodeNeedRetry(gatewayCode)) {
+        return await this.handleReTry(path, param, method, header, {
+          reportMsg: {
+            gatewayCode,
+            errMsg: `home gateway code ${gatewayCode} requires retry`,
+          },
+          waitTime: 10, // 网关框架码错误10ms后再重试
+          isSuccess: retryRes => !isGatewayCodeNeedRetry(retryRes?.header?.gatewayCode),
+        });
+      }
       return res;
     } catch (err) {
-      // 微信系统errno：在重试码白名单内，重试
+      // 重试case2：微信系统errno：在重试码白名单内，重试
       const { retryFlag, retryApiWhiteMap, requestRetryCount } = wx.tmsFlagMap || {};
       const isWhiteApi = retryApiWhiteMap?.home === 'all' ? true : (retryApiWhiteMap?.home || []).includes(path);
       const canRetry = errno => RETRY_WX_ERR_NOS.includes(errno) && isWhiteApi;
@@ -574,7 +589,7 @@ export default class Request {
      * @returns {Promise} 返回 wx.request 的 requestTask
      */
   async createStreamRequestTask(path, params = {}) {
-    const { param = {}, method = 'POST', header = {}, callbacks = {} } = params;
+    const { param = {}, method = 'POST', header = {}, callbacks = {}, timeout = 60000 } = params;
     const requestParam = await composeParam(param, this.withAuth, this.baseParam);
     const data = sign(requestParam, this.secretKey);
 
@@ -586,6 +601,7 @@ export default class Request {
       header,
       method,
       data,
+      timeout,
       enableHttp2: this.enableHttp2,
       enableChunked: this.enableChunked,
       responseType: this.responseType,
@@ -619,6 +635,9 @@ const isPathNeedRetryLogin = (path) => {
   return noRetryPaths.every(noRetryPath => !path.includes(noRetryPath));
 };
 
+// 判断网关框架码是否需要重试
+const isGatewayCodeNeedRetry = gatewayCode => (gatewayCode > 0 && gatewayCode <= 999) || +gatewayCode === 5000;
+
 let refreshPromise;
 async function loginRefresh() {
   if (!refreshPromise) {