@webqit/webflo 0.8.74 → 0.8.77

package/package.json

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

package/src/runtime/_Request.js

@@ -32,10 +32,8 @@ const _Request = globals => class extends _MessageStream(globals.Request, _Reque
         // Init can contain "already-parsed request content"
         if (('body' in init)) {
             init = { ...init };
-            if (('body' in init)) {
-                _typedDataCache = encodeBody(init.body, globals);
-                init.body = _typedDataCache.body;
-            }
+            _typedDataCache = encodeBody(init.body, globals);
+            init.body = _typedDataCache.body;
         }
         if (!_isEmpty(init)) {
             super(input, init);

package/src/runtime/client/Navigator.js

@@ -157,7 +157,6 @@ export default class Navigator {
                 ...params,
                 headers: {
                     'Accept': 'application/json',
-					'Cache-Control': 'no-store',
                     'X-Redirect-Policy': 'manual-when-cross-origin',
                     'X-Redirect-Code': xRedirectCode,
                     'X-Powered-By': '@webqit/webflo',
@@ -224,6 +223,7 @@ export default class Navigator {
         this._abortController = new AbortController();
         let xRedirectCode = 300;
 
+
         if (params.srcType === 'init' || !(_before(url.href, '#') === _before(params.referrer, '#') && (params.method || 'GET').toUpperCase() === 'GET')) {
             handleResponse(this.client.call(this, generateRequest(url.href, params), params, remoteRequest), params);
         }

package/src/runtime/client/Storage.js

@@ -6,30 +6,31 @@
 import { _isString, _isUndefined } from '@webqit/util/js/index.js';
 import { Observer } from './Runtime.js';
 
-export default function(persistent = false) {
+export default function(persistent = false, namespace = null) {
 
     const storeType = persistent ? 'localStorage' : 'sessionStorage';
     if (!window[storeType]) {
-        throw new Error(`The specified Web Storage API ${storeType} is invalid or not supported`)
+        throw new Error(`The specified Web Storage API ${storeType} is invalid or not supported`);
     }
 
     const _storage = {};
     Observer.intercept(_storage, (event, received, next) => {
-        if (event.type === 'get' && _isString(event.name)) {
-            const value = window[storeType].getItem(event.name);
+        const key = namespace ? `${namespace}.${event.name}` : event.name;
+        if (event.type === 'get' && _isString(key)) {
+            const value = window[storeType].getItem(key);
             return !_isUndefined(value) ? JSON.parse(value) : value;
         }
         if (event.type === 'set') {
-            window[storeType].setItem(event.name, !_isUndefined(event.value) ? JSON.stringify(event.value) : event.value);
+            window[storeType].setItem(key, !_isUndefined(event.value) ? JSON.stringify(event.value) : event.value);
             return true;
         }
         if (event.type === 'deleteProperty') {
-            window[storeType].removeItem(event.name);
+            window[storeType].removeItem(key);
             return true;
         }
         if (event.type === 'has') {
             for(var i = 0; i < window[storeType].length; i ++){
-                if (window[storeType].key(i) === event.name) {
+                if (window[storeType].key(i) === key) {
                     return true;
                 }
             };

package/src/runtime/client/Worker.js

@@ -103,10 +103,15 @@ export default function(layout, params) {
 
 			if (evt.request.url.startsWith(self.origin) && (evt.request.mode === 'navigate' || evt.request.headers.get('X-Powered-By') === '@webqit/webflo')) {
 				// -----------------
+				// We must patch the event object with the new request instance
+				// cos the body of the original gets consumed (thus invalidated) by the new instance
+				Object.defineProperty(evt, 'request', {
+					value: new NavigationEvent.Request(evt.request),
+				});
 				// Sync session data to cache to be available to service-worker routers
 				// Sync only takes for requests that actually do send the "$session" cookie
 				const sessionData = Observer.proxy(sessionStores[evt.clientId] || {});
-				const clientNavigationEvent = new NavigationEvent(new NavigationEvent.Request(evt.request), sessionData);
+				const clientNavigationEvent = new NavigationEvent(evt.request, sessionData);
 				// -----------------
 				// The app router
 				const router = new Router(_before(evt.request.url, '?'), layout, { layout });
@@ -120,7 +125,8 @@ export default function(layout, params) {
 			
 			return defaultFetch(evt);
 		};
-		evt.respondWith(handleFetch(evt));
+		let response = handleFetch(evt);
+		evt.respondWith(response);
 	});
 
 	const defaultFetch = function(evt) {

package/src/runtime/server/Runtime.js

@@ -459,6 +459,13 @@ export async function run(hostSetup, request, response, Ui, flags = {}, protocol
                     }
                 });
                 
+                // -------------------
+                // Important no-caching for non-"get" requests
+                // -------------------
+                if (httpMethodName !== 'get' && !response.getHeader('Cache-Control')) {
+                    response.setHeader('Cache-Control', 'no-store');
+                }
+
                 // -------------------
                 // Send
                 // -------------------
@@ -469,6 +476,7 @@ export async function run(hostSetup, request, response, Ui, flags = {}, protocol
                     if (xRedirectPolicy === 'manual' || (!isSameOriginRedirect && xRedirectPolicy === 'manual-when-cross-origin') || (isSameOriginRedirect && xRedirectPolicy === 'manual-when-same-origin')) {
                         response.statusCode = xRedirectCode;
                         response.setHeader('X-Redirect-Code', $context.response.status);
+                        response.setHeader('Cache-Control', 'no-store');
                     } else {
                         response.statusCode = $context.response.status;
                     }