Adblock Plus Crawler rewrite

lib/main.js

 /*
  * This Source Code is subject to the terms of the Mozilla Public License
  * version 2.0 (the "License"). You can obtain a copy of the License at
  * http://mozilla.org/MPL/2.0/.
  */
 
 /**
  * @module main

[saroyanm, 2015/05/04 18:13:43]

I think this should be file overview, maybe smth like:
/*
 * @fileOverview Starts up Crawler
/*

[Wladimir Palant, 2015/05/07 00:04:59]

As Sebastian noted elsewhere, @module is actually appropriate here.

  */
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/Promise.jsm");
 
 require("commandLine");
 let {run} = require("crawler");
+let {reportException} = require("debug");
 
 let baseURL = null;
 
 /**
  * Waits for the application to initialize.
  * @type {Promise}
  */
 let applicationReady = (function()
 {
-  let deferred = Promise.defer();

[saroyanm, 2015/05/04 18:13:43]

As mentioned in crawler.js please also don't use Deffered object here, but
Promises as well. This comment actually goes to other Deffered object usage in
the script.

[Wladimir Palant, 2015/05/07 00:04:59]

Done.

+  return new Promise((resolve, reject) =>
+  {
+    let observer = {
+      observe: function(subject, topic, data)
+      {
+        Services.obs.removeObserver(this, "sessionstore-windows-restored");
+        resolve();
+      },
+      QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference])
+    };
 
-  let observer = {
-    observe: function(subject, topic, data)
-    {
-      Services.obs.removeObserver(this, "sessionstore-windows-restored");
-      deferred.resolve();
-    },
-    QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference])
-  };
-
-  Services.obs.addObserver(observer, "sessionstore-windows-restored", true);
-  onShutdown.add(() => Services.obs.removeObserver(observer, "sessionstore-windows-restored"));
-
-  return deferred.promise;
+    Services.obs.addObserver(observer, "sessionstore-windows-restored", true);
+    onShutdown.add(() => Services.obs.removeObserver(observer, "sessionstore-windows-restored"));
+  });
 })();
 
 /**
  * Startup function, called from command line handler.
  *
  * @param {int} port  Port to communicate with
  */
 function startup(port)
 {
   baseURL = "http://localhost:" + port + "/";
@@ skipping 16 matching lines @@
 {
   let {urls, timeout, maxtabs} = event.target.response;
 
   applicationReady.then(function()
   {
     let window = Services.wm.getMostRecentWindow("navigator:browser");
     run(window, urls, timeout, maxtabs, baseURL + "save", function()
     {
       Services.startup.quit(Services.startup.eAttemptQuit);
     });
-  }, function(exception)
-  {
-    Cu.reportError(exception);
-    dump(exception + "\n")
-  });
+  }, reportException);
 }
 
 /**
  * Called if requesting parameters failed.
  *
  * @param {Event} event
  */
 function onParametersFailed(event)
 {
-  Cu.reportError("Failed loading parameters");

[saroyanm, 2015/05/04 18:13:43]

Maybe also make sense to print the message in the console, 
not to repeat the code, I think it make sense to create separate
"reportException" method, similar we have in crawler.js.

[Wladimir Palant, 2015/05/07 00:04:59]

Done.

+  reportException(new Error("Failed loading parameters"));
 }