@webqit/webflo 0.11.39 → 0.11.40

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 = [];

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

@@ -6,44 +6,22 @@ import Fs from 'fs';
 import Path from 'path';
 import Http from 'http';
 import Https from 'https';
-import Formidable from 'formidable';
 import Sessions from 'client-sessions';
 import { Observer } from '@webqit/oohtml-ssr/apis.js';
 import { _each } from '@webqit/util/obj/index.js';
 import { _isEmpty } from '@webqit/util/js/index.js';
 import { _from as _arrFrom, _any } from '@webqit/util/arr/index.js';
 import { slice as _streamSlice } from 'stream-slice';
-import { urlPattern } 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 { Readable as _ReadableStream } from 'stream';
+import { pattern } from '../util-url.js';
 import xRequest from "../xRequest.js";
 import xResponse from "../xResponse.js";
 import xfetch from '../xfetch.js';
-import xHttpEvent from '../xHttpEvent.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);
-const HttpEvent = xHttpEvent(Request, Response, URL);
-
 export {
-    URL,
-    FormData,
-    ReadableStream,
-    RequestHeaders,
-    ResponseHeaders,
-    Request,
-    Response,
-    fetch,
+    //fetch,
     HttpEvent,
     Observer,
 }
@@ -54,18 +32,18 @@ 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.ready = (async () => {
             // ---------------
             const resolveContextObj = async (cx, force = false) => {
-                if (_isEmpty(cx.server) || force) { cx.server = await (new cx.config.runtime.Server(cx)).read(); }
                 if (_isEmpty(cx.layout) || force) { cx.layout = await (new cx.config.deployment.Layout(cx)).read(); }
+                if (_isEmpty(cx.server) || force) { cx.server = await (new cx.config.runtime.Server(cx)).read(); }
                 if (_isEmpty(cx.env) || force) { cx.env = await (new cx.config.deployment.Env(cx)).read(); }
             };
             await resolveContextObj(this.cx);
@@ -88,6 +66,7 @@ export default class Runtime extends _Runtime {
                     if (vhost.path) {
                         cx = this.cx.constructor.create(this.cx, Path.join(this.cx.CWD, vhost.path));
                         await resolveContextObj(cx, true);
+                        cx.dict.key = true;
                         // From the server that's most likely to be active
                         port || (port = cx.server.https.port || cx.server.port);
                         // The domain list that corresponds to the specified resolved port
@@ -145,6 +124,7 @@ export default class Runtime extends _Runtime {
             }
             // ---------------
             const handleRequest = async (proto, request, response) => {
+                request[Symbol.toStringTag] = 'ReadableStream';
                 const [ fullUrl, requestInit ] = await this.parseNodeRequest(proto, request);
                 let clientResponse = await this.go(fullUrl, requestInit, { request, response });
                 if (response.headersSent) return;
@@ -158,9 +138,12 @@ export default class Runtime extends _Runtime {
                 if (clientResponse.headers.location) {
                     return response.end();
                 }
-                if ((clientResponse.body instanceof ReadableStream)) {
+                if ((clientResponse.body instanceof _ReadableStream)) {
                     return clientResponse.body.pipe(response);
                 }
+                if ((clientResponse.body instanceof ReadableStream)) {
+                    return _ReadableStream.from(clientResponse.body).pipe(response);
+                }
                 let body = clientResponse.body;
                 if (clientResponse.headers.contentType === 'application/json') {
                     body += '';
@@ -195,12 +178,12 @@ export default class Runtime extends _Runtime {
                 }
                 this.cx.logger.info(``);
             }
-			if (this.client && this.client.init) {
-                const request = this.generateRequest('/');
+			if (this.app && this.app.init) {
+                const request = this.generateRequest('http://localhost/');
                 const httpEvent = new HttpEvent(request, { srcType: 'initialization' }, (id = 'session', options = { duration: 60 * 60 * 24, activeDuration: 60 * 60 * 24 }, callback = null) => {
                     return this.getSession(this.cx, httpEvent, id, options, callback);
                 });
-                await this.client.init(httpEvent, ( ...args ) => this.remoteFetch( ...args ));
+                await this.app.init(httpEvent, ( ...args ) => this.remoteFetch( ...args ));
             }
 		})();
         // ---------------
@@ -220,55 +203,14 @@ export default class Runtime extends _Runtime {
      * @return Array
      */
     async parseNodeRequest(proto, request) {
-        let url = request.url;
         // Detected when using manual proxy setting in a browser
-        if (url.startsWith(`http://${ request.headers.host }`) || url.startsWith(`https://${ request.headers.host }`)) {
-            url = url.split(request.headers.host)[1];
+        if (request.url.startsWith(`http://${ request.headers.host }`) || request.url.startsWith(`https://${ request.headers.host }`)) {
+            request.url = request.url.split(request.headers.host)[1];
         }
-        const fullUrl = proto + '://' + request.headers.host + url;
+        const fullUrl = proto + '://' + request.headers.host + request.url;
         const requestInit = { method: request.method, headers: request.headers };
-        if (request.method !== 'GET' && request.method !== 'HEAD') {
-            requestInit.body = await new Promise((resolve, reject) => {
-                var formidable = new Formidable.IncomingForm({ multiples: true, allowEmptyFiles: true, keepExtensions: true });
-                formidable.parse(request, (error, fields, files) => {
-                    if (error) { return reject(error); }
-                    if (request.headers['content-type'] === 'application/json') {
-                        return resolve(fields);
-                    }
-                    const formData = new FormData;
-                    Object.keys(fields).forEach(name => {
-                        if (Array.isArray(fields[name])) {
-                            const values = Array.isArray(fields[name][0]) 
-                                ? fields[name][0]/* bugly a nested array when there are actually more than entry */ 
-                                : fields[name];
-                            values.forEach(value => {
-                                formData.append(!name.endsWith(']') ? name + '[]' : name, value);
-                            });
-                        } else {
-                            formData.append(name, fields[name]);
-                        }
-                    });
-                    Object.keys(files).forEach(name => {
-                        const fileCompat = file => {
-                            // IMPORTANT
-                            // Path up the "formidable" file in a way that "formdata-node"
-                            // to can translate it into its own file instance
-                            file[Symbol.toStringTag] = 'File';
-                            file.stream = () => Fs.createReadStream(file.path);
-                            // Done pathcing
-                            return file;
-                        }
-                        if (Array.isArray(files[name])) {
-                            files[name].forEach(value => {
-                                formData.append(name, fileCompat(value));
-                            });
-                        } else {
-                            formData.append(name, fileCompat(files[name]));
-                        }
-                    });
-                    resolve(formData);
-                });
-            });
+        if (!['GET', 'HEAD'].includes(request.method)) {
+            requestInit.body = request;
         }
         return [ fullUrl, requestInit ];
     }
@@ -286,7 +228,7 @@ export default class Runtime extends _Runtime {
         await this.ready;
 
         // ------------
-        url = typeof url === 'string' ? new whatwag.URL(url) : url;
+        url = typeof url === 'string' ? new URL(url) : url;
         init = { referrer: this.location.href, ...init };
         // ------------
         const hosts = [];
@@ -309,10 +251,10 @@ export default class Runtime extends _Runtime {
             exit = { status: 302, headers: { Location: ( url.hostname = `www.${ url.hostname }`, url.href ) } };
         } else if (this.cx.config.runtime.server.Redirects) {
             exit = ((await (new this.cx.config.runtime.server.Redirects(this.cx)).read()).entries || []).reduce((_rdr, entry) => {
-                return _rdr || ((_rdr = urlPattern(entry.from, url.origin).exec(url.href)) && { status: entry.code || 302, headers: { Location: _rdr.render(entry.to) } });
+                return _rdr || ((_rdr = pattern(entry.from, url.origin).exec(url.href)) && { status: entry.code || 302, headers: { Location: _rdr.render(entry.to) } });
             }, null);
         }
-        if (exit) { return new Response(null, exit); }
+        if (exit) { return new xResponse(null, exit); }
         // ------------
 
         // ------------
@@ -323,7 +265,7 @@ export default class Runtime extends _Runtime {
         // ------------
         // Automatically-added headers
         const autoHeaders = this.cx.config.runtime.server.Headers 
-            ? ((await (new this.cx.config.runtime.server.Headers(this.cx)).read()).entries || []).filter(entry => urlPattern(entry.url, url.origin).exec(url.href))
+            ? ((await (new this.cx.config.runtime.server.Headers(this.cx)).read()).entries || []).filter(entry => pattern(entry.url, url.origin).exec(url.href))
             : [];
         // The request object
         const request = this.generateRequest(url.href, init, autoHeaders.filter(header => header.type === 'request'));
@@ -334,10 +276,10 @@ export default class Runtime extends _Runtime {
         // Response
         let response, finalResponse;
         try {
-            response = await this.client.handle(httpEvent, ( ...args ) => this.remoteFetch( ...args ));
+            response = await this.app.handle(httpEvent, ( ...args ) => this.remoteFetch( ...args ));
             finalResponse = await this.handleResponse(this.cx, httpEvent, response, autoHeaders.filter(header => header.type === 'response'));
         } catch(e) {
-            finalResponse = new Response(null, { status: 500, statusText: e.message });
+            finalResponse = new xResponse(null, { status: 500, statusText: e.message });
             console.error(e);
         }
         // Logging
@@ -353,19 +295,20 @@ export default class Runtime extends _Runtime {
     // Fetch from proxied host
     async proxyGo(vhost, url, init) {
         // ---------
-        const url2 = new whatwag.URL(url);
+        const url2 = new URL(url);
         url2.port = vhost.port;
         if (vhost.proto) { url2.protocol = vhost.proto; }
         // ---------
-        const init2 = { ...init, compress: false };
+        const init2 = { ...init, decompress: false/* honoured in xfetch() */ };
         if (!init2.headers) init2.headers = {};
         init2.headers.host = url2.host;
+        delete init2.headers.connection;
         // ---------
         let response;
         try {
             response = await this.remoteFetch(url2, init2);
         } catch(e) {
-            response = new Response(null, { status: 500, statusText: e.message });
+            response = new xResponse(null, { status: 500, statusText: e.message });
             console.error(e);
         }
         if (this.cx.logger) {
@@ -378,7 +321,7 @@ export default class Runtime extends _Runtime {
 
     // Generates request object
     generateRequest(href, init = {}, autoHeaders = []) {
-        const request = new Request(href, init);
+        const request = new xRequest(href, init);
         this._autoHeaders(request.headers, autoHeaders);
         return request;
     }
@@ -422,24 +365,24 @@ 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);
-        const _response = fetch(request, ...args);
+        const _response = xfetch(request, ...args);
         // 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 new Response(response);
+            return new xResponse(response);
         });
     }
 
     // Handles response object
     async handleResponse(cx, e, response, autoHeaders = []) {
-        if (!(response instanceof Response)) { response = new Response(response); }
+        if (!(response instanceof xResponse)) { response = new xResponse(response); }
         Observer.set(this.network, 'remote', false);
         Observer.set(this.network, 'error', null);
 
@@ -461,7 +404,7 @@ export default class Runtime extends _Runtime {
         if (response.headers.location) {
             const xRedirectPolicy = e.request.headers.get('X-Redirect-Policy');
             const xRedirectCode = e.request.headers.get('X-Redirect-Code') || 300;
-            const destinationUrl = new whatwag.URL(response.headers.location, e.url.origin);
+            const destinationUrl = new URL(response.headers.location, e.url.origin);
             const isSameOriginRedirect = destinationUrl.origin === e.url.origin;
             let isSameSpaRedirect, sparootsFile = Path.join(cx.CWD, cx.layout.PUBLIC_DIR, 'sparoots.json');
             if (isSameOriginRedirect && xRedirectPolicy === 'manual-when-cross-spa' && Fs.existsSync(sparootsFile)) {
@@ -483,7 +426,7 @@ export default class Runtime extends _Runtime {
 
         // ----------------
         // 404
-        if (response.bodyAttrs.input === undefined || response.bodyAttrs.input === null) {
+        if (response.meta.body === undefined || response.meta.body === null) {
             response.attrs.status = response.status !== 200 ? response.status : 404;
             response.attrs.statusText  = `${e.request.url} not found!`;
             return response;
@@ -507,7 +450,7 @@ export default class Runtime extends _Runtime {
         // Body
         let rangeRequest, body = response.body;
         if ((rangeRequest = e.request.headers.range) && !response.headers.get('Content-Range')
-        && ((body instanceof ReadableStream) || (ArrayBuffer.isView(body) && (body = ReadableStream.from(body))))) {
+        && ((body instanceof ReadableStream) || (ArrayBuffer.isView(body) && (body = _ReadableStream.from(body))))) {
             // ...in partials
             const totalLength = response.headers.contentLength || 0;
             const ranges = await rangeRequest.reduce(async (_ranges, range) => {
@@ -540,7 +483,7 @@ export default class Runtime extends _Runtime {
                 });
             } else {
                 // TODO: of ranges.parts is more than one, return multipart/byteranges
-                response = new Response(ranges.parts[0].body, {
+                response = new xResponse(ranges.parts[0].body, {
                     status: 206,
                     statusText: response.statusText,
                     headers: response.headers,

package/src/runtime-pi/server/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);
 }
 
 /**