@tmsfe/tms-core 0.0.203 → 0.0.206

package/package.json

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

package/src/index.js

@@ -56,14 +56,6 @@ import * as storage from './storage';
 import * as uiUtil from './tmsuiUtils';
 import { throttle, debounce } from './funcUtils';
 import { formatAmount } from './priceUtils';
-import {
-  validTaxId,
-  validPhone,
-  validName,
-  validEmail,
-  validIdNumber,
-} from './regCheck';
-
 
 /**
  * @public
@@ -249,13 +241,6 @@ const api = {
   /* 金额方法 */
   formatAmount,
 
-  /* 常见正则校验 */
-  validTaxId,
-  validPhone,
-  validName,
-  validEmail,
-  validIdNumber,
-
   /* 时间方法 */
   groupTimeDuration,
   formatTimeDuration,

package/src/navbarUtils.js

@@ -2,23 +2,7 @@
  * @desc: 获取导航高度的相关函数
  */
 import { compareVersion } from './compareVersion';
-let systemInfo = null;
-
-/**
- * 获取系统信息，有缓存, 返回数据同wx.getSystemInfoSync  {@link https://developers.weixin.qq.com/miniprogram/dev/api/base/system/wx.getSystemInfoSync.html}
- * @returns {Object} 系统信息
- */
-const getSystemInfoSync = () => {
-  if (systemInfo) return systemInfo;
-  let res;
-  try {
-    systemInfo = wx.getSystemInfoSync();
-    res = systemInfo;
-  } catch (_) {
-    res = {};
-  }
-  return res;
-};
+import { getSystemInfoSync } from './wxApi';
 
 /**
  * 获取系统信息，有缓存, 返回数据同wx.getSystemInfoSync {@link https://developers.weixin.qq.com/miniprogram/dev/api/base/system/wx.getSystemInfoSync.html}

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) {

package/src/syncfnmanager.js

@@ -1,3 +1,5 @@
+import { getSystemInfoSync as getSystemInfoSyncFunc } from './wxApi';
+
 /**
  * @desc: 本文件负责对小程序调用wx同步方法的管理
  */
@@ -14,13 +16,8 @@ const getSystemInfoSync = () => {
     return systemInfo;
   }
 
-  try {
-    systemInfo = wx.getSystemInfoSync();
-
-    return systemInfo;
-  } catch (_) {
-    return {};
-  }
+  systemInfo = getSystemInfoSyncFunc();
+  return systemInfo;
 };
 
 /**

package/src/utils/canvas/canvasDrawer.js

@@ -1,3 +1,5 @@
+import { getSystemInfoSync } from '../../wxApi';
+
 class CanvasDrawer {
   constructor(canvasId, container, instance = '', designWindowWidth = 750) {
     this.canvasId = canvasId; // canvasId
@@ -16,7 +18,7 @@ class CanvasDrawer {
           const canvas = res[0].node;
           this.canvas = canvas;
           this.ctx = canvas.getContext('2d');
-          const { pixelRatio: dpr, windowWidth } = wx.getSystemInfoSync();
+          const { pixelRatio: dpr, windowWidth } = getSystemInfoSync();
           canvas.width = res[0].width * dpr;
           canvas.height = res[0].height * dpr;
           this.ratio = windowWidth / this.designWindowWidth;

package/src/wxApi.ts

@@ -35,4 +35,38 @@ async function getWxSetting(forceRefresh = false): Promise<{
   });
 }
 
-export { getWxSetting };
+/**
+ * 获取系统信息
+ * 文档：https://developers.weixin.qq.com/miniprogram/dev/api/base/system/wx.getSystemInfoSync.html
+ * !!! 注意事项 !!!
+ * 1. 小程序常规打开和被半屏时屏幕尺寸不一样，获取屏幕高度、顶部栏胶囊位置的不要使用该缓存，会导致样式异常，如：navBar组件
+ * 2. 获取系统授权信息的不要使用该缓存，会导致授权信息更新不及时，如：系统位置定位开关打开 ｜ 允许微信使用位置定位能力开关打开
+ */
+function getSystemInfoSync(): WechatMiniprogram.SystemInfo {
+  if (wx.tmsSystemInfo) {
+    return wx.tmsSystemInfo;
+  }
+
+  try {
+    // 可以安全缓存的key，其它key缓存可能会因为更新不及时出现异常
+    const canCacheKeys = [
+      'brand', 'model', 'pixelRatio', 'screenWidth', 'windowWidth', 'language',
+      'version', 'system', 'platform', 'SDKVersion', 'benchmarkLevel', 'host',
+    ];
+    const systemInfo = wx.getSystemInfoSync();
+    const safeSystemInfo = {};
+    canCacheKeys.forEach((key) => {
+      safeSystemInfo[key] = systemInfo[key];
+    });
+
+    wx.tmsSystemInfo = safeSystemInfo;
+    return wx.tmsSystemInfo;
+  } catch (_) {
+    return {};
+  }
+}
+
+export {
+  getWxSetting,
+  getSystemInfoSync,
+};

package/src/regCheck.ts

@@ -1,40 +0,0 @@
-/**
- * 常见正则校验
- */
-
-// 校验税号
-function validTaxId(taxId) {
-  return /^[A-Z0-9]{15}$|^[A-Z0-9]{17}$|^[A-Z0-9]{18}$|^[A-Z0-9]{20}$/.test(taxId);
-}
-
-// 校验电话、手机号
-function validPhone(phone) {
-  const reg = /^(1[3456789]\d{9}|(\d{3,4}-\d{7,8}))$/;
-  return reg.test(phone);
-}
-
-// 校验姓名只允许中英文
-function validName(name) {
-  const reg = /^[\u4e00-\u9fa5a-zA-Z]+$/;
-  return reg.test(name);
-}
-
-// 验证邮箱地址
-function validEmail(email) {
-  const regExp = /^\w+([.-]?\w+)*@\w+([.-]?\w+)*(\.\w{2,3})+$/;
-  return regExp.test(email);
-}
-
-// 匹配身份证号
-function validIdNumber(idNumber: string): boolean {
-  const regExp = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[Xx])$)$/;
-  return regExp.test(idNumber);
-}
-
-export {
-  validTaxId,
-  validPhone,
-  validName,
-  validEmail,
-  validIdNumber,
-};