bar.js: fixed manual refreshing via 'X-Tracy-Ajax': Tracy.getAjaxHead…

…er() (works only with fetch mode)
nette · Dec 20, 2021 · 59a3ae8 · 59a3ae8
1 parent 14a4225
commit 59a3ae8
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 18 deletions.
diff --git a/examples/ajax-fetch.php b/examples/ajax-fetch.php
@@ -61,8 +61,8 @@
 				method: 'GET',
 				headers: {
 					'Content-Type': 'application/json',
-					'X-Requested-With': 'XMLHttpRequest'
-					// 'X-Tracy-Ajax': Tracy.getAjaxHeader()}, // use when auto-refresh is disabled via window.TracyAutoRefresh = false;
+					'X-Requested-With': 'XMLHttpRequest',
+					//'X-Tracy-Ajax': Tracy.getAjaxHeader(), // use when auto-refresh is disabled via window.TracyAutoRefresh = false;
 				}
 			}
 		)

diff --git a/examples/ajax-jquery.php b/examples/ajax-jquery.php
@@ -62,8 +62,7 @@
 	jqxhr = $.ajax({
 		data: {error: $(this).hasClass('error') * 1},
 		dataType: 'json',
-		jsonp: false,
-		// headers: {'X-Tracy-Ajax': Tracy.getAjaxHeader()}, // use when auto-refresh is disabled via window.TracyAutoRefresh = false;
+		jsonp: false
 	}).done(function(data) {
 		$('#result').text('loaded: ' + data);
 

diff --git a/src/Tracy/Bar/assets/bar.js b/src/Tracy/Bar/assets/bar.js
@@ -466,16 +466,16 @@ class Debug
 
 
 	static captureAjax() {
-		let header = Tracy.getAjaxHeader();
-		if (!header) {
+		if (!contentId) {
 			return;
 		}
 		let oldOpen = XMLHttpRequest.prototype.open;
 
 		XMLHttpRequest.prototype.open = function() {
 			oldOpen.apply(this, arguments);
+
 			if (autoRefresh && new URL(arguments[1], location.origin).host === location.host) {
-				let reqId = header + '_' + ajaxCounter++;
+				let reqId = Tracy.getAjaxHeader();
 				this.setRequestHeader('X-Tracy-Ajax', reqId);
 				this.addEventListener('load', function() {
 					if (this.getAllResponseHeaders().match(/^X-Tracy-Ajax: 1/mi)) {
@@ -488,20 +488,20 @@ class Debug
 		let oldFetch = window.fetch;
 		window.fetch = function(request, options) {
 			request = request instanceof Request ? request : new Request(request, options || {});
+			let reqId = request.headers.get('X-Tracy-Ajax');
 
-			if (autoRefresh && new URL(request.url, location.origin).host === location.host) {
-				let reqId = header + '_' + ajaxCounter++;
+			if (autoRefresh && !reqId && new URL(request.url, location.origin).host === location.host) {
+				reqId = Tracy.getAjaxHeader();
 				request.headers.set('X-Tracy-Ajax', reqId);
-				return oldFetch(request).then((response) => {
-					if (response instanceof Response && response.headers.has('X-Tracy-Ajax') && response.headers.get('X-Tracy-Ajax')[0] === '1') {
-						Debug.loadScript(baseUrl + '_tracy_bar=content-ajax.' + reqId + '&XDEBUG_SESSION_STOP=1&v=' + Math.random());
-					}
-
-					return response;
-				});
 			}
 
-			return oldFetch(request);
+			return oldFetch(request).then((response) => {
+				if (response instanceof Response && response.headers.has('X-Tracy-Ajax') && response.headers.get('X-Tracy-Ajax')[0] === '1') {
+					Debug.loadScript(baseUrl + '_tracy_bar=content-ajax.' + reqId + '&XDEBUG_SESSION_STOP=1&v=' + Math.random());
+				}
+
+				return response;
+			});
 		};
 	}
 
@@ -686,7 +686,7 @@ let Tracy = window.Tracy = window.Tracy || {};
 Tracy.DebugPanel = Panel;
 Tracy.DebugBar = Bar;
 Tracy.Debug = Debug;
-Tracy.getAjaxHeader = () => contentId;
+Tracy.getAjaxHeader = () => contentId + '_' + ajaxCounter++;
 
 Debug.setOptions({
 	panelZIndex: Tracy.panelZIndex,