From 26c45bcba0587b5145b974d8e7688d3a5a58a4ae Mon Sep 17 00:00:00 2001
From: Henrik Skupin <mail@hskupin.info>
Date: Tue, 12 Jun 2012 00:25:50 +0200
Subject: [PATCH] Bug 686320 - Allow Mozmill to probe the OS for a free port
 instead of hardcoded value in JSBridge. r=jhammel

---
 jsbridge/jsbridge/__init__.py                 |  18 +-
 jsbridge/jsbridge/extension/chrome.manifest   |  15 +-
 .../extension/chrome/content/overlay.js       |   7 -
 .../extension/chrome/content/overlay.xul      |   9 -
 .../jsbridge/extension/components/cmdarg.js   | 145 ------------
 .../jsbridge/extension/components/jsbridge.js |  82 +++++++
 .../modules/{bridge.js => Bridge.jsm}         |  26 ++-
 .../extension/resource/modules/Events.jsm     |  34 +++
 .../extension/resource/modules/Log.jsm        |  37 +++
 .../extension/resource/modules/NSPR.jsm       | 123 ++++++++++
 .../modules/{nspr-server.js => Server.jsm}    |  84 ++++---
 .../extension/resource/modules/Sockets.jsm    | 124 ++++++++++
 .../extension/resource/modules/events.js      |  18 --
 .../extension/resource/modules/init.js        |   9 -
 .../resource/modules/jsbridgefilelogger.js    |  45 ----
 .../extension/resource/modules/nspr-socket.js | 118 ----------
 .../extension/resource/modules/nspr.js        | 105 ---------
 .../extension/resource/modules/server.js      | 214 ------------------
 jsbridge/jsbridge/network.py                  |   9 +-
 mozmill/mozmill/__init__.py                   |  54 +++--
 .../extension/resource/modules/frame.js       |  14 +-
 .../test_pre.js                               |   2 +-
 mutt/mutt/tests/python/usemozmill.py          |   3 -
 23 files changed, 528 insertions(+), 767 deletions(-)
 delete mode 100644 jsbridge/jsbridge/extension/chrome/content/overlay.js
 delete mode 100644 jsbridge/jsbridge/extension/chrome/content/overlay.xul
 delete mode 100644 jsbridge/jsbridge/extension/components/cmdarg.js
 create mode 100644 jsbridge/jsbridge/extension/components/jsbridge.js
 rename jsbridge/jsbridge/extension/resource/modules/{bridge.js => Bridge.jsm} (88%)
 create mode 100644 jsbridge/jsbridge/extension/resource/modules/Events.jsm
 create mode 100644 jsbridge/jsbridge/extension/resource/modules/Log.jsm
 create mode 100644 jsbridge/jsbridge/extension/resource/modules/NSPR.jsm
 rename jsbridge/jsbridge/extension/resource/modules/{nspr-server.js => Server.jsm} (55%)
 create mode 100644 jsbridge/jsbridge/extension/resource/modules/Sockets.jsm
 delete mode 100644 jsbridge/jsbridge/extension/resource/modules/events.js
 delete mode 100644 jsbridge/jsbridge/extension/resource/modules/init.js
 delete mode 100644 jsbridge/jsbridge/extension/resource/modules/jsbridgefilelogger.js
 delete mode 100644 jsbridge/jsbridge/extension/resource/modules/nspr-socket.js
 delete mode 100644 jsbridge/jsbridge/extension/resource/modules/nspr.js
 delete mode 100644 jsbridge/jsbridge/extension/resource/modules/server.js

diff --git a/jsbridge/jsbridge/__init__.py b/jsbridge/jsbridge/__init__.py
index 90021b23..d33d6d72 100644
--- a/jsbridge/jsbridge/__init__.py
+++ b/jsbridge/jsbridge/__init__.py
@@ -15,6 +15,16 @@
 extension_path = os.path.join(parent, 'extension')
 wait_to_create_timeout = 60
 
+
+def find_port():
+    free_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    free_socket.bind(('127.0.0.1', 0))
+    port = free_socket.getsockname()[1]
+    free_socket.close()
+
+    return port
+
+
 def wait_and_create_network(host, port, timeout=wait_to_create_timeout):
     ttl = 0
     while ttl < timeout:
@@ -28,16 +38,16 @@ def wait_and_create_network(host, port, timeout=wait_to_create_timeout):
         sleep(.25)
         ttl += .25
     if ttl == timeout:
-        raise Exception("Sorry, cannot connect to jsbridge extension, port %s" % port)
-    
+        raise Exception("Cannot connect to jsbridge extension, port %s" % port)
+
     back_channel, bridge = create_network(host, port)
     sleep(.5)
-    
+
     while back_channel.registered is False:
         back_channel.close()
         bridge.close()
         asyncore.socket_map = {}
         sleep(1)
         back_channel, bridge = create_network(host, port)
-    
+
     return back_channel, bridge
diff --git a/jsbridge/jsbridge/extension/chrome.manifest b/jsbridge/jsbridge/extension/chrome.manifest
index 6d548889..f9aa69f7 100644
--- a/jsbridge/jsbridge/extension/chrome.manifest
+++ b/jsbridge/jsbridge/extension/chrome.manifest
@@ -1,15 +1,6 @@
 resource jsbridge resource/
 
-content jsbridge chrome/content/
+component {2872d428-14f6-11de-ac86-001f5bd9235c} components/jsbridge.js
+contract @mozilla.org/jsbridge;1 {2872d428-14f6-11de-ac86-001f5bd9235c}
+category profile-after-change JSBridge @mozilla.org/jsbridge;1
 
-overlay chrome://browser/content/browser.xul chrome://jsbridge/content/overlay.xul
-overlay chrome://messenger/content/mailWindowOverlay.xul chrome://jsbridge/content/overlay.xul
-
-overlay chrome://calendar/content/calendar.xul chrome://jsbridge/content/overlay.xul
-
-overlay windowtype:Songbird:Main chrome://jsbridge/content/overlay.xul
-
-component {2872d428-14f6-11de-ac86-001f5bd9235c} components/cmdarg.js
-contract @mozilla.org/commandlinehandler/general-startup;1?type=jsbridge {2872d428-14f6-11de-ac86-001f5bd9235c}
-category profile-after-change jsbridge @mozilla.org/commandlinehandler/general-startup;1?type=jsbridge
-category command-line-handler jsbridge @mozilla.org/commandlinehandler/general-startup;1?type=jsbridge
diff --git a/jsbridge/jsbridge/extension/chrome/content/overlay.js b/jsbridge/jsbridge/extension/chrome/content/overlay.js
deleted file mode 100644
index 549c96b2..00000000
--- a/jsbridge/jsbridge/extension/chrome/content/overlay.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-var jsbridgeInit = {}; Cu.import('resource://jsbridge/modules/init.js',jsbridgeInit);
-
-
diff --git a/jsbridge/jsbridge/extension/chrome/content/overlay.xul b/jsbridge/jsbridge/extension/chrome/content/overlay.xul
deleted file mode 100644
index 879cd919..00000000
--- a/jsbridge/jsbridge/extension/chrome/content/overlay.xul
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this file,
-   - You can obtain one at http://mozilla.org/MPL/2.0/.  -->
-
-<overlay id="jsbridge-overlay"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script src="overlay.js"/>
-</overlay>
diff --git a/jsbridge/jsbridge/extension/components/cmdarg.js b/jsbridge/jsbridge/extension/components/cmdarg.js
deleted file mode 100644
index 4fd824c4..00000000
--- a/jsbridge/jsbridge/extension/components/cmdarg.js
+++ /dev/null
@@ -1,145 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cr = Components.results;
-const Cu = Components.utils;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-
-const nsIAppShellService    = Ci.nsIAppShellService;
-const nsISupports           = Ci.nsISupports;
-const nsICategoryManager    = Ci.nsICategoryManager;
-const nsIComponentRegistrar = Ci.nsIComponentRegistrar;
-const nsIObserver           = Ci.nsIObserver;
-const nsICommandLine        = Ci.nsICommandLine;
-const nsICommandLineHandler = Ci.nsICommandLineHandler;
-const nsIFactory            = Ci.nsIFactory;
-const nsIModule             = Ci.nsIModule;
-const nsIWindowWatcher      = Ci.nsIWindowWatcher;
-
-// chrome URI of your extension or application
-const CHROME_URI = "chrome://jsbridge/content/";
-
-// the contract id, CID, and category to be unique to your application.
-const clh_contractID = "@mozilla.org/commandlinehandler/general-startup;1?type=jsbridge";
-
-// use uuidgen to generate a unique ID
-const clh_CID = Components.ID("{2872d428-14f6-11de-ac86-001f5bd9235c}");
-
-// category names are sorted alphabetically. Typical command-line handlers use a
-// category that begins with the letter "m".
-const clh_category = "jsbridge";
-
-/**
- * The XPCOM component that implements nsICommandLineHandler.
- * It is also an event observer to shutdown the (socket) server on shutdown.
- * It also implements nsIFactory to serve as its own singleton factory.
- */
-function jsbridgeHandler() {
-  this.port = 24242;
-  this.server = null;
-}
-
-jsbridgeHandler.prototype = {
-  classID: clh_CID,
-  contractID: clh_contractID,
-  classDescription: "jsbridgeHandler",
-  _xpcom_categories: [{category: "profile-after-change",
-                       service: true},
-                      {category: "command-line-handler",
-                      entry: clh_category}],
-
-  QueryInterface: function jsbridgeHandler_QueryInterface(iid) {
-    if (iid.equals(nsIObserver) ||
-        iid.equals(nsIFactory) ||
-        iid.equals(nsISupports)||
-        iid.equals(nsICommandLineHandler))
-      return this;
-
-    throw Components.results.NS_ERROR_NO_INTERFACE;
-   },
-
-  /* nsIObserver */
-
-  observe: function jsbridgeHandler_observe(aSubject, aTopic, aData) {
-    switch (aTopic) {
-      case "profile-after-change":
-        this.init();
-        break;
-      case "quit-application":
-        this.uninit();
-        break;
-    }
-  },
-
-  /* nsICommandLineHandler */
-
-  handle: function jsbridgeHandler_handle(cmdLine) {
-    var port = cmdLine.handleFlagWithParam("jsbridge", false);
-
-    this.port = parseInt(port) || this.port;
-    this.startServer();
-  },
-
-  // follow the guidelines in nsICommandLineHandler.idl
-  // specifically, flag descriptions should start at
-  // character 24, and lines should be wrapped at
-  // 72 characters with embedded newlines,
-  // and finally, the string should end with a newline
-  helpInfo: "  -jsbridge            Port to run jsbridge on.\n",
-
-  /* nsIFactory */
-
-  createInstance: function jsbridgeHandler_createInstance(outer, iid) {
-    if (outer != null)
-      throw Cr.NS_ERROR_NO_AGGREGATION;
-
-    return this.QueryInterface(iid);
-  },
-
-  lockFactory: function jsbridgeHandler_lockFactory(lock) {
-    /* no-op */
-  },
-
-  /* internal methods */
-
-  startServer: function jsbridgeHandler_startServer() {
-    var server = {};
-
-    // import the server
-    try {
-      // use NSPR sockets to get offline+localhost support - needs recent js-ctypes
-      Cu.import('resource://jsbridge/modules/nspr-server.js', server);
-    } catch (e) {
-      dump("jsbridge can't use NSPR sockets, falling back to nsIServerSocket - " +
-           "OFFLINE TESTS WILL FAIL\n");
-      Cu.import('resource://jsbridge/modules/server.js', server);
-    }
-
-    // start the server
-    this.server = server.startServer(this.port);
-  },
-
-  init: function jsbridgeHandler_init() {
-    Services.obs.addObserver(this, "quit-application", false);
-  },
-
-  uninit: function jsbridgeHandler_uninit() {
-    Services.obs.removeObserver(this, "quit-application", false);
-    this.server.stop();
-    this.server = null;
-  }
-};
-
-/**
- * XPCOMUtils.generateNSGetFactory was introduced in Mozilla 2 (Firefox 4).
- * XPCOMUtils.generateNSGetModule is for Mozilla 1.9.1 (Firefox 3.5).
- */
-if (XPCOMUtils.generateNSGetFactory)
-  const NSGetFactory = XPCOMUtils.generateNSGetFactory([jsbridgeHandler]);
-else
-  const NSGetModule = XPCOMUtils.generateNSGetModule([jsbridgeHandler]);
diff --git a/jsbridge/jsbridge/extension/components/jsbridge.js b/jsbridge/jsbridge/extension/components/jsbridge.js
new file mode 100644
index 00000000..47941ab7
--- /dev/null
+++ b/jsbridge/jsbridge/extension/components/jsbridge.js
@@ -0,0 +1,82 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cu = Components.utils;
+
+// Import global modules
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
+
+// Include local modules
+Cu.import("resource://jsbridge/modules/Log.jsm");
+
+
+// Constants for preferences names
+const PREF_JSBRIDGE_PORT = "extensions.jsbridge.port";
+
+
+/**
+ * XPCOM component to observe different application states and to
+ * handle the JSBridge server.
+ */
+function JSBridge() {
+  this._server = null;
+}
+
+JSBridge.prototype = {
+  classDescription: "JSBridge",
+  classID: Components.ID("{2872d428-14f6-11de-ac86-001f5bd9235c}"),
+  contractID: "@mozilla.org/jsbridge;1",
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
+
+  _xpcom_categories: [{category: "profile-after-change"}],
+
+  /**
+   * Handler for registered observer notifications.
+   *
+   * @param {String} aSubject
+   *        Subject of the observer message (not used)
+   * @param {String} aTopic
+   *        Topic of the observer message
+   * @param {Object} aData
+   *        Data of the observer message (not used)
+   */
+  observe: function JSB_observe(aSubject, aTopic, aData) {
+    Log.dump("Observer topic", aTopic);
+
+    switch (aTopic) {
+      // The server cannot be started before the ui is shown. That means
+      // we also have to register for the final-ui-startup notification.
+      case "profile-after-change":
+        Services.obs.addObserver(this, "final-ui-startup", false);
+        Services.obs.addObserver(this, "quit-application", false);
+        break;
+
+      case "final-ui-startup":
+        Services.obs.removeObserver(this, "final-ui-startup", false);
+
+        // The port the server has to be started on is set via a preference
+        let port = Services.prefs.getIntPref(PREF_JSBRIDGE_PORT);
+
+        // Start the server
+        Cu.import('resource://jsbridge/modules/Server.jsm');
+        this._server = new Server.Server(port);
+        this._server.start();
+
+        break;
+
+      case "quit-application":
+        Services.obs.removeObserver(this, "quit-application", false);
+
+        // Stop the server
+        this._server.stop();
+        this._server = null;
+        break;
+    }
+  }
+}
+
+const NSGetFactory = XPCOMUtils.generateNSGetFactory([JSBridge]);
diff --git a/jsbridge/jsbridge/extension/resource/modules/bridge.js b/jsbridge/jsbridge/extension/resource/modules/Bridge.jsm
similarity index 88%
rename from jsbridge/jsbridge/extension/resource/modules/bridge.js
rename to jsbridge/jsbridge/extension/resource/modules/Bridge.jsm
index 40a66c17..15479fab 100644
--- a/jsbridge/jsbridge/extension/resource/modules/bridge.js
+++ b/jsbridge/jsbridge/extension/resource/modules/Bridge.jsm
@@ -4,16 +4,20 @@
 
 var EXPORTED_SYMBOLS = ["Bridge"];
 
+
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
 
-var events = {}; Cu.import("resource://jsbridge/modules/events.js", events);
 
-var uuidgen = Cc["@mozilla.org/uuid-generator;1"].getService(Ci.nsIUUIDGenerator);
+// Include local modules
+Cu.import("resource://jsbridge/modules/Events.jsm");
+Cu.import("resource://jsbridge/modules/Log.jsm");
 
 
-globalRegistry = {};
+var globalRegistry = {};
+var uuidgen = Cc["@mozilla.org/uuid-generator;1"].getService(Ci.nsIUUIDGenerator);
+
 
 function Bridge(session) {
   this.session = session;
@@ -23,11 +27,13 @@ function Bridge(session) {
 Bridge.prototype._register = function (_type) {
   this.bridgeType = _type;
 
-  if (_type == "backchannel")
-    events.addBackChannel(this);
+  if (_type === "backchannel")
+    Events.addBackChannel(this);
 };
 
 Bridge.prototype.register = function (uuid, _type) {
+  Log.dump("Register", uuid + " (" + _type + ")");
+
   try {
     this._register(_type);
     var passed = true;
@@ -74,6 +80,8 @@ Bridge.prototype._describe = function (obj) {
 };
 
 Bridge.prototype.describe = function (uuid, obj) {
+  Log.dump("Describe", uuid + ", " + obj);
+
   var response = this._describe(obj);
   response.uuid = uuid;
   response.result = true;
@@ -90,6 +98,8 @@ Bridge.prototype._set = function (obj) {
 };
 
 Bridge.prototype.set = function (uuid, obj) {
+  Log.dump("Set", uuid);
+
   var ruuid = this._set(obj);
 
   this.session.encodeOut({'result': true,
@@ -104,7 +114,8 @@ Bridge.prototype._setAttribute = function (obj, name, value) {
 };
 
 Bridge.prototype.setAttribute = function (uuid, obj, name, value) {
-  // log(uuid, String(obj), name, String(value))
+  Log.dump("Set attribute", uuid + " (" + name + "=" + value + ")");
+
   try {
     var result = this._setAttribute(obj, name, value);
   } catch (e) {
@@ -130,6 +141,8 @@ Bridge.prototype._execFunction = function (func, args) {
 };
 
 Bridge.prototype.execFunction = function (uuid, func, args) {
+  Log.dump("Exec function", uuid + " (" + func.name + ")");
+
   try {
     var data = this._execFunction(func, args);
     var result = true;
@@ -155,3 +168,4 @@ Bridge.prototype.execFunction = function (uuid, func, args) {
   else
     throw 'jsbridge could not execute function ' + func;
 };
+
diff --git a/jsbridge/jsbridge/extension/resource/modules/Events.jsm b/jsbridge/jsbridge/extension/resource/modules/Events.jsm
new file mode 100644
index 00000000..25d6a7e8
--- /dev/null
+++ b/jsbridge/jsbridge/extension/resource/modules/Events.jsm
@@ -0,0 +1,34 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+var EXPORTED_SYMBOLS = ["Events"];
+
+
+const Cu = Components.utils;
+
+
+// Include local modules
+Cu.import("resource://jsbridge/modules/Log.jsm");
+
+
+var Events = {
+  backChannels: [],
+
+  addBackChannel: function (aBackChannel) {
+    Log.dump("Add backchannel", JSON.stringify(aBackChannel));
+
+    Events.backChannels.push(aBackChannel);
+  },
+
+  fireEvent: function (aName, aObj) {
+    Log.dump("Fire event", aName);
+
+    Events.backChannels.forEach(function (aBackChannel) {
+      aBackChannel.session.encodeOut({
+          'eventType': aName,
+          'result': aObj}
+      );
+    });
+  }
+};
diff --git a/jsbridge/jsbridge/extension/resource/modules/Log.jsm b/jsbridge/jsbridge/extension/resource/modules/Log.jsm
new file mode 100644
index 00000000..26a7fe86
--- /dev/null
+++ b/jsbridge/jsbridge/extension/resource/modules/Log.jsm
@@ -0,0 +1,37 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+var EXPORTED_SYMBOLS = ["Log"];
+
+
+const Cu = Components.utils;
+
+
+// Import global modules
+Cu.import("resource://gre/modules/Services.jsm");
+
+
+// Constants for preferences names
+const PREF_JSBRIDGE_LOG = "extensions.jsbridge.log";
+
+const LOGGING = Services.prefs.prefHasUserValue(PREF_JSBRIDGE_LOG) &&
+                Services.prefs.getBoolPref(PREF_JSBRIDGE_LOG);
+
+
+var Log = {
+
+  /**
+   * Dump log message to stdout.
+   *
+   * @param {String} aTopic
+   *        Topic of the message to be logged
+   * @param {String} aMessage
+   *        Message to be logged
+   */
+  dump: function (aTopic, aMessage) {
+    if (LOGGING) {
+      dump("* " + aTopic + ": '" + aMessage + "'\n");
+    }
+  }
+}
diff --git a/jsbridge/jsbridge/extension/resource/modules/NSPR.jsm b/jsbridge/jsbridge/extension/resource/modules/NSPR.jsm
new file mode 100644
index 00000000..a3b51aa6
--- /dev/null
+++ b/jsbridge/jsbridge/extension/resource/modules/NSPR.jsm
@@ -0,0 +1,123 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+var EXPORTED_SYMBOLS = ["NSPR"];
+
+
+const Ci = Components.interfaces;
+const Cu = Components.utils;
+
+
+// Import global JS modules
+Cu.import("resource://gre/modules/ctypes.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
+
+
+/**
+ * Object to access the nspr4 library via ctypes
+ */
+var NSPR = {
+  init: function () {
+    let file = Services.dirsvc.get("GreD", Ci.nsILocalFile);
+    file.append(ctypes.libraryName("nspr4"));
+
+    // Open the NSSPR library
+    NSPR._library = ctypes.open(file.path);
+  }
+}
+
+NSPR.init();
+
+
+NSPR.Types = {
+  PRFileDesc: ctypes.StructType("PRFileDesc"),
+
+  PRNetAddr: ctypes.StructType("PRNetAddr", [
+    {'family': ctypes.uint16_t},
+    {'port': ctypes.uint16_t},
+    {'ip': ctypes.uint32_t},
+    {'pad' : ctypes.char.array(8)}
+  ]),
+
+  PRSocketOptionData: ctypes.StructType("PRSocketOptionData", [
+    {'option' : ctypes.int32_t},
+    {'non_blocking': ctypes.int32_t}
+  ])
+}
+
+
+NSPR.Sockets = {
+  PR_TRUE: 1,
+  PR_AF_INET: 2,
+  PR_IpAddrAny: 1,
+  PR_IpAddrLoopback: 2,
+  PR_SockOpt_Nonblocking: 0,
+  PR_SockOpt_Reuseaddr: 2,
+  PR_SockOpt_NoDelay: 13,
+  PR_INTERVAL_NO_WAIT: 0,
+  PR_INTERVAL_MAX: 100000,
+
+  buffer: ctypes.ArrayType(ctypes.char),
+
+  PR_SetNetAddr: NSPR._library.declare("PR_SetNetAddr",
+  ctypes.default_abi,
+  ctypes.int32_t, // really doesn't return anything
+  ctypes.int32_t, // val
+  ctypes.uint16_t, // af
+  ctypes.uint16_t, // port
+  NSPR.Types.PRNetAddr.ptr),
+
+  PR_OpenTCPSocket: NSPR._library.declare("PR_OpenTCPSocket",
+  ctypes.default_abi, // cdecl calling convention
+  NSPR.Types.PRFileDesc.ptr, // return (PRFileDesc*)
+  ctypes.int32_t), // first arg
+
+  PR_SetSocketOption: NSPR._library.declare("PR_SetSocketOption",
+  ctypes.default_abi,
+  ctypes.int32_t,
+  NSPR.Types.PRFileDesc.ptr,
+  NSPR.Types.PRSocketOptionData.ptr),
+
+  PR_Bind: NSPR._library.declare("PR_Bind",
+  ctypes.default_abi,
+  ctypes.int32_t,
+  NSPR.Types.PRFileDesc.ptr,
+  NSPR.Types.PRNetAddr.ptr),
+
+  PR_Listen: NSPR._library.declare("PR_Listen",
+  ctypes.default_abi,
+  ctypes.int32_t,
+  NSPR.Types.PRFileDesc.ptr, // fd
+  ctypes.int32_t), // backlog
+
+  PR_Accept: NSPR._library.declare("PR_Accept",
+  ctypes.default_abi,
+  NSPR.Types.PRFileDesc.ptr, // new socket fd
+  NSPR.Types.PRFileDesc.ptr, // rendezvous socket fd
+  NSPR.Types.PRNetAddr.ptr, //addr
+  ctypes.uint32_t), // timeout interval
+
+  PR_Close: NSPR._library.declare("PR_Close",
+  ctypes.default_abi,
+  ctypes.int32_t,
+  NSPR.Types.PRFileDesc.ptr),
+
+  PR_Recv: NSPR._library.declare("PR_Recv",
+  ctypes.default_abi,
+  ctypes.int32_t, // return
+  NSPR.Types.PRFileDesc.ptr, // socket
+  ctypes.voidptr_t, // buffer
+  ctypes.int32_t, // buffer length
+  ctypes.int32_t, // must be 0, deprecated
+  ctypes.uint32_t), // timeout interval
+
+  PR_Send: NSPR._library.declare("PR_Send",
+  ctypes.default_abi,
+  ctypes.int32_t, // return
+  NSPR.Types.PRFileDesc.ptr, // socket
+  ctypes.voidptr_t, // buffer
+  ctypes.int32_t, // buffer length
+  ctypes.int32_t, // must be 0, deprecated
+  ctypes.uint32_t) // timeout interval
+}
diff --git a/jsbridge/jsbridge/extension/resource/modules/nspr-server.js b/jsbridge/jsbridge/extension/resource/modules/Server.jsm
similarity index 55%
rename from jsbridge/jsbridge/extension/resource/modules/nspr-server.js
rename to jsbridge/jsbridge/extension/resource/modules/Server.jsm
index 4d25e0d0..634ceb3f 100644
--- a/jsbridge/jsbridge/extension/resource/modules/nspr-server.js
+++ b/jsbridge/jsbridge/extension/resource/modules/Server.jsm
@@ -2,26 +2,31 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-var EXPORTED_SYMBOLS = ["Server", "Session", "sessions", "startServer"];
+var EXPORTED_SYMBOLS = ["Server"];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
 
-var socket = {}; Cu.import("resource://jsbridge/modules/nspr-socket.js", socket);
-var bridge = {}; Cu.import("resource://jsbridge/modules/bridge.js", bridge);
 
-var hwindow = Cc["@mozilla.org/appshell/appShellService;1"].
-              getService(Ci.nsIAppShellService).hiddenDOMWindow;
+// Import local JS modules
+Cu.import("resource://jsbridge/modules/Bridge.jsm");
+Cu.import("resource://jsbridge/modules/Log.jsm");
+Cu.import("resource://jsbridge/modules/Sockets.jsm");
 
-backstage = this;
 
-function Session(client) {
+// Reference to module which is needed for backstage access
+const module = this;
+
+
+var Server = { };
+
+
+Server.Session = function (client) {
   this.client = client;
 
-  var sandbox = Cu.Sandbox(backstage);
-  sandbox.bridge = new bridge.Bridge(this);
-  sandbox.openPreferences = hwindow.openPreferences;
+  var sandbox = Cu.Sandbox(module);
+  sandbox.bridge = new Bridge(this);
 
   client.onMessage(function (data) {
     data = toUnicode(data, "utf-8");
@@ -29,18 +34,18 @@ function Session(client) {
   });
 }
 
-Session.prototype.send = function (string) {
+Server.Session.prototype.send = function (string) {
   if (typeof(string) != "string")
     throw "jsbridge can only send strings";
 
   this.client.sendMessage(toUnicode(string, 'utf-8'));
 };
 
-Session.prototype.quit = function () {
+Server.Session.prototype.quit = function () {
   this.client.close();
 };
 
-Session.prototype.encodeOut = function (obj) {
+Server.Session.prototype.encodeOut = function (obj) {
   try {
     this.send(JSON.stringify(obj));
   } catch (e) {
@@ -55,6 +60,33 @@ Session.prototype.encodeOut = function (obj) {
   }
 };
 
+/**
+ *
+ * @param port
+ * @constructor
+ */
+Server.Server = function (port) {
+  this._port = port;
+  this._socket = new Sockets.ServerSocket(this._port);
+}
+
+Server.Server.prototype = {
+  start: function () {
+    Log.dump("Start server on port", this._port);
+
+    this._socket.onConnect(function (client) {
+      sessions.add(new Server.Session(client));
+    });
+  },
+
+  stop: function () {
+    this._socket.close();
+    sessions.quit();
+    this._socket = undefined;
+  }
+};
+
+
 var sessions = {
   _list: [],
 
@@ -81,32 +113,10 @@ var sessions = {
   }
 };
 
-var Server = function (port) {
-  this.server = new socket.ServerSocket(port);
-}
-
-Server.prototype.start = function () {
-  this.server.onConnect(function (client) {
-    sessions.add(new Session(client));
-  });
-};
-
-Server.prototype.stop = function () {
-  this.server.close();
-  sessions.quit();
-  this.server = undefined;
-};
-
-function startServer(port) {
-  var server = new Server(port);
-  server.start();
-
-  return server;
-}
 
 var toUnicode = function (text, charset) {
-  var converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"].
-                  createInstance(Ci.nsIScriptableUnicodeConverter);
+  let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"].
+    createInstance(Ci.nsIScriptableUnicodeConverter);
   converter.charset = charset;
   text = converter.ConvertToUnicode(text);
 
diff --git a/jsbridge/jsbridge/extension/resource/modules/Sockets.jsm b/jsbridge/jsbridge/extension/resource/modules/Sockets.jsm
new file mode 100644
index 00000000..b9d69c3d
--- /dev/null
+++ b/jsbridge/jsbridge/extension/resource/modules/Sockets.jsm
@@ -0,0 +1,124 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+var EXPORTED_SYMBOLS = ["Sockets"];
+
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cu = Components.utils;
+
+
+// Import global JS modules
+Cu.import("resource://gre/modules/Services.jsm");
+
+// Import local JS modules
+Cu.import("resource://jsbridge/modules/NSPR.jsm");
+
+
+var Sockets = { };
+
+
+Sockets.Client = function (fd) {
+  this.fd = fd;
+};
+
+Sockets.Client.prototype = {
+  onMessage: function (callback, interval, bufsize) {
+    bufsize = bufsize || 4096;
+    interval = interval || 100;
+    var self = this;
+
+    (function getMessage() {
+      var buffer = new NSPR.Sockets.buffer(bufsize);
+      var bytes = NSPR.Sockets.PR_Recv(self.fd, buffer, bufsize, 0,
+                                       NSPR.Sockets.PR_INTERVAL_NO_WAIT);
+
+      if (bytes > 0) {
+        var message = buffer.readString();
+        callback(message);
+
+      } else if (bytes === 0) {
+        if (self.handleDisconnect)
+          self.handleDisconnect();
+
+        return;
+      }
+
+      Services.appShell.hiddenDOMWindow.setTimeout(getMessage, interval);
+    })();
+  },
+
+  onDisconnect: function (callback) {
+    this.handleDisconnect = callback;
+  },
+
+  sendMessage: function (message) {
+    var buffer = new NSPR.Sockets.buffer(message);
+    NSPR.Sockets.PR_Send(this.fd, buffer, message.length, 0, NSPR.Sockets.PR_INTERVAL_MAX);
+  },
+
+  close : function () {
+    return NSPR.Sockets.PR_Close(this.fd);
+  }
+};
+
+
+Sockets.ServerSocket = function (aPort) {
+  let addr = NSPR.Types.PRNetAddr();
+  NSPR.Sockets.PR_SetNetAddr(NSPR.Sockets.PR_IpAddrLoopback,
+                             NSPR.Sockets.PR_AF_INET,
+                             aPort, addr.address());
+
+  let fd = NSPR.Sockets.PR_OpenTCPSocket(NSPR.Sockets.PR_AF_INET);
+
+  // don't block for accept/send/recv
+  let opt = NSPR.Types.PRSocketOptionData();
+  opt.non_blocking = NSPR.Sockets.PR_TRUE;
+  opt.option = NSPR.Sockets.PR_SockOpt_Nonblocking;
+  NSPR.Sockets.PR_SetSocketOption(fd, opt.address());
+
+  // don't buffer when sending
+  opt = NSPR.Types.PRSocketOptionData();
+  opt.non_blocking = NSPR.Sockets.PR_TRUE; // same space
+  opt.option = NSPR.Sockets.PR_SockOpt_NoDelay;
+  NSPR.Sockets.PR_SetSocketOption(fd, opt.address());
+
+  // allow local address re-use
+  opt = NSPR.Types.PRSocketOptionData();
+  opt.non_blocking = NSPR.Sockets.PR_TRUE; // same space
+  opt.option = NSPR.Sockets.PR_SockOpt_Reuseaddr;
+  NSPR.Sockets.PR_SetSocketOption(fd, opt.address());
+
+  let status = NSPR.Sockets.PR_Bind(fd, addr.address());
+  if (status !== 0)
+    throw Error("Socket failed to bind, kill all firefox processes");
+
+  status = NSPR.Sockets.PR_Listen(fd, -1);
+  if (status !== 0)
+    throw Error("Socket failed to listen");
+
+  this.addr = addr;
+  this.fd = fd;
+};
+
+Sockets.ServerSocket.prototype = {
+  onConnect: function (callback, interval) {
+    interval = interval || 300;
+    let self = this;
+
+    (function accept() {
+      var newfd = NSPR.Sockets.PR_Accept(self.fd, self.addr.address(),
+                                         NSPR.Sockets.PR_INTERVAL_NO_WAIT);
+      if (!newfd.isNull())
+        callback(new Sockets.Client(newfd));
+
+      Services.appShell.hiddenDOMWindow.setTimeout(accept, interval);
+    })();
+  },
+
+  close: function () {
+    return NSPR.Sockets.PR_Close(this.fd);
+  }
+};
diff --git a/jsbridge/jsbridge/extension/resource/modules/events.js b/jsbridge/jsbridge/extension/resource/modules/events.js
deleted file mode 100644
index bd4984a9..00000000
--- a/jsbridge/jsbridge/extension/resource/modules/events.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-var EXPORTED_SYMBOLS = ["backchannels", "fireEvent", "addBackChannel"];
-
-var backchannels = [];
-
-var fireEvent = function (name, obj) {
-  for each(var backchannel in backchannels) {
-    backchannel.session.encodeOut({'eventType': name,
-                                   'result':obj});
-  }
-};
-
-var addBackChannel = function (backchannel) {
-  backchannels.push(backchannel);
-};
diff --git a/jsbridge/jsbridge/extension/resource/modules/init.js b/jsbridge/jsbridge/extension/resource/modules/init.js
deleted file mode 100644
index 7ab62d0b..00000000
--- a/jsbridge/jsbridge/extension/resource/modules/init.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-var EXPORTED_SYMBOLS = ["server"];
-
-const Cu = Components.utils;
-
-var server = {}; Cu.import('resource://jsbridge/modules/server.js', server);
diff --git a/jsbridge/jsbridge/extension/resource/modules/jsbridgefilelogger.js b/jsbridge/jsbridge/extension/resource/modules/jsbridgefilelogger.js
deleted file mode 100644
index ea869ffc..00000000
--- a/jsbridge/jsbridge/extension/resource/modules/jsbridgefilelogger.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-var EXPORTED_SYMBOLS = ["JsbridgeFileLogger"];
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-
-var gJsbridgeFileLogger = null;
-
-function JsbridgeFileLogger(filename) {
-  this.filename = filename;
-  this.init();
-}
-
-JsbridgeFileLogger.prototype = {
-  _file: null,
-  _fostream: null,
-
-  init: function JsbridgeFileLogger_init() {
-    this._file = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsILocalFile);
-    this._file.initWithPath(this.filename);
-    this._fostream = Cc["@mozilla.org/network/file-output-stream;1"].
-                     createInstance(Ci.nsIFileOutputStream);
-    // Create with PR_WRITE_ONLY(0x02), PR_CREATE_FILE(0x08), PR_APPEND(0x10)
-    this._fostream.init(this._file, 0x02 | 0x08 | 0x10, 0664, 0);
-  },
-
-  write: function JsbridgeFileLogger_write(msg) {
-    if (this._fostream) {
-      var msgn = msg + "\n";
-      this._fostream.write(msgn, msgn.length);
-    }
-  },
-
-  close: function JsbridgeFileLogger_close() {
-    if (this._fostream)
-      this._fostream.close();
-
-    this._fostream = null;
-    this._file = null;
-  }
-}; 
-
diff --git a/jsbridge/jsbridge/extension/resource/modules/nspr-socket.js b/jsbridge/jsbridge/extension/resource/modules/nspr-socket.js
deleted file mode 100644
index b6a80910..00000000
--- a/jsbridge/jsbridge/extension/resource/modules/nspr-socket.js
+++ /dev/null
@@ -1,118 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-var EXPORTED_SYMBOLS = ["ServerSocket"];
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cu = Components.utils;
-
-var nspr = {}; Cu.import("resource://jsbridge/modules/nspr.js", nspr);
-
-var nsprTypes = nspr.nsprTypes;
-nspr = nspr.nsprSockets;
-
-var hwindow = Cc["@mozilla.org/appshell/appShellService;1"].
-              getService(Ci.nsIAppShellService).hiddenDOMWindow;
-
-var ServerSocket = function (port) {
-  var addr = nsprTypes.PRNetAddr();
-  nspr.PR_SetNetAddr(nspr.PR_IpAddrLoopback, nspr.PR_AF_INET,
-                     port, addr.address());
-
-  var fd = nspr.PR_OpenTCPSocket(nspr.PR_AF_INET);
-
-  // don't block for accept/send/recv
-  var opt = nsprTypes.PRSocketOptionData();
-  opt.non_blocking = nspr.PR_TRUE;
-  opt.option = nspr.PR_SockOpt_Nonblocking;
-  nspr.PR_SetSocketOption(fd, opt.address());
-
-  // don't buffer when sending
-  var opt = nsprTypes.PRSocketOptionData();
-  opt.non_blocking = nspr.PR_TRUE; // same space
-  opt.option = nspr.PR_SockOpt_NoDelay;
-  nspr.PR_SetSocketOption(fd, opt.address());
-
-  // allow local address re-use
-  var opt = nsprTypes.PRSocketOptionData();
-  opt.non_blocking = nspr.PR_TRUE; // same space
-  opt.option = nspr.PR_SockOpt_Reuseaddr;
-  nspr.PR_SetSocketOption(fd, opt.address());
-
-  var status = nspr.PR_Bind(fd, addr.address());
-  if (status != 0)
-    throw "Socket failed to bind, kill all firefox processes";
-
-  var status = nspr.PR_Listen(fd, -1);
-  if (status != 0)
-    throw "Socket failed to listen";
-
-  this.addr = addr;
-  this.fd = fd;
-};
-
-ServerSocket.prototype = {
-  onConnect: function (callback, interval) {
-    interval = interval || 300;
-    var that = this;
-
-    (function accept() {
-      var newfd = nspr.PR_Accept(that.fd, that.addr.address(),
-                                 nspr.PR_INTERVAL_NO_WAIT);
-      if (!newfd.isNull())
-        callback(new Client(newfd));
-
-      hwindow.setTimeout(accept, interval);
-    })();
-  },
-
-  close: function () {
-    return nspr.PR_Close(this.fd);
-  }
-};
-
-
-var Client = function (fd) {
-  this.fd = fd;
-};
-
-Client.prototype = {
-  onMessage: function (callback, interval, bufsize) {
-    bufsize = bufsize || 4096;
-    interval = interval || 100; // polling interval
-    var that = this;
-
-    (function getMessage() {
-      var buffer = new nspr.buffer(bufsize);
-      var bytes = nspr.PR_Recv(that.fd, buffer, bufsize, 0,
-                               nspr.PR_INTERVAL_NO_WAIT);
-
-      if (bytes > 0) {
-        var message = buffer.readString();
-        callback(message);
-      } else if (bytes == 0) {
-        if (that.handleDisconnect)
-          that.handleDisconnect();
-
-        return;
-      }
-
-      hwindow.setTimeout(getMessage, interval);
-    })();
-  },
-
-  onDisconnect: function (callback) {
-    this.handleDisconnect = callback;
-  },
-
-  sendMessage: function (message) {
-    var buffer = new nspr.buffer(message);
-    nspr.PR_Send(this.fd, buffer, message.length, 0, nspr.PR_INTERVAL_MAX);
-  },
-
-  close : function () {
-    return nspr.PR_Close(this.fd);
-  }
-};
diff --git a/jsbridge/jsbridge/extension/resource/modules/nspr.js b/jsbridge/jsbridge/extension/resource/modules/nspr.js
deleted file mode 100644
index 6a417e17..00000000
--- a/jsbridge/jsbridge/extension/resource/modules/nspr.js
+++ /dev/null
@@ -1,105 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-var EXPORTED_SYMBOLS = ["nsprSockets", "nsprTypes"];
-
-const Ci = Components.interfaces;
-const Cu = Components.utils;
-
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/ctypes.jsm");
-
-// Open the NSSPR library.
-var nsprfile = Services.dirsvc.get("GreD", Ci.nsILocalFile);
-nsprfile.append(ctypes.libraryName("nspr4"));
-var lib = ctypes.open(nsprfile.path);
-
-var nsprTypes = {
-  PRFileDesc: ctypes.StructType("PRFileDesc"),
-
-  PRNetAddr: ctypes.StructType("PRNetAddr",
-                              [{'family': ctypes.uint16_t},
-                               {'port': ctypes.uint16_t},
-                               {'ip': ctypes.uint32_t},
-                               {'pad' : ctypes.char.array(8)}]),
-
-  PRSocketOptionData: ctypes.StructType("PRSocketOptionData",
-                                        [{'option' : ctypes.int32_t},
-                                         {'non_blocking': ctypes.int32_t}])
-};
-
-var nsprSockets = {
-  PR_TRUE: 1,
-  PR_AF_INET: 2,
-  PR_IpAddrAny: 1,
-  PR_IpAddrLoopback: 2,
-  PR_SockOpt_Nonblocking: 0,
-  PR_SockOpt_Reuseaddr: 2,
-  PR_SockOpt_NoDelay: 13,
-  PR_INTERVAL_NO_WAIT: 0,
-  PR_INTERVAL_MAX: 100000,
-
-  buffer: ctypes.ArrayType(ctypes.char),
-
-  PR_SetNetAddr: lib.declare("PR_SetNetAddr",
-                             ctypes.default_abi,
-                             ctypes.int32_t, // really doesn't return anything
-                             ctypes.int32_t, // val
-                             ctypes.uint16_t, // af
-                             ctypes.uint16_t, // port
-                             nsprTypes.PRNetAddr.ptr),
-
-  PR_OpenTCPSocket: lib.declare("PR_OpenTCPSocket",
-                                ctypes.default_abi, // cdecl calling convention
-                                nsprTypes.PRFileDesc.ptr, // return (PRFileDesc*)
-                                ctypes.int32_t), // first arg
-
-  PR_SetSocketOption: lib.declare("PR_SetSocketOption",
-                                  ctypes.default_abi,
-                                  ctypes.int32_t,
-                                  nsprTypes.PRFileDesc.ptr,
-                                  nsprTypes.PRSocketOptionData.ptr),
-
-  PR_Bind: lib.declare("PR_Bind",
-                       ctypes.default_abi,
-                       ctypes.int32_t,
-                       nsprTypes.PRFileDesc.ptr,
-                       nsprTypes.PRNetAddr.ptr),
-
-  PR_Listen: lib.declare("PR_Listen",
-                          ctypes.default_abi,
-                          ctypes.int32_t,
-                          nsprTypes.PRFileDesc.ptr, // fd
-                          ctypes.int32_t), // backlog
-
-  PR_Accept: lib.declare("PR_Accept",
-                         ctypes.default_abi,
-                         nsprTypes.PRFileDesc.ptr, // new socket fd
-                         nsprTypes.PRFileDesc.ptr, // rendezvous socket fd
-                         nsprTypes.PRNetAddr.ptr, //addr
-                         ctypes.uint32_t), // timeout interval
-
-  PR_Close: lib.declare("PR_Close",
-                        ctypes.default_abi,
-                        ctypes.int32_t,
-                        nsprTypes.PRFileDesc.ptr),
-
-  PR_Recv: lib.declare("PR_Recv",
-                       ctypes.default_abi,
-                       ctypes.int32_t, // return
-                       nsprTypes.PRFileDesc.ptr, // socket
-                       ctypes.voidptr_t, // buffer
-                       ctypes.int32_t, // buffer length
-                       ctypes.int32_t, // must be 0, deprecated
-                       ctypes.uint32_t), // timeout interval
-
-  PR_Send: lib.declare("PR_Send",
-                       ctypes.default_abi,
-                       ctypes.int32_t, // return
-                       nsprTypes.PRFileDesc.ptr, // socket
-                       ctypes.voidptr_t, // buffer
-                       ctypes.int32_t, // buffer length
-                       ctypes.int32_t, // must be 0, deprecated
-                       ctypes.uint32_t), // timeout interval
-}
diff --git a/jsbridge/jsbridge/extension/resource/modules/server.js b/jsbridge/jsbridge/extension/resource/modules/server.js
deleted file mode 100644
index 014ac744..00000000
--- a/jsbridge/jsbridge/extension/resource/modules/server.js
+++ /dev/null
@@ -1,214 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-var EXPORTED_SYMBOLS = ["Server", "AsyncRead", "Session", "sessions", "startServer"];
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cu = Components.utils;
-
-var bridge = {}; Cu.import("resource://jsbridge/modules/bridge.js", bridge);
-var gJsbridgeFileLogger = {}; Cu.import("resource://jsbridge/modules/jsbridgefilelogger.js", gJsbridgeFileLogger);
-
-const DEBUG_ON = true;
-const DO_FILE_LOGGING = true;
-const BUFFER_SIZE = 1024;
-
-var hwindow = Cc["@mozilla.org/appshell/appShellService;1"].
-              getService(Ci.nsIAppShellService).hiddenDOMWindow;
-
-var uuidgen = Cc["@mozilla.org/uuid-generator;1"].getService(Ci.nsIUUIDGenerator);
-
-function AsyncRead(session) {
-  this.session = session;
-}
-
-AsyncRead.prototype.onStartRequest = function (request, context) {
-};
-
-AsyncRead.prototype.onStopRequest = function (request, context, status) {
-  this.session.onQuit();
-};
-
-AsyncRead.prototype.onDataAvailable = function (request, context, inputStream, offset, count) {
-  var str = {};
-  str.value = '';
-
-  var bytesAvail = 0;
-  do {
-    bytesAvail = (count > BUFFER_SIZE) ? BUFFER_SIZE : count;
-
-    var parts = {};
-    var bytesRead = this.session.instream.readString(bytesAvail, parts);
-    count = count - bytesRead;
-    str.value += parts.value;
-  } while (count > 0);
-
-  this.session.receive(str.value);
-};
-
-backstage = this;
-
-function Session(transport) {
-  this.transpart = transport;
-  this.sandbox = Cu.Sandbox(backstage);
-  this.sandbox.bridge = new bridge.Bridge(this);
-  this.sandbox.openPreferences = hwindow.openPreferences;
-
-  try {
-    this.outputstream = transport.openOutputStream(Ci.nsITransport.OPEN_BLOCKING, 0, 0);
-    this.outstream = Cc['@mozilla.org/intl/converter-output-stream;1'].
-                     createInstance(Ci.nsIConverterOutputStream);
-    this.outstream.init(this.outputstream, 'UTF-8', BUFFER_SIZE,
-                        Ci.nsIConverterInputStream.DEFAULT_REPLACEMENT_CHARACTER);
-    this.stream = transport.openInputStream(0, 0, 0);
-    this.instream = Cc['@mozilla.org/intl/converter-input-stream;1'].
-                    createInstance(Ci.nsIConverterInputStream);
-    this.instream.init(this.stream, 'UTF-8', BUFFER_SIZE,
-                       Ci.nsIConverterInputStream.DEFAULT_REPLACEMENT_CHARACTER);
-  } catch (e) {
-    log('jsbridge: Error: ' + e);
-  }
-
-  this.pump = Cc['@mozilla.org/network/input-stream-pump;1'].
-              createInstance(Ci.nsIInputStreamPump);
-  this.pump.init(this.stream, -1, -1, 0, 0, false);
-  this.pump.asyncRead(new AsyncRead(this), null);
-}
-
-Session.prototype.onOutput = function (string) {
-  if (typeof(string) != "string") {
-    throw "This is not a string"
-  }
-
-  try {
-    var stroffset = 0;
-
-    do {
-      // Handle the case where we are writing something larger than our buffer
-      var parts = (string.length > BUFFER_SIZE) ? string.slice(stroffset, stroffset + BUFFER_SIZE)
-                                                : string;
-
-      // Update our offset
-      stroffset += parts.length;
-
-      // write it
-      this.outstream.writeString(parts);
-    } while (stroffset < string.length);
-
-    // Ensure the entire stream is flushed
-    this.outstream.flush();
-  } catch (e) {
-    throw "JSBridge cannot write: " + string;
-  }
-};
-
-Session.prototype.onQuit = function () {
-  this.instream.close();
-  this.outstream.close();
-  sessions.remove(session);
-};
-
-Session.prototype.encodeOut = function (obj) {
-  try {
-    this.onOutput(JSON.stringify(obj));
-  } catch(e) {
-    if (typeof(e) == "string")
-      var exception = e;
-    else
-      var exception = {'name': e.name,
-                       'message': e.message};
-
-    this.onOutput(JSON.stringify({'result': false,
-                                  'exception':exception}));
-  }
-};
-
-Session.prototype.receive = function (data) {
-  Cu.evalInSandbox(data, this.sandbox);
-}
-
-var sessions = {
-  _list: [],
-
-  add: function (session) {
-    this._list.push(session);
-  },
-
-  remove: function (session) {
-    var index = this._list.indexOf(session);
-
-    if(index != -1)
-      this._list.splice(index, 1);
-  },
-
-  get: function (index) {
-    return this._list[index];
-  },
-
-  quit: function () {
-    this._list.forEach(function (session) {
-      session.onQuit();
-    });
-
-    this._list.splice(0, this._list.length);
-  }
-};
-
-function Server(port) {
-  this.port = port;
-}
-
-Server.prototype.start = function () {
-  try {
-    this.serv = Cc['@mozilla.org/network/server-socket;1'].
-                createInstance(Ci.nsIServerSocket);
-    this.serv.init(this.port, true, -1);
-    this.serv.asyncListen(this);
-  } catch (e) {
-    log('jsbridge: Exception: ' + e);
-  }
-}
-
-Server.prototype.stop = function () {
-  this.serv.close();
-  this.sessions.quit();
-  this.serv = undefined;
-
-  // If we have file logging turned on, turn it off
-  if (gJsbridgeFileLogger) {
-    gJsbridgeFileLogger.close();
-    gJsbridgeFileLogger = null;
-  }
-};
-
-Server.prototype.onStopListening = function (serv, status) {
-  // Stub function
-};
-
-Server.prototype.onSocketAccepted = function (serv, transport) {
-  session = new Session(transport)
-  sessions.add(session);
-};
-
-function log(msg) {
-  if (DEBUG_ON)
-    dump(msg + '\n');
-
-  if (DO_FILE_LOGGING) {
-    if (!gJsbridgeFileLogger) {
-        // TODO
-        return;
-    }
-
-    gJsbridgeFileLogger.write(msg);
- }
-}
-
-function startServer(port) {
-  var server = new Server(port);
-  server.start();
-
-  return server;
-}
diff --git a/jsbridge/jsbridge/network.py b/jsbridge/jsbridge/network.py
index c605bf42..64cd253d 100644
--- a/jsbridge/jsbridge/network.py
+++ b/jsbridge/jsbridge/network.py
@@ -149,9 +149,12 @@ def handle_connect(self):
         self.register()
 
     def run(self, _uuid, exec_string, interval=.2, raise_exeption=True):
-
         exec_string += '\r\n'
-        self.send(exec_string)
+        try:
+            self.send(exec_string)
+        except Exception,e:
+            print str(e)
+            print "String: %s" % exec_string
 
         while _uuid not in self.callbacks.keys():
 
@@ -273,5 +276,5 @@ def do():
         thread = Thread(target=do)
         getattr(thread, 'setDaemon', lambda x : None)(True)
         thread.start()
-    
+
     return back_channel, bridge
diff --git a/mozmill/mozmill/__init__.py b/mozmill/mozmill/__init__.py
index 9b71ff31..16daeb5b 100644
--- a/mozmill/mozmill/__init__.py
+++ b/mozmill/mozmill/__init__.py
@@ -32,7 +32,6 @@
 
 # defaults
 ADDONS = [extension_path, jsbridge.extension_path]
-JSBRIDGE_PORT = 24242
 JSBRIDGE_TIMEOUT = 60. # timeout for jsbridge
 
 class TestResults(object):
@@ -99,35 +98,46 @@ class MozMill(object):
     """
 
     @classmethod
-    def create(cls, results=None, jsbridge_port=JSBRIDGE_PORT, jsbridge_timeout=JSBRIDGE_TIMEOUT, handlers=(),
+    def create(cls, results=None, jsbridge_timeout=JSBRIDGE_TIMEOUT, handlers=(),
                app='firefox', profile_args=None, runner_args=None):
 
+        jsbridge_port = jsbridge.find_port()
+
         # select runner and profile class for the given app
         try:
             runner_class = mozrunner.runners[app]
         except KeyError:
-            raise NotImplementedError('Application "%s" unknown (should be one of %s)' % (app, mozrunner.runners.keys()))
+            raise NotImplementedError('Application "%s" unknown (should be one of %s)' %
+                                      (app, mozrunner.runners.keys()))
 
         # get the necessary arguments to construct the profile and runner instance
         profile_args = profile_args or {}
-        runner_args = runner_args or {}
         profile_args.setdefault('addons', []).extend(ADDONS)
-        cmdargs = runner_args.setdefault('cmdargs', [])
-        if '-jsbridge' not in cmdargs:
-            cmdargs += ['-jsbridge', '%d' % jsbridge_port]
+
+        preferences = profile_args.setdefault('preferences', { })
+        if isinstance(preferences, dict):
+            preferences['extensions.jsbridge.port'] = jsbridge_port
+        elif isinstance(preferences, list):
+            preferences.append(('extensions.jsbridge.port', jsbridge_port))
+        else:
+            raise Exception('Invalid type for preferences in profile_args')
+
+        runner_args = runner_args or {}
         runner_args['profile_args'] = profile_args
 
         # create an equipped runner
         runner = runner_class.create(**runner_args)
 
         # create a mozmill
-        return cls(runner, results=results, jsbridge_port=jsbridge_port, jsbridge_timeout=jsbridge_timeout, handlers=handlers)
+        return cls(runner, jsbridge_port, results=results,
+                   jsbridge_timeout=jsbridge_timeout, handlers=handlers)
 
-    def __init__(self, runner, results=None, jsbridge_port=JSBRIDGE_PORT, jsbridge_timeout=JSBRIDGE_TIMEOUT, handlers=()):
+    def __init__(self, runner, jsbridge_port, results=None,
+                 jsbridge_timeout=JSBRIDGE_TIMEOUT, handlers=()):
         """
         - runner : a MozRunner instance to run the app
+        - jsbridge_port : The port the server is running on
         - results : a TestResults instance to accumulate results
-        - jsbridge_port : port jsbridge uses to connect to to the application
         - jsbridge_timeout : how long to go without jsbridge communication
         - handlers : pluggable event handler
         """
@@ -233,7 +243,6 @@ def create_network(self):
         # get the bridge and the back-channel
         self.back_channel, self.bridge = jsbridge.wait_and_create_network("127.0.0.1",
                                                                           self.jsbridge_port)
-
         # set a timeout on jsbridge actions in order to ensure termination
         self.back_channel.timeout = self.bridge.timeout = self.jsbridge_timeout
 
@@ -495,6 +504,8 @@ def __init__(self, args):
             name = getattr(handler_class, 'name', handler_class.__name__)
             self.handlers[name] = handler_class
 
+        self.jsbridge_port = jsbridge.find_port()
+
         # add and parse options
         mozrunner.CLI.__init__(self, args)
 
@@ -570,9 +581,6 @@ def add_options(self, parser):
                          action="store_true",
                          help="debug mode",
                          default=False)
-        group.add_option('-P', '--port', dest="port", type="int",
-                         default=JSBRIDGE_PORT,
-                         help="TCP port to run jsbridge on.")
         group.add_option('--list-tests', dest='list_tests',
                          action='store_true', default=False,
                          help="list test files that would be run, in order")
@@ -605,11 +613,15 @@ def profile_args(self):
         profile_args = mozrunner.CLI.profile_args(self)
         profile_args.setdefault('addons', []).extend(ADDONS)
 
+        profile_args['preferences'] = {
+            'extensions.jsbridge.port': self.jsbridge_port
+        }
+
         if self.options.debug:
-            profile_args['preferences'] = {
-              'extensions.checkCompatibility': False,
-              'javascript.options.strict': True
-            }
+            profile_args['preferences']['extensions.checkCompatibility'] = False
+            profile_args['preferences']['extensions.jsbridge.log'] = True
+            profile_args['preferences']['javascript.options.strict'] = True
+
         return profile_args
 
     def command_args(self):
@@ -618,8 +630,7 @@ def command_args(self):
         cmdargs = mozrunner.CLI.command_args(self)
         if self.options.debug and '-jsconsole' not in cmdargs:
             cmdargs.append('-jsconsole')
-        if '-jsbridge' not in cmdargs:
-            cmdargs += ['-jsbridge', '%d' % self.options.port]
+
         return cmdargs
 
     def run(self):
@@ -636,8 +647,7 @@ def run(self):
         runner = self.create_runner()
 
         # create a MozMill
-        mozmill = MozMill(runner, results,
-                          jsbridge_port=self.options.port,
+        mozmill = MozMill(runner, self.jsbridge_port, results,
                           jsbridge_timeout=self.options.timeout,
                           handlers=self.event_handlers
                           )
diff --git a/mozmill/mozmill/extension/resource/modules/frame.js b/mozmill/mozmill/extension/resource/modules/frame.js
index 15f140d2..2dd5bc5c 100644
--- a/mozmill/mozmill/extension/resource/modules/frame.js
+++ b/mozmill/mozmill/extension/resource/modules/frame.js
@@ -406,17 +406,13 @@ broker.addObject({'pass': events.pass,
                   'screenshot': events.screenshot});
 
 try {
-  var jsbridge = {}; Cu.import('resource://jsbridge/modules/events.js', jsbridge);
-} catch (e) {
-  var jsbridge = null;
-
-  aConsoleService.logStringMessage("jsbridge not available.");
-}
+  Cu.import('resource://jsbridge/modules/Events.jsm');
 
-if (jsbridge) {
   events.addListener('', function (name, obj) {
-                           jsbridge.fireEvent('mozmill.' + name, obj)
-                         });
+    Events.fireEvent('mozmill.' + name, obj);
+  });
+} catch (e) {
+  aConsoleService.logStringMessage("Event module of JSBridge not available.");
 }
 
 function Collector () {
diff --git a/mutt/mutt/tests/js/frame/restart_application_disconnect/test_pre.js b/mutt/mutt/tests/js/frame/restart_application_disconnect/test_pre.js
index fdb94572..124dfe61 100644
--- a/mutt/mutt/tests/js/frame/restart_application_disconnect/test_pre.js
+++ b/mutt/mutt/tests/js/frame/restart_application_disconnect/test_pre.js
@@ -7,7 +7,7 @@ var setupTest = function () {
 }
 
 var testOne = function () {
-  controller.restartApplication('testTwo');
+  controller.restartApplication('testTwo', true);
 }
 
 var testTwo = function () {
diff --git a/mutt/mutt/tests/python/usemozmill.py b/mutt/mutt/tests/python/usemozmill.py
index b99ded3f..13fdb535 100644
--- a/mutt/mutt/tests/python/usemozmill.py
+++ b/mutt/mutt/tests/python/usemozmill.py
@@ -14,11 +14,8 @@ def test_modules(self):
 
     def do_test(self, relative_test_path, passes = 0, fails = 0, skips = 0):
         testpath = os.path.join(os.path.dirname(os.path.abspath(__file__)), relative_test_path)
-        print "this is testpath: %s" % testpath
-        
         test = [{'path': testpath}]
         log_file = tempfile.mktemp(suffix='.txt')
-        print "this is logfile: %s" % log_file
         logger = LoggerListener(log_file=log_file, file_level="DEBUG", debug=True)
         m = mozmill.MozMill.create(handlers=(logger,), runner_args={'cmdargs':['-console']})
         results = m.run(*test)