@tmsfe/tms-core 0.0.194 → 0.0.196

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tms-core",
-  "version": "0.0.194",
+  "version": "0.0.196",
   "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/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 };