@tmsfe/tms-core 0.0.153 → 0.0.155

package/package.json

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

package/src/encrypt/encrypt-util.ts

@@ -74,12 +74,7 @@ const baseUtil = {
     }
     return '';
   },
-  getClientEncryptOpen: (): boolean => {
-    if (wx.$_encryptEnvInfo) {
-      return wx.$_encryptEnvInfo.requestEncryptOpen;
-    }
-    return false;
-  },
+  getClientEncryptOpen: (): boolean => wx.$_encryptEnvInfo?.requestEncryptOpen,
   BaseRespFac: class BaseRespFac<T> implements BaseResp<T> {
     success: boolean;
     msg: string;
@@ -92,12 +87,12 @@ const baseUtil = {
     }
   },
 };
-let composeParamsFunc = null;
+let composeParamsFunc = null; // 请求参数处理函数，加密初始化调用后之后会赋值
 // 加密工具
 const eccUtil = {
   _refreshPromise: null,
   _refreshPubKeyInfo: async (forceRefresh: boolean): Promise<boolean> => {
-    // 未完成初始化或者关闭秘钥刷新能力，则不支持秘钥刷新
+    // 未完成初始化，则不支持秘钥刷新
     if (!composeParamsFunc) {
       return false;
     }
@@ -147,12 +142,13 @@ const eccUtil = {
       const keyPair = ecc.box.keyPair();  // 生成客户端公钥私钥
       eccUtil._privateKeyInfo = {
         serverPubId: serverPubInfo.pubId,                       // 服务端公钥id
-        sharedByte: ecc.box.before(baseUtil.decUrl(serverPubInfo.pubKey), keyPair.secretKey),
+        sharedByte: ecc.box.before(baseUtil.decUrl(serverPubInfo.pubKey), keyPair.secretKey),  // 共享秘钥
         clientPublicKey: baseUtil.encUrl(keyPair.publicKey),    // base64 url safe 编码后的客户端公钥
       };
     }
     return eccUtil._privateKeyInfo;
   },
+  // 解析gwCode
   resolveGwCode: async (codeStr: string): Promise<{ retry: boolean, success: boolean }> => {
     if (!codeStr) return { retry: false, success: true };
     const code = parseInt(codeStr, 10);
@@ -431,7 +427,7 @@ const dealEncryptionSwitch = async (path: string, resHeader): Promise<void> => {
   } else if (formatHeader['x-crypto-enable'] === '1') {
     `${baseUtil.getSinanHost()}/user/login` === path && eccUtil._updateGlobalPublicKeyInfo(false, formatHeader);
     await eccUtil.openCrypto();
-  } // 0是关闭，2是开启, 1是保持
+  } // 0是关闭，1是开启, 2是保持
   dealEncryptionSwitching = false;
 };
 

package/src/encrypt/index.ts

@@ -29,13 +29,6 @@ const util = {
   reportFunc: (...args) => {
     util.logInfo('reportFunc init fail:', ...args);
   },
-  // 判断是否需要加密
-  needsEncryption: (path: string, reqData: Params): Boolean => {
-    // 小程序构建环境的加密开关关闭，不走加密
-    if (!wx.$_encryptEnvInfo.requestEncryptOpen) return false;
-    const isCryptoRuleMathRes = encryptUtil.isCryptoRuleMath(path, reqData);
-    return isCryptoRuleMathRes.res;
-  },
   reqEncrypt: (obj: { url: string, method: string, data: any, header: any }): {
     data: any, header: any, msg: string, cryptoKeyInfo?: any } => {
     const { url, method, data, header = {} } = obj;
@@ -107,6 +100,7 @@ function proxyWxRequest(): void {
       const completePromp = new Promise(resolve => { completeResolver = resolve; });
       wx._request.call(this, Object.assign(options, {
         data: formatData,
+        header: { ...formatHeader, Traceparent: traceparent },
         dataType: '其他',
         responseType: 'arraybuffer',
         success: async (result) => {
@@ -127,7 +121,7 @@ function proxyWxRequest(): void {
                 encryptUtil.dealEncryptionSwitch(url, res.header);
                 success?.call(this, res);
               },
-              header: { ...header, Traceparent: traceparent },
+              header: { ...header, Traceparent: genTraceparent() },
             }));
           }
         },
@@ -139,7 +133,6 @@ function proxyWxRequest(): void {
         complete: (res) => {
           completeResolver(res);
         },
-        header: { ...formatHeader, Traceparent: traceparent },
       }));
     },
   });

package/src/index.js

@@ -151,6 +151,7 @@ const init = (options = {}) => {
 
   Request.defaultHost = defaultHost;
   Request.defaultSecretKey = secretKey;
+  Request.encryptInit(secretKey);
   // 初始化云环境
   wx.cloud.init({ env: cloudEnvId });
 };

package/src/request.js

@@ -11,17 +11,11 @@
 import md5 from './md5';
 import { getEnvInfo, getAuthInfo } from './env';
 import { safeJsonParse } from './objUtils';
-import { encryptObjInit } from './encrypt';
+import { encryptObjInit } from './encrypt/index';
 import reporter from './report/index';
 
 const logger = wx.getLogManager({});
 
-// 加密模块初始化
-encryptObjInit({
-  composeParamsFunc: data => composeParam(data, true, {}),
-  report: (...args) => reporter.reportPerformance(...args),
-});
-
 /**
  * 用于序列化需要签名的参数
  * @private
@@ -165,6 +159,17 @@ export default class Request {
    */
   static defaultSecretKey = '';
 
+  static encryptInit(secretKey) {
+    // 加密模块初始化
+    encryptObjInit({
+      composeParamsFunc: async (data) => {
+        const params = await composeParam(data, true, {});
+        return sign(params, secretKey);
+      },
+      report: (...args) => reporter.reportPerformance(...args),
+    });
+  }
+
   static getInstance() {
     if (reqInstance === null) {
       reqInstance = new Request();