@tmsfe/tms-core 0.0.95 → 0.0.96

package/package.json

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

package/src/config.js

@@ -87,6 +87,46 @@ function getConfig(configPath, extendAttr = {}, defaultCfg) {
     });
 }
 
+/**
+* getApolloConfig 获取阿波罗平台配置
+* @description 拉取阿波罗的配置内容。参见{@link http://mapollo.woa.com/#/26fdbf3}
+* @example <caption>拉取单个配置</caption>
+* const { tms } = getApp({ allowDefault: true });
+* const cfg = await tms.getApolloConfig('sinan_me_faq', {}, { name: '默认配置'})
+* console.log(cfg); // 成功则返回服务端存储的配置，失败返回默认值
+* @param {String|Array} configPath 配置路径，单个路径或配置路径数组，支持替换${client}为当前小程序。例如在出行小程序，${client}会变替换为sinan
+* @param {Object} extendAttr 扩展属性，用于自定义的过滤条件，保留字段 businessKey、moduleKey。
+* @param {Object} [defaultCfg] 默认配置，请求失败返回默认值。
+* @returns {Promise<Object|Array<Object>>}
+* 有默认值时，请求失败返回默认值。无默认值时，请求失败返回Promise.reject
+*/
+function getApolloConfig(configPath, extendAttr = {}, defaultCfg) {
+  const configPaths = formatConfigPaths(configPath);
+  const defaultCfgs = (defaultCfg && (Array.isArray(defaultCfg) ? defaultCfg : [defaultCfg])) || null;
+  const { businessKey, moduleKey, ...extendAttrs } = extendAttr;
+  const api = new Request();
+  return api.post('marketing/apollo/config', {
+    businessKey,
+    moduleKey,
+    configPaths,
+    extendAttrs: JSON.stringify(extendAttrs),
+  })
+    .then((res)  => {
+      const { errCode, resData = {} } = res || {};
+      const { status, msg, data } = resData;
+      if (errCode === 0 && status === 0) {
+        return data.map(item => item.content);
+      }
+      throw new Error(msg);
+    })
+    .catch((e) => {
+      if (defaultCfgs) return Promise.resolve(defaultCfgs);
+      return Promise.reject({ err: e, msg: `获取${configPaths.join(',')}配置失败` });
+    });
+}
+
 export {
   getConfig,
+  getApolloConfig,
 };
+

package/src/index-proxy.js

@@ -68,7 +68,7 @@ const asyncFuncNames = [
   // 这行是runtime的
   'getPhone', 'registerPhone', 'login', 'getLoginInfo', 'getOpenId', 'getMycarPubOpenId', 'getSinanPubOpenId',
   // tms-core
-  'setAuthInfo', 'getConfig', 'navigateToWebview', 'callCloudFunc', 'getEncryptUserInfo',
+  'setAuthInfo', 'getConfig', 'getApolloConfig', 'navigateToWebview', 'callCloudFunc', 'getEncryptUserInfo',
   'setUserLocation', 'getUserLocation', 'getMpOpenId', 'getOuterOpenId',
 ];
 asyncFuncNames.forEach((funcName) => {

package/src/index.js

@@ -6,7 +6,7 @@ import runtime from './runtime/index';
 import Request from './request';
 import AutoReport from './report/proxy/index';
 import Reporter from './report/index';
-import { getConfig } from './config';
+import { getConfig, getApolloConfig } from './config';
 import syncApi from './syncfnmanager';
 import nav from './navigator';
 import { getLogManager, getRealtimeLogManager } from './log';
@@ -179,6 +179,7 @@ const api = {
   getEventDispatcher,
   getEnvInfo,
   getConfig,
+  getApolloConfig,
   navigateToWebview: nav.navigateToWebview,
   isAppPageExist,
   getHomePage,

package/src/location/base.ts

@@ -3,6 +3,9 @@ import { getSetting, updateLocStatus, getSystemInfo, getTextByReason, openSettin
 import EventDispatcher from '../eventDispatcher';
 import { WxPostionType } from '../types/object'; // eslint-disable-line
 
+const logger = wx.getLogManager({});
+logger.log('location模块代码被装载');
+
 const event = new EventDispatcher();
 
 let getLocPromise: null | Promise<any> = null;
@@ -13,6 +16,19 @@ const defaultLocationType = 'gcj02';
 // 派发事件的名称
 const EventName = 'loc_status_changed';
 
+// 小程序切换到前台|后台之后清除缓存，使后续能重新定位获取到最新位置
+function cleanCache(type: string) {
+  if (getLocPromise || userLocationCache) {
+    getLocPromise = null;
+    userLocationCache = undefined;
+    logger.log(type, '清除location缓存');
+  } else {
+    logger.log(type, 'location无缓存需要清理');
+  }
+}
+wx.onAppShow(() => cleanCache('wx.onAppShow'));
+wx.onAppHide(() => cleanCache('wx.onAppHide'));
+
 /**
  * @private 将wx.getLocation获取位置方法用promise封装
  * @param { string } type 获取位置类型
@@ -23,9 +39,13 @@ function getWxLocation(type: string = defaultLocationType): Promise<WxPostionTyp
     wx.getLocation({
       type,
       success: (res: WxPostionType) => {
+        logger.log(`wx.getLocation('${type}') 成功:\n`, JSON.stringify(res, null, '  '));
         resolve(res);
       },
-      fail: reject,
+      fail: (err) => {
+        logger.warn(`wx.getLocation('${type}') 失败:\n`, JSON.stringify(err, null, '  '));
+        reject(err);
+      },
     });
   });
 }
@@ -46,8 +66,8 @@ class LocationBase {
   listenerLocation() {
     if (!isListenerLocation) {
       isListenerLocation = true;
-      wx.onLocationChange(this.subscribeLocationChnage);
-      wx.startLocationUpdate({});
+      wx.onLocationChange(this.subscribeLocationChange);
+      wx.startLocationUpdate({}).then();
     }
   }
 
@@ -184,7 +204,7 @@ class LocationBase {
    * @param { object } res 用户位置信息对象
    * @returns { undefined } no retrurn
    */
-  public subscribeLocationChnage(res: WxPostionType) {
+  public subscribeLocationChange(res: WxPostionType) {
     userLocationCache = res;
   }
 

package/src/report/clone.ts

@@ -4,8 +4,8 @@
  */
 
 const maxArrLen = 10;
-const maxStrLen = 200;
-const maxFieldLen = 20;
+const maxStrLen = 50;
+const maxFieldLen = 10;
 
 // 字符串字段白名单，白名单内的字段不截断
 const fieldWhiteList = [
@@ -48,9 +48,9 @@ function isArrayType(obj: any): { isArray: boolean, value: any } {
  * @param depth 当前克隆的深度
  * @param maxDepth 最大克隆深度
  */
-function deepClone(obj: any, depth = 0, maxDepth = 5): any {
+function deepClone(obj: any, depth = 0, maxDepth = 2): any {
   if (depth > maxDepth) {
-    return undefined;
+    return '深度超过上限，截断';
   }
   const res1 = isBasicsType(obj);
   if (res1.isBasics) {

package/src/report/index.ts

@@ -9,6 +9,9 @@ import sender from './sender';
 import formatV1 from './formatV1';
 import formatV2 from './formatV2';
 
+const logger = wx.getLogManager({});
+logger.log('report模块代码被装载');
+
 /**
  * 初始化
  * @private
@@ -25,6 +28,7 @@ function init(options: IInitOptions): void {
  */
 function report(data: IOldParams = {}): void {
   if (helper.canReport()) {
+    logger.log('旧埋点:', data);
     formatV1.formatData(data).then(arr => sender.queue(arr));
   }
 }
@@ -37,6 +41,7 @@ function report(data: IOldParams = {}): void {
  */
 function fastReport(data: IOldParams = {}): void {
   if (helper.canReport()) {
+    logger.log('旧立即埋点:', data);
     const arr = formatV1.formatFastData(data);
     sender.send(arr);
   }
@@ -55,6 +60,7 @@ function fastReport(data: IOldParams = {}): void {
  */
 function report2(...data: any[]): void {
   if (helper.canReport()) {
+    logger.log('新埋点:', data);
     formatV2.formatData(data).then(arr => sender.queue(arr));
   }
 }
@@ -73,6 +79,7 @@ function report2(...data: any[]): void {
  */
 function fastReport2(...data: any[]): void {
   if (helper.canReport()) {
+    logger.log('新立即埋点:', data);
     const arr = formatV2.formatFastData(data);
     sender.send(arr);
   }

package/src/request.js

@@ -9,10 +9,11 @@
  * 框架判断在不同的运行环境，切换调用不同运行环境提供的方法。
  */
 import md5 from './md5';
-import { getLogManager } from './log';
 import { getEnvInfo, getAuthInfo } from './env';
 import { safeJsonParse } from './objUtils';
 
+const logger = wx.getLogManager({});
+
 /**
  * 用于序列化需要签名的参数
  * @private
@@ -144,11 +145,11 @@ export default class Request {
   }
 
   /**
-  * 格式化接口路径
-  * @private
-  * @param {string} path 需要格式化的接口路径
-  * @returns {string} 格式化后的接口路径
-  */
+   * 格式化接口路径
+   * @private
+   * @param {string} path 需要格式化的接口路径
+   * @returns {string} 格式化后的接口路径
+   */
   makeUrl(path) {
     if ((/^http/i).test(path)) return path;
     const host = this.host || Request.defaultHost;
@@ -288,10 +289,10 @@ export default class Request {
   async serialize(path, data = {}) {
     let url = this.makeUrl(path);
     const signData = await composeParam(data, this.withAuth, this.baseParam);
-    const signture = sign(signData);
+    const signature = sign(signData);
     const params = [];
-    Object.keys(signture).forEach((key) => {
-      const val = encodeURIComponent(signture[key]);
+    Object.keys(signature).forEach((key) => {
+      const val = encodeURIComponent(signature[key]);
       params.push(`${key}=${val}`);
     });
     if (params.length) url += (/\?/.test(url) ? '&' : '?') + params.join('&');
@@ -310,23 +311,46 @@ export default class Request {
   async createRequestTask(path, param = {}, method = 'POST', header = {}) {
     const requestParam = await composeParam(param, this.withAuth, this.baseParam);
     const data = sign(requestParam);
-    const logger = getLogManager();
-    const res = await new Promise((resolve, reject) => {
+    return new Promise((resolve, reject) => {
       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}`);
+          }
+
           resolve(res);
-          logger.log({ path, header, method, param: data, res: res?.data });
         },
         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.error(`接口请求失败：\n${str}`);
+
           reject(err);
-          logger.log({ path, header, method, param: data, err });
         },
       });
     });
-    return res;
   }
 }