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

src/entry/background.js

@@ -53,7 +53,7 @@ chrome.runtime.onUpdateAvailable.addListener(() => {
         Report.reportLog({
             objectType: Report.objectType.background_function_try,
             funcName: 'onUpdateAvailable'
-        });
+        })
         chrome.runtime.reload()
     } catch (error) {
         Report.reportLog({

src/logic/background/fetch/twitter.js

@@ -1,5 +1,6 @@
 import { commonFetch } from '@/http/fetch.js'
 import { getChromeStorage } from '@/uilts/chromeExtension.js'
+import Report from "@/log-center/log"
 export async function fetchTtwitterRequestToken() {
     return commonFetch({
         url: '/user/twitterRequestToken',
@@ -23,14 +24,22 @@ export async function fetchTwitterLogin(oauthToken, consumerKey, oauthVerifier,
 }
 // 请求推特短链接
 export async function fetchTwitterShortUrl(url) {
-    return new Promise(function (resolve, reject) {
-        fetch(url) // 返回一个Promise对象 
-            .then((res) => {
-                return res.text() // res.text()是一个Promise对象
-            }).then((res) => {
-                resolve(res.toString());
-            })
-    })
+    try {
+        return new Promise(function (resolve, reject) {
+            fetch(url) // 返回一个Promise对象 
+                .then((res) => {
+                    return res.text() // res.text()是一个Promise对象
+                }).then((res) => {
+                    resolve(res.toString());
+                })
+        })
+    } catch (error) {
+        Report.reportLog({
+            objectType: Report.objectType.background_function_try,
+            funcName: 'fetchTwitterShortUrl',
+            errMsg: error.message
+        })
+    }
 }
 
 

src/uilts/chromeExtension.js

@@ -29,33 +29,37 @@ export function setChromeStorage(params, callback) {
             chrome.storage.local.set(params)
         }
     } catch (error) {
-        console.error(error)
+        console.error('catch', error)
     }
 }
 
 export function getChromeStorage(key = '', callback) {
-    let params = {}
-    params[key] = ''
+    try {
+        let params = {}
+        params[key] = ''
+
+        if (!callback) {
+            return new Promise((resolve) => {
+                chrome.storage.local.get(params, (item) => {
+                    if (item[key]) {
+                        resolve(JSON.parse(item[key]))
+                    } else {
+                        resolve(null)
+                    }
+                });
+            })
+        }
 
-    if (!callback) {
-        return new Promise((resolve) => {
-            chrome.storage.local.get(params, (item) => {
-                if (item[key]) {
-                    resolve(JSON.parse(item[key]))
-                } else {
-                    resolve(null)
-                }
-            });
-        })
+        chrome.storage.local.get(params, (item) => {
+            if (item[key]) {
+                callback(JSON.parse(item[key]))
+            } else {
+                callback(null)
+            }
+        });
+    } catch (error) {
+        console.error('catch', error)
     }
-
-    chrome.storage.local.get(params, (item) => {
-        if (item[key]) {
-            callback(JSON.parse(item[key]))
-        } else {
-            callback(null)
-        }
-    });
 }
 
 // export function chromeSendMessage() {
@@ -69,12 +73,16 @@ export function setChromeCookie({
     name,
     url
 }, value_obj) {
-    chrome.cookies.set({
-        expirationDate: new Date().getTime() / 10,
-        name: name,
-        url: url,
-        value: encodeURIComponent(JSON.stringify(value_obj)) || ''
-    })
+    try {
+        chrome.cookies.set({
+            expirationDate: new Date().getTime() / 10,
+            name: name,
+            url: url,
+            value: encodeURIComponent(JSON.stringify(value_obj)) || ''
+        })
+    } catch (error) {
+        console.error('catch', error)
+    }
 }
 
 export function getChromeCookie({ name = '', url = '' }, callback) {
@@ -109,22 +117,26 @@ export function sendChromeTabMessage(params, callback) {
 }
 
 export function checkIsLogin(callback) {
-    return new Promise((resolve) => {
-        getChromeStorage('userInfo', (_userInfo) => {
-            if (!_userInfo) {
-                chrome.runtime.sendMessage(
-                    { actionType: "POPUP_LOGIN", data: "" },
-                    (response) => {
-                        console.log("res", response);
-                    }
-                )
-                callback && callback()
-                resolve(_userInfo)
-            } else {
-                resolve(_userInfo)
-            }
+    try {
+        return new Promise((resolve) => {
+            getChromeStorage('userInfo', (_userInfo) => {
+                if (!_userInfo) {
+                    chrome.runtime.sendMessage(
+                        { actionType: "POPUP_LOGIN", data: "" },
+                        (response) => {
+                            console.log("res", response);
+                        }
+                    )
+                    callback && callback()
+                    resolve(_userInfo)
+                } else {
+                    resolve(_userInfo)
+                }
+            })
         })
-    })
+    } catch (error) {
+        console.error('catch', error)
+    }
 }
 
 let callback_arr = []

src/uilts/help.js

@@ -54,7 +54,7 @@ export function throttle(fn, thresh) {
 }
 
 export function setStorage(key, value) {
-  return localStorage.setItem(key, JSON.stringify(value));
+  return localStorage.setItem(key, JSON.stringify(value) || '');
 }
 
 export function getStorage(key) {
@@ -101,10 +101,10 @@ export function getBit(value) {
   }
 }
 
-export function getTargetElementWhenClick(e) { 
+export function getTargetElementWhenClick(e) {
   const { target, path } = e;
   let result = null;
-  if (Array.isArray(path) && path.length > 0) { 
+  if (Array.isArray(path) && path.length > 0) {
     result = path.find((item) => item.denetClickLogkey)
   }
   return result
@@ -241,7 +241,7 @@ export function checkURL(URL) {
 
 let $_data = []
 export function $(key, cache = true) {
-  if (!key || typeof(key) != 'string') {
+  if (!key || typeof (key) != 'string') {
     return null
   }
   // 不使用缓存