@tmsfe/tms-core 0.0.13 → 0.0.17

package/dist/index-proxy.js

@@ -131,6 +131,16 @@ function getLocationManager() {
         return setUserLocation;
       }
 
+      if (name === 'locForNoAuth') {
+        return {
+          province: '广东省',
+          cityCode: '440300',
+          cityName: '深圳市',
+          latitude: 22.54286,
+          longitude: 114.05956
+        };
+      }
+
       return function (...args) {
         return ps.then(() => invoke(manager, name, args));
       };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { R as Request, g as getLogManager, a as getRealtimeLogManager } from './request-4c9af397.js';
+import { R as Request, g as getLogManager, a as getRealtimeLogManager } from './request-fea3ef26.js';
 import { g as getEnvInfo, a as getAuthInfo, s as setAuthInfo, i as isAppPageExist, b as getHomePage, c as setEnvInfo, d as setAppPagePaths } from './env-c7da70e1.js';
 import { s as syncApi, f as formatPlate, a as subStr, h as hidePhoneCenter, i as isValidPhone, b as isValidPlate, c as isValidAuthCode, r as roundStr, d as formatTime, e as formatTimeStr, g as formatTimeWithDetails, j as dateToString, k as ipxInit, l as isIPX, m as getIpxClass, n as getIpxConfig, o as serialize, p as rpxToPx } from './ipxHelper-71ef86c1.js';
 import { m as md5 } from './md5-34a9daf3.js';
@@ -28,6 +28,17 @@ const getSystemInfo$1 = () => {
     host
   };
 };
+
+const handleParamOfDifferentType = param => {
+  const data = new Array(41);
+  Object.keys(param).forEach(key => {
+    const valType = typeof param[key];
+    if (valType === 'string') data[key] = param[key];else if (valType === 'object') data[key] = JSON.stringify(param[key]);else data[key] = String(param[key]);
+  });
+  return data;
+};
+
+const defAssign = (value, defaultValue) => value || defaultValue;
 /**
  * @class FastReport
  * @classdesc 快速上报模块，不依赖用户标识和位置
@@ -45,20 +56,20 @@ class FastReport {
    * @param {Boolean} appVer 是否上报小程序版本
    * @returns {Promsie} 返回上报结果
    */
-  static report(param, simulatedUserId = true, simulatedUserIdIndex = 40, reportShowScene = true, appVer = true) {
+  static report(param = {}, simulatedUserId = true, simulatedUserIdIndex = 40, reportShowScene = true, appVer = true) {
     var _data$;
 
-    if (!(param !== null && param !== void 0 && param[27])) return Promise.reject('invalid report param');
-    const data = new Array(41);
+    if (!param[27]) return Promise.reject('invalid report param');
     const env = getEnvInfo();
-    Object.keys(param).forEach(key => {
-      const valType = typeof param[key];
-      if (valType === 'string') data[key] = param[key];else if (valType === 'object') data[key] = JSON.stringify(param[key]);else data[key] = String(param[key]);
-    });
+    const data = handleParamOfDifferentType(param);
     data[9] = '2';
     data[33] = encodeURIComponent(JSON.stringify(getSystemInfo$1()));
-    appVer && !data[10] && (data[10] = env.appVersion);
-    if (!data[26]) data[26] = (_data$ = data[27]) === null || _data$ === void 0 ? void 0 : _data$[0];
+
+    if (appVer) {
+      data[10] = defAssign(data[10], env.appVersion);
+    }
+
+    data[26] = defAssign(data[26], (_data$ = data[27]) === null || _data$ === void 0 ? void 0 : _data$[0]);
     data[28] = env.client;
 
     if (reportShowScene && !data[29]) {
@@ -117,6 +128,17 @@ const parseAllCfgs = (configPaths, resData, defaultCfgs) => configPaths.map((pat
 
   return {}; // 没找到配置，返回一个空对象
 });
+
+const formatConfigPaths = configPath => {
+  const configPaths = Array.isArray(configPath) ? configPath : [configPath];
+  const {
+    client
+  } = getEnvInfo();
+  configPaths.forEach((path, index) => {
+    configPaths[index] = path.replace(/\$\{client\}/, client);
+  });
+  return configPaths;
+};
 /**
  * getConfig 批量拉取配置
  * @description 拉取运营平台上的配置内容。关于运营平台的具体用法，参见{@link https://iwiki.woa.com/pages/viewpage.action?pageId=527948584}
@@ -154,14 +176,8 @@ function getConfig(configPath, extendAttr = {}, defaultCfg) {
     }
   }
 
-  const configPaths = Array.isArray(configPath) ? configPath : [configPath];
+  const configPaths = formatConfigPaths(configPath);
   const defaultCfgs = defaultCfg && (Array.isArray(defaultCfg) ? defaultCfg : [defaultCfg]) || null;
-  const {
-    client
-  } = getEnvInfo();
-  configPaths.forEach((path, index) => {
-    configPaths[index] = path.replace(/\$\{client\}/, client);
-  });
   const extendAttrs = typeof extendAttr === 'string' ? extendAttr : JSON.stringify(extendAttr);
   const api = new Request();
   return api.post('marketing/config', {
@@ -751,6 +767,7 @@ let cityTheUserAt = '';
 // 用户城市变化事件名
 const CityChangeEventName = 'loc_city_changed';
 const LocationType = 'gcj02'; // 获取经纬度时的坐标名称
+let ipLocationPromise = null; // ip定位请求的promise
 /**
  * @class Location
  * @classdesc 基于LocationBase，封装业务侧位置的接口。 将用户经纬度转化为城市等展示信息
@@ -977,6 +994,32 @@ class Location extends LocationBase$1 {
         }
         return request.post('basic/lbs/direction', { from, to, mode });
     }
+    /**
+     * ip定位
+     * 原理：通过调手图接口查询当前IP所在位置，市级的准确率是91%
+     * 注意：由于服务端对该查询服务有次数限制，所以本函数会缓存成功的promise
+     * @param force 是否清除上次的缓存重新请求
+     */
+    getIpLocation(force = false) {
+        if (ipLocationPromise === null || force) {
+            ipLocationPromise = new Promise((resolve, reject) => {
+                request.post('basic/lbs/decodeip')
+                    .then((res) => {
+                    if (res.errCode === 0) {
+                        resolve(res.resData);
+                        return;
+                    }
+                    reject({ erMsg: res.errMsg });
+                    ipLocationPromise = null;
+                })
+                    .catch((e) => {
+                    reject(e);
+                    ipLocationPromise = null;
+                });
+            });
+        }
+        return ipLocationPromise;
+    }
 }
 // 因为在构造函数中会用到wx的api，所以使用到时才实例化
 let instance;
@@ -1120,11 +1163,11 @@ const getProvinceInfoByIp = () => {
   if (!ProvinceInfoCacheByIp) {
     ProvinceInfoCacheByIp = new Promise(async resolve => {
       try {
-        const loc = await R.post('basic/lbs/decodeip');
+        const loc = await getLocInstance().getIpLocation();
         const {
           city,
           province
-        } = loc.resData.ad_info;
+        } = loc.ad_info;
         resolve({
           cityName: city,
           province
@@ -1254,16 +1297,21 @@ const formatReportData = async (reportData, deviceData) => {
 
   }; // 对部分空数据使用默认数据填充
 
-  Object.keys(defaultReportData).forEach(key => {
-    param[key] = param[key] !== null && JSON.stringify(param[key]) || defaultReportData[key];
+  const handleDefaultData = (paramItem, defaultData) => {
+    const arr = [paramItem, paramItem === 0, paramItem === false];
+    return arr.some(item => !!item) ? paramItem : defaultData || '';
+  };
+
+  Object.keys(defaultReportData).forEach(index => {
+    const paramItem = param[index];
+    param[index] = handleDefaultData(paramItem, defaultReportData[index]);
   }); // 所有上报数据都转换为字符串
 
   param.forEach((reportItem, index) => {
     if (reportItem && typeof reportItem !== 'string') {
       param[index] = `${JSON.stringify(reportItem)}`;
     } else {
-      const paramItem = param[index];
-      param[index] = paramItem || paramItem === 0 ? `${paramItem}` : '';
+      param[index] = handleDefaultData(reportItem, '');
     }
   });
   return param.map(item => item !== null ? encodeURIComponent(item) : item);

package/dist/request-fea3ef26.js

@@ -0,0 +1,538 @@
+import { m as md5 } from './md5-34a9daf3.js';
+import { a as getAuthInfo, g as getEnvInfo } from './env-c7da70e1.js';
+
+/**
+ * 本文件主要负责在小程序中日志打印功能，包含本地日志及实时日志. 主要做了两件事:
+ * 1、参数序列化处理；支持传递任意多个参数，并对类型为对象的参数进行字符串序列化处理(避免打印出来是'[Object Object]'的格式)；
+ * 2、低版本兼容；
+ */
+// 低版本不支持getLogManager或者getRealtimeLogManager时，用ManagerForLowerVersionLib来兼容
+const ManagerForLowerVersionLib = {
+  debug: () => {},
+  info: () => {},
+  log: () => {},
+  warn: () => {},
+  error: () => {},
+  addFilterMsg: () => {},
+  setFilterMsg: () => {}
+}; // 小程序基础库2.7.1版本以上支持，所以需要兼容性处理
+
+let logInstance = null;
+let rtLogInstance = null;
+
+function getLogInstance() {
+  if (logInstance === null) {
+    logInstance = wx.getLogManager ? wx.getLogManager() : ManagerForLowerVersionLib;
+  }
+
+  return logInstance;
+}
+
+function getRTLogInstance() {
+  if (rtLogInstance === null) {
+    rtLogInstance = wx.getRealtimeLogManager ? wx.getRealtimeLogManager() : ManagerForLowerVersionLib;
+  }
+
+  return rtLogInstance;
+}
+/**
+ * 参数中有对象类型的，将其转换为字符串类型，以便查看
+ * @param {Array<Any>} params 需要格式化的数据
+ * @returns {Array<String>} 字符串序列化后的数据
+ */
+
+
+const format = params => params.map(param => typeof param === 'string' ? param : JSON.stringify(param));
+/**
+ * @namespace LOG
+ * @description 普通日志管理器，将日志记录在小程序日志文件中，用户上传后，可以在小程序后台-反馈管理中看到
+ */
+
+
+const LOG = {
+  /**
+   * @description 写debug日志
+   * @param  {...Any} params 需要打印的数据，支持任意多个
+   * @returns {Void} 无返回值
+   */
+  debug(...params) {
+    getLogInstance().debug(...format(params));
+  },
+
+  /**
+   * @description 写info日志
+   * @param  {...Any} params 需要打印的数据，支持任意多个
+   * @returns {Void} 无返回值
+   */
+  info(...params) {
+    getLogInstance().info(...format(params));
+  },
+
+  /**
+   * @description 写log日志
+   * @param  {...Any} params 需要打印的数据，支持任意多个
+   * @returns {Void} 无返回值
+   */
+  log(...params) {
+    getLogInstance().log(...format(params));
+  },
+
+  /**
+   * @description 写warn日志
+   * @param  {...Any} params 需要打印的数据，支持任意多个
+   * @returns {Void} 无返回值
+   */
+  warn(...params) {
+    getLogInstance().warn(...format(params));
+  },
+
+  /**
+   * @description 写warn日志. LogManager并没有error方法，为了兼容旧代码，所以声明一个error方法
+   * @param  {...Any} params 需要打印的数据，支持任意多个
+   * @returns {Void} 无返回值
+   */
+  error(...params) {
+    LOG.warn(...params);
+  }
+
+};
+/**
+ * @namespace RTLOG
+ * @description 实时日志，将日志实时上传至小程序后台-开发-运维中心-实时日志，方便快速排查漏洞，定位问题
+ */
+
+const RTLOG = {
+  /**
+   * @description 写info日志
+   * @param  {...Any} params 需要打印的数据，支持任意多个
+   * @returns {Void} 无返回值
+   */
+  info(...params) {
+    getRTLogInstance().info(...format(params));
+  },
+
+  /**
+   * @description 写warn日志
+   * @param  {...Any} params 需要打印的数据，支持任意多个
+   * @returns {Void} 无返回值
+   */
+  warn(...params) {
+    getRTLogInstance().warn(...format(params));
+  },
+
+  /**
+   * @description 写error日志
+   * @param  {...Any} params 需要打印的数据，支持任意多个
+   * @returns {Void} 无返回值
+   */
+  error(...params) {
+    getRTLogInstance().error(...format(params));
+  },
+
+  /**
+   * @description 添加过滤关键字
+   * @param {String} msg 关键字
+   * @returns {Void} 无返回值
+   */
+  addFilterMsg(msg) {
+    getRTLogInstance().addFilterMsg(msg);
+  },
+
+  /**
+   * @description 设置过滤关键字
+   * @param {String} msg 关键字
+   * @returns {Void} 无返回值
+   */
+  setFilterMsg(msg) {
+    getRTLogInstance().setFilterMsg(msg);
+  }
+
+};
+/**
+ * @description 获取日志管理器对象，该对象提供的方法同wx.getLogManager()提供的方法，详见微信文档
+ * @returns {Object} [LOG](#namespace-log)
+ * @example
+ * const logger = getLogManager();
+ * logger.log(1, 'str', { a: 1 }, ...);
+ * logger.info(1, 'str', { a: 1 }, ...);
+ * logger.debug(1, 'str', { a: 1 }, ...);
+ * logger.awrn(1, 'str', { a: 1 }, ...);
+ */
+
+const getLogManager = () => LOG;
+/**
+ * @description 获取实时日志管理器对象，该对象提供的方法同wx.getRealtimeLogManager()提供的方法，详见微信文档
+ * @returns {Object} [RTLOG](#namespace-rtlog)
+ * @example
+ * const logger = getRealtimeLogManager();
+ * logger.info(1, 'str', { a: 1 }, ...);
+ * logger.warn(1, 'str', { a: 1 }, ...);
+ * logger.error(1, 'str', { a: 1 }, ...);
+ */
+
+
+const getRealtimeLogManager = () => RTLOG;
+
+/**
+ * @copyright 2021-present, Tencent, Inc. All rights reserved.
+ * @brief request.js用于发起网络请求.
+ * request模块作为基于 tms-core & tms-runtime 的应用的公共请求模块。
+ * 目前支持在出行服务小程序或基于出行服务的小程序中调用。在后续tms-runtime支持公众号H5后，
+ * 将支持在H5中调用。
+ *
+ * 考虑到对不同运行环境的支持，强依赖运行环境的依赖，比如 wx.request，应通过注入的形式提供。
+ * 框架判断在不同的运行环境，切换调用不同运行环境提供的方法。
+ */
+/**
+ * 用于序列化需要签名的参数
+ * @private
+ * @param {object} param 需要序列化的参数
+ * @returns {string} 序列化之后的参数字符串
+ */
+
+const seriesParam = param => {
+  const keys = Object.keys(param).filter(key => typeof param[key] !== 'undefined').sort();
+  const series = keys.map(key => {
+    const val = param[key];
+
+    if (typeof val === 'number' && isNaN(val)) {
+      return `${key}null`;
+    }
+
+    return `${key}${typeof val === 'object' ? JSON.stringify(val) : val}`;
+  });
+  return series.join('');
+};
+/**
+ * 用于对request请求对象做签名
+ * @private
+ * @param {object} param 需要做签名的参数
+ * @returns {object} 签名后的参数对象
+ */
+
+
+const sign = (param = {}) => {
+  const token = '';
+  const signture = md5(seriesParam(param) + token);
+  return { ...param,
+    sign: signture
+  };
+};
+/**
+ * 用于对request请求对象添加系统参数
+ * @private
+ * @param {object} param 接口调用传入的参数
+ * @param {Boolean} withAuth 是否需要登录参数
+ * @param {object} baseParam request实例定义的基础参数
+ * @returns {object} 全部参数对象
+ */
+
+
+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);
+  const timestamp = Date.now();
+  const random = Math.random().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);
+  const combinedParam = Object.assign({
+    version,
+    appVersion,
+    nonce,
+    timestamp,
+    seqId,
+    wxAppId
+  }, { ...baseParam
+  }, { ...paramsWithAuth
+  });
+  return combinedParam;
+};
+/**
+ * 用于保证业务参数的登录态参数，
+ * 若接口不依赖登录态 如 user/login，则保证参数中不包括userId & token,
+ * 若接口依赖登录态，则保证参数中填充userId & token,
+ * @private
+ * @param {object} param 要校验登录态的业务参数
+ * @param {boolean} withAuth 是否要校验登录态
+ * @returns {object} 增加登录态后的参数
+ */
+
+
+const modifyAuthParam = async (param, withAuth) => {
+  const requestParam = { ...param
+  };
+
+  if (withAuth) {
+    const {
+      userId,
+      token
+    } = await getAuthInfo();
+    requestParam.userId = userId;
+    requestParam.token = token;
+    return requestParam;
+  }
+
+  delete requestParam.userId;
+  delete requestParam.userid;
+  delete requestParam.token;
+  return requestParam;
+};
+/**
+ * @public
+ * @class Request
+ * @classdesc 网络请求类，对签名、鉴权等逻辑进行封装处理，用于向腾讯出行服务平台后台发送网络请求
+ */
+
+
+class Request {
+  /**
+   * 默认的request host域名
+   * defaultHost 在tms-runtime初始化时进行设置，为出行服务接入层域名
+   * 具体业务模块 new Request() 使用时，不指定自定义 host ，将使用defaultHost
+   */
+  static defaultHost = '';
+  host = '';
+  withAuth = true;
+  baseParam = {};
+  /**
+   * Request 构造函数
+   * @param {Object} config 构造参数
+   * @param {Object} config.withAuth 是否填充登录态参数
+   * @param {Object} config.host 自定义的host域名
+   * @param {Object} config.baseParam 默认携带的参数
+   */
+
+  constructor(config = {
+    withAuth: true
+  }) {
+    if (config.host) {
+      this.host = config.host;
+    }
+
+    if (typeof config.withAuth !== 'undefined') {
+      this.withAuth = !!config.withAuth;
+    }
+
+    this.baseParam = config.baseParam || {};
+  }
+  /**
+  * 格式化接口路径
+  * @private
+  * @param {string} path 需要格式化的接口路径
+  * @returns {string} 格式化后的接口路径
+  */
+
+
+  makeUrl(path) {
+    if (/^http/i.test(path)) return path;
+    const host = this.host || Request.defaultHost;
+    const validHost = /^http/i.test(host) ? host : `https://${host}`;
+    return `${validHost}/${path}`;
+  }
+
+  /**
+   * @public
+   * @memberof Request
+   * @param {String} path 请求接口路径
+   * @param {Object} [param] 请求参数
+   * @param {Object} [header] 自定义请求头
+   * @returns {Promise} 接口响应
+   * @example
+   * const $ = getApp().tms.createRequest();
+   * $.get(apiPath)
+   *  .then((data) => {
+   *    // data {Object} 响应数据
+   *    // {
+   *    //   errCode {Number} 接口响应状态码
+   *    //   errMsg  {String} 接口响应状态信息
+   *    //   resData {Object} 接口返回数据
+   *    // }
+   *  })
+   *  .catch((e) => {
+   *    // e {Object} 错误信息
+   *  });
+   */
+  get(path, param, header) {
+    return this.doRequest(path, param, 'GET', header);
+  }
+  /**
+   * @public
+   * @memberof Request
+   * @param {String} path 请求接口路径
+   * @param {Object} [param] 请求参数
+   * @param {Object} [header] 自定义请求头
+   * @returns {Promise} 接口响应
+   * @example
+   * const $ = getApp().tms.createRequest();
+   * $.post(apiPath)
+   *  .then((data) => {
+   *    // data {Object} 响应数据
+   *    // {
+   *    //   errCode {Number} 接口响应状态码
+   *    //   errMsg  {String} 接口响应状态信息
+   *    //   resData {Object} 接口返回数据
+   *    // }
+   *  })
+   *  .catch((e) => {
+   *    // e {Object} 错误信息
+   *  });
+   */
+
+
+  post(path, param, header) {
+    return this.doRequest(path, param, 'POST', header);
+  }
+  /**
+   * 发送get方式的请求，该方法会返回wx.request全量的返回值（含data，header，cookies，statusCode）
+   * @memberof Request
+   * @param {string} path 请求接口路径
+   * @param {object} param 业务参数
+   * @param {object} header 自定义请求头
+   * @returns {promise} 接口请求promise
+   */
+
+
+  execGet(path, param, header) {
+    return this.createRequestTask(path, param, 'GET', header);
+  }
+  /**
+   * 发送post方式的请求，该方法会返回wx.request全量的返回值（含data，header，cookies，statusCode等）
+   * @memberof Request
+   * @param {string} path 请求接口路径
+   * @param {object} param 业务参数
+   * @param {object} header 自定义请求头
+   * @returns {promise} 接口请求promise
+   */
+
+
+  execPost(path, param, header) {
+    return this.createRequestTask(path, param, 'POST', header);
+  }
+  /**
+   * @memberof Request
+   * @param {String} path 请求接口路径
+   * @param {String} filePath 上传文件的本地路径
+   * @param {Object} param 需要携带的其他参数
+   * @param {Object} header 自定义的请求头
+   * @returns {Object} 接口返回结果
+   */
+
+
+  async upload(path, filePath, param, header) {
+    const requestParam = await composeParam(param, this.withAuth, this.baseParam);
+    const res = await new Promise((resolve, reject) => {
+      wx.uploadFile({
+        name: 'content',
+        url: this.makeUrl(path),
+        filePath,
+        formData: sign(requestParam),
+        header,
+        success: resolve,
+        fail: reject
+      });
+    });
+
+    if (typeof (res === null || res === void 0 ? void 0 : res.data) === 'string') {
+      return JSON.parse(res === null || res === void 0 ? void 0 : res.data);
+    }
+
+    return res === null || res === void 0 ? void 0 : res.data;
+  }
+  /**
+   * @memberof Request
+   * @param {string} path 请求接口路径
+   * @param {string} param 业务参数
+   * @param {string} method 请求方法 get/post
+   * @param {object} header 自定义的请求头
+   * @returns {object} 接口返回结果
+   */
+
+
+  async doRequest(path, param = {}, method = 'POST', header = {}) {
+    const res = await this.createRequestTask(path, param, method, header);
+
+    if (typeof (res === null || res === void 0 ? void 0 : res.data) === 'string') {
+      return JSON.parse(res === null || res === void 0 ? void 0 : res.data);
+    }
+
+    return res === null || res === void 0 ? void 0 : res.data;
+  }
+  /**
+   * 序列化一个 get 请求地址
+   * @memberof Request
+   * @param {string} path 请求接口路径
+   * @param {object} data 业务参数
+   * @returns {Promise} 返回序列化之后的 get 请求地址
+   */
+
+
+  async serialize(path, data = {}) {
+    let url = this.makeUrl(path);
+    const signData = await composeParam(data, this.withAuth, this.baseParam);
+    const signture = sign(signData);
+    const params = [];
+    Object.keys(signture).forEach(key => {
+      const val = encodeURIComponent(signture[key]);
+      params.push(`${key}=${val}`);
+    });
+    if (params.length) url += (/\?/.test(url) ? '&' : '?') + params.join('&');
+    return Promise.resolve({
+      url
+    });
+  }
+  /**
+   * 创建发送请求任务
+   * @memberof Request
+   * @param {string} path 请求接口路径
+   * @param {string} param 业务参数
+   * @param {string} method 请求方法 get/post
+   * @param {object} header 自定义的请求头
+   * @returns {Promise} 接口返回结果
+   */
+
+
+  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) => {
+      wx.request({
+        url: this.makeUrl(path),
+        header,
+        method,
+        data,
+        success: res => {
+          resolve(res);
+          logger.log({
+            path,
+            header,
+            method,
+            param: data,
+            res: res === null || res === void 0 ? void 0 : res.data
+          });
+        },
+        fail: err => {
+          reject(err);
+          logger.log({
+            path,
+            header,
+            method,
+            param: data,
+            err
+          });
+        }
+      });
+    });
+    return res;
+  }
+
+}
+
+export { Request as R, getRealtimeLogManager as a, getLogManager as g };

package/dist/request.js

@@ -1,3 +1,3 @@
 import './md5-34a9daf3.js';
-export { R as default } from './request-4c9af397.js';
+export { R as default } from './request-fea3ef26.js';
 import './env-c7da70e1.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tms-core",
-  "version": "0.0.13",
+  "version": "0.0.17",
   "description": "tms运行时框架",
   "repository": {
     "type": "git",
@@ -34,9 +34,7 @@
     "rollup": "^2.6.1",
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-terser": "^6.1.0",
-    "rollup-plugin-typescript2": "0.27.0",
-    "rollup-plugin-replace": "^2.2.0",
-    "typescript": "^4.5.2"
+    "rollup-plugin-typescript2": "0.27.0"
   },
   "author": "tms·web",
   "gitHead": "72bf52451594b49a1c9f78edbad5956d414a66ca"

package/src/config.js

@@ -15,6 +15,15 @@ const parseAllCfgs = (configPaths, resData, defaultCfgs) => configPaths.map((pat
   return {}; // 没找到配置，返回一个空对象
 });
 
+const formatConfigPaths = (configPath) => {
+  const configPaths = Array.isArray(configPath) ? configPath : [configPath];
+  const { client } = getEnvInfo();
+  configPaths.forEach((path, index) => {
+    configPaths[index] = path.replace(/\$\{client\}/, client);
+  });
+  return configPaths;
+};
+
 /**
  * getConfig 批量拉取配置
  * @description 拉取运营平台上的配置内容。关于运营平台的具体用法，参见{@link https://iwiki.woa.com/pages/viewpage.action?pageId=527948584}
@@ -47,12 +56,8 @@ function getConfig(configPath, extendAttr = {}, defaultCfg) {
       }
     }
   }
-  const configPaths = Array.isArray(configPath) ? configPath : [configPath];
+  const configPaths = formatConfigPaths(configPath);
   const defaultCfgs = (defaultCfg && (Array.isArray(defaultCfg) ? defaultCfg : [defaultCfg])) || null;
-  const { client } = getEnvInfo();
-  configPaths.forEach((path, index) => {
-    configPaths[index] = path.replace(/\$\{client\}/, client);
-  });
   const extendAttrs = typeof extendAttr === 'string' ? extendAttr : JSON.stringify(extendAttr);
   const api = new Request();
   return api.post('marketing/config', {

package/src/fastreport.js

@@ -16,6 +16,20 @@ const getSystemInfo = () => {
   return { model, wxVersion, platform, SDKVersion, host };
 };
 
+const handleParamOfDifferentType = (param) => {
+  const data = new Array(41);
+  Object.keys(param).forEach((key) => {
+    const valType = typeof param[key];
+    if (valType === 'string') data[key] = param[key];
+    else if (valType === 'object') data[key] = JSON.stringify(param[key]);
+    else data[key] = String(param[key]);
+  });
+
+  return data;
+};
+
+const defAssign = (value, defaultValue) => (value || defaultValue);
+
 /**
  * @class FastReport
  * @classdesc 快速上报模块，不依赖用户标识和位置
@@ -31,20 +45,16 @@ export default class FastReport {
    * @param {Boolean} appVer 是否上报小程序版本
    * @returns {Promsie} 返回上报结果
    */
-  static report(param, simulatedUserId = true, simulatedUserIdIndex = 40, reportShowScene = true, appVer = true) {
-    if (!param?.[27]) return Promise.reject('invalid report param');
-    const data = new Array(41);
+  static report(param = {}, simulatedUserId = true, simulatedUserIdIndex = 40, reportShowScene = true, appVer = true) {
+    if (!param[27]) return Promise.reject('invalid report param');
     const env = getEnvInfo();
-    Object.keys(param).forEach((key) => {
-      const valType = typeof param[key];
-      if (valType === 'string') data[key] = param[key];
-      else if (valType === 'object') data[key] = JSON.stringify(param[key]);
-      else data[key] = String(param[key]);
-    });
+    const data = handleParamOfDifferentType(param);
     data[9] = '2';
     data[33] = encodeURIComponent(JSON.stringify(getSystemInfo()));
-    appVer && !data[10] && (data[10] = env.appVersion);
-    if (!data[26]) data[26] = data[27]?.[0];
+    if (appVer) {
+      data[10] = defAssign(data[10], env.appVersion);
+    }
+    data[26] = defAssign(data[26], data[27]?.[0]);
     data[28] = env.client;
     if (reportShowScene && !data[29]) {
       const appShowScene = wx.getStorageSync('appShowScene');

package/src/index-proxy.js

@@ -134,6 +134,15 @@ function getLocationManager() {
       if (name === 'setUserLocation') {
         return setUserLocation;
       }
+      if (name === 'locForNoAuth') {
+        return {
+          province: '广东省',
+          cityCode: '440300',
+          cityName: '深圳市',
+          latitude: 22.54286,
+          longitude: 114.05956,
+        };
+      }
       return function (...args) {
         return ps.then(() => invoke(manager, name, args));
       };

package/src/location/index.ts

@@ -16,6 +16,22 @@ interface UserLocationType {
   [key: string]: Promise<PostionType | void>
 }
 
+interface IpLocationType {
+  ip: string,
+  ad_info: {
+    adcode: number,
+    city: string,
+    cityCode: string,
+    district: string,
+    nation: string,
+    province: string,
+  },
+  location: {
+    lat: number,
+    lng: number,
+  },
+}
+
 const request = new Request();
 const event = new EventDispatcher();
 
@@ -27,6 +43,7 @@ let cityTheUserAt = '';
 // 用户城市变化事件名
 const CityChangeEventName = 'loc_city_changed';
 const LocationType = 'gcj02'; // 获取经纬度时的坐标名称
+let ipLocationPromise: null | Promise<IpLocationType> = null; // ip定位请求的promise
 
 /**
  * @class Location
@@ -272,6 +289,33 @@ class Location extends LocationBase {
     }
     return request.post('basic/lbs/direction', { from, to, mode });
   }
+
+  /**
+   * ip定位
+   * 原理：通过调手图接口查询当前IP所在位置，市级的准确率是91%
+   * 注意：由于服务端对该查询服务有次数限制，所以本函数会缓存成功的promise
+   * @param force 是否清除上次的缓存重新请求
+   */
+  getIpLocation(force = false): Promise<IpLocationType> {
+    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;
+          });
+      });
+    }
+    return ipLocationPromise;
+  }
 }
 
 // 因为在构造函数中会用到wx的api，所以使用到时才实例化

package/src/report.js

@@ -106,8 +106,8 @@ const getProvinceInfoByIp = () => {
   if (!ProvinceInfoCacheByIp) {
     ProvinceInfoCacheByIp = new Promise(async (resolve) => {
       try {
-        const loc = await R.post('basic/lbs/decodeip');
-        const { city, province } = loc.resData.ad_info;
+        const loc = await getLocInstance().getIpLocation();
+        const { city, province } = loc.ad_info;
         resolve({ cityName: city, province });
       } catch (_) {
         resolve({ cityName: '', province: '' });
@@ -212,8 +212,14 @@ const formatReportData = async (reportData, deviceData) => {
     36: getAppShowOptions(),       // 打开小程序的场景值及参数
   };
   // 对部分空数据使用默认数据填充
-  Object.keys(defaultReportData).forEach((key) => {
-    param[key] = (param[key] !== null && JSON.stringify(param[key])) || defaultReportData[key];
+  const handleDefaultData = (paramItem, defaultData) => {
+    const arr = [paramItem, paramItem === 0, paramItem === false];
+    return (arr.some(item => !!item)) ? paramItem : (defaultData || '');
+  };
+
+  Object.keys(defaultReportData).forEach((index) => {
+    const paramItem = param[index];
+    param[index] = handleDefaultData(paramItem, defaultReportData[index]);
   });
 
   // 所有上报数据都转换为字符串
@@ -221,8 +227,7 @@ const formatReportData = async (reportData, deviceData) => {
     if (reportItem && typeof reportItem !== 'string') {
       param[index] = `${JSON.stringify(reportItem)}`;
     } else {
-      const paramItem = param[index];
-      param[index] = (paramItem || paramItem === 0) ? `${paramItem}` : '';
+      param[index] = handleDefaultData(reportItem, '');
     }
   });
 

package/src/request.js

@@ -24,6 +24,9 @@ const seriesParam = (param) => {
     .sort();
   const series = keys.map((key) => {
     const val = param[key];
+    if (typeof val === 'number' && isNaN(val)) {
+      return `${key}null`;
+    }
     return `${key}${typeof val === 'object' ? JSON.stringify(val) : val}`;
   });
   return series.join('');