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

first attempt to track the origin requesters of webRequest events

Browse source
This commit is contained in:
Boik 2017-09-02 21:49:42 +08:00
parent 59cadf9e4b
commit 549c30f9b2
3 changed files with 6338 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -75,9 +75,14 @@ void ToDictionary(base::DictionaryValue* details, net::URLRequest* request) {
details->SetInteger("id", request->identifier()); details->SetInteger("id", request->identifier());
details->SetDouble("timestamp", base::Time::Now().ToDoubleT() * 1000); details->SetDouble("timestamp", base::Time::Now().ToDoubleT() * 1000);
auto info = content::ResourceRequestInfo::ForRequest(request); auto info = content::ResourceRequestInfo::ForRequest(request);
details->SetString("resourceType", if (info) {
info ? ResourceTypeToString(info->GetResourceType()) int64_t process_id = info->GetChildID();
: "other"); int64_t routing_id = info->GetRouteID();
details->SetDouble("webContentsGetId", (process_id << 32) + routing_id);
details->SetString("resourceType", ResourceTypeToString(info->GetResourceType()));
} else {
details->SetString("resourceType", "other");
}
} }
void ToDictionary(base::DictionaryValue* details, void ToDictionary(base::DictionaryValue* details,

6329
package-lock.json generated Normal file
View file

File diff suppressed because it is too large Load diff

1
spec/api-web-request-spec.js
View file

@ -89,6 +89,7 @@ describe('webRequest module', function () {
ses.webRequest.onBeforeRequest(function (details, callback) { ses.webRequest.onBeforeRequest(function (details, callback) {
assert.equal(typeof details.id, 'number') assert.equal(typeof details.id, 'number')
assert.equal(typeof details.timestamp, 'number') assert.equal(typeof details.timestamp, 'number')
assert.equal(typeof details.webContentsGetId, 'number')
assert.equal(details.url, defaultURL) assert.equal(details.url, defaultURL)
assert.equal(details.method, 'GET') assert.equal(details.method, 'GET')
assert.equal(details.resourceType, 'xhr') assert.equal(details.resourceType, 'xhr')