@tmsfe/tms-core 0.0.120 → 0.0.121

package/package.json

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

package/src/config.js

@@ -4,7 +4,6 @@
 import Request from './request';
 import { getEnvInfo } from './env';
 
-const api = new Request();
 const parseAllCfgs = (configPaths, resData, defaultCfgs) => configPaths.map((path, index) => {
   const found = resData.find(cfg => cfg.configPath === path);
   if (found) {
@@ -61,7 +60,7 @@ function getConfig(configPath, extendAttr = {}, defaultCfg) {
   const configPaths = formatConfigPaths(configPath);
   const defaultCfgs = (defaultCfg && (Array.isArray(defaultCfg) ? defaultCfg : [defaultCfg])) || null;
   const extendAttrs = typeof extendAttr === 'string' ? extendAttr : JSON.stringify(extendAttr);
-  return api.post('marketing/config', {
+  return Request.getInstance().post('marketing/config', {
     extendAttrs,
     configPaths,
   })
@@ -104,8 +103,7 @@ 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', {
+  return Request.getInstance().post('marketing/apollo/config', {
     businessKey,
     moduleKey,
     configPaths,

package/src/location/index.ts

@@ -37,7 +37,6 @@ interface IpLocationType {
   },
 }
 
-const request = new Request();
 const event = new EventDispatcher();
 
 const userLocationCache: UserLocationType = {}; // 获取位置缓存
@@ -104,35 +103,36 @@ class Location extends LocationBase {
       return userLocationCache[cacheName];
     }
 
-    userLocationCache[cacheName] = request.post('basic/lbs/decode', { lat, lng, getPoi }).then((res) => {
-      const { errCode, resData = {} } = res;
+    userLocationCache[cacheName] = Request.getInstance().post('basic/lbs/decode', { lat, lng, getPoi })
+      .then((res) => {
+        const { errCode, resData = {} } = res;
 
-      if (errCode === 0) {
-        const { result = {} } = resData;
-        const { ad_info: adInfo = {} } = result;
+        if (errCode === 0) {
+          const { result = {} } = resData;
+          const { ad_info: adInfo = {} } = result;
 
-        const loc = {
-          nationCode: adInfo.nation_code,
-          province: adInfo.province,
-          cityName: adInfo.city,
-          district: adInfo.district,
-          adCode: adInfo.adcode,
-          cityCode: formatCityCode(adInfo.city_code, adInfo.nation_code),
-          latitude: lat,
-          longitude: lng,
-        };
+          const loc = {
+            nationCode: adInfo.nation_code,
+            province: adInfo.province,
+            cityName: adInfo.city,
+            district: adInfo.district,
+            adCode: adInfo.adcode,
+            cityCode: formatCityCode(adInfo.city_code, adInfo.nation_code),
+            latitude: lat,
+            longitude: lng,
+          };
 
-        if (getPoi === 0) {
+          if (getPoi === 0) {
+            return loc;
+          }
+
+          loc.adCode = adInfo.adcode;
+          (loc as typeof loc & { poi: object }).poi = formatPoi(result);
           return loc;
         }
 
-        loc.adCode = adInfo.adcode;
-        (loc as typeof loc & { poi: object }).poi = formatPoi(result);
-        return loc;
-      }
-
-      return Promise.reject(res);
-    })
+        return Promise.reject(res);
+      })
       .catch(err => Promise.reject(err));
 
     return userLocationCache[cacheName];
@@ -324,7 +324,7 @@ class Location extends LocationBase {
       const { latitude, longitude } = (await this.getMergedLocation() as PostionType);
       from = `${latitude},${longitude}`;
     }
-    return request.post('basic/lbs/direction', { from, to, mode });
+    return Request.getInstance().post('basic/lbs/direction', { from, to, mode });
   }
 
   /**
@@ -336,7 +336,7 @@ class Location extends LocationBase {
   getIpLocation(force = false): Promise<IpLocationType> {
     if (ipLocationPromise === null || force) {
       ipLocationPromise = new Promise((resolve, reject) => {
-        request.post('basic/lbs/decodeip')
+        Request.getInstance().post('basic/lbs/decodeip')
           .then((res) => {
             if (res.errCode === 0) {
               resolve(res.resData as IpLocationType);

package/src/mpInfo.js

@@ -16,7 +16,7 @@ import Request from './request';
  * tms.getMpOpenId('xxx', '111')
  */
 async function getMpOpenId(mpId, userId) {
-  const { resData } = await new Request().post('user/mpinfo', { userId, mpId });
+  const { resData } = await Request.getInstance().post('user/mpinfo', { userId, mpId });
   const { openId = '' } = resData || {};
   return openId;
 }
@@ -33,7 +33,7 @@ async function getMpOpenId(mpId, userId) {
  * tms.getMpOpenId('xxx', '111')
  */
 async function getOuterOpenId(apiKey) {
-  const { resData } = await new Request().post('user/mpinfo', { mpId: apiKey });
+  const { resData } = await Request.getInstance().post('user/mpinfo', { mpId: apiKey });
   const { openId = '' } = resData || {};
   return openId;
 }

package/src/request.js

@@ -110,6 +110,8 @@ const modifyAuthParam = async (param, withAuth) => {
   return requestParam;
 };
 
+let reqInstance = null;
+
 /**
  * @public
  * @class Request
@@ -129,6 +131,13 @@ export default class Request {
    */
   static defaultSecretKey = '';
 
+  static getInstance() {
+    if (reqInstance === null) {
+      reqInstance = new Request();
+    }
+    return reqInstance;
+  }
+
   host = '';
   secretKey = '';
   withAuth = true;