@tmsfe/tms-core 0.0.112 → 0.0.113

package/package.json

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

package/src/request.js

@@ -22,7 +22,7 @@ const logger = wx.getLogManager({});
  */
 const seriesParam = (param) => {
   const keys = Object.keys(param)
-    .sort();
+  .sort();
   const series = keys.map((key) => {
     const val = param[key];
     return `${key}${typeof val === 'object' ? JSON.stringify(val) : val}`;
@@ -53,12 +53,12 @@ const composeParam = async (param = {}, withAuth = true, baseParam = {}) => {
   const version = '1.0';
   const { appVersion, wxAppId, client } = getEnvInfo();
   const nonce = Math.random()
-    .toString(36)
-    .substr(2, 10);
+  .toString(36)
+  .substr(2, 10);
   const timestamp = Date.now();
   const random = Math.random()
-    .toString()
-    .slice(2, 7);
+  .toString()
+  .slice(2, 7);
   const sourceId = ['', 'sinan', 'mycar'].indexOf(client) + 7; // 6 未知 7 云函数 8 出行 9 我的车
   const seqId = `${timestamp}${sourceId}${random}`;
   const paramsWithAuth = await modifyAuthParam(param, withAuth);
@@ -76,14 +76,14 @@ const composeParam = async (param = {}, withAuth = true, baseParam = {}) => {
   );
   // 清理undefined和NaN的参数
   Object.keys(combinedParam)
-    .forEach((key) => {
-      if (typeof combinedParam[key] === 'number' && isNaN(combinedParam[key])) {
-        delete combinedParam[key];
-      }
-      if (typeof combinedParam[key] === 'undefined') {
-        delete combinedParam[key];
-      }
-    });
+  .forEach((key) => {
+    if (typeof combinedParam[key] === 'number' && isNaN(combinedParam[key])) {
+      delete combinedParam[key];
+    }
+    if (typeof combinedParam[key] === 'undefined') {
+      delete combinedParam[key];
+    }
+  });
   return combinedParam;
 };
 
@@ -312,43 +312,52 @@ export default class Request {
     const requestParam = await composeParam(param, this.withAuth, this.baseParam);
     const data = sign(requestParam);
     return new Promise((resolve, reject) => {
+
+      const requestTime = Date.now();
+      const printLog = (isSuccess, res) => {
+        // 埋点已经单独打日志了，接口请求数据日志太长影响分析
+        if (path.indexOf('basic/event/upload') !== -1) {
+          return;
+        }
+
+        let result = JSON.stringify(res);
+        // 打车日志不截断，方便用于回放
+        if (isSuccess && path.indexOf('/takecar/') === -1 && result.length > 500) {
+          result = `${result.substring(0, 500)} 内容太长被截断`;
+        }
+
+        const obj = {
+          path,
+          method,
+          header: JSON.stringify(header),
+          params: JSON.stringify(data),
+          duration: Date.now() - requestTime,
+        };
+        if (isSuccess) {
+          obj.res = result;
+        } else {
+          obj.err = result;
+        }
+
+        const str = JSON.stringify(obj, null, '  ').replace(/\\"/ig, '\'');
+        if (isSuccess) {
+          logger.log(`接口请求成功：\n${str}`);
+        } else {
+          logger.warn(`接口请求失败：\n${str}`);
+        }
+      };
+
       wx.request({
         url: this.makeUrl(path),
         header,
         method,
         data,
         success: (res) => {
-          // 埋点已经单独打日志了，接口请求数据日志太长影响分析
-          if (path.indexOf('basic/event/upload') === -1) {
-            let result = JSON.stringify(res?.data);
-            // 打车日志不截断，方便用于回放
-            if (path.indexOf('/takecar/') === -1 && result.length > 500) {
-              result = `${result.substring(0, 500)} 内容太长被截断`;
-            }
-            const obj = {
-              path,
-              method,
-              header: JSON.stringify(header),
-              params: JSON.stringify(data),
-              res: result,
-            };
-            const str = JSON.stringify(obj, null, '  ').replace(/\\"/ig, '\'');
-            logger.log(`接口请求成功：\n${str}`);
-          }
-
+          printLog(true, res.data);
           resolve(res);
         },
         fail: (err) => {
-          const obj = {
-            path,
-            method,
-            header: JSON.stringify(header),
-            params: JSON.stringify(data),
-            err: JSON.stringify(err),
-          };
-          const str = JSON.stringify(obj, null, '  ').replace(/\\"/ig, '\'');
-          logger.warn(`接口请求失败：\n${str}`);
-
+          printLog(false, err);
           reject(err);
         },
       });