mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Refactoring net module, adding a ClientRequest and IncomingMessage classes.

Browse source
This commit is contained in:
ali.ibrahim 2016-09-27 10:21:11 +02:00
parent fcaf9cb031
commit 9498a5738a
5 changed files with 191 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

38
atom/browser/api/atom_api_url_request.cc
View file

@ -115,8 +115,6 @@ mate::WrappableBase* URLRequest::New(mate::Arguments* args) {
auto session = Session::FromPartition(args->isolate(), session_name);
auto browser_context = session->browser_context();
auto api_url_request = new URLRequest(args->isolate(), args->GetThis());
auto weak_ptr = api_url_request->weak_ptr_factory_.GetWeakPtr();
auto atom_url_request = AtomURLRequest::Create(
@ -126,12 +124,10 @@ mate::WrappableBase* URLRequest::New(mate::Arguments* args) {
weak_ptr);
api_url_request->atom_request_ = atom_url_request;
return api_url_request;
}
// static
void URLRequest::BuildPrototype(v8::Isolate* isolate,
v8::Local<v8::FunctionTemplate> prototype) {
@ -139,17 +135,17 @@ void URLRequest::BuildPrototype(v8::Isolate* isolate,
mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
// Request API
.MakeDestroyable()
.SetMethod("_writeBuffer", &URLRequest::WriteBuffer)
.SetMethod("writeBuffer", &URLRequest::WriteBuffer)
.SetMethod("abort", &URLRequest::Abort)
.SetMethod("_setHeader", &URLRequest::SetHeader)
.SetMethod("_getHeader", &URLRequest::GetHeader)
.SetMethod("_removaHeader", &URLRequest::RemoveHeader)
.SetMethod("setExtraHeader", &URLRequest::SetExtraHeader)
.SetMethod("removeExtraHeader", &URLRequest::RemoveExtraHeader)
.SetMethod("setChunkedUpload", &URLRequest::SetChunkedUpload)
// Response APi
.SetProperty("_statusCode", &URLRequest::StatusCode)
.SetProperty("_statusMessage", &URLRequest::StatusMessage)
.SetProperty("_rawResponseHeaders", &URLRequest::RawResponseHeaders)
.SetProperty("_httpVersionMajor", &URLRequest::ResponseHttpVersionMajor)
.SetProperty("_httpVersionMinor", &URLRequest::ResponseHttpVersionMinor);
.SetProperty("statusCode", &URLRequest::StatusCode)
.SetProperty("statusMessage", &URLRequest::StatusMessage)
.SetProperty("rawResponseHeaders", &URLRequest::RawResponseHeaders)
.SetProperty("httpVersionMajor", &URLRequest::ResponseHttpVersionMajor)
.SetProperty("httpVersionMinor", &URLRequest::ResponseHttpVersionMinor);
}
@ -166,7 +162,7 @@ void URLRequest::Abort() {
atom_request_->Abort();
}
bool URLRequest::SetHeader(const std::string& name,
bool URLRequest::SetExtraHeader(const std::string& name,
const std::string& value) {
if (!net::HttpUtil::IsValidHeaderName(name)) {
return false;
@ -176,14 +172,16 @@ bool URLRequest::SetHeader(const std::string& name,
return false;
}
atom_request_->SetHeader(name, value);
atom_request_->SetExtraHeader(name, value);
return true;
}
std::string URLRequest::GetHeader(const std::string& name) {
return atom_request_->GetHeader(name);
void URLRequest::RemoveExtraHeader(const std::string& name) {
atom_request_->RemoveExtraHeader(name);
}
void URLRequest::RemoveHeader(const std::string& name) {
atom_request_->RemoveHeader(name);
void URLRequest::SetChunkedUpload(bool is_chunked_upload) {
atom_request_->SetChunkedUpload(is_chunked_upload);
}
void URLRequest::OnAuthenticationRequired(
@ -196,7 +194,7 @@ void URLRequest::OnAuthenticationRequired(
void URLRequest::OnResponseStarted() {
EmitRequestEvent("response");
Emit("response");
}
void URLRequest::OnResponseData(

6
atom/browser/api/atom_api_url_request.h
View file

@ -35,9 +35,9 @@ private:
bool WriteBuffer(scoped_refptr<const net::IOBufferWithSize> buffer,
bool is_last);
void Abort();
bool SetHeader(const std::string& name, const std::string& value);
std::string GetHeader(const std::string& name);
void RemoveHeader(const std::string& name);
bool SetExtraHeader(const std::string& name, const std::string& value);
void RemoveExtraHeader(const std::string& name);
void SetChunkedUpload(bool is_chunked_upload);
friend class AtomURLRequest;
void OnAuthenticationRequired(

20
atom/browser/net/atom_url_request.cc
View file

@ -95,13 +95,13 @@ bool AtomURLRequest::WriteBuffer(
base::Bind(&AtomURLRequest::DoWriteBuffer, this, buffer, is_last));
}
void AtomURLRequest::SetChunkedUpload() {
void AtomURLRequest::SetChunkedUpload(bool is_chunked_upload) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
// The method can be called only before switching to multi-threaded mode,
// i.e. before the first call to write.
// So it is safe to change the object in the UI thread.
is_chunked_upload_ = true;
is_chunked_upload_ = is_chunked_upload;
}
@ -109,26 +109,14 @@ void AtomURLRequest::Abort() const {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
}
void AtomURLRequest::SetHeader(const std::string& name,
void AtomURLRequest::SetExtraHeader(const std::string& name,
const std::string& value) const {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
request_->SetExtraRequestHeaderByName(name, value, true);
}
std::string AtomURLRequest::GetHeader(const std::string& name) const {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
std::string result;
const auto& extra_headers = request_->extra_request_headers();
if (!extra_headers.GetHeader(name, &result)) {
net::HttpRequestHeaders* request_headers = nullptr;
if (request_->GetFullRequestHeaders(request_headers) && request_headers) {
request_headers->GetHeader(name, &result);
}
}
return result;
}
void AtomURLRequest::RemoveHeader(const std::string& name) const {
void AtomURLRequest::RemoveExtraHeader(const std::string& name) const {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
request_->RemoveRequestHeaderByName(name);
}

7
atom/browser/net/atom_url_request.h
View file

@ -36,11 +36,10 @@ public:
bool WriteBuffer(scoped_refptr<const net::IOBufferWithSize> buffer,
bool is_last);
void SetChunkedUpload();
void SetChunkedUpload(bool is_chunked_upload);
void Abort() const;
void SetHeader(const std::string& name, const std::string& value) const;
std::string GetHeader(const std::string& name) const;
void RemoveHeader(const std::string& name) const;
void SetExtraHeader(const std::string& name, const std::string& value) const;
void RemoveExtraHeader(const std::string& name) const;
void PassLoginInformation(const base::string16& username,
const base::string16& password) const;
scoped_refptr<const net::HttpResponseHeaders> GetResponseHeaders() const;