@tmsfe/tms-core 0.0.194 → 0.0.197

package/package.json

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

package/src/location/utils.ts

@@ -3,6 +3,7 @@
  */
 
 import EventDispatcher from '../eventDispatcher';
+import { getWxSetting } from '../wxApi';
 
 const event = new EventDispatcher();
 
@@ -80,27 +81,25 @@ export function getSetting(scopeKey: string = LocationScopeKey) {
     return getSettingPromise;
   }
 
-  getSettingPromise = new Promise((resolve, reject) => {
-    wx.getSetting({
-      success: ({ authSetting = {} }) => {
-        resolve((authSetting as any)[scopeKey]);
-        getSettingPromise = null;
-      },
-      fail: (err: { errMsg: string }) => {
-        getSettingPromise = null;
-
-        const { errMsg = '' } = err || {};
-        // wx.getSetting接口没有响应时errMsg
-        const reason = 'getSetting:fail data no response';
-        // 部分机型上，wx.getSetting接口没有响应，此时，当做位置开关是打开的来处理
-        if (errMsg.indexOf(reason) > -1) {
-          resolve(true);
-          return;
-        }
-
-        reject(err);
-      },
-    });
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
+  getSettingPromise = new Promise(async (resolve, reject) => {
+    // 历史逻辑：这里需要每次调用都获取最新的setting —— 后续评估优化
+    const settingRes = await getWxSetting(true);
+    const { success, errMsg = '', authSetting } = settingRes;
+    if (success) {
+      resolve((authSetting as any)?.[scopeKey]);
+      getSettingPromise = null;
+      return;
+    }
+    getSettingPromise = null;
+    // wx.getSetting接口没有响应时errMsg
+    const reason = 'getSetting:fail data no response';
+    // 部分机型上，wx.getSetting接口没有响应，此时，当做位置开关是打开的来处理
+    if (errMsg.indexOf(reason) > -1) {
+      resolve(true);
+      return;
+    }
+    reject(settingRes);
   });
 
   return getSettingPromise;

package/src/request.js

@@ -16,17 +16,7 @@ import reporter from './report/index';
 import logger from './logger';
 
 // 微信底层错误重试码 600001-微信cronet组件错误 600003-网络中断 5-接口超时
-export const RETRY_WX_ERRNO_MAP = {
-  600001: {
-    waitTime: 500,
-  },
-  600003: {
-    waitTime: 300,
-  },
-  5: {
-    waitTime: 500,
-  },
-};
+export const RETRY_WX_ERR_NOS = [600001, 600003, 5];
 
 /**
  * 用于序列化需要签名的参数
@@ -384,6 +374,7 @@ export default class Request {
    * @param {object} header 自定义的请求头
    * @returns {Promise} 接口返回结果
    */
+  // eslint-disable-next-line complexity
   async createRequestTask(path, param = {}, method = 'POST', header = {}) {
     try {
       const res = await this.invokeRequest(path, param, method, header);
@@ -400,18 +391,17 @@ export default class Request {
       return res;
     } catch (err) {
       // 微信系统errno：在重试码白名单内，重试
-      const { retryFlag, retryApiWhiteMap } = wx.tmsFlagMap || {};
+      const { retryFlag, retryApiWhiteMap, requestRetryCount } = wx.tmsFlagMap || {};
       const isWhiteApi = retryApiWhiteMap?.home === 'all' ? true : (retryApiWhiteMap?.home || []).includes(path);
-      const canRetry = errno => RETRY_WX_ERRNO_MAP[errno] && isWhiteApi;
+      const canRetry = errno => RETRY_WX_ERR_NOS.includes(errno) && isWhiteApi;
       if (retryFlag && canRetry(err?.errno)) {
-        const waitTime = RETRY_WX_ERRNO_MAP[err.errno]?.waitTime || 300;
         return await this.handleReTry(path, param, method, header, {
           reportMsg: {
             errno: err.errno,
             errMsg: err.errMsg,
           },
-          // maxRetryCount: 2, // 先立即重试一次，失败再延时重试一次
-          waitTime, // 微信底层错误300ms后重试一次
+          maxRetryCount: requestRetryCount, // 重试次数
+          waitTime: 300, // 微信底层错误300ms后重试一次
           isSuccess: retryRes => !canRetry(retryRes?.errno),
         });
       }

package/src/wxApi.ts

@@ -0,0 +1,38 @@
+/**
+ * 微信API工具类
+ */
+
+/**
+ * getSetting
+ * @param forceRefresh 是否强制刷新
+ */
+async function getWxSetting(forceRefresh = false): Promise<{
+  success: boolean;           // 是否成功
+  errMsg?: string,            // message
+  authSetting?: {             // 用户设置
+    [key: string]: string;
+  };
+  subscriptionsSetting?: {
+    mainSwitch: boolean;      // 订阅消息总开关
+    itemSettings?: {          // 每一项开关
+      [key: string]: string;
+    };
+  }
+}> {
+  if (wx.tmsGetWxSetting && !forceRefresh) {
+    return wx.tmsGetWxSetting;
+  }
+  return new Promise((resolve) => {
+    const cacheData = (data, success) => {
+      wx.tmsGetWxSetting = { ...(data || {}), success };
+      resolve(wx.tmsGetWxSetting);
+    };
+    wx.getSetting({
+      withSubscriptions: true,
+      success: res => cacheData(res, true),
+      fail: err => cacheData(err, false),
+    });
+  });
+}
+
+export { getWxSetting };