@tmsfe/tms-core 0.0.155 → 0.0.157

package/package.json

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

package/src/encrypt/encrypt-util.ts

@@ -166,8 +166,14 @@ const eccUtil = {
       }
       case 11307:  // 加密未开启
         return { retry: false, success: false };
-      default:
+      case 11301:
+      case 11302:
+      case 11303:
+      case 11304:
+      case 11308:
         return { retry: false, success: false };
+      default:     // 其他网关错误码
+        return { retry: false, success: true };
     }
   },
   execEncrypt: (input: string, ignoreNull = false): BaseResp<{
@@ -223,9 +229,9 @@ const eccUtil = {
 // 加密规则判断工具
 const cryptRuleUtil = {
   // 远程加密服务是否开启
-  _isServerOpen: (): boolean => !!wx.$_publicKey,
+  isServerOpen: (): boolean => !!wx.$_publicKey,
   // 检查path是否符合下发的路由前缀
-  _pathInEnablePrefix: (path: string): boolean => {
+  pathInEnablePrefix: (path: string): boolean => {
     if (!wx.$_publicKey) {
       return false;
     }
@@ -242,7 +248,7 @@ const cryptRuleUtil = {
     return false;
   },
   // 判断是否是性能埋点上报接口
-  _isPerformanceReport: (path: string, params: any): boolean => {
+  isPerformanceReport: (path: string, params: any): boolean => {
     // 如果是日志上报接口，需要过滤性能日志，不需要加密
     if (path.indexOf('basic/event/upload') > -1) {
       if (params.batch?.length === 1 && params.batch[0]?.[31] === 'tms-performance-log') {
@@ -261,7 +267,7 @@ const cryptRuleUtil = {
       '^/tde', '^/basic/crypto/lastkey',
     ],
   },
-  _isHostValid: (url) => {
+  isHostValid: (url) => {
     // 使用正则表达式解析URL
     const urlPattern = /^(https?:\/\/)?([^/?#]+)([/?#].*)?$/;
     const matches = url.match(urlPattern);
@@ -297,19 +303,19 @@ const isCryptoRuleMath = (path: string, reqData: any): BaseResp<boolean> => {
     return new baseUtil.BaseRespFac(false, false, '本地加密未开启');
   }
   // 如果服务端下发的加密开关关闭，不走加密
-  if (!cryptRuleUtil._isServerOpen()) {
+  if (!cryptRuleUtil.isServerOpen()) {
     return new baseUtil.BaseRespFac(false, false, '服务端加密未开启');
   }
   // 请求路由不满足服务端下发的加密规则，不走加密
-  if (!cryptRuleUtil._pathInEnablePrefix(path)) {
+  if (!cryptRuleUtil.pathInEnablePrefix(path)) {
     return new baseUtil.BaseRespFac(false, false, '未命中服务端加密规则');
   }
   // 请求接口是加密性能埋点上报接口，不加密
-  if (cryptRuleUtil._isPerformanceReport(path, reqData)) {
+  if (cryptRuleUtil.isPerformanceReport(path, reqData)) {
     return new baseUtil.BaseRespFac(false, false, '性能埋点');
   }
   // 请求路由不走sinan网关，不加密
-  if (!cryptRuleUtil._isHostValid(path)) {
+  if (!cryptRuleUtil.isHostValid(path)) {
     return new baseUtil.BaseRespFac(false, false, '非sinan网关加密接口');
   }
   return new baseUtil.BaseRespFac(true);;

package/src/encrypt/index.ts

@@ -1,12 +1,6 @@
 import encryptUtil from './encrypt-util';
 import { genTraceparent } from './traceUtils';
 
-interface Params {
-  filePath?: string,
-  name?: string,
-  data?: any,
-}
-
 const logger = wx.getLogManager({});
 const util = {
   // 统一格式化日志输出
@@ -22,8 +16,9 @@ const util = {
     return args;
   },
   logInfo: (...args) => {
-    console.log(...args);
+    args.unshift('request_encrypt_log');
     const items = util.formatLog(args);
+    console.log(...items);
     logger.log(...items);
   },
   reportFunc: (...args) => {
@@ -45,16 +40,24 @@ const util = {
     return Object.assign({ msg }, reqEncryptRes.res);
   },
 };
-
+let originalRequestApi;
+let originalUploadFileApi;
 // 劫持wx.request和wx.uploadFile函数
-const requestInit = () => {
+const requestInit = (utilFunc) => {
   if (!wx.request.cryptoFlag) {
-    wx._request = wx.request;
+    originalRequestApi = wx.request;
+    // 初始化参数加签函数和性能上报函数
+    const { report, composeParamsFunc } = utilFunc;
+    encryptUtil.init(composeParamsFunc);
+    util.reportFunc = (...args) => {
+      util.logInfo(...args);
+      report('request_encrypt_log', ...args);
+    };
     proxyWxRequest();
     wx.request.cryptoFlag = true;
   }
   if (!wx.uploadFile.cryptoFlag) {
-    wx._uploadFile = wx.uploadFile;
+    originalUploadFileApi = wx.uploadFile;
     proxyWxUploadFile();
     wx.uploadFile.cryptoFlag = true;
   }
@@ -68,16 +71,19 @@ function proxyWxRequest(): void {
     value(options: any) {
       const { url, method, data, header = {}, success, fail, complete, dataType, responseType } = options;
       const traceparent = genTraceparent();
+      const originalOptions = { ...options };
+
       // 如果用户自定义了dataType或者responseType，则不做处理
       if (dataType || responseType) {
         util.reportFunc(url, traceparent, '用户自定义了dataType和responseType');
-        wx._request.call(this, Object.assign(options, {
+        originalRequestApi.call(this, {
+          ...originalOptions,
           success: (res) => {
             encryptUtil.dealEncryptionSwitch(url, res.header);
             success?.call(this, res);
           },
           header: { ...header, Traceparent: traceparent },
-        }));
+        });
         return;
       }
       // 加密请求数据
@@ -86,25 +92,28 @@ function proxyWxRequest(): void {
       if (!cryptoKeyInfo) {
         // 如果没有加密信息，则不走加密
         util.logInfo(url, traceparent, msg);
-        wx._request.call(this, Object.assign(options, {
+        originalRequestApi.call(this, {
+          ...originalOptions,
           success: (res) => {
             encryptUtil.dealEncryptionSwitch(url, res.header);
             success?.call(this, res);
           },
           header: { ...header, Traceparent: traceparent },
-        }));
+        });
         return;
       }
+
       let completeResolver;
-      // eslint-disable-next-line
-      const completePromp = new Promise(resolve => { completeResolver = resolve; });
-      wx._request.call(this, Object.assign(options, {
+      const completePromp = new Promise((resolve) => {
+        completeResolver = resolve;
+      });
+      originalRequestApi.call(this, {
+        ...originalOptions,
         data: formatData,
         header: { ...formatHeader, Traceparent: traceparent },
         dataType: '其他',
         responseType: 'arraybuffer',
         success: async (result) => {
-          // 解密响应
           const { header: resHeader, data: resData } = result;
           const { success: resSuccess, msg, res } = await encryptUtil.resDecrypt(resHeader, resData, cryptoKeyInfo);
           if (resSuccess) {
@@ -116,13 +125,14 @@ function proxyWxRequest(): void {
             complete?.call(this, completeRes);
           } else {
             util.reportFunc(url, traceparent, `解密失败：${msg}`);
-            wx._request.call(this, Object.assign(options, {
+            originalRequestApi.call(this, {
+              ...originalOptions,
               success: (res) => {
                 encryptUtil.dealEncryptionSwitch(url, res.header);
                 success?.call(this, res);
               },
               header: { ...header, Traceparent: genTraceparent() },
-            }));
+            });
           }
         },
         fail: async (err) => {
@@ -133,7 +143,7 @@ function proxyWxRequest(): void {
         complete: (res) => {
           completeResolver(res);
         },
-      }));
+      });
     },
   });
 }
@@ -144,7 +154,7 @@ function proxyWxUploadFile(): void {
     enumerable: true,
     configurable: true,
     value(options: any) {
-      wx._uploadFile.call(this, Object.assign(options, {
+      originalUploadFileApi.call(this, Object.assign(options, {
         header: { ...options.header, Traceparent: genTraceparent() },
       }));
     },
@@ -155,14 +165,7 @@ export const encryptObjInit = (utilFunc: {
   composeParamsFunc: Function,
   report: Function,
 }) => {
-  // 初始化参数加签函数和性能上报函数
-  const { report, composeParamsFunc } = utilFunc;
-  encryptUtil.init(composeParamsFunc);
-  util.reportFunc = (...args) => {
-    util.logInfo('request_encrypt_log', ...args);
-    report('request_encrypt_log', ...args);
-  };
   // 劫持wx.request和wx.uploadFile函数
-  requestInit();
+  requestInit(utilFunc);
 };