Add header support to CrossOrigin.ajax

src/meta/eventPage.coffee

@@ -25,16 +25,19 @@ handlers =
     xhr.open 'GET', request.url, true
     xhr.responseType = request.responseType
     xhr.timeout = request.timeout
+    for key, value of (request.headers or {})
+      xhr.setRequestHeader key, value
     xhr.addEventListener 'load', ->
       {status, statusText, response} = @
+      responseHeaderString = @getAllResponseHeaders()
       if @readyState is @DONE && xhr.status is 200
         if request.responseType is 'arraybuffer'
           response = [new Uint8Array(response)...]
           contentType = @getResponseHeader 'Content-Type'
           contentDisposition = @getResponseHeader 'Content-Disposition'
-        cb {status, statusText, response, contentType, contentDisposition}
+        cb {status, statusText, response, responseHeaderString, contentType, contentDisposition}
       else
-        cb {status, statusText, response, error: true}
+        cb {status, statusText, response, responseHeaderString, error: true}
     , false
     xhr.addEventListener 'error', ->
       cb {error: true}

src/platform/CrossOrigin.coffee

@@ -68,45 +68,73 @@ CrossOrigin =
       blob.name = name
       cb blob
 
+  Request: class Request
+    status: 0
+    statusText: ''
+    response: null
+    responseHeaderString: null
+    getResponseHeader: (headerName) ->
+      if !@responseHeaders? and @responseHeaderString?
+        @responseHeaders = {}
+        for header in @responseHeaderString.split('\r\n')
+          if (i = header.indexOf(':')) >= 0
+            key = header[...i].trim().toLowerCase()
+            val = header[i+1..].trim()
+            @responseHeaders[key] = val
+      (@responseHeaders or {})[headerName.toLowerCase()] ? null
+
   # Attempts to fetch `url` in JSON format using cross-origin privileges, if available.
   # Interface is a subset of that of $.ajax.
-  # Returns an object with `status`, `statusText`, `response` properties, all initially set falsy.
+  # Options:
-  # On success, populates the properties.
+  #   `options.onloadend` - called with the returned object as `this` on success or error/abort/timeout.
-  # Both on success or error/abort/timeout, calls `options.onloadend` with the returned object as `this`.
+  #   `options.timeout` - time limit for request
-  ajax: (url, options={}) ->
+  #   `extra.headers` - request headers
+  # Returned object properties:
+  #   `status` - HTTP status (0 if connection not successful)
+  #   `statusText` - HTTP status text
+  #   `response` - decoded response body
+  #   `abort` - if present, can be called to abort the request
+  #   `getResponseHeader` - function for reading response headers
+  ajax: (url, options={}, extra={}) ->
     {onloadend, timeout} = options
+    {headers} = extra
 
     <% if (type === 'userscript') { %>
     unless GM?.xmlHttpRequest? or GM_xmlhttpRequest?
       return $.ajax url, options
     <% } %>
 
-    req =
+    req = new CrossOrigin.Request()
-      status: 0
+    req.onloadend = onloadend
-      statusText: ''
-      response: null
 
     <% if (type === 'userscript') { %>
-    gmReq = (GM?.xmlHttpRequest or GM_xmlhttpRequest)
+    gmReq = (GM?.xmlHttpRequest or GM_xmlhttpRequest) {
-      method: "GET"
+      method: 'GET'
-      url: url+''
+      url
-      timeout: timeout
+      headers
+      timeout
       onload: (xhr) ->
         try
-          response = JSON.parse(xhr.responseText)
+          response = if xhr.responseText then JSON.parse(xhr.responseText) else null
-          $.extend req, {response, status: xhr.status, statusText: xhr.statusText}
+          $.extend req, {
-        onloadend.call(req)
+            response
-      onerror:   -> onloadend.call(req)
+            status: xhr.status
-      onabort:   -> onloadend.call(req)
+            statusText: xhr.statusText
-      ontimeout: -> onloadend.call(req)
+            responseHeaderString: xhr.responseHeaders
+          }
+        req.onloadend()
+      onerror:   -> req.onloadend()
+      onabort:   -> req.onloadend()
+      ontimeout: -> req.onloadend()
+    }
     req.abort = gmReq.abort
     <% } %>
 
     <% if (type === 'crx') { %>
-    eventPageRequest {type: 'ajax', url, responseType: 'json', timeout}, (result) ->
+    eventPageRequest {type: 'ajax', url, responseType: 'json', headers, timeout}, (result) ->
       if result.status
         $.extend req, result
-      onloadend.call(req)
+      req.onloadend()
     <% } %>
 
     req