Bug 706590 - API for implementing XPCOM interfaces

packages/addon-kit/lib/request.js

@@ -3,11 +3,15 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
-const xpcom = require("api-utils/xpcom");
+
+const { Base } = require("api-utils/base");
+const { ns } = require("api-utils/namespace");
 const xhr = require("api-utils/xhr");
 const errors = require("api-utils/errors");
 const apiUtils = require("api-utils/api-utils");
 
+const response = ns();
+
 // Ugly but will fix with: https://bugzilla.mozilla.org/show_bug.cgi?id=596248
 const EventEmitter = require('api-utils/events').EventEmitter.compose({
   constructor: function EventEmitter() this
@@ -88,7 +92,7 @@ function Request(options) {
     // handle the readystate, create the response, and call the callback
     request.onreadystatechange = function () {
       if (request.readyState == 4) {
-        response = new Response(request);
+        response = Response.new(request);
         errors.catchAndLog(function () {
           self._emit('complete', response);
         })();
@@ -195,34 +199,29 @@ function fixedEncodeURIComponent (str) {
                                  replace(/\)/g, "%29").replace(/\*/g, "%2A");
 }
 
-function Response(request) {
-  // Define the straight mappings of our value to original request value
-  xpcom.utils.defineLazyGetter(this, "text", function () request.responseText);
-  xpcom.utils.defineLazyGetter(this, "xml", function () {
+const Response = Base.extend({
+  initialize: function initialize(request) {
+    response(this).request = request;
+  },
+  get text() response(this).request.responseText,
+  get xml() {
     throw new Error("Sorry, the 'xml' property is no longer available. " +
                     "see bug 611042 for more information.");
-  });
-  xpcom.utils.defineLazyGetter(this, "status", function () request.status);
-  xpcom.utils.defineLazyGetter(this, "statusText", function () request.statusText);
-
-  // this.json should be the JS object, so we need to attempt to parse it.
-  xpcom.utils.defineLazyGetter(this, "json", function () {
-    let _json = null;
+  },
+  get status() response(this).request.status,
+  get statusText() response(this).request.statusText,
+  get json() {
     try {
-      _json = JSON.parse(this.text);
+      return JSON.parse(this.text);
+    } catch(error) {
+      return null;
     }
-    catch (e) {}
-    return _json;
-  });
-
-  // this.headers also should be a JS object, so we need to split up the raw
-  // headers string provided by the request.
-  xpcom.utils.defineLazyGetter(this, "headers", function () {
-    let _headers = {};
-    let lastKey;
+  },
+  get headers() {
+    let headers = {}, lastKey;
     // Since getAllResponseHeaders() will return null if there are no headers,
     // defend against it by defaulting to ""
-    let rawHeaders = request.getAllResponseHeaders() || "";
+    let rawHeaders = response(this).request.getAllResponseHeaders() || "";
     rawHeaders.split("\n").forEach(function (h) {
       // According to the HTTP spec, the header string is terminated by an empty
       // line, so we can just skip it.
@@ -241,16 +240,16 @@ function Response(request) {
       // new line. We'll assume lastKey will be set because there should never
       // be an empty key on the first pass.
       if (key) {
-        _headers[key] = val;
+        headers[key] = val;
         lastKey = key;
       }
       else {
-        _headers[lastKey] += "\n" + val;
+        headers[lastKey] += "\n" + val;
       }
     });
-    return _headers;
-  })
-}
+    return headers;
+  }
+});
 
 // apiUtils.validateOptions doesn't give the ability to easily validate single
 // options, so this is a wrapper that provides that ability.

packages/addon-kit/lib/selection.js

@@ -12,9 +12,14 @@ if (!require("api-utils/xul-app").is("Firefox")) {
   ].join(""));
 }
 
-let { Ci } = require("chrome"),
+let { Ci, Cc } = require("chrome"),
     { setTimeout } = require("api-utils/timer"),
-    { EventEmitter } = require("api-utils/events");
+    { EventEmitter } = require("api-utils/events"),
+    { Unknown } = require("api-utils/xpcom");
+
+const windowMediator = Cc["@mozilla.org/appshell/window-mediator;1"].
+                       getService(Ci.nsIWindowMediator);
+
 
 // The selection type HTML
 const HTML = 0x01;
@@ -66,9 +71,6 @@ function Selection(rangeNumber) {
   });
 }
 
-require("api-utils/xpcom").utils.defineLazyServiceGetter(this, "windowMediator",
-  "@mozilla.org/appshell/window-mediator;1", "nsIWindowMediator");
-
 /**
  * Returns the most recent content window
  */
@@ -262,10 +264,8 @@ function onSelect() {
   SelectionListenerManager.onSelect();
 }
 
-let SelectionListenerManager = {
-  QueryInterface: require("api-utils/xpcom").utils.
-                  generateQI([Ci.nsISelectionListener]),
-
+let SelectionListenerManager = Unknown.extend({
+  interfaces: [ 'nsISelectionListener' ],
   // The collection of listeners wanting to be notified of selection changes
   listeners: EventEmitter.compose({
     emit: function emit(type) this._emitOnObject(exports, type),
@@ -325,7 +325,7 @@ let SelectionListenerManager = {
     let self = this;
     function wrap(count, func) {
       if (count-- > 0)
-        require("api-utils/timer").setTimeout(wrap, 0);
+        setTimeout(wrap, 0);
       else
         self.addSelectionListener(window);
     }
@@ -382,7 +382,7 @@ let SelectionListenerManager = {
     browser.removeEventListener("load", onLoad, true);
     browser.removeEventListener("unload", onUnload, true);
   }
-};
+});
 SelectionListenerManager.listeners.on('error', console.error);
 
 /**

packages/addon-kit/lib/widget.js

@@ -40,10 +40,11 @@ const { EventEmitter, EventEmitterTrait } = require("api-utils/events");
 const { Trait } = require("api-utils/traits");
 const LightTrait = require('api-utils/light-traits').Trait;
 const { Loader, Symbiont } = require("api-utils/content");
-const timer = require("api-utils/timer");
 const { Cortex } = require('api-utils/cortex');
 const windowsAPI = require("./windows");
+const { setTimeout } = require("api-utils/timer");
 const unload = require("api-utils/unload");
+const { uuid } = require("api-utils/uuid");
 
 // Data types definition
 const valid = {
@@ -692,7 +693,7 @@ WidgetChrome.prototype.update = function WC_update(updatedItem, property, value)
 WidgetChrome.prototype._createNode = function WC__createNode() {
   // XUL element container for widget
   let node = this._doc.createElement("toolbaritem");
-  let guid = require("api-utils/xpcom").makeUuid().toString();
+  let guid = String(uuid());
 
   // Temporary work around require("self") failing on unit-test execution ...
   let jetpackID = "testID";
@@ -796,7 +797,7 @@ WidgetChrome.prototype.setContent = function WC_setContent() {
     contentScriptWhen: this._widget.contentScriptWhen,
     allow: this._widget.allow,
     onMessage: function(message) {
-      timer.setTimeout(function() {
+      setTimeout(function() {
         self._widget._onEvent("message", message);
       }, 0);
     }
@@ -826,7 +827,7 @@ WidgetChrome.prototype.addEventHandlers = function WC_addEventHandlers() {
       return;
 
     // Proxy event to the widget
-    timer.setTimeout(function() {
+    setTimeout(function() {
       self._widget._onEvent(EVENTS[e.type], null, self.node);
     }, 0);
   };