@tmsfe/tms-core 0.0.128 → 0.0.130

package/package.json

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

package/src/request.js

@@ -51,7 +51,7 @@ const getTmsUUID = () => {
   }
 
   return uuid;
-}
+};
 
 /**
  * 用于对request请求对象做签名

package/src/runtime/login.ts

@@ -165,8 +165,9 @@ const getMycarPubOpenId = () => {
     return getMycarPubOpenIdProm;
   }
 
-  // 优先用缓存的
-  const key = 'tms.pubOpenId';
+  const { appEnv } = getApp().tms.getEnvInfo();
+  // 优先用缓存的，正式环境跟测试环境的不一样
+  const key = `tms.pubOpenId.${appEnv}`;
   const pubOpenId = wx.getStorageSync(key);
   if (pubOpenId) {
     getMycarPubOpenIdProm = Promise.resolve(pubOpenId);

package/src/index-proxy.js

@@ -1,250 +0,0 @@
-/**
- * 由于需要把tms-core从主包中移到vendor分包中使用分包异步化加载，
- * 但是很多分包中都会立即调用getApp().tms的接口，为了保证调用不出错，
- * 特地新增此代理js，用于在app.js中先挂在到app.tms下，等vendor加载完再替换掉。
- * 注意：tms-core有改动都要来这里确认proxy有没有问题。
- */
-
-import syncApi from './syncfnmanager';
-import AutoReport from './report/proxy/index';
-import md5 from './md5';
-import { serialize } from './objUtils';
-import { calCoordinateDistance, formatDistance } from './distanceUtils';
-import { getNavBarConfigData } from './navbarUtils';
-import { compareVersion } from './compareVersion';
-import * as uiUtil from './tmsuiUtils';
-import * as rpxUtil from './rpx';
-import * as stringUtils from './stringUtils';
-import * as timeUtils from './timeUtils';
-import * as ipxHelper from './ipxHelper';
-import * as storage from './storage';
-import * as funcUtils from './funcUtils';
-
-let app = null;
-let initOptions = null;
-let tmsPromise = null;
-let tms = null;
-let logger = null;
-
-function invoke(obj, funcName, args) {
-  if (obj[funcName]) {
-    return obj[funcName](...args);
-  }
-
-  // 非法调用的时候就要及时上报日志，方便解决问题
-  if (!logger) {
-    logger = wx.getRealtimeLogManager();
-  }
-  const msg = `tms-proxy: Cannot read property ${funcName}`;
-  logger.addFilterMsg('tms-proxy');
-  logger.error(msg);
-  console.error(msg);
-  return Promise.reject(msg);
-}
-
-function initProxy(appObj, options) {
-  app = appObj;
-  initOptions = options;
-  // 如果是在app.js的onLaunch中调用，则没有getApp().tms为空
-  const getTms = () => getApp()?.tms || wx.tms;
-  AutoReport.init({
-    report: (...data) => {
-      const tms = getTms();
-      tms.getReporter().report2(...data);
-    },
-    fastReport: (...data) => {
-      const tms = getTms();
-      tms.getReporter().fastReport2(...data);
-    },
-  });
-}
-
-function awaitTMS() {
-  if (tmsPromise === null) {
-    tmsPromise = new Promise((resolve) => {
-      app.initPromise.then((res) => {
-        tms = res;
-        resolve(res);
-      });
-    });
-  }
-  return tmsPromise;
-}
-
-// 返回Promise的函数，无返回结果的也可以放这里
-const asyncFuncs = {};
-const asyncFuncNames = [
-  // 这行是tms-ui的
-  'showDrawer', 'hideDrawer', 'showModal', 'hideModal',
-  // 这行是runtime的
-  'getPhone', 'registerPhone', 'login', 'checkLogin', 'getLoginInfo', 'getOpenId', 'getMycarPubOpenId', 'getSinanPubOpenId',
-  // tms-core
-  'setAuthInfo', 'getConfig', 'getApolloConfig', 'navigateToWebview', 'callCloudFunc', 'getEncryptUserInfo',
-  'setUserLocation', 'getUserLocation', 'getMpOpenId', 'getOuterOpenId',
-];
-asyncFuncNames.forEach((funcName) => {
-  asyncFuncs[funcName] = function (...args) {
-    return awaitTMS().then(tms => invoke(tms, funcName, args));
-  };
-});
-
-// 返回对象的函数，并且对象的所有接口都可以以promise的形式返回
-const objFuncs = {};
-const objFuncNames = [
-  'getLogManager', 'getRealtimeLogManager', 'getReporter', 'getEventDispatcher',
-];
-objFuncNames.forEach((funcName) => {
-  objFuncs[funcName] = function (...args1) {
-    const ps = awaitTMS().then(tms => invoke(tms, funcName, args1));
-    return new Proxy({}, {
-      get(obj, name) {
-        return function (...args2) {
-          return ps.then(funcObj => invoke(funcObj, name, args2));
-        };
-      },
-    });
-  };
-});
-
-// runtime
-function getCarManager() {
-  return {
-    getCarInfo() {
-      if (tms) {
-        return tms.getCarManager().getCarInfo();
-      }
-      return wx.getStorageSync('currentCar') || {};
-    },
-    setCarInfo(param = {}) {
-      awaitTMS().then(tms => tms.getCarManager().setCarInfo(param));
-    },
-    getCarList() {
-      return awaitTMS().then(tms => tms.getCarManager().getCarList());
-    },
-  };
-}
-
-function getLocationManager() {
-  let manager = null;
-  const ps = awaitTMS().then((tms) => {
-    manager = tms.getLocationManager();
-  });
-  let currLoc = null;
-  const getUserLocation = () => {
-    if (manager) {
-      return manager.getUserLocation();
-    }
-    return currLoc;
-  };
-  const setUserLocation = (loc) => {
-    if (manager) {
-      manager.setUserLocation(loc);
-    } else if (loc && (typeof loc === 'object')) {
-      currLoc = loc;
-      ps.then(() => manager.setUserLocation(loc));
-    }
-  };
-  return new Proxy({}, {
-    get(obj, name) {
-      if (name === 'getUserLocation') {
-        return getUserLocation;
-      }
-      if (name === 'setUserLocation') {
-        return setUserLocation;
-      }
-      if (name === 'locForNoAuth') {
-        return {
-          province: '广东省',
-          cityCode: '440300',
-          cityName: '深圳市',
-          latitude: 22.54286,
-          longitude: 114.05956,
-          title: '深圳市民中心',
-          address: '广东省深圳市福田区福中三路',
-        };
-      }
-      return function (...args) {
-        return ps.then(() => invoke(manager, name, args));
-      };
-    },
-  });
-}
-
-function createRequest(config = {}) {
-  let request = null;
-  const ps = awaitTMS().then((tms) => {
-    request = tms.createRequest(config);
-  });
-  const makeUrl = (path) => {
-    if (request) {
-      return request.makeUrl(path);
-    }
-    if ((/^http/i).test(path)) {
-      return path;
-    }
-    const host = config?.host || initOptions.defaultHost;
-    const validHost = (/^http/i).test(host) ? host : `https://${host}`;
-    return `${validHost}/${path}`;
-  };
-  return new Proxy({}, {
-    get(obj, name) {
-      if (name === 'makeUrl') {
-        return makeUrl;
-      }
-      return function (...args) {
-        return ps.then(() => invoke(request, name, args));
-      };
-    },
-  });
-}
-
-function getEnvInfo() {
-  if (tms) {
-    return tms.getEnvInfo();
-  }
-  const { wxAppId, appVersion, appEnv, client } = initOptions;
-  return { wxAppId, appVersion, appEnv, client };
-}
-
-function isAppPageExist(...args) {
-  if (tms) {
-    return tms.isAppPageExist(...args);
-  }
-  return true; // todo: 可能不正确
-}
-
-function getHomePage() {
-  if (tms) {
-    return tms.getHomePage();
-  }
-  return initOptions.homePage;
-}
-
-const api = {
-  isProxy: true, // 方便定位问题时判断是否proxy
-  initProxy,
-  md5,
-  getCarManager,
-  getLocationManager,
-  serialize,
-  calCoordinateDistance,
-  formatDistance,
-  getNavBarConfigData,
-  compareVersion,
-  createRequest,
-  getEnvInfo,
-  isAppPageExist,
-  getHomePage,
-  storage,
-  ...rpxUtil,
-  ...uiUtil,
-  ...asyncFuncs,
-  ...objFuncs,
-  ...syncApi,
-  ...stringUtils,
-  ...timeUtils,
-  ...ipxHelper,
-  ...funcUtils,
-};
-
-export default api;

package/src/index-proxy.test.js

@@ -1,19 +0,0 @@
-import tmsProxy from './index-proxy';
-
-describe('tmsProxy', () => {
-  beforeAll(() => {
-    tmsProxy.initProxy({
-      initPromise: new Promise(() => {}),
-    }, {});
-  });
-
-  it('tmsProxy.getCarManager test', () => {
-    const car = tmsProxy.getCarManager();
-    expect(car).toBeInstanceOf(Object);
-  });
-
-  it('tmsProxy.createRequest test', () => {
-    const request = tmsProxy.createRequest();
-    expect(request).toBeInstanceOf(Object);
-  });
-});