@webqit/webflo 0.11.39 → 0.11.41

package/src/runtime-pi/client/Runtime.js

@@ -4,40 +4,17 @@
  */
 import { _before, _toTitle } from '@webqit/util/str/index.js';
 import { Observer } from '@webqit/oohtml-ssr/apis.js';
-import Storage from './Storage.js';
+import createStorage from './createStorage.js';
 import Url from './Url.js';
-import { wwwFormUnserialize, wwwFormSet, wwwFormSerialize } from '../util.js';
-import * as whatwag from './whatwag.js';
-import xURL from '../xURL.js';
-import xFormData from "../xFormData.js";
-import xRequestHeaders from "../xRequestHeaders.js";
-import xResponseHeaders from "../xResponseHeaders.js";
+import Workport from './Workport.js';
 import xRequest from "../xRequest.js";
 import xResponse from "../xResponse.js";
 import xfetch from '../xfetch.js';
-import xHttpEvent from '../xHttpEvent.js';
-import Workport from './Workport.js';
+import HttpEvent from '../HttpEvent.js';
 import _Runtime from '../Runtime.js';
-
-const URL = xURL(whatwag.URL);
-const FormData = xFormData(whatwag.FormData);
-const ReadableStream = whatwag.ReadableStream;
-const RequestHeaders = xRequestHeaders(whatwag.Headers);
-const ResponseHeaders = xResponseHeaders(whatwag.Headers);
-const Request = xRequest(whatwag.Request, RequestHeaders, FormData, whatwag.Blob);
-const Response = xResponse(whatwag.Response, ResponseHeaders, FormData, whatwag.Blob);
-const fetch = xfetch(whatwag.fetch, Request);
-const HttpEvent = xHttpEvent(Request, Response, URL);
+import { params } from '../util-url.js';
 
 export {
-	URL,
-	FormData,
-	ReadableStream,
-	RequestHeaders,
-	ResponseHeaders,
-	Request,
-	Response,
-	fetch,
 	HttpEvent,
 	Observer,
 }
@@ -48,12 +25,12 @@ export default class Runtime extends _Runtime {
      * Runtime
      * 
      * @param Object        cx
-     * @param Function      clientCallback
+     * @param Function      applicationInstance
      * 
      * @return void
      */
-	constructor(cx, clientCallback) {
-		super(cx, clientCallback);
+	constructor(cx, applicationInstance) {
+		super(cx, applicationInstance);
 		// -----------------------
 		// Initialize location
 		Observer.set(this, 'location', new Url(window.document.location));
@@ -124,11 +101,11 @@ export default class Runtime extends _Runtime {
 					formData.set(submitter.name, submitter.value);
 				}
 				if (submitParams.method.toUpperCase() === 'GET') {
-					var query = wwwFormUnserialize(actionEl.search);
+					var query = params.parse(actionEl.search);
 					Array.from(formData.entries()).forEach(_entry => {
-						wwwFormSet(query, _entry[0], _entry[1], false);
+						params.set(query, _entry[0], _entry[1]);
 					});
-					actionEl.search = wwwFormSerialize(query);
+					actionEl.search = params.stringify(query);
 					formData = null;
 				}
 				this.go(Url.copy(actionEl), {
@@ -150,7 +127,8 @@ export default class Runtime extends _Runtime {
 		// -----------------------
 		// Service Worker && COMM
 		if (this.cx.params.service_worker_support) {
-			const workport = new Workport(this.cx.params.worker_filename, { scope: this.cx.params.worker_scope, startMessages: true });
+			const { public_base_url: base, worker_filename: filename, worker_scope: scope } = this.cx.params;
+			const workport = new Workport(base + filename, { scope, startMessages: true });
 			Observer.set(this, 'workport', workport);
 		}
 
@@ -158,10 +136,10 @@ export default class Runtime extends _Runtime {
 		// Initialize and Hydration
 		(async () => {
 			let shouldHydrate;
-			if (this.client.init) {
+			if (this.app.init) {
 				const request = this.generateRequest(this.location);
 				const httpEvent = new HttpEvent(request, { srcType: 'initialization' }, (id = null, persistent = false) => this.getSession(httpEvent, id, persistent));
-				shouldHydrate = await this.client.init(httpEvent, ( ...args ) => this.remoteFetch( ...args ));
+				shouldHydrate = await this.app.init(httpEvent, ( ...args ) => this.remoteFetch( ...args ));
 			}
 			if (shouldHydrate !== false) {
 				this.go(this.location, {}, { srcType: 'hydration' });
@@ -185,7 +163,7 @@ export default class Runtime extends _Runtime {
 
 	// Check is-spa-route
 	isSpaRoute(url, e = undefined) {
-		url = typeof url === 'string' ? new whatwag.URL(url) : url;
+		url = typeof url === 'string' ? new URL(url, this.location.origin) : url;
 		if (url.origin && url.origin !== this.location.origin) return false;
 		if (e && (e.metaKey || e.altKey || e.ctrlKey || e.shiftKey)) return false;
 		if (!this.cx.params.routing) return true;
@@ -202,7 +180,7 @@ export default class Runtime extends _Runtime {
 
 	// Generates request object
 	generateRequest(href, init = {}) {
-		return new Request(href, {
+		return new xRequest(href, {
 			signal: this._abortController && this._abortController.signal,
 			...init,
 			headers: {
@@ -216,8 +194,8 @@ export default class Runtime extends _Runtime {
 	}
 
 	// Generates session object
-    getSession(e, id = null, persistent = false) {
-		return Storage(id, persistent);
+    createStorage(e, id = null, persistent = false) {
+		return createStorage(id, persistent);
 	}
 
     /**
@@ -230,13 +208,13 @@ export default class Runtime extends _Runtime {
      * @return Response
      */
     async go(url, init = {}, detail = {}) {
-        url = typeof url === 'string' ? new whatwag.URL(url) : url;
+        url = typeof url === 'string' ? new URL(url, this.location.origin) : url;
         init = { referrer: this.location.href, ...init };
         // ------------
 		// Put his forward before instantiating a request and aborting previous
 		// Same-page hash-links clicks on chrome recurse here from histroy popstate
-        if (detail.srcType !== 'hydration' && (_before(url.href, '#') === _before(init.referrer, '#') && (init.method || 'GET').toUpperCase() === 'GET')) {
-			return new Response(null, { status: 304 }); // Not Modified
+        if (![ 'hydration', 'rdr' ].includes(detail.srcType) && (_before(url.href, '#') === _before(init.referrer, '#') && (init.method || 'GET').toUpperCase() === 'GET')) {
+			return new xResponse(null, { status: 304 }); // Not Modified
         }
 		// ------------
         if (this._abortController) {
@@ -257,23 +235,21 @@ export default class Runtime extends _Runtime {
 		// Run
 		// ------------
 		const request = this.generateRequest(url.href, init);
-		const httpEvent = new HttpEvent(request, detail, (id = null, persistent = false) => this.getSession(httpEvent, id, persistent));
+		const httpEvent = new HttpEvent(request, detail, (id = null, persistent = false) => this.createStorage(httpEvent, id, persistent));
 		let response, finalResponse;
 		try {
 			// ------------
 			// Response
 			// ------------
-			response = await this.client.handle(httpEvent, ( ...args ) => this.remoteFetch( ...args ));
+			response = await this.app.handle(httpEvent, ( ...args ) => this.remoteFetch( ...args ));
 			finalResponse = this.handleResponse(httpEvent, response);
 			// ------------
 			// Address bar
 			// ------------
-			if (response.redirected) {
-				Observer.set(this.location, { href: response.url }, { detail: { redirected: true }, });
-				Observer.set(this.network, 'requesting', null);
+			if (response && response.redirected) {
+				Observer.set(this.location, { href: response.url }, { detail: { redirected: true, ...detail }, });
 			} else if (![302, 301].includes(finalResponse.status)) {
-				Observer.set(this.location, Url.copy(url)/* copy() is important */);
-				Observer.set(this.network, 'requesting', null);
+				Observer.set(this.location, Url.copy(url)/* copy() is important */, { detail });
 			}
 			// ------------
 			// States
@@ -286,19 +262,19 @@ export default class Runtime extends _Runtime {
 			// Rendering
 			// ------------
 			if (finalResponse.ok && (finalResponse.headers.contentType === 'application/json' || finalResponse.headers.contentType.startsWith('multipart/form-data'))) {
-				this.client.render && await this.client.render(httpEvent, finalResponse);
+				this.app.render && await this.app.render(httpEvent, finalResponse);
 			} else if (!finalResponse.ok) {
 				if ([404, 500].includes(finalResponse.status)) {
 					Observer.set(this.network, 'error', new Error(finalResponse.statusText, { cause: finalResponse.status }));
 				}
 				if (!finalResponse.headers.get('Location')) {
-					this.client.unrender && await this.client.unrender(httpEvent);
+					this.app.unrender && await this.app.unrender(httpEvent);
 				}
 			}
 		} catch(e) {
 			console.error(e);
 			Observer.set(this.network, 'error', { ...e, retry: () => this.go(url, init = {}, detail) });
-			finalResponse = new Response(null, { status: 500, statusText: e.message });
+			finalResponse = new xResponse(null, { status: 500, statusText: e.message });
 		}
 		// ------------
         // Return value
@@ -310,35 +286,37 @@ export default class Runtime extends _Runtime {
 		let href = request;
 		if (request instanceof Request) {
 			href = request.url;
-		} else if (request instanceof whatwag.URL) {
+		} else if (request instanceof URL) {
 			href = request.href;
 		}
 		Observer.set(this.network, 'remote', href);
-		let _response = fetch(request, ...args);
+		let _response = xfetch(request, ...args);
 		// This catch() is NOT intended to handle failure of the fetch
 		_response.catch(e => Observer.set(this.network, 'error', e));
 		// Return xResponse
 		return _response.then(async response => {
 			// Stop loading status
 			Observer.set(this.network, 'remote', null);
-			return new Response(response);
+			return new xResponse(response);
 		});
 	}
 
 	// Handles response object
 	handleResponse(e, response) {
-		if (!(response instanceof Response)) { response = new Response(response); }
+		if (typeof response === 'undefined') { response = new xResponse(undefined, { status: 404 }); }
+		else if (!(response instanceof xResponse)) { response = new xResponse(response); }
+		Observer.set(this.network, 'requesting', null);
+		Observer.set(this.network, 'redirecting', null);
 		if (!response.redirected) {
 			let location = response.headers.get('Location');
 			if (location) {
 				let xActualRedirectCode = parseInt(response.headers.get('X-Redirect-Code'));
+				Observer.set(this.network, 'redirecting', location);
 				if (xActualRedirectCode && response.status === this._xRedirectCode) {
 					response.attrs.status = xActualRedirectCode;
-					Observer.set(this.network, 'redirecting', location);
 					window.location = location;
 				} else if ([302,301].includes(response.status)) {
 					if (!this.isSpaRoute(location)) {
-						Observer.set(this.network, 'redirecting', location);
 						window.location = location;
 					} else {
 						this.go(location, {}, { srcType: 'rdr' });

package/src/runtime-pi/client/Url.js

@@ -4,8 +4,8 @@
  */
 import { _with } from '@webqit/util/obj/index.js';
 import { _isArray, _isObject, _isTypeObject, _isString, _isEmpty } from '@webqit/util/js/index.js';
-import { wwwFormUnserialize, wwwFormSerialize } from '../util.js';
 import { Observer } from './Runtime.js';
+import { params } from '../util-url.js';
 
 /**
  * ---------------------------
@@ -169,7 +169,7 @@ export default class Url {
 	 * @return object
 	 */
 	static toQuery(search) {
-		return wwwFormUnserialize(search);
+		return params.parse(search);
 	}
 
 	/**
@@ -180,7 +180,7 @@ export default class Url {
 	 * @return string
 	 */
 	static toSearch(query) {
-		var search = wwwFormSerialize(query);
+		var search = params.stringify(query);
 		return search ? '?' + search : '';
 	}}
 

package/src/runtime-pi/client/Workport.js

@@ -45,7 +45,7 @@ export default class Workport {
                     resolve(registration);
                 }).catch(e => reject(e));
             };
-            if (params.onWondowLoad) {
+            if (params.onWindowLoad) {
                 window.addEventListener('load', register);
             } else {
                 register();

package/src/runtime-pi/client/{Storage.js → createStorage.js}

@@ -29,7 +29,7 @@ export default function(namespace = null, persistent = false) {
             return true;
         }
         if (event.type === 'has') {
-            for(var i = 0; i < window[storeType].length; i ++){
+            for(let i = 0; i < window[storeType].length; i ++){
                 if (window[storeType].key(i) === key) {
                     return true;
                 }
@@ -37,8 +37,8 @@ export default function(namespace = null, persistent = false) {
             return false;
         }
         if (event.type === 'ownKeys') {
-            var keys = [];
-            for(var i = 0; i < window[storeType].length; i ++){
+            const keys = [];
+            for(let i = 0; i < window[storeType].length; i ++){
                 keys.push(window[storeType].key(i));
             };
             return keys;

package/src/runtime-pi/client/generate.js

@@ -11,7 +11,7 @@ import { _afterLast, _beforeLast } from '@webqit/util/str/index.js';
 import { _isObject, _isArray } from '@webqit/util/js/index.js';
 import { jsFile } from '@webqit/backpack/src/dotfile/index.js';
 import { gzipSync, brotliCompressSync } from 'zlib';
-import { urlPattern } from '../util.js';
+import { pattern } from '../util-url.js';
 
 /**
  * @generate
@@ -152,12 +152,14 @@ export async function generate() {
         // >> Modules import
         gen.imports[`${dirSelf}/worker/index.js`] = `{ start }`;
         gen.code.push(``);
+        gen.code.push(`self.WebQit = {}`);
+        gen.code.push(``);
         // ------------------
         // Bundle
         if (workerConfig.cache_only_urls.length) {
             // Separate URLs from patterns
             let [ urls, patterns ] = workerConfig.cache_only_urls.reduce(([ urls, patterns ], url) => {
-                let patternInstance = urlPattern(url, 'http://localhost'),
+                let patternInstance = pattern(url, 'http://localhost'),
                     isPattern = patternInstance.isPattern();
                 if (isPattern && (patternInstance.pattern.pattern.hostname !== 'localhost' || patternInstance.pattern.pattern.port)) {
                     throw new Error(`Pattern URLs must have no origin part. Recieved "${url}".`);
@@ -233,7 +235,7 @@ function declareStart(gen, routesDir, targetDir, paramsObj, routing) {
     // ------------------
     // >> Startup
     gen.code.push(`// >> Startup`);
-    gen.code.push(`start.call({ layout, params })`);
+    gen.code.push(`WebQit.app = await start.call({ layout, params })`);
 }
 
 /**

package/src/runtime-pi/client/index.js

@@ -3,16 +3,16 @@
  * @imports
  */
 import Context from './Context.js';
-import RuntimeClient from './RuntimeClient.js';
+import Application from './Application.js';
 import Runtime from './Runtime.js';
 
 /**
  * @start
  */
-export async function start(clientCallback = null) {
+export async function start(applicationInstance = null) {
     const cx = this || {};
-    const defaultClientCallback = _cx => new RuntimeClient(_cx);
-    return new Runtime(Context.create(cx), clientCallback || defaultClientCallback);
+    const defaultApplicationInstance = _cx => new Application(_cx);
+    return new Runtime(Context.create(cx), applicationInstance || defaultApplicationInstance);
 }
 
 /**

package/src/runtime-pi/client/worker/{WorkerClient.js → Application.js}

@@ -3,9 +3,9 @@
  * @imports
  */
 import Router from '../Router.js';
-import _WorkerClient from '../../RuntimeClient.js';
+import _Application from '../../Application.js';
 
-export default class RuntimeClient extends _WorkerClient {
+export default class Application extends _Application {
 
 	// Returns router class
 	get Router() {
@@ -27,14 +27,18 @@ export default class RuntimeClient extends _WorkerClient {
 			// --------
 			// ROUTE FOR DATA
 			// --------
-			const httpMethodName = httpEvent.request.method.toUpperCase();
-			let response = await router.route([httpMethodName, 'default'], httpEvent, {}, async event => {
+			return router.route([httpEvent.request.method, 'default'], httpEvent, {}, async event => {
+				if (event !== httpEvent) {
+					// This was nexted()
+					if (!event.request.headers.has('Accept')) {
+						event.request.headers.set('Accept', 'application/json');
+					}
+					if (event.request.body && !event.request.headers.has('Content-Type')) {
+						event.request.headers.set('Content-Type', 'application/json');
+					}
+				}
 				return remoteFetch(event.request);
 			}, remoteFetch);
-			if (!(response instanceof httpEvent.Response)) {
-                response = httpEvent.Response.compat(response);
-            }
-            return response;
 		};
         return handle();
 	}

package/src/runtime-pi/client/worker/{Worker.js → Runtime.js}

@@ -3,42 +3,38 @@
  * @imports
  */
 import { _any } from '@webqit/util/arr/index.js';
-import { urlPattern } from '../../util.js';
-import { HttpEvent, Request, Response, fetch as xfetch, Observer } from '../Runtime.js';
+import { Observer } from '@webqit/oohtml-ssr/apis.js';
+import { pattern } from '../../util-url.js';
 import Workport from './Workport.js';
-import _Worker from '../../Runtime.js';
+import _Runtime from '../../Runtime.js';
+import xRequest from "../../xRequest.js";
+import xResponse from "../../xResponse.js";
+import xfetch from '../../xfetch.js';
+import HttpEvent from '../../HttpEvent.js';
 
 export {
-	URL,
-	FormData,
-	ReadableStream,
-	RequestHeaders,
-	ResponseHeaders,
-	Request,
-	Response,
-	fetch,
 	HttpEvent,
 	Observer,
-} from '../Runtime.js';
+}
 
 /**
  * ---------------------------
- * The Worker Initializer
+ * The Runtime Initializer
  * ---------------------------
  */
 
-export default class Worker extends _Worker {
+export default class Runtime extends _Runtime {
 
 	/**
      * Runtime
      * 
      * @param Object        cx
-     * @param Function      clientCallback
+     * @param Function      applicationInstance
      * 
      * @return void
      */
-	constructor(cx, clientCallback) {
-		super(cx, clientCallback);
+	constructor(cx, applicationInstance) {
+		super(cx, applicationInstance);
         // ---------------
         this.mockSessionStore = {};
         // --------------		
@@ -50,7 +46,7 @@ export default class Worker extends _Worker {
 				// Add files to cache
 				evt.waitUntil( self.caches.open(this.cx.params.cache_name).then(cache => {
 					if (this.cx.logger) { this.cx.logger.log('[ServiceWorker] Pre-caching resources.'); }
-					const cache_only_urls = (this.cx.params.cache_only_urls || []).map(c => c.trim()).filter(c => c && !urlPattern(c, self.origin).isPattern());
+					const cache_only_urls = (this.cx.params.cache_only_urls || []).map(c => c.trim()).filter(c => c && !pattern(c, self.origin).isPattern());
 					return cache.addAll(cache_only_urls);
 				}) );
 			}
@@ -93,7 +89,7 @@ export default class Worker extends _Worker {
 			event.respondWith((async (req, evt) => {
 				let requestingClient = await self.clients.get(event.clientId);
 				this.workport.setCurrentClient(requestingClient);
-				const [ url, requestInit ] = await Request.rip(req);
+				const [ url, requestInit ] = await xRequest.rip(req);
 				// Now, the following is key:
 				// The browser likes to use "force-cache" for "navigate" requests, when, e.g: re-entering your site with the back button
 				// Problem here, force-cache forces out JSON not HTML as per webflo's design.
@@ -113,10 +109,10 @@ export default class Worker extends _Worker {
 		// -------------
 		// Initialize
 		(async () => {
-			if (!this.client.init) return;
+			if (!this.app.init) return;
 			const request = this.generateRequest('/');
 			const httpEvent = new HttpEvent(request, { srcType: 'initialization' }, (id = null, persistent = false) => this.getSession(httpEvent, id, persistent));
-			await this.client.init(httpEvent, ( ...args ) => this.remoteFetch( ...args ));
+			await this.app.init(httpEvent, ( ...args ) => this.remoteFetch( ...args ));
 		})();
 		
 	}
@@ -132,11 +128,12 @@ export default class Worker extends _Worker {
      */
 	async go(url, init = {}, detail = {}) {
 		// ------------
-        url = typeof url === 'string' ? new URL(url) : url;
+        url = typeof url === 'string' ? new URL(url, self.location.origin) : url;
 		init = { referrer: this.location.href, ...init };
         // ------------
 		// The request object
 		const request = await this.generateRequest(url.href, init);
+
 		if (detail.event) {
 			Object.defineProperty(detail.event, 'request', { value: request });
 		}
@@ -151,7 +148,7 @@ export default class Worker extends _Worker {
 		// Response
 		let response;
 		if (httpEvent.request.url.startsWith(self.origin)/* && httpEvent.request.mode === 'navigate'*/) {
-			response = await this.client.handle(httpEvent, ( ...args ) => this.remoteFetch( ...args ));
+			response = await this.app.handle(httpEvent, ( ...args ) => this.remoteFetch( ...args ));
 		} else {
 			response = await this.remoteFetch(httpEvent.request);
 		}
@@ -162,7 +159,7 @@ export default class Worker extends _Worker {
 
     // Generates request object
     generateRequest(href, init = {}) {
-		const request = new Request(href, init);
+		const request = new xRequest(href, init);
 		return request;
     }
 
@@ -179,7 +176,7 @@ export default class Worker extends _Worker {
 		if (arguments.length > 1) {
 			request = this.generateRequest(request, ...args);
 		}
-		const matchUrl = (patterns, url) => _any((patterns || []).map(p => p.trim()).filter(p => p), p => urlPattern(p, self.origin).test(url));
+		const matchUrl = (patterns, url) => _any((patterns || []).map(p => p.trim()).filter(p => p), p => pattern(p, self.origin).test(url));
 		const execFetch = () => {
 			// network_first_urls
 			if (!this.cx.params.default_fetching_strategy || this.cx.params.default_fetching_strategy === 'network-first' || matchUrl(this.cx.params.network_first_urls, request.url)) {
@@ -206,7 +203,7 @@ export default class Worker extends _Worker {
 		// This catch() is NOT intended to handle failure of the fetch
 		response.catch(e => Observer.set(this.network, 'error', e.message));
 		// Return xResponse
-		return response.then(_response => Response.compat(_response));
+		return response.then(_response => xResponse.compat(_response));
 	}
 
 	// Caching strategy: network_first
@@ -265,7 +262,8 @@ export default class Worker extends _Worker {
 
 	// Handles response object
 	handleResponse(e, response) {
-		if (!(response instanceof Response)) { response = Response.compat(response); }
+		if (typeof response === 'undefined') { response = new xResponse(undefined, { status: 404 }); }
+		else if (!(response instanceof xResponse)) { response = xResponse.compat(response); }
 		return response;
 	}
 

package/src/runtime-pi/client/worker/index.js

@@ -3,19 +3,19 @@
  * @imports
  */
 import Context from './Context.js';
-import WorkerClient from './WorkerClient.js';
-import Worker from './Worker.js';
+import Application from './Application.js';
+import Runtime from './Runtime.js';
 
 /**
  * @start
  */
-export async function start(clientCallback = null) {
+export async function start(applicationInstance = null) {
     const cx = this || {};
-    const defaultClientCallback = _cx => new WorkerClient(_cx);
-    return new Worker(Context.create(cx), clientCallback || defaultClientCallback);
+    const defaultApplicationInstance = _cx => new Application(_cx);
+    return new Runtime(Context.create(cx), applicationInstance || defaultApplicationInstance);
 }
 
 /**
  * @APIS
  */
-export * as APIS from './Worker.js';
+export * as APIS from './Runtime.js';

package/src/runtime-pi/server/{RuntimeClient.js → Application.js}

@@ -6,12 +6,12 @@ import Fs from 'fs';
 import Path from 'path';
 import QueryString from 'querystring';
 import Router from './Router.js';
-import _RuntimeClient from '../RuntimeClient.js';
+import _Application from '../Application.js';
 
-export default class RuntimeClient extends _RuntimeClient {
+export default class Application extends _Application {
 
     /**
-     * RuntimeClient
+     * Application
      * 
      * @param Context cx
      */
@@ -40,8 +40,7 @@ export default class RuntimeClient extends _RuntimeClient {
             // --------
             // ROUTE FOR DATA
             // --------
-            const httpMethodName = httpEvent.request.method.toUpperCase();
-            let response = await router.route([httpMethodName, 'default'], httpEvent, {}, async event => {
+            let response = await router.route([httpEvent.request.method, 'default'], httpEvent, {}, async event => {
                 return router.file(event);
             }, remoteFetch);
             if (!(response instanceof httpEvent.Response)) {
@@ -50,14 +49,15 @@ export default class RuntimeClient extends _RuntimeClient {
             // --------
             // Rendering
             // --------
-            if (response.ok && response.bodyAttrs.inputType === 'object' && httpEvent.request.headers.accept.match('text/html')) {
+            if (response.ok && response.meta.type === 'json' && typeof response.meta.body === 'object' && response.meta.body && httpEvent.request.headers.accept.match('text/html')) {
                 let rendering = await this.render(httpEvent, router, response);
                 if (typeof rendering !== 'string' && !(typeof rendering === 'object' && rendering && typeof rendering.toString === 'function')) {
                     throw new Error('render() must return a string response or an object that implements toString()..');
                 }
-                response = new httpEvent.Response(rendering.toString(), {
+                rendering = rendering.toString();
+                response = new httpEvent.Response(rendering, {
+                    headers: { ...response.headers.json(), contentType: 'text/html', contentLength: (new Blob([rendering]).size) },
                     status: response.status,
-                    headers: { ...response.headers.json(), contentType: 'text/html' },
                 });
             }
 

package/src/runtime-pi/server/Router.js

@@ -17,6 +17,7 @@ import _Router from '../Router.js';
 export default class Router extends _Router {
 
     async readTick(thisTick) {
+        thisTick = { ...thisTick };
         if (thisTick.trail) {
             thisTick.currentSegment = thisTick.destination[thisTick.trail.length];
             thisTick.currentSegmentOnFile = [ thisTick.currentSegment, '-' ].reduce((_segmentOnFile, _seg) => {
@@ -27,8 +28,8 @@ export default class Router extends _Router {
                     Fs.existsSync(Path.join(this.cx.CWD, this.cx.layout.SERVER_DIR, _currentPath)) ? { seg: _seg, dirExists: true } : _segmentOnFile
                 );
             }, { seg: null });
-            thisTick.trail.push(thisTick.currentSegment);
-            thisTick.trailOnFile.push(thisTick.currentSegmentOnFile.seg);
+            thisTick.trail = thisTick.trail.concat(thisTick.currentSegment);
+            thisTick.trailOnFile = thisTick.trailOnFile.concat(thisTick.currentSegmentOnFile.seg);
             thisTick.exports = thisTick.currentSegmentOnFile.index ? await import(Url.pathToFileURL(thisTick.currentSegmentOnFile.index)) : undefined;
         } else {
             thisTick.trail = [];