Make URLRequestFetchJob actually work

atom/browser/net/url_request_fetch_job.cc

@@ -4,85 +4,141 @@
 
 #include "atom/browser/net/url_request_fetch_job.h"
 
-#include <string>
+#include <algorithm>
+#include <vector>
 
 #include "atom/browser/atom_browser_context.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
+#include "net/http/http_response_headers.h"
+#include "net/url_request/url_fetcher.h"
+#include "net/url_request/url_fetcher_response_writer.h"
 #include "net/url_request/url_request_status.h"
 
 namespace atom {
 
+namespace {
+
+// Pipe the response writer back to URLRequestFetchJob.
+class ResponsePiper : public net::URLFetcherResponseWriter {
+ public:
+  explicit ResponsePiper(URLRequestFetchJob* job)
+      : first_write_(true), job_(job) {}
+
+  // net::URLFetcherResponseWriter:
+  int Initialize(const net::CompletionCallback& callback) override {
+    return net::OK;
+  }
+  int Write(net::IOBuffer* buffer,
+            int num_bytes,
+            const net::CompletionCallback& callback) override {
+    job_->DataAvailable(buffer, num_bytes);
+    if (first_write_) {
+      // The URLFetcherResponseWriter doesn't have an event when headers have
+      // been read, so we have to emulate by hooking to first write event.
+      job_->HeadersCompleted();
+      first_write_ = false;
+    }
+    return num_bytes;
+  }
+  int Finish(const net::CompletionCallback& callback) override {
+    return net::OK;
+  }
+
+ private:
+  bool first_write_;
+  URLRequestFetchJob* job_;
+
+  DISALLOW_COPY_AND_ASSIGN(ResponsePiper);
+};
+
+}  // namespace
+
 URLRequestFetchJob::URLRequestFetchJob(
     net::URLRequest* request,
     net::NetworkDelegate* network_delegate,
     const GURL& url)
     : net::URLRequestJob(request, network_delegate),
       url_(url),
-      weak_ptr_factory_(this) {}
+      finished_(false),
+      weak_factory_(this) {}
 
-URLRequestFetchJob::~URLRequestFetchJob() {}
+void URLRequestFetchJob::HeadersCompleted() {
+  response_info_.reset(new net::HttpResponseInfo);
+  response_info_->headers = fetcher_->GetResponseHeaders();
+  NotifyHeadersComplete();
+}
+
+void URLRequestFetchJob::DataAvailable(net::IOBuffer* buffer, int num_bytes) {
+  buffer_.resize(buffer_.size() + num_bytes);
+  memcpy(buffer_.data() + buffer_.size() - num_bytes,
+         buffer->data(),
+         num_bytes);
+  SetStatus(net::URLRequestStatus());
+}
 
 void URLRequestFetchJob::Start() {
   fetcher_.reset(net::URLFetcher::Create(url_, net::URLFetcher::GET, this));
   auto context = AtomBrowserContext::Get()->url_request_context_getter();
   fetcher_->SetRequestContext(context);
-  fetcher_->SaveResponseWithWriter(scoped_ptr<net::URLFetcherResponseWriter>(
-      this));
+  fetcher_->SaveResponseWithWriter(make_scoped_ptr(new ResponsePiper(this)));
   fetcher_->Start();
 }
 
 void URLRequestFetchJob::Kill() {
-  weak_ptr_factory_.InvalidateWeakPtrs();
   URLRequestJob::Kill();
+  fetcher_.reset();
 }
 
 bool URLRequestFetchJob::ReadRawData(net::IOBuffer* dest,
                                      int dest_size,
                                      int* bytes_read) {
-  if (!dest_size) {
+  if (finished_) {
     *bytes_read = 0;
     return true;
   }
 
-  int to_read = dest_size < buffer_->BytesRemaining() ?
-      dest_size : buffer_->BytesRemaining();
-  memcpy(dest->data(), buffer_->data(), to_read);
-  buffer_->DidConsume(to_read);
-  if (!buffer_->BytesRemaining()) {
-    NotifyReadComplete(buffer_->size());
-    return true;
+  if (buffer_.size() == 0) {
+    SetStatus(net::URLRequestStatus(net::URLRequestStatus::IO_PENDING, 0));
+    return false;
   }
 
-  *bytes_read = to_read;
-  return false;
+  if (static_cast<size_t>(dest_size) >= buffer_.size()) {
+    // Copy all data at once (quick).
+    memcpy(dest->data(), buffer_.data(), buffer_.size());
+    *bytes_read = buffer_.size();
+    buffer_.clear();
+  } else {
+    // Can not fit all data, strip them (slow).
+    memcpy(dest->data(), buffer_.data(), dest_size);
+    *bytes_read = dest_size;
+    std::rotate(buffer_.begin(), buffer_.begin() + dest_size, buffer_.end());
+    buffer_.resize(buffer_.size() - dest_size);
+  }
+  return true;
+}
+
+bool URLRequestFetchJob::GetMimeType(std::string* mime_type) const {
+  if (!response_info_)
+    return false;
+
+  return response_info_->headers->GetMimeType(mime_type);
+}
+
+void URLRequestFetchJob::GetResponseInfo(net::HttpResponseInfo* info) {
+  if (response_info_)
+    *info = *response_info_;
+}
+
+int URLRequestFetchJob::GetResponseCode() const {
+  if (!response_info_)
+    return -1;
+
+  return response_info_->headers->response_code();
 }
 
 void URLRequestFetchJob::OnURLFetchComplete(const net::URLFetcher* source) {
-  if (!source->GetStatus().is_success())
-    NotifyDone(net::URLRequestStatus(net::URLRequestStatus::FAILED,
-                                     source->GetResponseCode()));
-
-  NotifyHeadersComplete();
-}
-
-
-int URLRequestFetchJob::Initialize(const net::CompletionCallback& callback) {
-  if (buffer_)
-    buffer_->Release();
-  return net::OK;
-}
-
-int URLRequestFetchJob::Write(net::IOBuffer* buffer,
-                              int num_bytes,
-                              const net::CompletionCallback& calback) {
-  buffer_ = new net::DrainableIOBuffer(buffer, num_bytes);
-  set_expected_content_size(num_bytes);
-  return num_bytes;
-}
-
-int URLRequestFetchJob::Finish(const net::CompletionCallback& callback) {
-  return net::OK;
+  finished_ = true;
 }
 
 }  // namespace atom