@webqit/webflo 0.11.61-0 → 0.11.61

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

@@ -1,86 +1,78 @@
-
-export default class Workport {
-
-    constructor() {
-        // --------
-        // Post messaging
-        // --------
-        this.messaging = {
-            post: (message, client = this.client) => {
-                if (!client) throw new Error(`No client for this operation.`);
-                client.postMessage(message);
-                return this.post;
-            },
-            listen: (callback, client = this.client) => {
-                (client || self).addEventListener('message', evt => {
-                    this.client = evt.source;
-                    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;
-            },
-            request: (message, client = this.client) => {
-                if (!client) throw new Error(`No client for this operation.`);
-                return new Promise(res => {
-                    let messageChannel = new MessageChannel();
-                    client.postMessage(message, [ messageChannel.port2 ]);
-                    messageChannel.port1.onmessage = e => res(e.data);
-                });
-            },
-            channel(channelId) {
-                if (!this.channels.has(channelId)) { this.channels.set(channelId, new BroadcastChannel(channel)); }
-                let channel = this.channels.get(channelId);
-                return {
-                    broadcast: message => channel.postMessage(message),
-                    listen: callback => channel.addEventListener('message', callback),
-                };
-            },
-            channels: new Map,
-        };
-
-        // --------
-        // Notifications
-        // --------
-        this.notifications = {
-            fire: (title, params = {}) => {
-                return new Promise((res, rej) => {
-                    if (!(self.Notification && self.Notification.permission === 'granted')) {
-                        return rej(self.Notification && self.Notification.permission);
-                    }
-                    notification.addEventListener('error', rej);
-                    let notification = new self.Notification(title, params);
-                    notification.addEventListener('click', res);
-                    notification.addEventListener('close', res);
-                });
-            },
-            handle: callback => {
-                self.addEventListener('notificationclick', callback);
-                return this.notifications;
-            },
-        };
-
-        // --------
-        // Push Notifications
-        // --------
-        this.push = {
-            listen: callback => {
-                self.addEventListener('push', callback);
-                return this.post;
-            },
-        };
-    }
-
-    setCurrentClient(client) {
-        this.client = client;
-    }
-
+
+export default class Workport {
+
+    constructor() {
+        // --------
+        // Post messaging
+        // --------
+        this.messaging = {
+            post: (message, client = this.client) => {
+                if (!client) throw new Error(`No client for this operation.`);
+                client.postMessage(message);
+                return this;
+            },
+            listen: (callback, client = this.client) => {
+                (client || self).addEventListener('message', evt => {
+                    this.client = evt.source;
+                    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;
+            },
+            request: (message, client = this.client) => {
+                if (!client) throw new Error(`No client for this operation.`);
+                return new Promise(res => {
+                    let messageChannel = new MessageChannel();
+                    client.postMessage(message, [ messageChannel.port2 ]);
+                    messageChannel.port1.onmessage = e => res(e.data);
+                });
+            },
+            channel(channelId) {
+                if (!this.channels.has(channelId)) { this.channels.set(channelId, new BroadcastChannel(channel)); }
+                let channel = this.channels.get(channelId);
+                return {
+                    broadcast: message => channel.postMessage(message),
+                    listen: callback => channel.addEventListener('message', callback),
+                };
+            },
+            channels: new Map,
+        };
+
+        // --------
+        // Notifications
+        // --------
+        this.notifications = {
+            handle: callback => {
+                self.addEventListener('notificationclick', e => e.waitUntil(callback(e)));
+                return this;
+            },
+            fire: (title, params = {}) => {
+                return self.registration.showNotification(title, params);
+            },
+        };
+
+        // --------
+        // Push Notifications
+        // --------
+        this.push = {
+            listen: callback => {
+                self.addEventListener('push', e => e.waitUntil(callback(e)));
+                return this;
+            },
+        };
+    }
+
+    setCurrentClient(client) {
+        this.client = client;
+    }
+
 }

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

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

package/src/runtime-pi/index.js

@@ -1,14 +1,14 @@
-
-/**
- * @imports
- */
-import * as server from './server/index.js';
-import * as client from './client/generate.js';
-
-/**
- * @exports
- */
-export {
-    server,
-    client,
+
+/**
+ * @imports
+ */
+import * as server from './server/index.js';
+import * as client from './client/generate.js';
+
+/**
+ * @exports
+ */
+export {
+    server,
+    client,
 }

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

@@ -1,116 +1,101 @@
-
-/**
- * imports
- */
-import Fs from 'fs';
-import Path from 'path';
-import QueryString from 'querystring';
-import Router from './Router.js';
-import _Application from '../Application.js';
-
-export default class Application extends _Application {
-
-    /**
-     * Application
-     * 
-     * @param Context cx
-     */
-    constructor(cx) {
-        super(cx);
-        this.renderFileCache = {};
-    }
-
-	// Returns router class
-	get Router() {
-		return Router;
-	}
-
-    /**
-     * Handles navigation events.
-     * 
-     * @param NavigationEvent       httpEvent
-     * @param Function              remoteFetch
-     * 
-     * @return Response
-     */
-    async handle(httpEvent, remoteFetch) {
-        // The app router
-        const router = new this.Router(this.cx, httpEvent.url.pathname);
-        const handle = async () => {
-            // --------
-            // ROUTE FOR DATA
-            // --------
-            let response = await router.route([httpEvent.request.method, 'default'], httpEvent, {}, async event => {
-                return router.file(event);
-            }, remoteFetch);
-            if (!(response instanceof httpEvent.Response)) {
-                response = httpEvent.Response.compat(response);
-            }
-            // --------
-            // Rendering
-            // --------
-            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()..');
-                }
-                rendering = rendering.toString();
-                response = new httpEvent.Response(rendering, {
-                    headers: { ...response.headers.json(), contentType: 'text/html', contentLength: (new Blob([rendering]).size) },
-                    status: response.status,
-                });
-            }
-
-            return response;
-        };
-        // --------
-        // PIPE THROUGH MIDDLEWARES
-        // --------
-        return (this.cx.middlewares || []).concat(handle).reverse().reduce((next, fn) => {
-            return () => fn.call(this.cx, httpEvent, router, next);
-        }, null)();
-    }
-
-    // Renderer
-    async render(httpEvent, router, response) {
-        let data = await response.jsonfy();
-        let rendering = await router.route('render', httpEvent, data, async (httpEvent, data) => {
-            var renderFile, pathnameSplit = httpEvent.url.pathname.split('/');
-            while ((renderFile = Path.join(this.cx.CWD, this.cx.layout.PUBLIC_DIR, './' + pathnameSplit.join('/'), 'index.html')) 
-            && (this.renderFileCache[renderFile] === false/* false on previous runs */ || !Fs.existsSync(renderFile))) {
-                this.renderFileCache[renderFile] = false;
-                pathnameSplit.pop();
-            }
-            const instanceParams = QueryString.stringify({
-                file: renderFile,
-                url: httpEvent.url.href,
-                root: this.cx.CWD,
-                oohtml_level: this.cx.server.oohtml_support,
-            });
-            const { window } = await import('@webqit/oohtml-ssr/instance.js?' + instanceParams);
-            // --------
-            // OOHTML would waiting for DOM-ready in order to be initialized
-            if (window.WebQit.DOM) {
-                await new Promise(res => window.WebQit.DOM.ready(res));
-            }
-            if (window.document.templates) {
-                await new Promise(res => (window.document.templatesReadyState === 'complete' && res(), window.document.addEventListener('templatesreadystatechange', res)));
-            }
-            if (window.document.state) {
-                if (!window.document.state.env) {
-                    window.document.setState({
-                        env: 'server',
-                    }, { update: true });
-                }
-                window.document.setState({ data, url: httpEvent.url }, { update: 'merge' });
-            }
-            if (window.document.templates) {
-                window.document.body.setAttribute('template', 'routes/' + httpEvent.url.pathname.split('/').filter(a => a).map(a => a + '+-').join('/'));
-            }
-            await new Promise(res => setTimeout(res, 60));
-            return window;
-        });
-        return rendering + '';
-    }
-
+
+/**
+ * imports
+ */
+import Fs from 'fs';
+import Url from 'url';
+import Path from 'path';
+import QueryString from 'querystring';
+import Router from './Router.js';
+import _Application from '../Application.js';
+
+export default class Application extends _Application {
+
+    /**
+     * Application
+     * 
+     * @param Context cx
+     */
+    constructor(cx) {
+        super(cx);
+        this.renderFileCache = {};
+    }
+
+	// Returns router class
+	get Router() {
+		return Router;
+	}
+
+    /**
+     * Handles navigation events.
+     * 
+     * @param NavigationEvent       httpEvent
+     * @param Function              remoteFetch
+     * 
+     * @return Response
+     */
+    async handle(httpEvent, remoteFetch) {
+        // The app router
+        const router = new this.Router(this.cx, httpEvent.url.pathname);
+        const handle = async () => {
+            return await router.route([httpEvent.request.method, 'default'], httpEvent, {}, async event => {
+                return router.file(event);
+            }, remoteFetch);
+        };
+        return (this.cx.middlewares || []).concat(handle).reverse().reduce((next, fn) => {
+            return () => fn.call(this.cx, httpEvent, router, next);
+        }, null)();
+    }
+
+    // Renderer
+    async render(httpEvent, response) {
+        let data = await response.jsonfy();
+		const router = new this.Router(this.cx, httpEvent.url.pathname);
+        return router.route('render', httpEvent, data, async (httpEvent, data) => {
+            let renderFile, pathnameSplit = httpEvent.url.pathname.split('/');
+            while ((renderFile = Path.join(this.cx.CWD, this.cx.layout.PUBLIC_DIR, './' + pathnameSplit.join('/'), 'index.html')) 
+            && (this.renderFileCache[renderFile] === false/* false on previous runs */ || !Fs.existsSync(renderFile))) {
+                this.renderFileCache[renderFile] = false;
+                pathnameSplit.pop();
+            }
+            const dirPublic = Url.pathToFileURL( Path.resolve( Path.join(this.cx.CWD, this.cx.layout.PUBLIC_DIR) ) );
+            const instanceParams = QueryString.stringify({
+                file: renderFile,
+                url: dirPublic.href,// httpEvent.url.href,
+                root: this.cx.CWD,
+            });
+            const { window, document } = await import('@webqit/oohtml-ssr/src/instance.js?' + instanceParams);
+            await new Promise(res => {
+                if (document.readyState === 'complete') return res();
+                document.addEventListener('load', res);
+            });
+			if (window.webqit?.oohtml?.configs) {
+				const {
+				    CONTEXT_API: { attr: contextConfig } = {},
+					BINDINGS_API: { api: bindingsConfig } = {},
+					HTML_IMPORTS: { attr: modulesContextAttrs } = {},
+				} = window.webqit.oohtml.configs;
+                if ( bindingsConfig ) {
+                    document[ bindingsConfig.bind ]({
+                        env: 'server',
+                        state: this.cx.runtime,
+                        ...data
+                    }, { diff: true });
+                }
+                if ( modulesContextAttrs ) {
+                    const routingContext = document.body.querySelector(`[${ window.CSS.escape( contextConfig.contextname ) }="route"]`) || document.body;
+                    routingContext.setAttribute( modulesContextAttrs.importscontext, '/' + `routes/${ httpEvent.url.pathname }`.split('/').map(a => a.trim()).filter(a => a).join('/'));
+                }
+			}
+            if (window.webqit.$qCompilerImport) {
+                await new Promise(res => {
+                    window.webqit.$qCompilerImport.then(res);
+                    setTimeout(res, 300);
+                });
+            }
+            await new Promise(res => setTimeout(res, 50));
+            return window;
+        });
+    }
+
 }

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

@@ -1,16 +1,16 @@
-
-/**
- * @imports
- */
-import _Contex from '../../Context.js';
-
-export default class Context extends _Contex {
-    // env
-    get env() {
-        return this.dict.env || {};
-    }
-
-    set env(value) {
-        this.dict.env = value;
-    }
+
+/**
+ * @imports
+ */
+import _Context from '../../Context.js';
+
+export default class Context extends _Context {
+    // env
+    get env() {
+        return this.dict.env || {};
+    }
+
+    set env(value) {
+        this.dict.env = value;
+    }
 }