@webqit/webflo 0.11.33 → 0.11.35

package/package.json

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

package/src/config-pi/deployment/Virtualization.js

@@ -46,15 +46,21 @@ export default class Virtualization extends Dotfile {
                 initial: config.entries,
                 questions: [
                     {
-                        name: 'host',
+                        name: 'path',
                         type: 'text',
-                        message: 'Enter Host name',
+                        message: 'Enter local pathname to target server if exists. (Leave empty to explicitly specify hostnames and port number.)',
                         validation: ['important'],
                     },
                     {
-                        name: 'path',
+                        name: 'hostnames',
+                        type: 'text',
+                        message: 'Enter host names. (Leave empty to automatically derive hostnames from the config of the target server specified above.)',
+                        validation: ['important'],
+                    },
+                    {
+                        name: 'port',
                         type: 'text',
-                        message: 'Enter local path',
+                        message: 'Enter target port. (Leave empty to automatically derive port number from the config of the target server specified above.)',
                         validation: ['important'],
                     },
                 ],

package/src/config-pi/runtime/Server.js

@@ -21,16 +21,16 @@ export default class Server extends Dotfile {
     withDefaults(config) {
         return _merge(true, {
             port: process.env.port || 3000,
+            domains: [],
+            force_www: '',
             https: {
                 port: 0,
                 keyfile: '',
                 certfile: '',
-                certdoms: ['*'],
+                domains: [],
                 force: false,
             },
-            force_www: '',
             oohtml_support: 'full',
-            shared: false,
         }, config);
     }
 
@@ -60,6 +60,19 @@ export default class Server extends Dotfile {
                 initial: config.port,
                 validation: ['important'],
             },
+            {
+                name: 'domains',
+                type: 'list',
+                message: '[domains]: Enter a list of allowed domains if necessary (comma-separated)',
+                validation: ['important'],
+            },
+            {
+                name: 'force_www',
+                type: 'select',
+                message: '[force_www]: Force add/remove "www" on hostname?',
+                choices: CHOICES.force_www,
+                initial: this.indexOfInitial(CHOICES.force_www, config.force_www),
+            },
             {
                 name: 'https',
                 controls: {
@@ -86,9 +99,9 @@ export default class Server extends Dotfile {
                         validation: ['important'],
                     },
                     {
-                        name: 'certdoms',
+                        name: 'domains',
                         type: 'list',
-                        message: '[certdoms]: Enter the CERT domains (comma-separated)',
+                        message: '[domains]: Enter the CERT domains (comma-separated)',
                         validation: ['important'],
                     },
                     {
@@ -100,13 +113,6 @@ export default class Server extends Dotfile {
                     },
                 ],
             },
-            {
-                name: 'force_www',
-                type: 'select',
-                message: '[force_www]: Force add/remove "www" on hostname?',
-                choices: CHOICES.force_www,
-                initial: this.indexOfInitial(CHOICES.force_www, config.force_www),
-            },
             {
                 name: 'oohtml_support',
                 type: 'select',
@@ -115,14 +121,6 @@ export default class Server extends Dotfile {
                 initial: this.indexOfInitial(CHOICES.oohtml_support, config.oohtml_support),
                 validation: ['important'],
             },
-            {
-                name: 'shared',
-                type: 'toggle',
-                message: '[shared]: Shared server?',
-                active: 'YES',
-                inactive: 'NO',
-                initial: config.shared,
-            },
         ];
     }
 }

package/src/runtime-pi/Router.js

@@ -22,13 +22,13 @@ export default class Router {
 	 *
 	 * @return void
 	 */
-	constructor(cx, path) {
+	constructor(cx, path = []) {
         this.cx = cx;
         this.path = _isArray(path) ? path : (path + '').split('/').filter(a => a);
     }
 
     /**
-     * Performs dynamic routing.
+     * Performs dynamic routing
      * 
      * @param array|string      method
      * @param Object            event
@@ -59,7 +59,7 @@ export default class Router {
                     // Broadcast any hints exported by handler
                     if (thisTick.exports.hints) { await event.port.post({ ...thisTick.exports.hints, $type: 'handler:hints' }); }
                     const methods = _arrFrom(thisTick.method);
-                    const handler = _isFunction(thisTick.exports) && methods.includes('default') ? thisTick.exports : methods.reduce((_handler, name) => _handler || thisTick.exports[name.toLowerCase()], null);
+                    const handler = _isFunction(thisTick.exports) && methods.includes('default') ? thisTick.exports : methods.reduce((_handler, name) => _handler || thisTick.exports[name], null);
                     if (handler) {
                         // -------------
                         // Dynamic response

package/src/runtime-pi/Runtime.js

@@ -0,0 +1,21 @@
+
+/**
+ * @imports
+ */
+
+import { _isFunction } from "@webqit/util/js/index.js";
+
+/**
+ * ---------------------------
+ * The base Runtime class
+ * ---------------------------
+ */
+            
+export default class Runtime {
+    constructor(cx, client) {
+        this.cx = cx;
+        this.cx.runtime = this;
+        this.client = _isFunction(client) ? client(this.cx) : client;
+        if (!this.client || !this.client.handle) throw new Error(`Application instance must define a ".handle()" method.`);
+    }
+}

package/src/runtime-pi/RuntimeClient.js

@@ -0,0 +1,29 @@
+
+/**
+ * ---------------------------
+ * The base RuntimeClient class
+ * ---------------------------
+ */
+            
+export default class RuntimeClient {
+
+    constructor(cx) {
+        this.cx = cx;
+    }
+    
+	/**
+     * Initializes application itself.
+     * 
+     * @param HttpEvent       httpEvent
+     * @param Function        remoteFetch
+     * 
+     * @return Boolean|undefined
+     */
+	async init(httpEvent, remoteFetch) {
+		// The app router
+        const router = new this.Router(this.cx, '/');
+        return router.route(['init'], httpEvent, {}, async event => {
+		}, remoteFetch);
+	}
+
+}

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

@@ -17,6 +17,7 @@ import xResponse from "../xResponse.js";
 import xfetch from '../xfetch.js';
 import xHttpEvent from '../xHttpEvent.js';
 import Workport from './Workport.js';
+import _Runtime from '../Runtime.js';
 
 const URL = xURL(whatwag.URL);
 const FormData = xFormData(whatwag.FormData);
@@ -41,7 +42,7 @@ export {
 	Observer,
 }
 
-export default class Runtime {
+export default class Runtime extends _Runtime {
 
     /**
      * Runtime
@@ -52,15 +53,7 @@ export default class Runtime {
      * @return void
      */
 	constructor(cx, clientCallback) {
-        // ---------------
-		this.cx = cx;
-        this.clients = new Map;
-        // ---------------
-		this.cx.runtime = this;
-		let client = clientCallback(this.cx, '*');
-        if (!client || !client.handle) throw new Error(`Application instance must define a ".handle()" method.`);
-		this.clients.set('*', client);
-
+		super(cx, clientCallback);
 		// -----------------------
 		// Initialize location
 		Observer.set(this, 'location', new Url(window.document.location));
@@ -157,27 +150,24 @@ export default class Runtime {
 		// -----------------------
 		// Service Worker && COMM
 		if (this.cx.params.service_worker_support) {
-			let workport = new Workport(this.cx.params.worker_filename, { scope: this.cx.params.worker_scope, startMessages: true });
+			const workport = new Workport(this.cx.params.worker_filename, { scope: this.cx.params.worker_scope, startMessages: true });
 			Observer.set(this, 'workport', workport);
-			workport.messaging.listen(async evt => {
-				let responsePort = evt.ports[0];
-				let client = this.clients.get('*');
-				let response = client.alert && await client.alert(evt);
-				if (responsePort) {
-					if (response instanceof Promise) {
-						response.then(data => {
-							responsePort.postMessage(data);
-						});
-					} else {
-						responsePort.postMessage(response);
-					}
-				}
-			});
 		}
 
-        // ---------------
-        this.go(this.location, {}, { srcType: 'init' });
-        // ---------------
+		// -----------------------
+		// Initialize and Hydration
+		(async () => {
+			let shouldHydrate;
+			if (this.client.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 ));
+			}
+			if (shouldHydrate !== false) {
+				this.go(this.location, {}, { srcType: 'hydration' });
+			}
+		})(); 
+
 	}
 
     /**
@@ -211,9 +201,9 @@ export default class Runtime {
 	}
 
 	// Generates request object
-	generateRequest(href, init) {
+	generateRequest(href, init = {}) {
 		return new Request(href, {
-			signal: this._abortController.signal,
+			signal: this._abortController && this._abortController.signal,
 			...init,
 			headers: {
 				'Accept': 'application/json',
@@ -245,7 +235,7 @@ export default class Runtime {
         // ------------
 		// 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 !== 'init' && (_before(url.href, '#') === _before(init.referrer, '#') && (init.method || 'GET').toUpperCase() === 'GET')) {
+        if (detail.srcType !== 'hydration' && (_before(url.href, '#') === _before(init.referrer, '#') && (init.method || 'GET').toUpperCase() === 'GET')) {
 			return new Response(null, { status: 304 }); // Not Modified
         }
 		// ------------
@@ -266,17 +256,14 @@ export default class Runtime {
         // ------------
 		// Run
 		// ------------
-		// The request object
-		let request = this.generateRequest(url.href, init);
-		// The navigation event
-		let httpEvent = new HttpEvent(request, detail, (id = null, persistent = false) => this.getSession(httpEvent, id, persistent));
-		// Response
-		let client = this.clients.get('*'), response, finalResponse;
+		const request = this.generateRequest(url.href, init);
+		const httpEvent = new HttpEvent(request, detail, (id = null, persistent = false) => this.getSession(httpEvent, id, persistent));
+		let response, finalResponse;
 		try {
 			// ------------
 			// Response
 			// ------------
-			response = await client.handle(httpEvent, ( ...args ) => this.remoteFetch( ...args ));
+			response = await this.client.handle(httpEvent, ( ...args ) => this.remoteFetch( ...args ));
 			finalResponse = this.handleResponse(httpEvent, response);
 			// ------------
 			// Address bar
@@ -299,12 +286,14 @@ export default class Runtime {
 			// Rendering
 			// ------------
 			if (finalResponse.ok && (finalResponse.headers.contentType === 'application/json' || finalResponse.headers.contentType.startsWith('multipart/form-data'))) {
-				client.render && await client.render(httpEvent, finalResponse);
+				this.client.render && await this.client.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 }));
 				}
-				client.unrender && await client.unrender(httpEvent);
+				if (!finalResponse.headers.get('Location')) {
+					this.client.unrender && await this.client.unrender(httpEvent);
+				}
 			}
 		} catch(e) {
 			console.error(e);
@@ -321,7 +310,7 @@ export default class Runtime {
 		let href = request;
 		if (request instanceof Request) {
 			href = request.url;
-		} else if (request instanceof self.URL) {
+		} else if (request instanceof whatwag.URL) {
 			href = request.href;
 		}
 		Observer.set(this.network, 'remote', href);

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

@@ -3,19 +3,16 @@
  * @imports
  */
 import Router from './Router.js';
+import _RuntimeClient from '../RuntimeClient.js';
 
-export default class RuntimeClient {
+export default class RuntimeClient extends _RuntimeClient {
 
-	/**
-     * RuntimeClient
-     * 
-     * @param Context cx
-     */
-	constructor(cx) {
-		this.cx = cx;
+	// Returns router class
+	get Router() {
+		return Router;
 	}
 
-	 /**
+	/**
      * Handles HTTP events.
      * 
      * @param HttpEvent       httpEvent
@@ -25,12 +22,12 @@ export default class RuntimeClient {
      */
 	async handle(httpEvent, remoteFetch) {
 		// The app router
-        const router = new Router(this.cx, httpEvent.url.pathname);
+        const router = new this.Router(this.cx, httpEvent.url.pathname);
         const handle = async () => {
 			// --------
 			// ROUTE FOR DATA
 			// --------
-			let httpMethodName = httpEvent.request.method.toUpperCase();
+			const httpMethodName = httpEvent.request.method.toUpperCase();
 			return router.route([httpMethodName, 'default'], httpEvent, {}, async event => {
 				return remoteFetch(event.request);
 			}, remoteFetch);
@@ -46,7 +43,7 @@ export default class RuntimeClient {
 	// Renderer
     async render(httpEvent, response) {
 		let data = await response.jsonfy();
-		const router = new Router(this.cx, httpEvent.url.pathname);
+		const router = new this.Router(this.cx, httpEvent.url.pathname);
 		return router.route('render', httpEvent, data, async (httpEvent, data) => {
 			// --------
 			// OOHTML would waiting for DOM-ready in order to be initialized
@@ -57,7 +54,7 @@ export default class RuntimeClient {
 				if (!window.document.state.env) {
 					window.document.setState({
 						env: 'client',
-						onHydration: (httpEvent.detail || {}).srcType === 'init',
+						onHydration: (httpEvent.detail || {}).srcType === 'hydration',
 						network: this.cx.runtime.network,
 						url: this.cx.runtime.location,
 					}, { update: true });

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

@@ -9,7 +9,7 @@ import { Observer } from './Runtime.js';
 export default class Workport {
 
     constructor(file, params = {}) {
-        this.ready = navigator.serviceWorker ? navigator.serviceWorker.ready : new Promise;
+        this.ready = navigator.serviceWorker ? navigator.serviceWorker.ready : new Promise(() => {});
 
         // --------
         // Registration and lifecycle
@@ -83,7 +83,19 @@ export default class Workport {
             },
             listen: callback => {
                 if (navigator.serviceWorker) {
-                    navigator.serviceWorker.addEventListener('message', callback);
+                    navigator.serviceWorker.addEventListener('message', evt => {
+                        const response = callback(evt);
+                        let responsePort = evt.ports[0];
+                        if (responsePort) {
+                            if (response instanceof Promise) {
+                                response.then(data => {
+                                    responsePort.postMessage(data);
+                                });
+                            } else {
+                                responsePort.postMessage(response);
+                            }
+                        }
+                    });
                 }
                 return this.post;
             },

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

@@ -12,9 +12,7 @@ import Runtime from './Runtime.js';
 export async function start(clientCallback = null) {
     const cx = this || {};
     const defaultClientCallback = _cx => new RuntimeClient(_cx);
-    return new Runtime(Context.create(cx), ( ...args ) => {
-        return clientCallback ? clientCallback( ...args.concat( defaultClientCallback ) ) : defaultClientCallback( ...args );
-    });
+    return new Runtime(Context.create(cx), clientCallback || defaultClientCallback);
 }
 
 /**

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

@@ -6,6 +6,8 @@ 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 Workport from './Workport.js';
+import _Worker from '../../Runtime.js';
+
 export {
 	URL,
 	FormData,
@@ -25,7 +27,7 @@ export {
  * ---------------------------
  */
 
-export default class Worker {
+export default class Worker extends _Worker {
 
 	/**
      * Runtime
@@ -36,18 +38,10 @@ export default class Worker {
      * @return void
      */
 	constructor(cx, clientCallback) {
-
+		super(cx, clientCallback);
         // ---------------
-		this.cx = cx;
-        this.clients = new Map;
         this.mockSessionStore = {};
-        // ---------------
-		this.cx.runtime = this;
-		let client = clientCallback(this.cx, '*');
-        if (!client || !client.handle) throw new Error(`Application instance must define a ".handle()" method.`);
-		this.clients.set('*', client);
-		
-		// -------------
+        // --------------		
 		// ONINSTALL
 		self.addEventListener('install', evt => {
 			if (this.cx.params.skip_waiting) { self.skipWaiting(); }
@@ -113,26 +107,17 @@ export default class Worker {
 
 		// -------------
 		// Workport
-		let workport = new Workport();
+		const workport = new Workport();
 		Observer.set(this, 'workport', workport);
-		workport.messaging.listen(async evt => {
-			let responsePort = evt.ports[0];
-			let client = this.clients.get('*');
-			let response = client.alert && await client.alert(evt);
-			if (responsePort) {
-				if (response instanceof Promise) {
-					response.then(data => {
-						responsePort.postMessage(data);
-					});
-				} else {
-					responsePort.postMessage(response);
-				}
-			}
-		});
-		workport.push.listen(async evt => {
-			let client = this.clients.get('*');
-			client.alert && await client.alert(evt);
-		});
+
+		// -------------
+		// Initialize
+		(async () => {
+			if (!this.client.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 ));
+		})();
 		
 	}
 
@@ -151,12 +136,12 @@ export default class Worker {
 		init = { referrer: this.location.href, ...init };
         // ------------
 		// The request object
-		let request = await this.generateRequest(url.href, init);
+		const request = await this.generateRequest(url.href, init);
 		if (detail.event) {
 			Object.defineProperty(detail.event, 'request', { value: request });
 		}
 		// The navigation event
-		let 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.getSession(httpEvent, id, persistent));
 		httpEvent.port.listen(message => {
 			if (message.$type === 'handler:hints' && message.session) {
 				// TODO: Sync session data from client
@@ -166,18 +151,18 @@ export default class Worker {
 		// Response
 		let response;
 		if (httpEvent.request.url.startsWith(self.origin)/* && httpEvent.request.mode === 'navigate'*/) {
-			response = await this.clients.get('*').handle(httpEvent, ( ...args ) => this.remoteFetch( ...args ));
+			response = await this.client.handle(httpEvent, ( ...args ) => this.remoteFetch( ...args ));
 		} else {
 			response = await this.remoteFetch(httpEvent.request);
 		}
-		let finalResponse = this.handleResponse(httpEvent, response);
+		const finalResponse = this.handleResponse(httpEvent, response);
         // Return value
         return finalResponse;
 	}
 
     // Generates request object
-    generateRequest(href, init) {
-		let request = new Request(href, init);
+    generateRequest(href, init = {}) {
+		const request = new Request(href, init);
 		return request;
     }
 

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

@@ -3,19 +3,16 @@
  * @imports
  */
 import Router from '../Router.js';
+import _WorkerClient from '../../RuntimeClient.js';
 
-export default class WorkerClient {
+export default class RuntimeClient extends _WorkerClient {
 
-	/**
-     * WorkerClient
-     * 
-     * @param Context cx
-     */
-	constructor(cx) {
-		this.cx = cx;
+	// Returns router class
+	get Router() {
+		return Router;
 	}
 
-	 /**
+	/**
      * Handles HTTP events.
      * 
      * @param HttpEvent       httpEvent
@@ -25,12 +22,12 @@ export default class WorkerClient {
      */
 	async handle(httpEvent, remoteFetch) {
 		// The app router
-        const router = new Router(this.cx, httpEvent.url.pathname);
+        const router = new this.Router(this.cx, httpEvent.url.pathname);
         const handle = async () => {
 			// --------
 			// ROUTE FOR DATA
 			// --------
-			let httpMethodName = httpEvent.request.method.toUpperCase();
+			const httpMethodName = httpEvent.request.method.toUpperCase();
 			let response = await router.route([httpMethodName, 'default'], httpEvent, {}, async event => {
 				return remoteFetch(event.request);
 			}, remoteFetch);

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

@@ -15,7 +15,17 @@ export default class Workport {
                 if (!client) {
                     self.addEventListener('message', evt => {
                         this.client = evt.source;
-                        callback(evt);
+                        const response = callback(evt);
+                        let responsePort = evt.ports[0];
+                        if (responsePort) {
+                            if (response instanceof Promise) {
+                                response.then(data => {
+                                    responsePort.postMessage(data);
+                                });
+                            } else {
+                                responsePort.postMessage(response);
+                            }
+                        }
                     });
                     return this.post;
                 }

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

@@ -12,9 +12,7 @@ import Worker from './Worker.js';
 export async function start(clientCallback = null) {
     const cx = this || {};
     const defaultClientCallback = _cx => new WorkerClient(_cx);
-    return new Worker(Context.create(cx), ( ...args ) => {
-        return clientCallback ? clientCallback( ...args.concat( defaultClientCallback ) ) : defaultClientCallback( ...args );
-    });
+    return new Worker(Context.create(cx), clientCallback || defaultClientCallback);
 }
 
 /**

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

@@ -80,6 +80,7 @@ export default class Router extends _Router {
                 ext = Path.parse(filename.substring(0, filename.length - ext.length)).ext;
             }
         }
+
         // read file from file system
         return new Promise(resolve => {
             Fs.readFile(filename, function(err, data) {