@webqit/webflo 0.8.72 → 0.8.75

package/package.json

@@ -12,7 +12,7 @@
     "vanila-javascript"
   ],
   "homepage": "https://webqit.io/tooling/webflo",
-  "version": "0.8.72",
+  "version": "0.8.75",
   "license": "MIT",
   "repository": {
     "type": "git",

package/src/runtime/client/Http.js

@@ -45,22 +45,24 @@ export default class Http {
 			 * @return void
 			 */
 			async go(url, options = {}) {
-				if (this.activeController) {
-					this.activeController.abort();
+				if (this.abortController) {
+					this.abortController.abort();
 				}
-				this.activeController = new AbortController();
+				this.abortController = new AbortController();
+				let xRedirectCode = 300;
 				// Generates request object
 				let generateRequest = (url, options) => {
 					return new StdRequest(url, {
 						...options,
 						headers: {
 							'Accept': 'application/json',
-							'X-No-Cors-Redirect': 'manual',
+							'X-Redirect-Policy': 'manual-when-cross-origin',
+							'X-Redirect-Code': xRedirectCode,
 							'X-Powered-By': '@webqit/webflo',
 							...(options.headers || {}),
 						},
 						referrer: window.document.location.href,
-						signal: this.activeController.signal,
+						signal: this.abortController.signal,
 					});
 				};
 				// Handles response object
@@ -70,14 +72,14 @@ export default class Http {
 						Observer.set(this.location, { href: response.url }, {
 							detail: { isRedirect: true },
 						});
-					} else if (response.headers.get('X-No-Cors-Redirect')) {
+					} else if (response.headers.get('Location') && response.status === xRedirectCode) {
 						window.location = response.headers.get('Location');
 					}
 				};
 				url = typeof url === 'string' ? { href: url } : url;
-				options = { referrer: window.document.location.href, ...options };
+				options = { referrer: this.location.href, ...options };
 				Observer.set(this.location, url, { detail: options, });
-				if (options.srcType === 'history' || !(_before(url.href, '#') === _before(options.referrer, '#') && (options.method || 'GET').toUpperCase() === 'GET')) {
+				if (!(_before(url.href, '#') === _before(options.referrer, '#') && (options.method || 'GET').toUpperCase() === 'GET')) {
 					handleResponse(await client.call(this, generateRequest(url.href, options)));
 				}
 			},
@@ -108,7 +110,13 @@ export default class Http {
 		};
 
 		// -----------------------
-		// Initialize instance
+		// Initialize network
+		Observer.set(instance, 'network', {});
+		window.addEventListener('online', () => Observer.set(instance.network, 'online', navigator.onLine));
+		window.addEventListener('offline', () => Observer.set(instance.network, 'online', navigator.onLine));
+
+		// -----------------------
+		// Initialize location
 		Observer.set(instance, 'location', new Url(window.document.location));
 		// -----------------------
 		// Syndicate changes to the browser;s location bar
@@ -169,14 +177,14 @@ export default class Http {
 		// Capture all form-submit
 		// and fire to this router.
 		window.addEventListener('submit', e => {
-			var form = e.target.closest('form'),
-				submits = [e.submitter]; //_arrFrom(form.elements).filter(el => el.matches('button,input[type="submit"],input[type="image"]'));
+			var form = e.target.closest('form'), submitter = e.submitter;
 			var submitParams = [ 'action', 'enctype', 'method', 'noValidate', 'target' ].reduce((params, prop) => {
-				params[prop] = submits.reduce((val, el) => val || (el.hasAttribute(`form${prop.toLowerCase()}`) ? el[`form${_toTitle(prop)}`] : null), null) || form[prop];
+				params[prop] = submitter && submitter.hasAttribute(`form${prop.toLowerCase()}`) ? submitter[`form${_toTitle(prop)}`] : form[prop];
 				return params;
 			}, {});
 			// We support method hacking
-			submitParams.method = e.submitter.dataset.method || form.dataset.method || submitParams.method;
+			submitParams.method = (submitter && submitter.dataset.method) || form.dataset.method || submitParams.method;
+			submitParams.submitter = submitter;
 			// ---------------
 			var actionEl = window.document.createElement('a');
 			actionEl.href = submitParams.action;
@@ -186,8 +194,8 @@ export default class Http {
 				if (e.metaKey || e.altKey || e.ctrlKey || e.shiftKey) return;
 				// Build data
 				var formData = new FormData(form);
-				if (e.submitter.name) {
-					formData.set(e.submitter.name, e.submitter.value);
+				if ((submitter || {}).name) {
+					formData.set(submitter.name, submitter.value);
 				}
 				if (submitParams.method.toUpperCase() === 'GET') {
 					var query = wwwFormUnserialize(actionEl.search);

package/src/runtime/client/Navigator.js

@@ -0,0 +1,250 @@
+
+/**
+ * @imports
+ */
+import _before from '@webqit/util/str/before.js';
+import _toTitle from '@webqit/util/str/toTitle.js';
+import { wwwFormUnserialize, wwwFormSet, wwwFormSerialize } from '../util.js';
+import { Observer } from './Runtime.js';
+import Url from './Url.js';
+
+export default class Navigator {
+
+    constructor(client) {
+        this.client = client;
+
+		/**
+		 * ----------------
+		 * Navigator location
+		 * ----------------
+		 */
+
+		// -----------------------
+		// Initialize location
+		Observer.set(this, 'location', new Url(window.document.location));
+		// -----------------------
+		// Syndicate changes to the browser;s location bar
+		Observer.observe(this.location, [[ 'href' ]], ([e]) => {
+			if (e.value === 'http:' || (e.detail || {}).src === window.document.location) {
+				// Already from a "popstate" event as above, so don't push again
+				return;
+			}
+			if (e.value === window.document.location.href || e.value + '/' === window.document.location.href) {
+				window.history.replaceState(window.history.state, '', this.location.href);
+			} else {
+				try { window.history.pushState(window.history.state, '', this.location.href); } catch(e) {}
+			}
+		}, { diff: true });
+
+		// -----------------------
+		// This event is triggered by
+		// either the browser back button,
+		// the window.history.back(),
+		// the window.history.forward(),
+		// or the window.history.go() action.
+		window.addEventListener('popstate', e => {
+			// Needed to allow window.document.location
+			// to update to window.location
+			window.setTimeout(() => {
+				this.go(Url.copy(window.document.location), { src: window.document.location, srcType: 'history', });
+			}, 0);
+		});
+
+		// -----------------------
+		// Capture all link-clicks
+		// and fire to this router.
+		window.addEventListener('click', e => {
+			var anchor = e.target.closest('a');
+			if (!anchor || !anchor.href) return;
+			if (!anchor.target && !anchor.download && (!anchor.origin || anchor.origin === this.location.origin)) {
+				if (e.metaKey || e.altKey || e.ctrlKey || e.shiftKey) return;
+				// Publish everything, including hash
+				this.go(Url.copy(anchor), { src: anchor, srcType: 'link', });
+				// URLs with # will cause a natural navigation
+				// even if pointing to a different page, a natural navigation will still happen
+				// because with the Observer.set() above, window.document.location.href would have become
+				// the destination page, which makes it look like same page navigation
+				if (!anchor.href.includes('#')) {
+					e.preventDefault();
+				}
+			}
+		});
+
+		// -----------------------
+		// Capture all form-submit
+		// and fire to this router.
+		window.addEventListener('submit', e => {
+			var form = e.target.closest('form'), submitter = e.submitter;
+			var submitParams = [ 'action', 'enctype', 'method', 'noValidate', 'target' ].reduce((params, prop) => {
+				params[prop] = submitter && submitter.hasAttribute(`form${prop.toLowerCase()}`) ? submitter[`form${_toTitle(prop)}`] : form[prop];
+				return params;
+			}, {});
+			// We support method hacking
+			submitParams.method = (submitter && submitter.dataset.method) || form.dataset.method || submitParams.method;
+			submitParams.submitter = submitter;
+			// ---------------
+			var actionEl = window.document.createElement('a');
+			actionEl.href = submitParams.action;
+			// ---------------
+			// If not targeted and same origin...
+			if (!submitParams.target && (!actionEl.origin || actionEl.origin === this.location.origin)) {
+				if (e.metaKey || e.altKey || e.ctrlKey || e.shiftKey) return;
+				// Build data
+				var formData = new FormData(form);
+				if ((submitter || {}).name) {
+					formData.set(submitter.name, submitter.value);
+				}
+				if (submitParams.method.toUpperCase() === 'GET') {
+					var query = wwwFormUnserialize(actionEl.search);
+					Array.from(formData.entries()).forEach(_entry => {
+						wwwFormSet(query, _entry[0], _entry[1], false);
+					});
+					actionEl.search = wwwFormSerialize(query);
+					formData = null;
+				}
+				this.go(Url.copy(actionEl), { ...submitParams, body: formData, src: form, srcType: 'form', });
+				// URLs with # will cause a natural navigation
+				// even if pointing to a different page, a natural navigation will still happen
+				// because with the Observer.set() above, window.document.location.href would have become
+				// the destination page, which makes it look like same page navigation
+				if (!actionEl.hash) {
+					e.preventDefault();
+				}
+			}
+		});
+
+		/**
+		 * ----------------
+		 * Navigator network
+		 * ----------------
+		 */
+
+		// -----------------------
+		// Initialize network
+		Observer.set(this, 'network', {});
+		window.addEventListener('online', () => Observer.set(this.network, 'online', navigator.onLine));
+		window.addEventListener('offline', () => Observer.set(this.network, 'online', navigator.onLine));
+
+		/**
+		 * ----------------
+		 * Initial navigation
+		 * ----------------
+		 */
+
+        this.go(this.location, { srcType: 'init' });
+     }
+
+    /**
+     * History object
+     */
+    get history() {
+        return window.history;
+    }
+
+    /**
+     * Performs a request.
+     *
+     * @param object|string 	href
+     * @param object 			params
+     *
+     * @return void
+     */
+    async go(url, params = {}) {
+
+        // Generates request object
+        const generateRequest = (url, params) => {
+            return new Request(url, {
+                ...params,
+                headers: {
+                    'Accept': 'application/json',
+					'Cache-Control': 'no-store',
+                    'X-Redirect-Policy': 'manual-when-cross-origin',
+                    'X-Redirect-Code': xRedirectCode,
+                    'X-Powered-By': '@webqit/webflo',
+                    ...(params.headers || {}),
+                },
+                referrer: window.document.location.href,
+                signal: this._abortController.signal,
+            });
+        };
+
+        // Initiates remote fetch and sets the status
+        const remoteRequest = request => {
+            Observer.set(this.network, 'remote', true);
+            let _response = fetch(request);
+            // This catch() is NOT intended to handle failure of the fetch
+            _response.catch(e => Observer.set(this.network, 'error', e.message));
+            // Save a reference to this
+            return _response.then(async response => {
+                // Stop loading status
+                Observer.set(this.network, 'remote', false);
+                return response;
+            });
+        };
+
+        // Handles response object
+        const handleResponse = async (response, params) => {
+            response = await response;
+            Observer.set(this.network, 'remote', false);
+            Observer.set(this.network, 'error', null);
+            if (['link', 'form'].includes(params.srcType)) {
+                Observer.set(params.src, 'active', false);
+                Observer.set(params.submitter || {}, 'active', false);
+            }
+            if (!response) return;
+            if (response.redirected && this.isSameOrigin(response.url)) {
+                Observer.set(this.location, { href: response.url }, {
+                    detail: { isRedirect: true },
+                });
+                return;
+            }
+            let location = response.headers.get('Location');
+            if (location && response.status === xRedirectCode) {
+                Observer.set(this.network, 'redirecting', location);
+                window.location = location;
+            }
+        };
+
+        // ------------
+        url = typeof url === 'string' ? { href: url } : url;
+        params = { referrer: this.location.href, ...params };
+        // ------------
+        Observer.set(this.location, url, { detail: params, });
+        Observer.set(this.network, 'redirecting', null);
+        // ------------
+        if (['link', 'form'].includes(params.srcType)) {
+            Observer.set(params.src, 'active', true);
+            Observer.set(params.submitter || {}, 'active', true);
+        }
+        // ------------
+
+        if (this._abortController) {
+            this._abortController.abort();
+        }
+        this._abortController = new AbortController();
+        let xRedirectCode = 300;
+
+        if (params.srcType === 'init' || !(_before(url.href, '#') === _before(params.referrer, '#') && (params.method || 'GET').toUpperCase() === 'GET')) {
+            handleResponse(this.client.call(this, generateRequest(url.href, params), params, remoteRequest), params);
+        }
+
+        return this._abortController;
+    }
+
+    /**
+     * Checks if an URL is same origin.
+     *
+     * @param object|string 	url
+     *
+     * @return Bool
+     */
+    isSameOrigin(url) {
+        if (typeof url === 'string') {
+            let href = url;
+            url = window.document.createElement('a');
+            url.href = href
+        }
+        return !url.origin || url.origin === this.location.origin;
+    }
+
+}

package/src/runtime/client/Runtime.js

@@ -10,7 +10,7 @@ import NavigationEvent from './NavigationEvent.js';
 import WorkerClient from './WorkerClient.js';
 import Storage from './Storage.js';
 import Router from './Router.js';
-import Http from './Http.js';
+import Navigator from './Navigator.js';
 
 /**
  * ---------------------------
@@ -21,184 +21,106 @@ import Http from './Http.js';
 export const { Observer } = window.WebQit;
 export default function(layout, params) {
 
-	const session = Storage();
-	const workerClient = new WorkerClient('/worker.js', { startMessages: true });
-	Observer.observe(workerClient, changes => {
-		console.log('SERVICE_WORKER_STATE', changes[0].name, changes[0].value);
-	});
-
-	// Copy..
 	layout = {...layout};
 	params = {...params};
-	window.addEventListener('online', () => Observer.set(networkWatch, 'online', navigator.onLine));
-	window.addEventListener('offline', () => Observer.set(networkWatch, 'online', navigator.onLine));
-	var networkProgressOngoing;
-
-	/**
-	 * ----------------
-	 * Apply routing
-	 * ----------------
-	 */	
-
-	Http.createClient(async function(request, event = null) {
 
-		const httpInstance = this;
-
-        // -------------------
-        // Resolve canonicity
-        // -------------------
-
-		// The srvice object
-		const $context = {
-			layout,
-			onHydration: !event && (await window.WebQit.OOHTML.meta.get('isomorphic')),
-			response: null,
-		}
+	const session = Storage();
+	const workerClient = new WorkerClient('/worker.js', { startMessages: true });
+	const navigator = new Navigator(async (request, params, remoteFetch) => {
 		
-		// The app router
-		const clientNavigationEvent = new NavigationEvent(request, session);
-		const requestPath = clientNavigationEvent.url.pathname;
-		const router = new Router(requestPath, layout, $context);
-		if (networkProgressOngoing) {
-			networkProgressOngoing.setActive(false);
-			networkProgressOngoing = null;
-		}
+		// The navigation event
+		const clientNavigationEvent = new NavigationEvent(
+			new NavigationEvent.Request(request),
+			session,
+		);
 
-		try {
+		// The app router
+		const router = new Router(clientNavigationEvent.url.pathname, layout, {
+			layout,
+			onHydration: params.srcType === 'init',
+		});
 
-			// --------
-			// ROUTE FOR DATA
-			// --------
-			const httpMethodName = clientNavigationEvent.request.method.toLowerCase();
-			$context.response = await router.route([httpMethodName === 'delete' ? 'del' : httpMethodName, 'default'], clientNavigationEvent, document.state, async function(event) {
-				// -----------------
-				var networkProgress = networkProgressOngoing = new RequestHandle();
-				networkProgress.setActive(true, event.request._method || event.request.method);
-				const _response = fetch(event.request);
-				// This catch() is NOT intended to handle failure of the fetch
-				_response.catch(e => networkProgress.throw(e.message));
-				// Save a reference to this
-				return _response.then(async response => {
-					response = new clientNavigationEvent.Response(response.body, {
-						status: response.status,
-						statusText: response.statusText,
-						headers: response.headers,
-						_proxy: {
-							url: response.url,
-							ok: response.ok,
-							redirected: response.redirected
-						},
-					});
-					if (response.headers.get('Location')) {
-						networkProgress.redirecting(response.headers.get('Location'));
-					}
-					// Stop loading status
-					networkProgress.setActive(false);
-					return response;
+		// --------
+		// ROUTE FOR DATA
+		// --------
+		const httpMethodName = clientNavigationEvent.request.method.toLowerCase();
+		const response = await router.route([httpMethodName === 'delete' ? 'del' : httpMethodName, 'default'], clientNavigationEvent, document.state, async function(event) {
+			return remoteFetch(event.request).then(response => {
+				return new clientNavigationEvent.Response(response.body, {
+					status: response.status,
+					statusText: response.statusText,
+					headers: response.headers,
+					_proxy: {
+						url: response.url,
+						ok: response.ok,
+						redirected: response.redirected
+					},
 				});
 			});
-			if ($context.response instanceof clientNavigationEvent.Response) {
-				$context.data = await $context.response.data();
-            } else {
-				$context.data = $context.response;
-			}
+		}).catch(e => {
+			window.document.body.setAttribute('template', '');
+			throw e;
+		});
 
-			// --------
-			// Render
-			// --------
-			const rendering = await router.route('render', clientNavigationEvent, $context.data, async function(event, data) {
-				// --------
-				// OOHTML would waiting for DOM-ready in order to be initialized
-				await new Promise(res => window.WebQit.DOM.ready(res));
-				if (!window.document.state.env) {
-					window.document.setState({
-						env: 'client',
-						onHydration: $context.onHydration,
-						network: networkWatch,
-						url: httpInstance.location,
-						session,
-					}, { update: true });
-				}
-				window.document.setState({ page: data }, { update: 'merge' });
-				window.document.body.setAttribute('template', 'page/' + requestPath.split('/').filter(a => a).map(a => a + '+-').join('/'));
-				return new Promise(res => {
-					window.document.addEventListener('templatesreadystatechange', () => res(window));
-					if (window.document.templatesReadyState === 'complete') {
-						res(window);
-					}
-				});
-			});
 
+		// --------
+		// Render
+		// --------
+		const data = response instanceof clientNavigationEvent.Response ? await response.data() : response;
+		await router.route('render', clientNavigationEvent, data, async function(event, data) {
 			// --------
-			// Render...
-			// --------
-
-			if (/*document.activeElement === document.body && */event && _isObject(event.detail) && (event.detail.src instanceof Element) && /* do only on url path change */ _before(event.value, '?') !== _before(event.oldValue, '?')) {
-				setTimeout(() => {
-					let vieportTop;
-					if (clientNavigationEvent.url.hash && (urlTarget = document.querySelector(clientNavigationEvent.url.hash))) {
-						urlTarget.scrollIntoView();
-					} else if (vieportTop = Array.from(document.querySelectorAll('[data-viewport-top]')).pop()) {
-						vieportTop.focus();
-					} else {
-						document.documentElement.classList.add('scroll-reset');
-						document.body.scrollIntoView();
-						setTimeout(() => {
-							document.documentElement.classList.remove('scroll-reset');
-						}, 600);
-					}
-				}, 0);
+			// OOHTML would waiting for DOM-ready in order to be initialized
+			await new Promise(res => window.WebQit.DOM.ready(res));
+			if (!window.document.state.env) {
+				window.document.setState({
+					env: 'client',
+					onHydration: params.srcType === 'init',
+					network: navigator.network,
+					url: navigator.location,
+					session,
+				}, { update: true });
 			}
+			window.document.setState({ page: data }, { update: 'merge' });
+			window.document.body.setAttribute('template', 'page/' + clientNavigationEvent.url.pathname.split('/').filter(a => a).map(a => a + '+-').join('/'));
+			return new Promise(res => {
+				window.document.addEventListener('templatesreadystatechange', () => res(window));
+				if (window.document.templatesReadyState === 'complete') {
+					res(window);
+				}
+			});
+		});
 
-		} catch(e) {
-
-			window.document.body.setAttribute('template', '');
-			throw e;
-
+		// --------
+		// Render...
+		// --------
+
+		if (params.src instanceof Element) {
+			setTimeout(() => {
+				let viewportTop;
+				if (clientNavigationEvent.url.hash && (urlTarget = document.querySelector(clientNavigationEvent.url.hash))) {
+					urlTarget.scrollIntoView();
+				} else if (viewportTop = Array.from(document.querySelectorAll('[data-viewport-top]')).pop()) {
+					viewportTop.focus();
+				} else {
+					document.documentElement.classList.add('scroll-reset');
+					document.body.scrollIntoView();
+					setTimeout(() => {
+						document.documentElement.classList.remove('scroll-reset');
+					}, 600);
+				}
+			}, 0);
 		}
 		
-		return $context.response;
+		return response;
 	});
 
+	Observer.observe(session, changes => {
+		//console.log('SESSION_STATE_CHANGE', changes[0].name, changes[0].value);
+	});
+	Observer.observe(workerClient, changes => {
+		//console.log('SERVICE_WORKER_STATE_CHANGE', changes[0].name, changes[0].value);
+	});
+	Observer.observe(navigator, changes => {
+		//console.log('NAVIGATORSTATE_CHANGE', changes[0].name, changes[0].value);
+	});
 };
-
-const networkWatch = { progress: {}, online: navigator.onLine };
-class RequestHandle {
-	setActive(state, method = '') {
-		if (this.active === false) {
-			return;
-		}
-		this.active = state;
-		Observer.set(networkWatch, {
-			method,
-			error: '',
-			progress: {
-				active: state, 
-				determinate: false,
-				valuenow: 0,
-				valuetotal: NaN,
-			},
-		});
-	}
-	updateProgress(phase, valuenow, valuetotal) {
-		if (this.active === false) {
-			return;
-		}
-		Observer.set(networkWatch.progress, {
-			phase,
-			determinate: !isNaN(valuetotal),
-			valuenow,
-			valuetotal,
-		});
-	}
-	redirecting(location) {
-		Observer.set(networkWatch, 'redirecting', location);
-	}
-	throw(message) {
-		if (this.active === false) {
-			return;
-		}
-		this.error = true;
-		Observer.set(networkWatch, 'error', message);
-	}
-};

package/src/runtime/client/Worker.js

@@ -120,7 +120,8 @@ export default function(layout, params) {
 			
 			return defaultFetch(evt);
 		};
-		evt.respondWith(handleFetch(evt));
+		let response = handleFetch(evt);
+		evt.respondWith(response);
 	});
 
 	const defaultFetch = function(evt) {

package/src/runtime/server/Runtime.js

@@ -208,7 +208,6 @@ export async function run(hostSetup, request, response, Ui, flags = {}, protocol
     // --------
 
     const fullUrl = protocol + '://' + request.headers.host + request.url;
-    const _request = new NavigationEvent.Request(fullUrl, requestInit);
     const _sessionFactory = function(id, params = {}, callback = null) {
         let factory, secret = hostSetup.variables.entries.SESSION_KEY;
         Sessions({
@@ -229,8 +228,8 @@ export async function run(hostSetup, request, response, Ui, flags = {}, protocol
         return !callback ? factory : undefined;
     };
     const serverNavigationEvent = new NavigationEvent(
-        _request,
-        _sessionFactory('_session', {duration: 60 * 60 * 24 * 30}).get(),
+        new NavigationEvent.Request(fullUrl, requestInit),
+        _sessionFactory('_session', { duration: 60 * 60, activeDuration: 60 * 60 }).get(),
         _sessionFactory
     );
 
@@ -464,15 +463,17 @@ export async function run(hostSetup, request, response, Ui, flags = {}, protocol
                 // Send
                 // -------------------
                 if ($context.response.headers.redirect) {
-                    if (serverNavigationEvent.request.headers.get('X-No-Cors-Redirect') === 'manual' 
-                    && (new serverNavigationEvent.globals.URL($context.response.headers.location)).origin !== serverNavigationEvent.url.origin) {
-                        response.statusCode = 200;
-                        response.setHeader('X-No-Cors-Redirect', $context.response.status);
-                        response.end();
+                    let xRedirectPolicy = serverNavigationEvent.request.headers.get('X-Redirect-Policy');
+                    let xRedirectCode = serverNavigationEvent.request.headers.get('X-Redirect-Code') || 300;
+                    let isSameOriginRedirect = (new serverNavigationEvent.globals.URL($context.response.headers.location)).origin === serverNavigationEvent.url.origin;
+                    if (xRedirectPolicy === 'manual' || (!isSameOriginRedirect && xRedirectPolicy === 'manual-when-cross-origin') || (isSameOriginRedirect && xRedirectPolicy === 'manual-when-same-origin')) {
+                        response.statusCode = xRedirectCode;
+                        response.setHeader('X-Redirect-Code', $context.response.status);
+                        response.setHeader('Cache-Control', 'no-store');
                     } else {
                         response.statusCode = $context.response.status;
-                        response.end();
                     }
+                    response.end();
                 } else if ($context.response.original !== undefined && $context.response.original !== null) {
                     response.statusCode = $context.response.status;
                     response.statusMessage = $context.response.statusText;
@@ -553,9 +554,9 @@ export async function run(hostSetup, request, response, Ui, flags = {}, protocol
 
     if (flags.logs !== false) {
         let errorCode = [ 404, 500 ].includes(response.statusCode) ? response.statusCode : 0;
-        let noCorsRedirect = response.getHeader('X-No-Cors-Redirect');
-        let redirectCode = noCorsRedirect || ((response.statusCode + '').startsWith('3') ? response.statusCode : 0);
-        let statusCode = noCorsRedirect || response.statusCode;
+        let xRedirectCode = response.getHeader('X-Redirect-Code');
+        let redirectCode = xRedirectCode || ((response.statusCode + '').startsWith('3') ? response.statusCode : 0);
+        let statusCode = xRedirectCode || response.statusCode;
         Ui.log(''
             + '[' + (hostSetup.vh ? Ui.style.keyword(hostSetup.vh.host) + '][' : '') + Ui.style.comment((new Date).toUTCString()) + '] '
             + Ui.style.keyword(protocol.toUpperCase() + ' ' + serverNavigationEvent.request.method) + ' '