@tmsfe/tms-core 0.0.141 → 0.0.143

package/package.json

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

package/src/encrypt.js

@@ -60,7 +60,7 @@ function _getEccPublicId() {
 // 获取私钥
 let privateKeyInfo = null;
 const _getPrivateKeyInfo = (enforceUpdate) => {
-  if (!privateKeyInfo || enforceUpdate) {
+  if (!privateKeyInfo || enforceUpdate || privateKeyInfo.publicKeyId !== _getEccPublicId()) {
     const aesKey = _generateRandomKey();
     const encryptAesKey = _encryptWithPublicKey(aesKey, _getEccPublicKey());
     privateKeyInfo = {
@@ -268,11 +268,39 @@ function needsEncryption(url, params) {
   return true; // 没有匹配到规则，需要加密
 }
 
+// 判断是否是加密相关的错误类型（因为rawresponse的配置，需要errcode和errmessage共同来确定加密错误类型）
+const ErrCodeType = {
+  pubKeyIdInvalid: '11_Invalid public key!',
+  pubKeyExpired: '12_Expired public key!',
+  aesCipherInvalid: '13_Invalid AES cipher!',
+  decryptError: '14_Decrypt error!',
+  cryptoDisabled: '15_Crypto disabled!',
+};
+const reqErrType = {
+  pubKeyInvalid: 'pubKeyInvalid',
+  decryptError: 'decryptError',
+  cryptoDisabled: 'cryptoDisabled',
+};
+const getErrcodeType = (errCode, errMsg) => {
+  const errType = `${errCode}_${errMsg}`;
+  if (ErrCodeType.decryptError === errType) {
+    return reqErrType.decryptError;
+  }
+  if (ErrCodeType.cryptoDisabled === errType) {
+    return reqErrType.cryptoDisabled;
+  }
+  if ([ErrCodeType.pubKeyIdInvalid, ErrCodeType.pubKeyExpired, ErrCodeType.aesCipherInvalid].indexOf(errType) > -1) {
+    return reqErrType.pubKeyInvalid;
+  }
+};
+
 const encryptObj = {
   reqEncrypt,
   resDecrypt,
   updateDecryptKey,
   needsEncryption,
+  getErrcodeType,
+  reqErrType,
 };
 
 

package/src/index.js

@@ -130,8 +130,15 @@ const init = (options = {}) => {
     getLocation: async () => {
       try {
         const res = await getLocationManager().getIpLocation();
-        const ad = res.ad_info;
-        return { province: ad.province, cityName: ad.city };
+        const { ad_info: ad, location } = res;
+        return {
+          province: ad.province,
+          cityName: ad.city,
+          district: ad.district,
+          cityCode: ad.cityCode,
+          latitude: location.lat,
+          longitude: location.lng,
+        };
       } catch {
         return null;
       }

package/src/report/formatV2.ts

@@ -68,7 +68,9 @@ function getBaseData(page: IPage, deviceData: IDeviceData): { arr: DataItem[], n
   arr[27] = helper.getTmsUUID();
   // 28: f28，实际执行页面url
   arr[28] = page.execRoute;
-  // 29 ~ 30: 预留字段给后续扩展使用
+  // 29: f29，定位相关信息
+  arr[29] = JSON.stringify(location);
+  // 30 ~ 30: 预留字段给后续扩展使用
   // 31 ~ 40: 提供给开发自定义
   // --------------------------字段列表--------------------------
   return { arr, nextIndex: 31 };

package/src/report/helper.ts

@@ -255,6 +255,9 @@ function getDeviceData(): Promise<IDeviceData> {
             if (loc) {
               deviceData.location.province = loc.province;
               deviceData.location.cityName = loc.cityName;
+              deviceData.location.district = loc.district;
+              deviceData.location.latitude = loc.latitude;
+              deviceData.location.longitude = loc.longitude;
             }
             resolve();
           })

package/src/report/types.ts

@@ -9,7 +9,7 @@ export interface IInitOptions {
   // 小程序版本号
   appVersion: string,
   // 获取定位信息
-  getLocation: () => Promise<{ province: string, cityName: string } | null>,
+  getLocation: () => Promise<ILocation | null>,
   // 允许自定义日志输出
   logger: ILogger,
   // post方法，用于发送埋点
@@ -53,6 +53,9 @@ export interface ISystemInfo {
 export interface ILocation {
   province: string,
   cityName: string,
+  district: string
+  latitude: number,
+  longitude: number,
 }
 
 export interface IDeviceData {

package/src/request.js

@@ -347,17 +347,17 @@ export default class Request {
   }
 
   // wx请求封装成promise
-  async wxRequest(path, method, header = {}, data, needReport = false) {
+  async wxRequest(path, method, header = {}, data, needReport, seqId) {
     if (needReport && path.indexOf('basic/event/upload') < 0) {
       reporter.reportPerformance(
-        'request_encrypt_log', 'main', 'send_unencrypt_request', data.seqId,
+        'request_encrypt_log', 'main', 'send_unencrypt_request', seqId,
         !!wx.$_publicKey, Request.requestEncryptOpen, path,
       );
     }
     return new Promise((resolve, reject) => {
       wx.request({
         url: path,
-        header: { ...header, 'X-Trace-Id': data.seqId },
+        header: { ...header, 'X-Trace-Id': seqId },
         method,
         data,
         enableHttp2: true,
@@ -373,7 +373,10 @@ export default class Request {
 
   async refreshEncryptKey() {
     try {
-      const res = await this.doRequest('/basic/crypto/lastkey', {}, 'GET', {});
+      const requestParam = await composeParam({}, true, {});
+      const data = sign(requestParam, this.secretKey);
+      const finalUrl = this.makeUrl('basic/crypto/lastkey');
+      const res = await this.wxRequest(finalUrl, 'GET', {}, data, true, data.seqId);
       encryptObj.updateDecryptKey(res.data.resData);
     } catch (e) {
       encryptObj.updateDecryptKey(null);
@@ -389,8 +392,8 @@ export default class Request {
     return true;
   }
 
-  async dealEncryptionSwitch(resHeader) {
-    if (!resHeader || this.dealEncryptionSwitching) {
+  async dealEncryptionSwitch(resHeader, forceRefresh = false) {
+    if (!forceRefresh && (!resHeader || this.dealEncryptionSwitching)) {
       return false;
     }
     this.dealEncryptionSwitching = true;
@@ -403,7 +406,7 @@ export default class Request {
       return false;
     }
     // 打开开关，如果当前是关闭状态，则需要刷新加密key
-    if (!wx.$_publicKey) {
+    if (forceRefresh || !wx.$_publicKey) {
       await this.refreshEncryptKey();
     }
     this.dealEncryptionSwitching = false;
@@ -458,58 +461,55 @@ export default class Request {
         logger.warn(`接口请求失败：\n${str}`);
       }
     };
-    // 当前请求不加密 || 不满足加密前提
-    if (!doEncrypt || !this.checkIfNeedEncrypt(finalUrl, data)) {
-      return this.wxRequest(finalUrl, method, header, data, true)
-        .then((res) => {
-          printLog(true, res.data);
-          return res;
-        })
-        .catch((err) => {
-          printLog(false, err);
-          throw err;
-        });
-    }
-    // 1. 加密请求
-    const {
-      header: encryptHeader, data: encryptData, aesKey,
-    } = encryptObj.reqEncrypt(method, data, header, '');
-    // 2. 发送请求
+    const { seqId } = data;
     try {
-      reporter.reportPerformance('request_encrypt_log', 'main', 'send_encrypt_request', data.seqId);
-      const result = await this.wxRequest(finalUrl, method, encryptHeader, encryptData);
+      // 当前请求不加密 || 不满足加密前提
+      if (!doEncrypt || !this.checkIfNeedEncrypt(finalUrl, data)) {
+        const result = await this.wxRequest(finalUrl, method, header, data, true, seqId);
+        const { header: resHeader, data: resData } = result;
+        // 根据返回的响应头来控制接下来运行时的加密开关
+        this.dealEncryptionSwitch(resHeader);
+        printLog(true, resData);
+        return result;
+      }
+      // 1. 加密请求
+      const {
+        header: encryptHeader, data: encryptData, aesKey,
+      } = encryptObj.reqEncrypt(method, data, header, '');
+      // 2. 发送请求
+      reporter.reportPerformance('request_encrypt_log', 'main', 'send_encrypt_request', seqId);
+      const result = await this.wxRequest(finalUrl, method, encryptHeader, encryptData, false, seqId);
       const { header: resHeader, data: resData } = result;
       // 3. 解密响应
       const { success, header: decryptHeader, data: decryptData } = encryptObj.resDecrypt(aesKey, resHeader, resData);
       if (!success) {
-        reporter.reportPerformance('request_encrypt_log', 'main', 'local_response_decrypt_fail', data.seqId);
+        reporter.reportPerformance('request_encrypt_log', 'main', 'local_response_decrypt_fail', seqId);
         return this.createRequestTask(path, param, method, header, false);
       }
-      reporter.reportPerformance('request_encrypt_log', 'main', 'decrypt_response_success', data.seqId);
+      reporter.reportPerformance('request_encrypt_log', 'main', 'decrypt_response_success', seqId);
       // 4. 处理解密失败的响应
-      switch (decryptData.errCode) {
-        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('解密失败，请重试');
-          }
-          await this.refreshEncryptKey();
-          return this.createRequestTask(path, param, method, header, true, retryTimes + 1);
+      const errCodeType = encryptObj.getErrcodeType(decryptData.errCode, decryptData.errMsg);
+      if (errCodeType === encryptObj.reqErrType.pubKeyInvalid) {  // 秘钥失效
+        reporter.reportPerformance(
+          'request_encrypt_log', 'main', 'remote_response_decrypt_fail',
+          seqId, decryptData.errCode, retryTimes,
+        );
+        const encryptSwitch = await this.dealEncryptionSwitch(resHeader, true);
+        if (retryTimes > 2) {
+          throw new Error('解密失败，请重试');
         }
-        case 14: // 解密失败
-          // 请求不加密重试
-          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;
+        return this.createRequestTask(path, param, method, header, encryptSwitch, retryTimes + 1);
+      }
+      if (errCodeType === encryptObj.reqErrType.decryptError) { // 解密失败
+        reporter.reportPerformance(
+          'request_encrypt_log', 'main', 'remote_response_decrypt_fail',
+          seqId, decryptData.errCode, retryTimes,
+        );
+        return this.createRequestTask(path, param, method, header, false);
+      }
+      if (errCodeType === encryptObj.reqErrType.cryptoDisabled) { // 加密关闭
+        wx.$_publicKey = null;
+        return this.createRequestTask(path, param, method, header, false);
       }
       result.header = decryptHeader;
       result.data = decryptData;