浏览代码

Merge branch 'dev_1.1.7' of https://git.yishihui.com/DeNet/de-net into dev_1.1.7

zhangwei 2 年之前
父节点
当前提交
a9c7507dda
共有 3 个文件被更改,包括 38 次插入9 次删除
  1. 33 5
      src/entry/background.js
  2. 3 2
      src/http/fetch.js
  3. 2 2
      src/log-center/logger.js

+ 33 - 5
src/entry/background.js

@@ -39,18 +39,30 @@ import {
 try {
     chrome.runtime.onMessage.addListener(onMessageMethod);
 } catch (error) {
-    console.log('error when background onMessage addListener', error)
+    console.log('error when background onMessage addListener', error);
+    Report.reportLog({
+        objectType: Report.objectType.background_function_catch,
+        funcName: 'onMessage addListener',
+        errMsg: error.message
+    });
 }
 
 try {
     chrome.runtime.onInstalled.addListener(onInstalledMethod);
 } catch (error) {
-    console.log('error when background onInstalled addListener', error)
+    console.log('error when background onInstalled addListener', error);
+    Report.reportLog({
+        objectType: Report.objectType.background_function_catch,
+        funcName: 'onInstalled addListener',
+        errMsg: error.message
+    });
 }
 
 
 
 
+
+
 // chrome.runtime.setUninstallURL('https://denet.me', (e) => { 
 //     console.log('e', e)
 // })
@@ -63,7 +75,13 @@ try {
         });
     });
 } catch (error) {
-    console.log('error when background onConnect addListener', error)
+    console.log('error when background onConnect addListener', error);
+    Report.reportLog({
+        objectType: Report.objectType.background_function_catch,
+        funcName: 'onDisconnect addListener',
+        errMsg: error.message
+    });
+
 }
 
 
@@ -83,7 +101,12 @@ try {
         }
     })
 } catch (error) {
-    console.log('error when background onUpdateAvailable addListener', error)
+    console.log('error when background onUpdateAvailable addListener', error);
+    Report.reportLog({
+        objectType: Report.objectType.background_function_catch,
+        funcName: 'onUpdateAvailable addListener',
+        errMsg: error.message
+    });
 }
 
 
@@ -104,7 +127,12 @@ try {
         }
     });
 } catch (error) {
-    console.log('error when background onAlarm addListener', error)
+    console.log('error when background onAlarm addListener', error);
+    Report.reportLog({
+        objectType: Report.objectType.background_function_catch,
+        funcName: 'onAlarm addListener',
+        errMsg: error.message
+    });
 }
 
 

+ 3 - 2
src/http/fetch.js

@@ -3,10 +3,11 @@ import { getChromeStorage } from '@/uilts/chromeExtension.js'
 
 export async function commonFetch({ url = '', method = 'POST', params = {}, baseInfo = {} }) {
     try {
-        let storage_mid = await getChromeStorage('mid') || ''
+
+        let storage_mid = await getChromeStorage('mid').catch((error) => {console.log(error) }) || ''
         const { mid } = storage_mid || {}
         if (!baseInfo.token || !baseInfo.uid) {
-            const { accessToken: token = '', uid = '' } = await getChromeStorage('userInfo') || {}
+            const { accessToken: token = '', uid = '' } = await getChromeStorage('userInfo').catch((error) => {console.log(error) }) || {}
             baseInfo.token = token
             baseInfo.uid = uid
         }

+ 2 - 2
src/log-center/logger.js

@@ -19,10 +19,10 @@ export async function reportLog(eventData = {}, extParams = {}) {
     // 2.reportLog 异常 存储到本地,再上报
     try {
         if (!userInfo) {
-            userInfo = await getChromeStorage('userInfo') || null;
+            userInfo = await getChromeStorage('userInfo').catch((error) => {console.log(error) }) || null;
         }
         if (!mid) {
-            mid = await getChromeStorage('mid') || '';
+            mid = await getChromeStorage('mid').catch((error) => {console.log(error) }) || '';
         }
         let isMobile = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i);
         let platform = isMobile ? `mobile` : `pc`;