Fix compatibility with lastest Firefox Nightly

Author: janodvarko

README.md

@@ -3,7 +3,7 @@ Firefox add-on improving automated HAR (HTTP Archive) export of collected
 data from the Network panel. This add-on is built on top of native developer
 tools in Firefox. Firebug is not needed for this add-on.
 
-The add-on HAR exports HAR API directly to the page. Any automated system can
+The add-on exports HAR API directly to the page. Any automated system can
 be consequently built on top of the API and trigger HAR export using a simple
 JavaScript call at any time. It can be also nicely integrated with e.g.
 Selenium to implement automated HAR export robots for existing automated test

lib/har-driver-actor.js

@@ -15,22 +15,41 @@ const Events = require("sdk/event/core");
 // Platform
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
-// DevTools
-// See also: https://bugzilla.mozilla.org/show_bug.cgi?id=912121
-var devtools;
-try {
-  devtools = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {}).devtools;
-} catch (err) {
-  devtools = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).devtools;
+function safeImport(...args) {
+  for (var i=0; i<args.length; i++) {
+    try {
+      return Cu["import"](args[i], {});
+    }
+    catch (err) {
+    }
+  }
+  return {};
 }
 
-var DevToolsUtils;
-try {
-  DevToolsUtils = devtools["require"]("devtools/shared/DevToolsUtils");
-} catch (err) {
-  DevToolsUtils = devtools["require"]("devtools/toolkit/DevToolsUtils");
+function safeRequire(devtools, ...args) {
+  for (var i=0; i<args.length; i++) {
+    try {
+      return devtools["require"](args[i]);
+    }
+    catch (err) {
+    }
+  }
+  return {};
 }
 
+// DevTools
+// See also: https://bugzilla.mozilla.org/show_bug.cgi?id=912121
+const devtools = safeImport(
+  "resource://devtools/shared/Loader.jsm",
+  "resource://gre/modules/devtools/shared/Loader.jsm",
+  "resource://gre/modules/devtools/Loader.jsm"
+).devtools;
+
+const DevToolsUtils = safeRequire(devtools,
+  "devtools/shared/DevToolsUtils",
+  "devtools/toolkit/DevToolsUtils"
+);
+
 const { DebuggerServer } = devtools["require"]("devtools/server/main");
 const protocol = devtools["require"]("devtools/server/protocol");
 const { method, RetVal, ActorClass, Actor, Arg, types } = protocol;
@@ -69,7 +88,7 @@ function expectState(expectedState, method) {
 }
 
 /**
- * @actor 
+ * @actor
  *
  * Read more about Protocol API:
  * https://github.com/mozilla/gecko-dev/blob/master/toolkit/devtools/server/docs/protocol.js.md

lib/har-driver-front.js

@@ -10,7 +10,7 @@ module.metadata = {
 const { Cu } = require("chrome");
 
 // DevTools
-const { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
+const { devtools } = require("firebug.sdk/lib/core/devtools.js");
 const { Front, FrontClass } = devtools["require"]("devtools/server/protocol");
 
 // Firebug SDK

lib/trigger-toolbox-overlay.js

@@ -29,6 +29,7 @@ const { get: getHarOverlay } = safeRequire(devtools,
 const { Trace, TraceError } = require("firebug.sdk/lib/core/trace.js").get(module.id);
 const { ToolboxOverlay } = require("firebug.sdk/lib/toolbox-overlay.js");
 const { Rdp } = require("firebug.sdk/lib/core/rdp.js");
+const { Options } = require("firebug.sdk/lib/core/options.js");
 
 // HARExportTrigger
 const { HarDriverFront } = require("./har-driver-front");
@@ -99,6 +100,12 @@ const TriggerToolboxOverlay = Class(
 
         // Initialize automation.
         let harOverlay = getHarOverlay(this.toolbox);
+        if (!harOverlay) {
+          TraceError.sysout("TriggerToolboxOverlay.onReady; ERROR " +
+            "No HAR Overlay!");
+          return;
+        }
+
         if (!harOverlay.automation) {
           harOverlay.initAutomation();
         }
@@ -149,6 +156,18 @@ const TriggerToolboxOverlay = Class(
         });
       }
     }
+
+    // xxxHonza: needs testing
+    /*automation.pageLoadBegin = function(response) {
+      // If the persist log preference is on do not clear the HAR log.
+      // It'll be collecting all data as the tab content is reloaded
+      // or navigated to different location.
+      // See also: https://github.com/firebug/har-export-trigger/issues/14
+      let persist = Options.getPref("devtools.webconsole.persistlog");
+      if (!persist) {
+        this.resetCollector();
+      }
+    }*/
   },
 
   onPageLoadDone: function(response) {
@@ -242,8 +261,6 @@ const TriggerToolboxOverlay = Class(
           "Failed to parse HAR log " + err);
       }
 
-      Trace.sysout("TriggerToolboxOverlay.triggerExport; DONE", har);
-
       // Send event back to the backend notifying that it has
       // finished. If 'getData' is true include also the HAR string.
       // The content API call will be resolved as soon as the packet