@tmsfe/tms-core 0.0.140 → 0.0.141

package/package.json

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

package/src/report/index.ts

@@ -73,6 +73,7 @@ function report2(...data: any[]): void {
 function reportPerformance(...data: any[]): void {
   data.unshift('tms-performance-log');
   fastReport2(...data);
+  console.log('tms-performance-log', ...data);
 }
 
 /**

package/src/request.js

@@ -347,15 +347,17 @@ export default class Request {
   }
 
   // wx请求封装成promise
-  async wxRequest(path, method, header, data, needReport = false) {
+  async wxRequest(path, method, header = {}, data, needReport = false) {
     if (needReport && path.indexOf('basic/event/upload') < 0) {
-      reporter.reportPerformance('request_encrypt_log', 'main', 'send_unencrypt_request', data.seqId,
-        !!wx.$_publicKey, Request.requestEncryptOpen, path);
+      reporter.reportPerformance(
+        'request_encrypt_log', 'main', 'send_unencrypt_request', data.seqId,
+        !!wx.$_publicKey, Request.requestEncryptOpen, path,
+      );
     }
     return new Promise((resolve, reject) => {
       wx.request({
         url: path,
-        header,
+        header: { ...header, 'X-Trace-Id': data.seqId },
         method,
         data,
         enableHttp2: true,
@@ -394,8 +396,8 @@ export default class Request {
     this.dealEncryptionSwitching = true;
     const formatHeader = {};
     Object.keys(resHeader).forEach(key => formatHeader[key.toLowerCase()] = resHeader[key]);
-    const encryptionAvaliable = formatHeader['x-encryption-avaliable'] === '1';
-    if (!encryptionAvaliable) {
+    const encryptionAvaliable = formatHeader['x-encryption-available'] === '0';
+    if (encryptionAvaliable) {
       // 关闭接下来请求的加密开关
       wx.$_publicKey = null;
       return false;
@@ -489,8 +491,10 @@ export default class Request {
         case 11:   // 公钥id失效
         case 12:   // 公钥已过期
         case 13: { // aes秘钥无效
-          reporter.reportPerformance('request_encrypt_log', 'main', 'remote_response_decrypt_fail',
-            data.seqId, decryptData.errCode, retryTimes);
+          reporter.reportPerformance(
+            'request_encrypt_log', 'main', 'remote_response_decrypt_fail',
+            data.seqId, decryptData.errCode, retryTimes,
+          );
           if (retryTimes > 2) {
             throw new Error('解密失败，请重试');
           }
@@ -499,8 +503,10 @@ export default class Request {
         }
         case 14: // 解密失败
           // 请求不加密重试
-          reporter.reportPerformance('request_encrypt_log', 'main', 'remote_response_decrypt_fail',
-            data.seqId, decryptData.errCode, retryTimes);
+          reporter.reportPerformance(
+            'request_encrypt_log', 'main', 'remote_response_decrypt_fail',
+            data.seqId, decryptData.errCode, retryTimes,
+          );
           return this.createRequestTask(path, param, method, header, false);
         default:
           break;