Skip to content

[WebProfiler] added support for window.fetch calls in ajax section #19576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ivoba wants to merge 4 commits into from
Closed

[WebProfiler] added support for window.fetch calls in ajax section #19576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af9225d
added support for window.fetch calls in ajax section
ivoba Aug 9, 2016
e080ca1
applied suggested fixes:
ivoba Aug 24, 2016
36cad1e
added type to profiler table, use 2nd argument instead of catch, usin…
ivoba Oct 5, 2016
385279c
fixed polyfill detect
ivoba Oct 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/ajax.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<thead>
<tr>
<th>Method</th>
<th>Type</th>
<th>Status</th>
<th>URL</th>
<th>Time</th>
Expand Down
44 changes: 44 additions & 0 deletions src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,10 @@
methodCell.textContent = request.method;
row.appendChild(methodCell);

var typeCell = document.createElement('td');
typeCell.textContent = request.type;
row.appendChild(typeCell);

var statusCodeCell = document.createElement('td');
var statusCode = document.createElement('span');
if (request.statusCode < 300) {
Expand Down Expand Up @@ -235,6 +239,45 @@
}

{% if excluded_ajax_paths is defined %}

Copy link
Member

@fabpot fabpot Sep 14, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

extra blank line here

if (window.fetch && window.fetch.polyfill === undefined) {
var oldFetch = window.fetch;
window.fetch = function () {
Copy link
Contributor

@romainneutron romainneutron Sep 30, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what about using fetch signature (fetch(url, options):promise) instead of relying on arguments? I think it's easier to read

Copy link
Contributor Author

@ivoba ivoba Oct 5, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

absolutly, fixed

var promise = oldFetch.apply(this, arguments);
if (!arguments[0].match(new RegExp({{ excluded_ajax_paths|json_encode|raw }}))) {
var method = 'GET';
if (arguments[1] && arguments[1].method !== undefined) {
method = arguments[1].method;
}

var stackElement = {
loading: true,
error: false,
url: arguments[0],
Copy link
Member

@stof stof Aug 23, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you need to match the URL against the excluded ajax paths before adding it in the request stack

method: method,
type: 'fetch',
start: new Date()
};

requestStack.push(stackElement);
promise.then(function (r) {
Copy link
Member

@stof stof Aug 23, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what if the promise gets rejected ? The stack element should not stay in loading state in this case

stackElement.duration = new Date() - stackElement.start;
stackElement.loading = false;
stackElement.error = r.status < 200 || r.status >= 400;
stackElement.statusCode = r.status;
stackElement.profile = r.headers.get('x-debug-token');
stackElement.profilerUrl = r.headers.get('x-debug-token-link');
Copy link
Member

@stof stof Aug 23, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this compatible with CORS restriction or will it log a security warning ?

Copy link
Member

@fabpot fabpot Sep 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@romainneutron any ideas?

Copy link
Contributor

@romainneutron romainneutron Sep 30, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm gonna try this PR

Sfjs.renderAjaxRequests();
}, function (e){
stackElement.loading = false;
stackElement.error = true;
Copy link
Contributor

@romainneutron romainneutron Sep 30, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what about adding a type so we could make distinction between ajax (xhr) and fetch in the toolbar. As they do not behave the same way, it may be useful, WDYT?

Copy link
Contributor Author

@ivoba ivoba Sep 30, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah was thinking about that too, but was bit afraid of the extra effort. i see what i can do.

Copy link
Member

@stof stof Sep 30, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

well, the extra work is mainly about figuring out the display. Adding the type property is not hard (it should just be done in both place initializing a stackElement)

Copy link
Contributor Author

@ivoba ivoba Oct 5, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i added type to stackElement and to display

});
Copy link
Contributor

@romainneutron romainneutron Sep 30, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what about adding the error content as a property and display this error in the toolbar?

Copy link
Contributor Author

@ivoba ivoba Oct 5, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

its a good idea, but maybe we can put this in another PR since its also not implemented for XHR, afaik, and it would need some more adjustments in how we render the table.

Sfjs.renderAjaxRequests();
}

return promise;
};
}
if (window.XMLHttpRequest && XMLHttpRequest.prototype.addEventListener) {
var proxied = XMLHttpRequest.prototype.open;

Expand All @@ -258,6 +301,7 @@
error: false,
url: url,
method: method,
type: 'xhr',
start: new Date()
};

Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@
padding: 4px;
}
.sf-ajax-request-url {
max-width: 300px;
max-width: 250px;
line-height: 9px;
overflow: hidden;
text-overflow: ellipsis;
Expand Down