@webqit/webflo 1.0.11 → 1.0.13

package/package.json

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

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

@@ -105,13 +105,13 @@ export class WebfloRootClient1 extends WebfloClient {
 		const undoControl = super.controlClassic((newHref) => {
             try {
                 // Save current scroll position
-                this.host.history.replaceState({
+                window.history.replaceState({
                     ...(this.currentEntry()?.getState?.() || {}),
                     scrollPosition: this.host === window.document ? [window.scrollX, window.scrollY] : [this.host.scrollLeft, this.host.scrollTop,],
                 }, '', this.location.href);
             } catch (e) { }
             // Do actual location update
-            try { this.host.history.pushState({}, '', newHref); } catch (e) { }
+            try { window.history.pushState({}, '', newHref); } catch (e) { }
         });
 		// ONPOPSTATE
 		const popstateHandler = (e) => {

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';
@@ -646,12 +647,14 @@ 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 = createWindow(renderFile, instanceParams);
+            const document = window.document;
+            //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);
@@ -719,6 +722,7 @@ export class WebfloServer extends WebfloRuntime {
             headers: response.headers,
             status: response.status,
         });
+        scope.rendering.close?.();
         scope.response.headers.set('Content-Type', 'text/html');
         scope.response.headers.set('Content-Length', (new Blob([scope.rendering])).size);
         return scope.response;