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

Unify how listeners are handled

Browse source
This commit is contained in:
Cheng Zhao 2015-12-11 21:02:44 +08:00
parent 9d406b695f
commit 79a627014c
2 changed files with 152 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

158
atom/browser/net/atom_network_delegate.cc
View file

@ -5,6 +5,7 @@
#include "atom/browser/net/atom_network_delegate.h" #include "atom/browser/net/atom_network_delegate.h"
#include "atom/common/native_mate_converters/net_converter.h" #include "atom/common/native_mate_converters/net_converter.h"
#include "base/stl_util.h"
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
#include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_thread.h"
#include "content/public/browser/resource_request_info.h" #include "content/public/browser/resource_request_info.h"
@ -43,19 +44,17 @@ AtomNetworkDelegate::BlockingResponse RunListener(
return callback.Run(*(details.get())); return callback.Run(*(details.get()));
} }
bool MatchesFilterCondition( bool MatchesFilterCondition(net::URLRequest* request,
net::URLRequest* request, const URLPatterns& patterns) {
const AtomNetworkDelegate::ListenerInfo& info) { if (patterns.empty())
if (!info.url_patterns.empty()) {
auto url = request->url();
for (auto& pattern : info.url_patterns)
if (pattern.MatchesURL(url))
return true; return true;
return false;
}
for (const auto& pattern : patterns) {
if (pattern.MatchesURL(request->url()))
return true; return true;
} }
return false;
}
void FillDetailsObject(base::DictionaryValue* details, void FillDetailsObject(base::DictionaryValue* details,
net::URLRequest* request) { net::URLRequest* request) {
@ -199,75 +198,67 @@ int AtomNetworkDelegate::OnBeforeURLRequest(
net::URLRequest* request, net::URLRequest* request,
const net::CompletionCallback& callback, const net::CompletionCallback& callback,
GURL* new_url) { GURL* new_url) {
auto listener_info = event_listener_map_.find(kOnBeforeRequest); if (!ContainsKey(event_listener_map_, kOnBeforeRequest))
if (listener_info != event_listener_map_.end()) { return brightray::NetworkDelegate::OnBeforeURLRequest(
if (!MatchesFilterCondition(request, listener_info->second)) request, callback, new_url);
const ListenerInfo& info = event_listener_map_[kOnBeforeRequest];
if (!MatchesFilterCondition(request, info.url_patterns))
return net::OK; return net::OK;
scoped_ptr<base::DictionaryValue> details(new base::DictionaryValue); scoped_ptr<base::DictionaryValue> details(new base::DictionaryValue);
FillDetailsObject(details.get(), request); FillDetailsObject(details.get(), request);
auto wrapped_callback = listener_info->second.callback;
BrowserThread::PostTaskAndReplyWithResult(BrowserThread::UI, FROM_HERE, BrowserThread::PostTaskAndReplyWithResult(BrowserThread::UI, FROM_HERE,
base::Bind(&RunListener, wrapped_callback, base::Passed(&details)), base::Bind(&RunListener, info.callback, base::Passed(&details)),
base::Bind(&OnBeforeURLRequestResponse, base::Bind(&OnBeforeURLRequestResponse,
callback, new_url)); callback, new_url));
return net::ERR_IO_PENDING; return net::ERR_IO_PENDING;
} }
return brightray::NetworkDelegate::OnBeforeURLRequest(request,
callback,
new_url);
}
int AtomNetworkDelegate::OnBeforeSendHeaders( int AtomNetworkDelegate::OnBeforeSendHeaders(
net::URLRequest* request, net::URLRequest* request,
const net::CompletionCallback& callback, const net::CompletionCallback& callback,
net::HttpRequestHeaders* headers) { net::HttpRequestHeaders* headers) {
auto listener_info = event_listener_map_.find(kOnBeforeSendHeaders); if (!ContainsKey(event_listener_map_, kOnBeforeSendHeaders))
if (listener_info != event_listener_map_.end()) { return brightray::NetworkDelegate::OnBeforeSendHeaders(
if (!MatchesFilterCondition(request, listener_info->second)) request, callback, headers);
const ListenerInfo& info = event_listener_map_[kOnBeforeSendHeaders];
if (!MatchesFilterCondition(request, info.url_patterns))
return net::OK; return net::OK;
scoped_ptr<base::DictionaryValue> details(new base::DictionaryValue); scoped_ptr<base::DictionaryValue> details(new base::DictionaryValue);
FillDetailsObject(details.get(), request); FillDetailsObject(details.get(), request);
FillDetailsObject(details.get(), *headers); FillDetailsObject(details.get(), *headers);
auto wrapped_callback = listener_info->second.callback;
BrowserThread::PostTaskAndReplyWithResult(BrowserThread::UI, FROM_HERE, BrowserThread::PostTaskAndReplyWithResult(BrowserThread::UI, FROM_HERE,
base::Bind(&RunListener, wrapped_callback, base::Passed(&details)), base::Bind(&RunListener, info.callback, base::Passed(&details)),
base::Bind(&OnBeforeSendHeadersResponse, base::Bind(&OnBeforeSendHeadersResponse,
callback, headers)); callback, headers));
return net::ERR_IO_PENDING; return net::ERR_IO_PENDING;
} }
return brightray::NetworkDelegate::OnBeforeSendHeaders(request,
callback,
headers);
}
void AtomNetworkDelegate::OnSendHeaders( void AtomNetworkDelegate::OnSendHeaders(
net::URLRequest* request, net::URLRequest* request,
const net::HttpRequestHeaders& headers) { const net::HttpRequestHeaders& headers) {
auto listener_info = event_listener_map_.find(kOnSendHeaders); if (!ContainsKey(event_listener_map_, kOnSendHeaders)) {
if (listener_info != event_listener_map_.end()) { brightray::NetworkDelegate::OnSendHeaders(request, headers);
if (!MatchesFilterCondition(request, listener_info->second)) return;
}
const ListenerInfo& info = event_listener_map_[kOnSendHeaders];
if (!MatchesFilterCondition(request, info.url_patterns))
return; return;
scoped_ptr<base::DictionaryValue> details(new base::DictionaryValue); scoped_ptr<base::DictionaryValue> details(new base::DictionaryValue);
FillDetailsObject(details.get(), request); FillDetailsObject(details.get(), request);
FillDetailsObject(details.get(), headers); FillDetailsObject(details.get(), headers);
auto wrapped_callback = listener_info->second.callback;
BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
base::Bind(base::IgnoreResult(&RunListener), base::Bind(base::IgnoreResult(&RunListener),
wrapped_callback, info.callback,
base::Passed(&details))); base::Passed(&details)));
} else {
brightray::NetworkDelegate::OnSendHeaders(request, headers);
}
} }
int AtomNetworkDelegate::OnHeadersReceived( int AtomNetworkDelegate::OnHeadersReceived(
@ -276,36 +267,37 @@ int AtomNetworkDelegate::OnHeadersReceived(
const net::HttpResponseHeaders* original_response_headers, const net::HttpResponseHeaders* original_response_headers,
scoped_refptr<net::HttpResponseHeaders>* override_response_headers, scoped_refptr<net::HttpResponseHeaders>* override_response_headers,
GURL* allowed_unsafe_redirect_url) { GURL* allowed_unsafe_redirect_url) {
auto listener_info = event_listener_map_.find(kOnHeadersReceived); if (!ContainsKey(event_listener_map_, kOnHeadersReceived))
if (listener_info != event_listener_map_.end()) { return brightray::NetworkDelegate::OnHeadersReceived(
if (!MatchesFilterCondition(request, listener_info->second)) request, callback, original_response_headers, override_response_headers,
allowed_unsafe_redirect_url);
const ListenerInfo& info = event_listener_map_[kOnHeadersReceived];
if (!MatchesFilterCondition(request, info.url_patterns))
return net::OK; return net::OK;
scoped_ptr<base::DictionaryValue> details(new base::DictionaryValue); scoped_ptr<base::DictionaryValue> details(new base::DictionaryValue);
FillDetailsObject(details.get(), request); FillDetailsObject(details.get(), request);
FillDetailsObject(details.get(), original_response_headers); FillDetailsObject(details.get(), original_response_headers);
auto wrapped_callback = listener_info->second.callback;
BrowserThread::PostTaskAndReplyWithResult(BrowserThread::UI, FROM_HERE, BrowserThread::PostTaskAndReplyWithResult(BrowserThread::UI, FROM_HERE,
base::Bind(&RunListener, wrapped_callback, base::Passed(&details)), base::Bind(&RunListener, info.callback, base::Passed(&details)),
base::Bind(&OnHeadersReceivedResponse, base::Bind(&OnHeadersReceivedResponse,
callback, callback,
original_response_headers, original_response_headers,
override_response_headers)); override_response_headers));
return net::ERR_IO_PENDING; return net::ERR_IO_PENDING;
} }
return brightray::NetworkDelegate::OnHeadersReceived(
request, callback, original_response_headers, override_response_headers,
allowed_unsafe_redirect_url);
}
void AtomNetworkDelegate::OnBeforeRedirect(net::URLRequest* request, void AtomNetworkDelegate::OnBeforeRedirect(net::URLRequest* request,
const GURL& new_location) { const GURL& new_location) {
auto listener_info = event_listener_map_.find(kOnBeforeRedirect); if (!ContainsKey(event_listener_map_, kOnBeforeRedirect)) {
if (listener_info != event_listener_map_.end()) { brightray::NetworkDelegate::OnBeforeRedirect(request, new_location);
if (!MatchesFilterCondition(request, listener_info->second)) return;
}
const ListenerInfo& info = event_listener_map_[kOnBeforeRedirect];
if (!MatchesFilterCondition(request, info.url_patterns))
return; return;
scoped_ptr<base::DictionaryValue> details(new base::DictionaryValue); scoped_ptr<base::DictionaryValue> details(new base::DictionaryValue);
@ -315,23 +307,23 @@ void AtomNetworkDelegate::OnBeforeRedirect(net::URLRequest* request,
FillDetailsObject(details.get(), request->GetSocketAddress()); FillDetailsObject(details.get(), request->GetSocketAddress());
FillDetailsObject(details.get(), request->was_cached()); FillDetailsObject(details.get(), request->was_cached());
auto wrapped_callback = listener_info->second.callback;
BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
base::Bind(base::IgnoreResult(&RunListener), base::Bind(base::IgnoreResult(&RunListener),
wrapped_callback, info.callback,
base::Passed(&details))); base::Passed(&details)));
} else {
brightray::NetworkDelegate::OnBeforeRedirect(request, new_location);
}
} }
void AtomNetworkDelegate::OnResponseStarted(net::URLRequest* request) { void AtomNetworkDelegate::OnResponseStarted(net::URLRequest* request) {
auto listener_info = event_listener_map_.find(kOnResponseStarted); if (!ContainsKey(event_listener_map_, kOnResponseStarted)) {
if (listener_info != event_listener_map_.end()) { brightray::NetworkDelegate::OnResponseStarted(request);
return;
}
if (request->status().status() != net::URLRequestStatus::SUCCESS) if (request->status().status() != net::URLRequestStatus::SUCCESS)
return; return;
if (!MatchesFilterCondition(request, listener_info->second)) const ListenerInfo& info = event_listener_map_[kOnResponseStarted];
if (!MatchesFilterCondition(request, info.url_patterns))
return; return;
scoped_ptr<base::DictionaryValue> details(new base::DictionaryValue); scoped_ptr<base::DictionaryValue> details(new base::DictionaryValue);
@ -339,32 +331,36 @@ void AtomNetworkDelegate::OnResponseStarted(net::URLRequest* request) {
FillDetailsObject(details.get(), request->response_headers()); FillDetailsObject(details.get(), request->response_headers());
FillDetailsObject(details.get(), request->was_cached()); FillDetailsObject(details.get(), request->was_cached());
auto wrapped_callback = listener_info->second.callback;
BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
base::Bind(base::IgnoreResult(&RunListener), base::Bind(base::IgnoreResult(&RunListener),
wrapped_callback, info.callback,
base::Passed(&details))); base::Passed(&details)));
} else {
brightray::NetworkDelegate::OnResponseStarted(request);
}
} }
void AtomNetworkDelegate::OnCompleted(net::URLRequest* request, bool started) { void AtomNetworkDelegate::OnCompleted(net::URLRequest* request, bool started) {
auto listener_info = event_listener_map_.find(kOnCompleted);
if (listener_info != event_listener_map_.end()) {
if (request->status().status() == net::URLRequestStatus::FAILED || if (request->status().status() == net::URLRequestStatus::FAILED ||
request->status().status() == net::URLRequestStatus::CANCELED) { request->status().status() == net::URLRequestStatus::CANCELED) {
// Error event.
if (ContainsKey(event_listener_map_, kOnErrorOccurred))
OnErrorOccurred(request); OnErrorOccurred(request);
else
brightray::NetworkDelegate::OnCompleted(request, started);
return; return;
} else { } else if (request->response_headers() &&
bool is_redirect = request->response_headers() &&
net::HttpResponseHeaders::IsRedirectResponseCode( net::HttpResponseHeaders::IsRedirectResponseCode(
request->response_headers()->response_code()); request->response_headers()->response_code())) {
if (is_redirect) // Redirect event.
brightray::NetworkDelegate::OnCompleted(request, started);
return; return;
} }
if (!MatchesFilterCondition(request, listener_info->second)) if (!ContainsKey(event_listener_map_, kOnCompleted)) {
brightray::NetworkDelegate::OnCompleted(request, started);
return;
}
const ListenerInfo& info = event_listener_map_[kOnCompleted];
if (!MatchesFilterCondition(request, info.url_patterns))
return; return;
scoped_ptr<base::DictionaryValue> details(new base::DictionaryValue); scoped_ptr<base::DictionaryValue> details(new base::DictionaryValue);
@ -372,20 +368,16 @@ void AtomNetworkDelegate::OnCompleted(net::URLRequest* request, bool started) {
FillDetailsObject(details.get(), request->response_headers()); FillDetailsObject(details.get(), request->response_headers());
FillDetailsObject(details.get(), request->was_cached()); FillDetailsObject(details.get(), request->was_cached());
auto wrapped_callback = listener_info->second.callback;
BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
base::Bind(base::IgnoreResult(&RunListener), base::Bind(base::IgnoreResult(&RunListener),
wrapped_callback, info.callback,
base::Passed(&details))); base::Passed(&details)));
} else {
brightray::NetworkDelegate::OnCompleted(request, started);
}
} }
void AtomNetworkDelegate::OnErrorOccurred(net::URLRequest* request) { void AtomNetworkDelegate::OnErrorOccurred(net::URLRequest* request) {
auto listener_info = event_listener_map_.find(kOnErrorOccurred);
if (listener_info != event_listener_map_.end()) { const ListenerInfo& info = event_listener_map_[kOnErrorOccurred];
if (!MatchesFilterCondition(request, listener_info->second)) if (!MatchesFilterCondition(request, info.url_patterns))
return; return;
scoped_ptr<base::DictionaryValue> details(new base::DictionaryValue); scoped_ptr<base::DictionaryValue> details(new base::DictionaryValue);
@ -393,12 +385,10 @@ void AtomNetworkDelegate::OnErrorOccurred(net::URLRequest* request) {
FillDetailsObject(details.get(), request->was_cached()); FillDetailsObject(details.get(), request->was_cached());
FillDetailsObject(details.get(), request->status()); FillDetailsObject(details.get(), request->status());
auto wrapped_callback = listener_info->second.callback;
BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
base::Bind(base::IgnoreResult(&RunListener), base::Bind(base::IgnoreResult(&RunListener),
wrapped_callback, info.callback,
base::Passed(&details))); base::Passed(&details)));
} }
}
} // namespace atom } // namespace atom

4
atom/browser/net/atom_network_delegate.h
View file

@ -22,6 +22,8 @@ class URLPattern;
namespace atom { namespace atom {
using URLPatterns = std::set<extensions::URLPattern>;
class AtomNetworkDelegate : public brightray::NetworkDelegate { class AtomNetworkDelegate : public brightray::NetworkDelegate {
public: public:
struct BlockingResponse; struct BlockingResponse;
@ -41,7 +43,7 @@ class AtomNetworkDelegate : public brightray::NetworkDelegate {
}; };
struct ListenerInfo { struct ListenerInfo {
std::set<extensions::URLPattern> url_patterns; URLPatterns url_patterns;
AtomNetworkDelegate::Listener callback; AtomNetworkDelegate::Listener callback;
}; };