@tmsfe/tms-core 0.0.176 → 0.0.178

package/package.json

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

package/src/encrypt/encrypt-util.ts

@@ -317,7 +317,7 @@ const cryptRuleUtil = {
   // 远程加密服务是否开启
   isServerOpen: (): boolean => !!wx.$_publicKey,
   // 检查path是否符合下发的路由前缀
-  pathInEnablePrefix: (path: string): boolean => {
+  pathInUnablePrefix: (path: string): boolean => {
     if (!wx.$_publicKey) {
       return false;
     }
@@ -392,8 +392,8 @@ const isCryptoRuleMath = (path: string, reqData: any): BaseResp<boolean> => {
   if (!cryptRuleUtil.isServerOpen()) {
     return new baseUtil.BaseRespFac(false, false, '服务端加密未开启');
   }
-  // 请求路由不满足服务端下发的加密规则，不走加密
-  if (!cryptRuleUtil.pathInEnablePrefix(path)) {
+  // 请求路由满足服务端下发的不加密规则，不走加密
+  if (cryptRuleUtil.pathInUnablePrefix(path)) {
     return new baseUtil.BaseRespFac(false, false, '未命中服务端加密规则');
   }
   // 请求接口是加密性能埋点上报接口，不加密

package/src/encrypt/index.ts

@@ -52,7 +52,7 @@ function proxyWxRequest(): void {
     enumerable: true,
     configurable: true,
     value(options: any) {
-      const startTime = Date.now();
+      let startTime = Date.now();
       const { url, method, data, header = {}, success, fail, complete, dataType, responseType } = options;
       const traceparent = genTraceparent();
       const traceId = traceparent.split('-')[1];
@@ -113,22 +113,26 @@ function proxyWxRequest(): void {
         responseType: 'arraybuffer',
         success: async (result) => {
           // 网络响应耗时
+          let now = Date.now();
           wx.reportEvent?.('cost_encrypt_statistic', {
             period: 'receive_data',
-            cost: Date.now() - startTime,
+            cost: now - startTime,
             path: originalOptions.url,
             trace_id: traceparent,
           });
+          startTime = now;
           const { header: resHeader, data: resData } = result;
           const { success: decSuccess, msg, res } = await encryptUtil
             .resDecrypt(traceId, resHeader, resData, cryptoKeyInfo);
           // 解密响应耗时
+          now = Date.now();
           wx.reportEvent?.('cost_encrypt_statistic', {
             period: 'decrypt_data',
-            cost: Date.now() - startTime,
+            cost: now - startTime,
             path: originalOptions.url,
             trace_id: traceparent,
           });
+          startTime = now;
           if (res.retry) { // 解密出现问题，需要明文重试
             util.reportFunc(url, traceparent, `解密失败：${msg}`);
             const newTraceparent = genTraceparent();
@@ -141,12 +145,14 @@ function proxyWxRequest(): void {
                 });
                 success?.call(this, res);
                 // 接口重试耗时
+                const now = Date.now();
                 wx.reportEvent?.('cost_encrypt_statistic', {
                   period: 'retry_request',
                   cost: Date.now() - startTime,
                   path: originalOptions.url,
                   trace_id: traceparent,
                 });
+                startTime = now;
               },
               header: { ...header, Traceparent: newTraceparent },
             });
@@ -159,12 +165,14 @@ function proxyWxRequest(): void {
             });
             success?.call(this, res);
             // 响应回调耗时
+            const now = Date.now();
             wx.reportEvent?.('cost_encrypt_statistic', {
               period: 'response_callback',
-              cost: Date.now() - startTime,
+              cost: now - startTime,
               path: originalOptions.url,
               trace_id: traceparent,
             });
+            startTime = now;
           } else { // 不支持明文重试，且解密失败
             util.reportFunc(url, traceparent, `解密失败：${msg}`);
             fail?.call(this, new Error(msg));
@@ -184,12 +192,14 @@ function proxyWxRequest(): void {
         },
       });
       // 加密请求准备耗时
+      const now = Date.now();
       wx.reportEvent?.('cost_encrypt_statistic', {
         period: 'before_request',
-        cost: Date.now() - startTime,
+        cost: now - startTime,
         path: url,
         trace_id: traceparent,
       });
+      startTime = now;
     },
   });
 }