@tmsfe/tms-core 0.0.4 → 0.0.5

package/package.json

@@ -1,14 +1,13 @@
 {
   "name": "@tmsfe/tms-core",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "tms运行时框架",
   "repository": {
     "type": "git",
     "url": "http://git.code.oa.com/lbsweb/tms/tms-arch.git"
   },
-  "main": "dist/index",
-  "types": "dist/src",
-  "miniprogram": "dist",
+  "main": "src/index",
+  "miniprogram": "src",
   "buildOptions": {
     "formats": [
       "esm"
@@ -17,4 +16,4 @@
   "scripts": {},
   "author": "tms·web",
   "gitHead": "72bf52451594b49a1c9f78edbad5956d414a66ca"
-}
+}

package/src/config.js

@@ -4,6 +4,17 @@
 import Request from './request';
 import { getEnvInfo } from './env';
 
+const parseAllCfgs = (configPaths, resData, defaultCfgs) => configPaths.map((path, index) => {
+  const found = resData.find(cfg => cfg.configPath === path);
+  if (found) {
+    return JSON.parse(found.configValue);
+  }
+  if (defaultCfgs && defaultCfgs[index]) {
+    return defaultCfgs[index];
+  }
+  return {}; // 没找到配置，返回一个空对象
+});
+
 /**
  * getConfig 批量拉取配置
  * @description 拉取运营平台上的配置内容。关于运营平台的具体用法，参见{@link https://iwiki.woa.com/pages/viewpage.action?pageId=527948584}
@@ -51,16 +62,7 @@ function getConfig(configPath, extendAttr = {}, defaultCfg) {
     .then((res = {}) => {
       const { errCode, resData } = res || {};
       if (resData && resData.length > 0) {
-        const parsed = configPaths.map((path, index) => {
-          const found = resData.find(cfg => cfg.configPath === path);
-          if (found) {
-            return JSON.parse(found.configValue);
-          }
-          if (defaultCfgs && defaultCfgs[index]) {
-            return defaultCfgs[index];
-          }
-          return {}; // 没找到配置，返回一个空对象
-        });
+        const parsed = parseAllCfgs(configPaths, resData, defaultCfgs);
         if (Array.isArray(configPath)) {
           return parsed;
         }
@@ -78,6 +80,7 @@ function getConfig(configPath, extendAttr = {}, defaultCfg) {
       return Promise.reject({ err: e, msg: `获取${configPaths.join(',')}配置失败，接口调用出错` });
     });
 }
-export default {
+
+export {
   getConfig,
 };

package/src/env.js

@@ -4,6 +4,7 @@ const env = {
   appVersion: '', // 当前运行时所在项目的版本号
   appEnv: '', // 运行环境 test - 测试、production - 正式
   client: '', // 运行时项目名，sinan - 腾讯出行服务； mycar - 我的车小程序
+  cloudEnvId: '', // 运行云函数的环境id
 };
 
 let baseAuthInfo = undefined;
@@ -48,11 +49,12 @@ export const getEnvInfo = () => env;
  * @returns {undefined} 无.
  */
 export const setEnvInfo = (envInfo) => {
-  const { wxAppId, appVersion, appEnv, client } = envInfo;
+  const { wxAppId, appVersion, appEnv, client, cloudEnvId } = envInfo;
   env.wxAppId = wxAppId;
   env.appVersion = appVersion;
   env.appEnv = appEnv;
   env.client = client;
+  env.cloudEnvId = cloudEnvId;
 };
 
 let appPagePaths = []; // app页面路径集合

package/src/fastreport.js

@@ -5,9 +5,17 @@
  */
 import Request from './request';
 import { getEnvInfo } from './env';
+import Sync from './syncfnmanager';
 
 let simulatedUserIdCache; // 模拟用户id在内存里的缓存
 
+const getSystemInfo = () => {
+  const system = Sync.getSystemInfoSync();
+  const { model = '', version: wxVersion = '', platform = '', SDKVersion = '', host = '' } = system;
+
+  return { model, wxVersion, platform, SDKVersion, host };
+};
+
 /**
  * @class FastReport
  * @classdesc 快速上报模块，不依赖用户标识和位置
@@ -28,12 +36,10 @@ export default class FastReport {
     const data = new Array(41);
     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]);
+      data[key] = param[key] === null ? '' : JSON.stringify(param[key]);
     });
     data[9] = '2';
+    data[33] = getSystemInfo();
     appVer && !data[10] && (data[10] = env.appVersion);
     if (!data[26]) data[26] = data[27]?.[0];
     data[28] = env.client;
@@ -45,7 +51,7 @@ export default class FastReport {
       data[simulatedUserIdIndex] = FastReport.getSimulatedUserId();
     }
 
-    return new Request().post('basic/event/upload', { batch: [data] })
+    return new Request({ withAuth: false }).post('basic/event/upload', { batch: [data] })
       .catch(() => null);
   }
 

package/src/index.js

@@ -1,6 +1,6 @@
 import Request from './request';
 import FastReport from './fastreport';
-import configApi from './config';
+import { getConfig } from './config';
 import syncApi from './syncfnmanager';
 import nav from './navigator';
 import { getLogManager, getRealtimeLogManager } from './log';
@@ -100,6 +100,7 @@ const init = (options = {}) => {
     appVersion,
     appEnv,
     client,
+    cloudEnvId,
   });
   setAppPagePaths(appPagePaths, homePage);
   Request.defaultHost = defaultHost;
@@ -132,7 +133,7 @@ const api = {
   getLocationBaseClass,
   getEventDispatcher,
   getEnvInfo,
-  getConfig: configApi.getConfig,
+  getConfig,
   navigateToWebview: nav.navigateToWebview,
   isAppPageExist,
   getHomePage,

package/src/location/base.ts

@@ -55,12 +55,12 @@ class LocationBase {
    */
   public getLocation(showModalWhenCloseAuth: boolean, type: string, content = '', showCancel = true): Promise<WxPostionType> {
     // 如果缓存中没有， 并且getLocPromise有值， 说明正在请求中。 返回请求的promise
-    if (!userLocationCache && getLocPromise) {
+    if (!userLocationCache && getLocPromise) {  // eslint-disable-line
       return getLocPromise;
     }
 
     // 如果缓存中没有， 并且getLocPromise没有值，新建一个请求
-    if (!userLocationCache && !getLocPromise) {
+    if (!userLocationCache && !getLocPromise) { // eslint-disable-line
       getLocPromise = this.getWxLocationPromise(showModalWhenCloseAuth, type, content, showCancel);
       return getLocPromise;
     }

package/src/location/index.ts

@@ -61,7 +61,7 @@ class Location extends LocationBase {
     const cacheName = `${lat}-${lng}-${getPoi}`;
 
     // @ts-ignore
-    if (userLocationCache[cacheName]) {
+    if (userLocationCache[cacheName]) { // eslint-disable-line
       return userLocationCache[cacheName];
     }
 

package/src/location/utils.ts

@@ -72,7 +72,7 @@ export async function updateLocStatus(status: boolean): Promise<void> {
  * @returns { Promise } 用户授权对象
  */
 export function getSetting(scopeKey: string = LocationScopeKey) {
-  if (getSettingPromise) {
+  if (getSettingPromise) { // eslint-disable-line
     return getSettingPromise;
   }
 

package/src/navigator.js

@@ -46,6 +46,7 @@ const navigateToWebview = ({ url: webUrl, complete = DEFN, message = DEFN, share
   wx.navigateTo(navSetting);
 };
 
-export default {
+const obj = {
   navigateToWebview,
 };
+export default obj;

package/src/report.js

@@ -117,16 +117,19 @@ const getProvinceInfoByIp = () => {
   return ProvinceInfoCacheByIp;
 };
 
+// 用于缓存用户唯一标识userId
+let userId = '';
 /**
- * 获取userId
+ * 获取用户唯一标识userId
  * @private
  * @returns {string} userId
  */
 const getUserId = async () => {
   if (userId) {
-    return Promise.resolve(userId);
+    return userId;
   }
-  const { userId } = await getAuthInfo();
+
+  ({ userId } = await getAuthInfo());
   return userId;
 };
 
@@ -193,32 +196,25 @@ const formatReportData = async (reportData, deviceData) => {
 
   param[5] = await getUserId();
   param[10] = getMiniProgramVersion(); // 上报小程序版本号
-  param[19] = system?.host; // 上报宿主app信息 { appId, env, version }
   param[16] = getLaunchFrom(); // 渠道公共参数
   param[17] = param[17] || provinceInfo?.province;
   param[18] = param[18] || provinceInfo?.cityName;
+  param[19] = system?.host; // 上报宿主app信息 { appId, env, version }
   param[28] = client;
 
-  if (!param[9]) {
-    param[9] = '2';
-  }
-  if (!param[12]) {
-    param[12] = netType;
-  }
-  if (!param[13]) {
-    param[13] = '2';
-  }
-  if (!param[29]) {
-    // 上报打开小程序的场景值
-    param[29] = getAppShowOptions().scene;
-  }
-  if (!param[33]) {
-    param[33] = JSON.stringify(system);
-  }
-  if (!param[36]) {
-    // 上报打开小程序的场景值及参数
-    param[36] = getAppShowOptions();
-  }
+  // 默认上报数据
+  const defaultReportData = {
+    9: '2',
+    12: netType,
+    13: '2',
+    29: getAppShowOptions().scene, // 打开小程序的场景值
+    33: JSON.stringify(system),    // 数据字符串化
+    36: getAppShowOptions(),       // 打开小程序的场景值及参数
+  };
+  // 对部分空数据使用默认数据填充
+  Object.keys(defaultReportData).forEach((key) => {
+    param[key] = (param[key] !== null && JSON.stringify(param[key])) || defaultReportData[key];
+  });
 
   // 所有上报数据都转换为字符串
   param.forEach((reportItem, index) => {

package/src/request.js

@@ -260,9 +260,6 @@ export default class Request {
    */
   async doRequest(path, param = {}, method = 'POST', header = {}) {
     const res = await this.createRequestTask(path, param, method, header);
-    const logger = getLogManager();
-
-    logger.log({ path, header, method, param, res: res?.data });
 
     if (typeof res?.data === 'string') {
       return JSON.parse(res?.data);
@@ -298,18 +295,26 @@ export default class Request {
    * @param {string} param 业务参数
    * @param {string} method 请求方法 get/post
    * @param {object} header 自定义的请求头
-   * @returns {object} 接口返回结果
+   * @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: sign(requestParam),
-        success: resolve,
-        fail: reject,
+        data,
+        success: (res) => {
+          resolve(res);
+          logger.log({ path, header, method, param: data, res: res?.data });
+        },
+        fail: (err) => {
+          reject(err);
+          logger.log({ path, header, method, param: data, err });
+        },
       });
     });
     return res;

package/src/syncfnmanager.js

@@ -95,7 +95,7 @@ export const getAccountInfoSync = () => {
   }
 };
 
-export default {
+const obj = {
   getPlatform,
   getSystemInfoSync,
   getLaunchOptionsSync,
@@ -103,3 +103,4 @@ export default {
   resetSystemInfoSync,
   getAccountInfoSync,
 };
+export default obj;

package/dist/cloudService.js

@@ -1,60 +0,0 @@
-import { a as getAuthInfo, g as getEnvInfo } from './env-3dc05530.js';
-
-/**
- * callCloudFunc 方法 调用云函数
- * @param {String} name 要调用的云函数
- * @param {Object} data 需要传给云函数的参数
- * @param {Boolean} withAuth 是否需要补充userId，token参数，当云函数需要调用SinanServer时，需要这些参数来完成鉴权
- * @returns {viod} 云函数
- */
-
-const callCloudFunc = async (name = '', data = {}, withAuth = true) => {
-  const {
-    cloudEnvId,
-    appVersion
-  } = getEnvInfo();
-  const timestamp = Date.now();
-  const random = Math.random().toString().slice(2, 7);
-  const sourceId = 7; // 6 未知 7 云函数 8 出行 9 我的车
-
-  const mergedData = { ...data,
-    timestamp,
-    seqId: `${timestamp}${sourceId}${random}`,
-    // 补充seqId参数
-    appVersion // 补充appVersion参数
-
-  };
-
-  if (withAuth) {
-    // 补充userId， token参数
-    const {
-      userId,
-      token
-    } = await getAuthInfo();
-    Object.assign(mergedData, {
-      userId,
-      token
-    });
-  }
-
-  const res = await new Promise((resolve, reject) => {
-    wx.cloud.callFunction({
-      name,
-      data: mergedData,
-      config: {
-        env: cloudEnvId
-      },
-      success: resolve,
-      fail: err => {
-        reject({
-          err,
-          name,
-          mergedData
-        });
-      }
-    });
-  });
-  return res;
-};
-
-export { callCloudFunc };

package/dist/env-3dc05530.js

@@ -1,142 +0,0 @@
-const env = {
-  wxAppId: '',
-  // 当前运行时小程序的appId
-  appVersion: '',
-  // 当前运行时所在项目的版本号
-  appEnv: '',
-  // 运行环境 test - 测试、production - 正式
-  client: '' // 运行时项目名，sinan - 腾讯出行服务； mycar - 我的车小程序
-
-};
-let baseAuthInfo = undefined;
-const getAuthInfoQueue = [];
-/**
- * @description 设置用户信息
- * @param {Object} authInfo 用户信息
- * @param {Object} err err
- * @returns {Void} 无返回值
- */
-
-const setAuthInfo = (authInfo, err) => {
-  baseAuthInfo = authInfo;
-
-  while (getAuthInfoQueue.length) {
-    const pro = getAuthInfoQueue.shift();
-
-    if (err) {
-      pro.reject(err);
-    } else {
-      pro.resolve(baseAuthInfo);
-    }
-  }
-};
-/**
- * 获取登录状态信息
- * @returns {Object} 当前用户状态参数
- */
-
-const getAuthInfo = async () => {
-  if (baseAuthInfo !== undefined) {
-    return baseAuthInfo;
-  }
-
-  return new Promise((resolve, reject) => getAuthInfoQueue.push({
-    resolve,
-    reject
-  }));
-};
-/**
- * tms.getEnvInfo 用于获取运行时所在的环境信息
- * @returns {object} 运行时环境信息.
- */
-
-const getEnvInfo = () => env;
-/**
- * 设置环境变量
- * @param {object} envInfo 环境变量
- * @returns {undefined} 无.
- */
-
-const setEnvInfo = envInfo => {
-  const {
-    wxAppId,
-    appVersion,
-    appEnv,
-    client
-  } = envInfo;
-  env.wxAppId = wxAppId;
-  env.appVersion = appVersion;
-  env.appEnv = appEnv;
-  env.client = client;
-};
-let appPagePaths = []; // app页面路径集合
-
-let homePageInfo = null; // 首页信息 { isTab, path, tabs }
-/**
- * 设置app内所有页面的路径
- * @param {Array<String>} paths    页面路径集合
- * @param {Object|null}   homePage 首页信息
- * @param {Boolean}       homePath.isTab 首页是否tab页
- * @param {String}        homePath.path  首页页面路径（isTab=false时使用此字段）
- * @param {Array<String>} homePath.tabs  tab页面路径列表（isTab=true时使用自此段）
- * @returns {void}
- */
-
-const setAppPagePaths = (paths, homePage) => {
-  appPagePaths = paths;
-  const {
-    isTab = false,
-    path = '',
-    tabs = []
-  } = homePage || {};
-  homePageInfo = {
-    isTab,
-    path,
-    tabs
-  };
-};
-/**
- * 判断页面是否存在于当前app中
- * @param {String} page 页面路径
- * @returns {Boolean} 页面是否存在app中
- */
-
-const isAppPageExist = page => {
-  const route = !page ? '' : String(page).split('?')[0];
-  if (!route || !Array.isArray(appPagePaths)) return false;
-  const routeWithoutPrefixSlash = route[0] === '/' ? route.substring(1) : route;
-  return appPagePaths.some(path => path === routeWithoutPrefixSlash || path === `/${routeWithoutPrefixSlash}`);
-}; // 以下变量标识各小程序appId
-
-const MOBILITY_APPID = 'wx65cc950f42e8fff1'; // 出行服务小程序AppId
-
-const MOBILITY_DEMO_APPID = 'wxa7ce727b525f80b0'; // 出行服务demo小程序AppId
-
-const SINAN_HOME = '/modules/index/carlife/pages/index/index'; // 出行首页地址
-
-const MYCAR_HOME = '/modules/car/index/index'; // 我的车首页地址
-
-/**
- * 获取首页信息
- * @returns {Object|null}   homePage 首页信息
- * @returns {Boolean}       homePath.isTab 首页是否tab页
- * @returns {String}        homePath.path  首页页面路径（isTab=false时使用此字段）
- * @returns {Array<String>} homePath.tabs  tab页面路径列表（isTab=true时使用自此段）
- */
-
-const getHomePage = () => {
-  var _wx$getAccountInfoSyn, _wx$getAccountInfoSyn2;
-
-  if (homePageInfo) return homePageInfo; // 返回默认信息
-
-  const mpAppId = (_wx$getAccountInfoSyn = wx.getAccountInfoSync()) === null || _wx$getAccountInfoSyn === void 0 ? void 0 : (_wx$getAccountInfoSyn2 = _wx$getAccountInfoSyn.miniProgram) === null || _wx$getAccountInfoSyn2 === void 0 ? void 0 : _wx$getAccountInfoSyn2.appId;
-  const homePagePath = [MOBILITY_APPID, MOBILITY_DEMO_APPID].indexOf(mpAppId) > -1 ? SINAN_HOME : MYCAR_HOME;
-  homePageInfo = {
-    isTab: false,
-    path: homePagePath,
-    tabs: []
-  };
-  return homePageInfo;
-};
-
-export { getAuthInfo as a, getHomePage as b, setEnvInfo as c, setAppPagePaths as d, getEnvInfo as g, isAppPageExist as i, setAuthInfo as s };