Try-catch optimization

See
https://github.com/petkaantonov/bluebird/wiki/Optimization-killers#2-uns
upported-syntax

Author: zalmoxisus

src/browser/extension/inject/contentScript.js

@@ -35,6 +35,22 @@ function connect() {
   });
 }
 
+function tryCatch(fn, args) {
+  try {
+    return fn(args);
+  } catch (err) {
+    /* eslint-disable no-console */
+    if (process.env.NODE_ENV !== 'production') console.error('Failed to send message', err);
+    /* eslint-enable no-console */
+  }
+}
+
+function send(message) {
+  if (!bg) connect();
+  if (message.type === 'INIT_INSTANCE') bg.postMessage({ name: 'INIT_INSTANCE' });
+  else bg.postMessage({ name: 'RELAY', message });
+}
+
 // Resend messages from the page to the background script
 window.addEventListener('message', function(event) {
   if (!isAllowed()) return;
@@ -46,13 +62,5 @@ window.addEventListener('message', function(event) {
     return;
   }
 
-  try {
-    if (!bg) connect();
-    if (message.type === 'INIT_INSTANCE') bg.postMessage({ name: 'INIT_INSTANCE' });
-    else bg.postMessage({ name: 'RELAY', message });
-  } catch (err) {
-    /* eslint-disable no-console */
-    if (process.env.NODE_ENV !== 'production') console.error('Failed to send message', err);
-    /* eslint-enable no-console */
-  }
+  tryCatch(send, message);
 }, false);

src/browser/extension/inject/pageScript.js

@@ -52,12 +52,7 @@ window.devToolsExtension = function(reducer, preloadedState, config) {
     if (shouldSerialize || window.devToolsOptions.serialize) {
       toContentScript(message, true, config.serializeState, config.serializeAction);
     } else {
-      try {
-        toContentScript(message);
-      } catch (err) {
-        toContentScript(message, true);
-        shouldSerialize = true;
-      }
+      toContentScript(message);
     }
   }
 

src/browser/extension/utils/contentScriptMsg.js

@@ -2,6 +2,7 @@ import { stringify } from 'jsan';
 
 const listeners = {};
 export const source = '@devtools-page';
+let isCircular;
 
 /*
 function stringify(obj) {
@@ -16,12 +17,28 @@ export function generateId(instanceId) {
   return instanceId || Math.random().toString(36).substr(2);
 }
 
+
+function tryCatch(fn, args) {
+  try {
+    return fn(args);
+  } catch (err) {
+    isCircular = true;
+    toContentScript(args);
+  }
+}
+
+function send(message) {
+  window.postMessage(message, '*');
+}
+
 export function toContentScript(message, shouldStringify, serializeState, serializeAction) {
-  if (shouldStringify) {
+  if (shouldStringify || isCircular) {
     if (message.payload) message.payload = stringify(message.payload, serializeState);
     if (message.action) message.action = stringify(message.action, serializeAction);
+    send(message);
+  } else {
+    tryCatch(send, message);
   }
-  window.postMessage(message, '*');
 }
 
 export function sendMessage(action, state, shouldStringify, id) {