@tmsfe/tms-core 0.0.139 → 0.0.141

package/package.json

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

package/src/encrypt.js

@@ -13,11 +13,11 @@ import JSEncrypt from './jsencrypt.min.js';
 const funAes = require('./aes.js');
 // 加密模式
 const ENCRYPT_MODE_ENUM = {
-  ASYMMETRIC_ENCRYPT_1: 1,      // 非对称加密
-  NO_ENCRYPT_0: 0,              // 不加密
-  ENCRYPT_COMPRESS: 1,          // 加密压缩
-  ENCRYPT_NOCOMPRESS_2: 2,      // 加密不压缩
-  NOENCRYPT_NOCOMPRESS_0: 0,    // 不加密不压缩
+  ASYMMETRIC_ENCRYPT_1: '1',      // 非对称加密
+  NO_ENCRYPT_0: '0',              // 不加密
+  ENCRYPT_COMPRESS: '1',          // 加密压缩
+  ENCRYPT_NOCOMPRESS_2: '2',      // 加密不压缩
+  NOENCRYPT_NOCOMPRESS_0: '0',    // 不加密不压缩
 };
 // -----------------------------------------------工具函数定义开始-----------------------------------------------------
 // -----------------------------------------------------------------------------------------------------------------
@@ -66,6 +66,7 @@ const _getPrivateKeyInfo = (enforceUpdate) => {
     privateKeyInfo = {
       aesKey,
       encryptAesKey,
+      publicKeyId: _getEccPublicId(),
     };
   }
   return privateKeyInfo;
@@ -129,41 +130,46 @@ const _aesDecrypt = (cipherText, aesKey) => {
  */
 const reqEncrypt = (method, params = {}, header = {}, encryptedResponseHeaderName = '') => {
   let finalData = params;
+  const { aesKey, encryptAesKey, publicKeyId } = _getPrivateKeyInfo();
   // 1. 处理请求参数
   if (method.toUpperCase() === 'GET') {
     const searchParams = Object.keys(params)
       .map(key => `${encodeURIComponent(key)}=${encodeURIComponent(params[key])}`)
       .join('&');
-    const encodedParams = _aesEncrypt(searchParams, _getPrivateKeyInfo().aesKey);
+    const encodedParams = _aesEncrypt(searchParams, aesKey);
     finalData = { tmsec: encodedParams };
   } else {
-    finalData = _aesEncrypt(JSON.stringify(params), _getPrivateKeyInfo().aesKey);
+    finalData = _aesEncrypt(JSON.stringify(params), aesKey);
   }
   // 2. 处理Headers
-  const encodedHeaders = _aesEncrypt(JSON.stringify(header), _getPrivateKeyInfo().aesKey);
+  const encodedHeaders = _aesEncrypt(JSON.stringify(header), aesKey);
   return {
     header: {
       'X-Encrypt-Mode': ENCRYPT_MODE_ENUM.ASYMMETRIC_ENCRYPT_1,
       'X-Compress-Mode': 'none',
       'X-Encrypted-Headers': encodedHeaders,
-      'X-Encrypt-Pub': _getEccPublicId(),
-      'X-Encrypt-Key': _getPrivateKeyInfo().encryptAesKey,
+      'X-Encrypt-Pub': publicKeyId,
+      'X-Encrypt-Key': encryptAesKey,
       'X-Encrypt-Response': ENCRYPT_MODE_ENUM.ENCRYPT_NOCOMPRESS_2,
       'X-Response-Header-Name': encryptedResponseHeaderName,
     },
     data: finalData,
-    aesKey: _getPrivateKeyInfo().aesKey,
+    aesKey,
   };
 };
 
 // 解密请求结果
 const resDecrypt = (aesKey, header, data) => {
+  const formatHeader = {};
+  Object.keys(header).forEach((key) => {
+    formatHeader[key.toLocaleLowerCase()] = header[key];
+  });
   const {
     // 'x-encrypt-key': encryptKey,                 // 使用ECC公钥加密后的AES秘钥
     'x-encrypt-response': encryptResponse,       // 期望的响应加密模式1: 加密、压缩 2: 加密、不压缩
     'x-response-headfer-name': encryptedResponseHeaderName, // 需要加密的响应Header: X-Header1,X-Header2
     'x-encrypted-headers': encryptedHeaders,     // 加密后的Header信息
-  } = header;
+  } = formatHeader;
   if (!encryptResponse || encryptResponse === ENCRYPT_MODE_ENUM.NOENCRYPT_NOCOMPRESS_0) {
     // 不需要解密，直接返回
     return {
@@ -201,7 +207,12 @@ const resDecrypt = (aesKey, header, data) => {
  * 更新秘钥信息：更新公钥，同时生成新的私钥
  * @param {String: publicKey, Number: expireDate, String: id } param0
  */
-const updateDecryptKey = ({ publicKey, expireDate, id }) => {
+const updateDecryptKey = (publicKeyInfo) => {
+  if (!publicKeyInfo) {
+    wx.$_publicKey = null;
+    return;
+  }
+  const { publicKey, expireDate, id } = publicKeyInfo;
   // 1. 存储新的公钥
   wx.$_publicKey = {
     publicKey,

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,11 +347,17 @@ export default class Request {
   }
 
   // wx请求封装成promise
-  async wxRequest(path, method, header, data) {
+  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,
+      );
+    }
     return new Promise((resolve, reject) => {
       wx.request({
         url: path,
-        header,
+        header: { ...header, 'X-Trace-Id': data.seqId },
         method,
         data,
         enableHttp2: true,
@@ -366,8 +372,13 @@ export default class Request {
   }
 
   async refreshEncryptKey() {
-    const res = await this.doRequest('/basic/crypto/lastkey', {}, 'GET', {});
-    encryptObj.updateDecryptKey(res.data.resData);
+    try {
+      const res = await this.doRequest('/basic/crypto/lastkey', {}, 'GET', {});
+      encryptObj.updateDecryptKey(res.data.resData);
+    } catch (e) {
+      encryptObj.updateDecryptKey(null);
+      reporter.reportPerformance('request_encrypt_log', 'main', 'refresh_encrypt_key_false', e);
+    }
   }
 
   // 如果全局请求加密开关关闭 || 当前请求内容不满足加密规则（publickey不为空且走sinan网关且非性能上报埋点）
@@ -378,6 +389,27 @@ export default class Request {
     return true;
   }
 
+  async dealEncryptionSwitch(resHeader) {
+    if (!resHeader || this.dealEncryptionSwitching) {
+      return false;
+    }
+    this.dealEncryptionSwitching = true;
+    const formatHeader = {};
+    Object.keys(resHeader).forEach(key => formatHeader[key.toLowerCase()] = resHeader[key]);
+    const encryptionAvaliable = formatHeader['x-encryption-available'] === '0';
+    if (encryptionAvaliable) {
+      // 关闭接下来请求的加密开关
+      wx.$_publicKey = null;
+      return false;
+    }
+    // 打开开关，如果当前是关闭状态，则需要刷新加密key
+    if (!wx.$_publicKey) {
+      await this.refreshEncryptKey();
+    }
+    this.dealEncryptionSwitching = false;
+    return true;
+  }
+
   /**
    * 创建发送请求任务
    * @memberof Request
@@ -428,7 +460,7 @@ export default class Request {
     };
     // 当前请求不加密 || 不满足加密前提
     if (!doEncrypt || !this.checkIfNeedEncrypt(finalUrl, data)) {
-      return this.wxRequest(finalUrl, method, header, data)
+      return this.wxRequest(finalUrl, method, header, data, true)
         .then((res) => {
           printLog(true, res.data);
           return res;
@@ -456,18 +488,25 @@ export default class Request {
       reporter.reportPerformance('request_encrypt_log', 'main', 'decrypt_response_success', data.seqId);
       // 4. 处理解密失败的响应
       switch (decryptData.errCode) {
-        case 11: // 公钥id失效
-        case 12: // 公钥已过期
-        case 13: // aes秘钥无效
-          if (retryTimes > 1) {
+        case 11:   // 公钥id失效
+        case 12:   // 公钥已过期
+        case 13: { // aes秘钥无效
+          reporter.reportPerformance(
+            'request_encrypt_log', 'main', 'remote_response_decrypt_fail',
+            data.seqId, decryptData.errCode, retryTimes,
+          );
+          if (retryTimes > 2) {
             throw new Error('解密失败，请重试');
           }
-          reporter.reportPerformance('request_encrypt_log', 'main', 'remote_response_decrypt_fail', data.seqId, decryptData.errCode);
           await this.refreshEncryptKey();
           return this.createRequestTask(path, param, method, header, true, retryTimes + 1);
+        }
         case 14: // 解密失败
           // 请求不加密重试
-          reporter.reportPerformance('request_encrypt_log', 'main', 'remote_response_decrypt_fail', data.seqId, decryptData.errCode);
+          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;
@@ -475,6 +514,8 @@ export default class Request {
       result.header = decryptHeader;
       result.data = decryptData;
       printLog(true, result.data);
+      // 根据返回的响应头来控制接下来运行时的加密开关
+      this.dealEncryptionSwitch(resHeader);
       return result;
     } catch (err) {
       printLog(false, err);