fix: error catching

Author: painty

public/static/js/devtools.js

@@ -40,9 +40,9 @@ function evalGetCssUsed(cancel = false) {
         },
         function (result, isException) {
           if (isException) {
-            // showMessage("isException:",isException);
+            console.log("evalGetCssUsed isException: ",isException);
           } else {
-            // console.log(result);
+            // console.log('evalGetCssUsed result: ',result);
           }
         }
       )

src/content.ts

@@ -11,7 +11,7 @@ const externalCssCache: { [index: string]: cssNodeObj } = {}
 //to store timers of testing if a html element matches a rule selector.
 const arrTimerOfTestingIfMatched: ReturnType<typeof setTimeout>[] = []
 let doc = document
-function getC($0: HTMLElement) {
+async function getC($0: HTMLElement) {
   arrTimerOfTestingIfMatched.forEach(function (ele) {
     clearTimeout(ele)
   })
@@ -24,28 +24,29 @@ function getC($0: HTMLElement) {
     typeof $0.nodeName === 'undefined'
   ) {
     return
-  } else {
-    if ($0.nodeName.match(/^<pseudo:/)) {
-      chrome.runtime.sendMessage({
-        action: 'inform',
-        info: "It's a pseudo element",
-      })
-      return
-    } else if ($0.nodeName === 'html' || $0.nodeName.match(/^#/)) {
-      chrome.runtime.sendMessage({
-        action: 'inform',
-        info: 'Not for this element',
-      })
-      return
-    }
+  }
+
+  if ($0.nodeName.match(/^<pseudo:/)) {
+    chrome.runtime.sendMessage({
+      action: 'inform',
+      info: "It's a pseudo element",
+    })
+    return
+  }
+
+  if ($0.nodeName === 'html' || $0.nodeName.match(/^#/)) {
+    chrome.runtime.sendMessage({
+      action: 'inform',
+      info: 'Not for this element',
+    })
+    return
   }
 
   let isInSameOrigin = true
   try {
     $0.ownerDocument.defaultView.parent.document
   } catch (e) {
     isInSameOrigin = false
-    // console.log(e);
   }
 
   if (isInSameOrigin) {
@@ -138,11 +139,13 @@ function getC($0: HTMLElement) {
     })
 }
 
-chrome.runtime.sendMessage({
-  action: 'evalGetCssUsed',
-  info: 'page loaded',
-}).catch(()=>{
-  // console.log('error',error);
-})
+chrome.runtime
+  .sendMessage({
+    action: 'evalGetCssUsed',
+    info: 'page loaded',
+  })
+  .catch(() => {
+    // console.log('error',error);
+  })
 
 export default getC

src/ui/Panel.svelte

@@ -35,7 +35,6 @@
         /^(chrome|https:\/\/chrome\.google\.com\/webstore)/
       ) !== null
     ) {
-      // showMessage('This page is protected by Chrome.<br>Try another page.')
       isGooglePreservedPages = true
     } else {
       isGooglePreservedPages = false

src/util/cssHelper.ts

@@ -8,11 +8,11 @@ import convTextToRules from './convTextToRules'
 
 const cssHelper = {
   mergeobjCss: function (a: cssObj, b: cssObj) {
-    ;['normRule', 'fontFace', 'keyFram'].forEach(function (ele) {
+    ['normRule', 'fontFace', 'keyFram'].forEach(function (ele) {
       if (!a[ele] || !b[ele]) {
         // console.log('NO '+ele);
       }
-      a[ele] = a[ele].concat(b[ele])
+      a[ele] = a[ele].concat(b[ele]).filter(e=>e)
     })
   },
   normRuleNodeToText: function (node) {

src/util/generateRulesAll.ts

@@ -30,11 +30,7 @@ function generateRulesAll(
             // can be link tag
             cssNodeArr = externalCssCache[styleSheet.href];
             cssNodeArr.media = doc.styleSheets[x].media;
-            traversalCSSRuleList(doc, externalCssCache, cssNodeArr).then(
-              function (obj) {
-                res(obj);
-              }
-            );
+            traversalCSSRuleList(doc, externalCssCache, cssNodeArr).then(res);
           } else if(styleSheet.ownerNode instanceof Element) {
             // style tag
             let html: string = styleSheet.ownerNode.innerHTML;
@@ -59,16 +55,13 @@ function generateRulesAll(
             // the next operation is asynchronous
             // store the current x value
             let _x = x;
-            convTextToRules(html, doc.location.href).then(function (
-              cssNodeArr
-            ) {
-              cssNodeArr.media = doc.styleSheets[_x].media;
-              traversalCSSRuleList(doc, externalCssCache, cssNodeArr).then(
-                function (obj) {
-                  res(obj);
-                }
-              );
+            convTextToRules(html, doc.location.href).then(cssNodeObj=>{
+              cssNodeObj.media = doc.styleSheets[_x].media;
+              traversalCSSRuleList(doc, externalCssCache, cssNodeObj).then(res);
             });
+          }else{
+            // console.log('ProcessingInstruction', styleSheet.ownerNode);
+            res({})
           }
         })
       );