@tmsfe/tms-core 0.0.111 → 0.0.113

package/package.json

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

package/src/location/index.ts

@@ -55,19 +55,19 @@ let ipLocationPromise: null | Promise<IpLocationType> = null; // ip定位请求
  */
 class Location extends LocationBase {
   /**
-   * @desc 默认位置信息
-   * @property {object} locForNoAuth 默认的位置信息
-   * @property {string} locForNoAuth.privince 省份信息
-   * @property {string} locForNoAuth.cityCode 城市编码
-   * @property {string} locForNoAuth.cityName 城市名称
-   * @property {string} locForNoAuth.district 地区名称
-   * @property {string} locForNoAuth.latitude 维度
-   * @property {string} locForNoAuth.longitude 经度
-   * @example
-   * const app = getApp({ allowDefault: true });
-   * const locationManager = app.tms.getLocationManager(); // 获取位置管理器
-   * console.log(locationManager.locForNoAuth) // 获取默认位置
-   */
+  * @desc 默认位置信息
+  * @property {object} locForNoAuth 默认的位置信息
+  * @property {string} locForNoAuth.privince 省份信息
+  * @property {string} locForNoAuth.cityCode 城市编码
+  * @property {string} locForNoAuth.cityName 城市名称
+  * @property {string} locForNoAuth.district 地区名称
+  * @property {string} locForNoAuth.latitude 维度
+  * @property {string} locForNoAuth.longitude 经度
+  * @example
+  * const app = getApp({ allowDefault: true });
+  * const locationManager = app.tms.getLocationManager(); // 获取位置管理器
+  * console.log(locationManager.locForNoAuth) // 获取默认位置
+  */
   public locForNoAuth = {
     province: '广东省',
     cityCode: '440300',
@@ -133,7 +133,7 @@ class Location extends LocationBase {
 
       return Promise.reject(res);
     })
-    .catch(err => Promise.reject(err));
+      .catch(err => Promise.reject(err));
 
     return userLocationCache[cacheName];
   }
@@ -175,13 +175,13 @@ class Location extends LocationBase {
    */
   getLocationDetail(showModalWhenCloseAuth = false, type = LocationType, content = '', getPoi = 0) {
     return this.getLocation(showModalWhenCloseAuth, type, content)
-    .then(async (res: WxPostionType) => {
-      const res2 = await this.getPoiInfo(res.latitude, res.longitude, getPoi);
-      // @ts-ignore
-      res2.accuracy = res.accuracy;
-      return res2;
-    })
-    .catch(err => Promise.reject(err));
+      .then(async (res: WxPostionType) => {
+        const res2 = await this.getPoiInfo(res.latitude, res.longitude, getPoi);
+        // @ts-ignore
+        res2.accuracy = res.accuracy;
+        return res2;
+      })
+      .catch(err => Promise.reject(err));
   }
 
   /**
@@ -216,13 +216,13 @@ class Location extends LocationBase {
    */
   getLocationDetailSilent(getPoi = 0, type = 'gcj02') {
     return this.getLocationSilent(type)
-    .then(async (res: WxPostionType) => {
-      const res2 = await this.getPoiInfo(res.latitude, res.longitude, getPoi);
-      // @ts-ignore
-      res2.accuracy = res.accuracy;
-      return res2;
-    })
-    .catch(err => Promise.reject(err));
+      .then(async (res: WxPostionType) => {
+        const res2 = await this.getPoiInfo(res.latitude, res.longitude, getPoi);
+        // @ts-ignore
+        res2.accuracy = res.accuracy;
+        return res2;
+      })
+      .catch(err => Promise.reject(err));
   }
 
   /**
@@ -239,7 +239,7 @@ class Location extends LocationBase {
    *   longitude: 116.2545454,
    *   adCode: 1212144,
    * }
-   */
+  */
   getUserLocation(): PostionType | undefined {
     return userLocation;
   }
@@ -337,18 +337,18 @@ class Location extends LocationBase {
     if (ipLocationPromise === null || force) {
       ipLocationPromise = new Promise((resolve, reject) => {
         request.post('basic/lbs/decodeip')
-        .then((res) => {
-          if (res.errCode === 0) {
-            resolve(res.resData as IpLocationType);
-            return;
-          }
-          reject({ erMsg: res.errMsg });
-          ipLocationPromise = null;
-        })
-        .catch((e) => {
-          reject(e);
-          ipLocationPromise = null;
-        });
+          .then((res) => {
+            if (res.errCode === 0) {
+              resolve(res.resData as IpLocationType);
+              return;
+            }
+            reject({ erMsg: res.errMsg });
+            ipLocationPromise = null;
+          })
+          .catch((e) => {
+            reject(e);
+            ipLocationPromise = null;
+          });
       });
     }
     return ipLocationPromise;

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,42 +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 (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);
         },
       });