Consolidated missing endpoint error detection in Messages.

3 files changed, 6 insertions, 2 deletions

diff --git a/src/content/content.js b/src/content/content.js
index eabf7c3..74e1d95 100644
--- a/src/content/content.js
+++ b/src/content/content.js
@@ -62,7 +62,7 @@ var notifyPage = async () => {
       return true;
     } catch (e) {
       debug(e);
-      if (/Receiving end does not exist/.test(e.message)) {
+      if (Messages.isMissingEndpoint(e)) {
         window.setTimeout(notifyPage, 2000);
       }
     }
diff --git a/src/content/staticNS.js b/src/content/staticNS.js
index 40e2420..828663f 100644
--- a/src/content/staticNS.js
+++ b/src/content/staticNS.js
@@ -49,7 +49,7 @@
             {id: "fetchPolicy", url, contextUrl: url});
           break;
         } catch (e) {
-          if (e.message !== "Could not esablish connection. Receiving end does not exist.") {
+          if (!Messages.isMissingEndpoint(e)) {
             break;
           }
           error("Background page ready yet, retrying to fetch policy...")
diff --git a/src/lib/Messages.js b/src/lib/Messages.js
index 0a47c42..f33b621 100644
--- a/src/lib/Messages.js
+++ b/src/lib/Messages.js
@@ -65,6 +65,10 @@
         return await browser.tabs.sendMessage(recipientInfo.tabId, args, opts);
       }
       return await browser.runtime.sendMessage(args);
+    },
+    isMissingEndpoint(error) {
+      return error && error.message ===
+        "Could not esablish connection. Receiving end does not exist.";
     }
   }
 }