Fix compatibility with Firefox Nightly

Author: janodvarko

lib/firequery-actor.js

@@ -34,6 +34,26 @@ function safeRequire(devtools, ...args) {
   return {};
 }
 
+function safeGet(devtools, ...args) {
+  for (var i=0; i<args.length; i++) {
+    var url = args[i];
+    if (url.startsWith("resource://")) {
+      try {
+        return Cu["import"](url, {});
+      }
+      catch (err) {
+      }
+    } else if (url.startsWith("devtools/")) {
+      try {
+        return devtools["require"](url);
+      }
+      catch (err) {
+      }
+    }
+  }
+  return {};
+}
+
 // DevTools
 // See also: https://bugzilla.mozilla.org/show_bug.cgi?id=912121
 const devtools = safeImport(
@@ -50,9 +70,17 @@ const DevToolsUtils = safeRequire(devtools,
 const { NodeActor } = devtools["require"]("devtools/server/actors/inspector");
 const makeInfallible = DevToolsUtils.makeInfallible;
 
-const { DebuggerServer } = devtools["require"]("devtools/server/main");
-const protocol = devtools["require"]("devtools/server/protocol");
-const { method, RetVal, ActorClass, Actor, Arg, types } = protocol;
+const Protocol = safeRequire(devtools,
+  "devtools/shared/protocol",
+  "devtools/server/protocol"
+);
+
+const DebuggerServer = safeGet(devtools,
+  "devtools/server/main",
+  "resource://gre/modules/devtools/dbg-server.jsm"
+).DebuggerServer;
+
+const { method, RetVal, ActorClass, Actor, Arg, types } = Protocol;
 
 // Make sure the DebuggerServer.ObjectActorPreviewers is initialized.
 // See also: https://github.com/firebug/firequery/issues/32

lib/firequery-front.js

@@ -11,9 +11,8 @@ const { Cu } = require("chrome");
 const Events = require("sdk/event/core");
 
 // DevTools
-const { devtools } = require("firebug.sdk/lib/core/devtools.js");
-const { Front, FrontClass } = devtools["require"]("devtools/server/protocol");
-const { custom } = devtools["require"]("devtools/server/protocol");
+const DevTools = require("firebug.sdk/lib/core/devtools.js");
+const { Front, FrontClass, custom } = DevTools.Protocol;
 
 // Firebug SDK
 const { Trace, TraceError } = require("firebug.sdk/lib/core/trace.js").get(module.id);