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

feat: add missing resourceType conversions for webRequest listener details (#29902)

Browse source
This commit is contained in:
Milan Burda 2021-07-08 09:19:16 +02:00 • committed by GitHub
parent 13bf2fd7ec
commit 635ed5a6e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
docs/api/web-request.md
View file

@ -54,7 +54,7 @@ The following methods are available on instances of `WebRequest`:
* `webContentsId` Integer (optional) * `webContentsId` Integer (optional)
* `webContents` WebContents (optional) * `webContents` WebContents (optional)
* `frame` WebFrameMain (optional) * `frame` WebFrameMain (optional)
* `resourceType` String * `resourceType` String - Can be `mainFrame`, `subFrame`, `stylesheet`, `script`, `image`, `font`, `object`, `xhr`, `ping`, `cspReport`, `media`, `webSocket` or `other`.
* `referrer` String * `referrer` String
* `timestamp` Double * `timestamp` Double
* `uploadData` [UploadData[]](structures/upload-data.md) * `uploadData` [UploadData[]](structures/upload-data.md)
@ -99,7 +99,7 @@ Some examples of valid `urls`:
* `webContentsId` Integer (optional) * `webContentsId` Integer (optional)
* `webContents` WebContents (optional) * `webContents` WebContents (optional)
* `frame` WebFrameMain (optional) * `frame` WebFrameMain (optional)
* `resourceType` String * `resourceType` String - Can be `mainFrame`, `subFrame`, `stylesheet`, `script`, `image`, `font`, `object`, `xhr`, `ping`, `cspReport`, `media`, `webSocket` or `other`.
* `referrer` String * `referrer` String
* `timestamp` Double * `timestamp` Double
* `requestHeaders` Record<string, string> * `requestHeaders` Record<string, string>
@ -128,7 +128,7 @@ The `callback` has to be called with a `response` object.
* `webContentsId` Integer (optional) * `webContentsId` Integer (optional)
* `webContents` WebContents (optional) * `webContents` WebContents (optional)
* `frame` WebFrameMain (optional) * `frame` WebFrameMain (optional)
* `resourceType` String * `resourceType` String - Can be `mainFrame`, `subFrame`, `stylesheet`, `script`, `image`, `font`, `object`, `xhr`, `ping`, `cspReport`, `media`, `webSocket` or `other`.
* `referrer` String * `referrer` String
* `timestamp` Double * `timestamp` Double
* `requestHeaders` Record<string, string> * `requestHeaders` Record<string, string>
@ -150,7 +150,7 @@ response are visible by the time this listener is fired.
* `webContentsId` Integer (optional) * `webContentsId` Integer (optional)
* `webContents` WebContents (optional) * `webContents` WebContents (optional)
* `frame` WebFrameMain (optional) * `frame` WebFrameMain (optional)
* `resourceType` String * `resourceType` String - Can be `mainFrame`, `subFrame`, `stylesheet`, `script`, `image`, `font`, `object`, `xhr`, `ping`, `cspReport`, `media`, `webSocket` or `other`.
* `referrer` String * `referrer` String
* `timestamp` Double * `timestamp` Double
* `statusLine` String * `statusLine` String
@ -183,7 +183,7 @@ The `callback` has to be called with a `response` object.
* `webContentsId` Integer (optional) * `webContentsId` Integer (optional)
* `webContents` WebContents (optional) * `webContents` WebContents (optional)
* `frame` WebFrameMain (optional) * `frame` WebFrameMain (optional)
* `resourceType` String * `resourceType` String - Can be `mainFrame`, `subFrame`, `stylesheet`, `script`, `image`, `font`, `object`, `xhr`, `ping`, `cspReport`, `media`, `webSocket` or `other`.
* `referrer` String * `referrer` String
* `timestamp` Double * `timestamp` Double
* `responseHeaders` Record<string, string[]> (optional) * `responseHeaders` Record<string, string[]> (optional)
@ -209,7 +209,7 @@ and response headers are available.
* `webContentsId` Integer (optional) * `webContentsId` Integer (optional)
* `webContents` WebContents (optional) * `webContents` WebContents (optional)
* `frame` WebFrameMain (optional) * `frame` WebFrameMain (optional)
* `resourceType` String * `resourceType` String - Can be `mainFrame`, `subFrame`, `stylesheet`, `script`, `image`, `font`, `object`, `xhr`, `ping`, `cspReport`, `media`, `webSocket` or `other`.
* `referrer` String * `referrer` String
* `timestamp` Double * `timestamp` Double
* `redirectURL` String * `redirectURL` String
@ -236,7 +236,7 @@ redirect is about to occur.
* `webContentsId` Integer (optional) * `webContentsId` Integer (optional)
* `webContents` WebContents (optional) * `webContents` WebContents (optional)
* `frame` WebFrameMain (optional) * `frame` WebFrameMain (optional)
* `resourceType` String * `resourceType` String - Can be `mainFrame`, `subFrame`, `stylesheet`, `script`, `image`, `font`, `object`, `xhr`, `ping`, `cspReport`, `media`, `webSocket` or `other`.
* `referrer` String * `referrer` String
* `timestamp` Double * `timestamp` Double
* `responseHeaders` Record<string, string[]> (optional) * `responseHeaders` Record<string, string[]> (optional)
@ -261,7 +261,7 @@ completed.
* `webContentsId` Integer (optional) * `webContentsId` Integer (optional)
* `webContents` WebContents (optional) * `webContents` WebContents (optional)
* `frame` WebFrameMain (optional) * `frame` WebFrameMain (optional)
* `resourceType` String * `resourceType` String - Can be `mainFrame`, `subFrame`, `stylesheet`, `script`, `image`, `font`, `object`, `xhr`, `ping`, `cspReport`, `media`, `webSocket` or `other`.
* `referrer` String * `referrer` String
* `timestamp` Double * `timestamp` Double
* `fromCache` Boolean * `fromCache` Boolean

28
shell/browser/api/electron_api_web_request.cc
View file

@ -29,19 +29,6 @@
namespace gin { namespace gin {
template <>
struct Converter<URLPattern> {
static bool FromV8(v8::Isolate* isolate,
v8::Local<v8::Value> val,
URLPattern* out) {
std::string pattern;
if (!ConvertFromV8(isolate, val, &pattern))
return false;
*out = URLPattern(URLPattern::SCHEME_ALL);
return out->Parse(pattern) == URLPattern::ParseResult::kSuccess;
}
};
template <> template <>
struct Converter<extensions::WebRequestResourceType> { struct Converter<extensions::WebRequestResourceType> {
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
@ -63,12 +50,27 @@ struct Converter<extensions::WebRequestResourceType> {
case extensions::WebRequestResourceType::IMAGE: case extensions::WebRequestResourceType::IMAGE:
result = "image"; result = "image";
break; break;
case extensions::WebRequestResourceType::FONT:
result = "font";
break;
case extensions::WebRequestResourceType::OBJECT: case extensions::WebRequestResourceType::OBJECT:
result = "object"; result = "object";
break; break;
case extensions::WebRequestResourceType::XHR: case extensions::WebRequestResourceType::XHR:
result = "xhr"; result = "xhr";
break; break;
case extensions::WebRequestResourceType::PING:
result = "ping";
break;
case extensions::WebRequestResourceType::CSP_REPORT:
result = "cspReport";
break;
case extensions::WebRequestResourceType::MEDIA:
result = "media";
break;
case extensions::WebRequestResourceType::WEB_SOCKET:
result = "webSocket";
break;
default: default:
result = "other"; result = "other";
} }