@tmsfe/tms-core 0.0.202 → 0.2.1

package/package.json

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

package/src/index.js

@@ -56,6 +56,14 @@ 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
@@ -241,6 +249,13 @@ const api = {
   /* 金额方法 */
   formatAmount,
 
+  /* 常见正则校验 */
+  validTaxId,
+  validPhone,
+  validName,
+  validEmail,
+  validIdNumber,
+
   /* 时间方法 */
   groupTimeDuration,
   formatTimeDuration,

package/src/regCheck.ts

@@ -0,0 +1,40 @@
+/**
+ * 常见正则校验
+ */
+
+// 校验税号
+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,
+};

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 } = currentSystemInfo;
-    systemInfo = { model, wxVersion, platform, SDKVersion, host };
+    const { model = '', version: wxVersion = '', platform = '', SDKVersion = '', host, benchmarkLevel, system, memorySize } = currentSystemInfo;
+    systemInfo = { model, wxVersion, platform, SDKVersion, host, benchmarkLevel, system, memorySize };
   }
   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);
-      // 重试case1：处理token失效情况(errcode=35)
+      // 处理token失效情况(errcode=35)
       const needRetryLogin = errCode === 35 && isPathNeedRetryLogin(path);
       if (needRetryLogin) {
         // 调用runtime的login方法刷新token
@@ -415,24 +415,9 @@ 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) {
-      // 重试case2：微信系统errno：在重试码白名单内，重试
+      // 微信系统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;
@@ -589,7 +574,7 @@ export default class Request {
      * @returns {Promise} 返回 wx.request 的 requestTask
      */
   async createStreamRequestTask(path, params = {}) {
-    const { param = {}, method = 'POST', header = {}, callbacks = {}, timeout = 60000 } = params;
+    const { param = {}, method = 'POST', header = {}, callbacks = {} } = params;
     const requestParam = await composeParam(param, this.withAuth, this.baseParam);
     const data = sign(requestParam, this.secretKey);
 
@@ -601,7 +586,6 @@ export default class Request {
       header,
       method,
       data,
-      timeout,
       enableHttp2: this.enableHttp2,
       enableChunked: this.enableChunked,
       responseType: this.responseType,
@@ -635,9 +619,6 @@ 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) {