@webqit/webflo 1.0.12 → 1.0.14

package/package.json

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

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

@@ -3,8 +3,7 @@ import { WebfloRootClient2 } from './WebfloRootClient2.js';
 import { WebfloSubClient } from './WebfloSubClient.js';
 
 export function start() {
-    const navigationAPIMeta = document.querySelector('meta[name="webflo-navigationapi"]')?.value;
-    const WebfloRootClient = window.navigation && navigationAPIMeta ? WebfloRootClient2 : WebfloRootClient1;
+    const WebfloRootClient = window.navigation ? WebfloRootClient2 : WebfloRootClient1;
     const instance = WebfloRootClient.create(document, this || {});
     instance.initialize();
     WebfloSubClient.defineElement();

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

@@ -6,7 +6,7 @@ export class SessionStorage extends WebfloStorage {
 
     static create(request, params = {}) {
         let sessionID = request.headers.get('Cookie', true).find((c) => c.name === '__sessid')?.value;
-        if (sessionID?.includes('.')) {
+        if (sessionID?.includes('.') && params.secret) {
             const [rand, signature] = sessionID.split('.');
             const expectedSignature = crypto.createHmac('sha256', params.secret)
                 .update(rand)

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

@@ -12,6 +12,7 @@ import { _each } from '@webqit/util/obj/index.js';
 import { slice as _streamSlice } from 'stream-slice';
 import { Readable as _ReadableStream } from 'stream';
 import { WebfloRuntime } from '../WebfloRuntime.js';
+import { createWindow } from '@webqit/oohtml-ssr';
 import { Context } from './Context.js';
 import { CookieStorage } from './CookieStorage.js';
 import { SessionStorage } from './SessionStorage.js';
@@ -20,7 +21,7 @@ import { ClientMessagingRegistry } from './ClientMessagingRegistry.js';
 import { HttpEvent } from '../HttpEvent.js';
 import { HttpUser } from '../HttpUser.js';
 import { Router } from './Router.js';
-import { pattern } from '../util-url.js';
+import { params, pattern } from '../util-url.js';
 import xfetch from '../xfetch.js';
 import '../util-http.js';
 
@@ -646,28 +647,34 @@ export class WebfloServer extends WebfloRuntime {
                 pathnameSplit.pop();
             }
             const dirPublic = Url.pathToFileURL(Path.resolve(Path.join(this.#cx.CWD, this.#cx.layout.PUBLIC_DIR)));
-            const instanceParams = QueryString.stringify({
-                file: renderFile,
+            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);
+            const { window, document } = createWindow(renderFile, instanceParams);
+            //const { window, document } = await import('@webqit/oohtml-ssr/src/instance.js?' + instanceParams);
             await new Promise(res => {
-                if (document.readyState === 'complete') return res();
+                if (document.readyState === 'complete') return res(1);
                 document.addEventListener('load', res);
             });
-            // Await rendering engine
-            if (window.webqit.$qCompilerImport) {
-                await new Promise(res => {
-                    window.webqit.$qCompilerImport.then(res);
-                    setTimeout(res, 300);
-                });
-            }
             if (window.webqit?.oohtml?.configs) {
+                // Await rendering engine
+                if (window.webqit?.$qCompilerWorker) {
+                    window.webqit.$qCompilerWorker.postMessage({ source: '1+1', params: {} }, []);
+                    await new Promise(res => {
+                        window.webqit.$qCompilerImport.then(res);
+                        setTimeout(() => res(1), 1000);
+                    });
+                }
                 const {
-                    BINDINGS_API: { api: bindingsConfig } = {},
                     HTML_IMPORTS: { attr: modulesContextAttrs } = {},
+                    BINDINGS_API: { api: bindingsConfig } = {},
                 } = window.webqit.oohtml.configs;
+                if (modulesContextAttrs) {
+                    const newRoute = '/' + `routes/${httpEvent.url.pathname}`.split('/').map(a => (a => a.startsWith('$') ? '-' : a)(a.trim())).filter(a => a).join('/');
+                    document.body.setAttribute(modulesContextAttrs.importscontext, newRoute);
+                }
                 if (bindingsConfig) {
                     document[bindingsConfig.bind]({
                         state: {},
@@ -684,11 +691,7 @@ export class WebfloServer extends WebfloRuntime {
                         console.error(`The following data properties were overridden: ${overridenKeys.join(', ')}`);
                     }
                 }
-                if (modulesContextAttrs) {
-                    const newRoute = '/' + `routes/${httpEvent.url.pathname}`.split('/').map(a => (a => a.startsWith('$') ? '-' : a)(a.trim())).filter(a => a).join('/');
-                    document.body.setAttribute(modulesContextAttrs.importscontext, newRoute);
-                }
-                await new Promise(res => setTimeout(res, 500));
+                await new Promise(res => setTimeout(res, 300));
             }
             // Append background-activity meta
             let backgroundActivityMeta = document.querySelector('meta[name="X-Background-Messaging"]');
@@ -708,7 +711,11 @@ export class WebfloServer extends WebfloRuntime {
             hydrationData.setAttribute('rel', 'hydration');
             hydrationData.textContent = JSON.stringify(data);
             document.body.append(hydrationData);
-            return window;
+            const rendering = window.toString();
+            document.documentElement.remove();
+            document.writeln('');
+            try { window.close(); } catch(e) {}
+            return rendering;
         });
         // Validate rendering
         if (typeof scope.rendering !== 'string' && !(typeof scope.rendering?.toString === 'function')) {