@webqit/webflo 0.11.58-0 → 0.11.59

package/package.json

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

package/src/runtime-pi/HttpEvent.js

@@ -91,14 +91,15 @@ export default class HttpEvent {
     }
 
     // "with()"
-    with(url, init = {}) {
+    async with(url, init = {}) {
         let request;
         if (url instanceof Request) {
+            if (init instanceof Request) { [ /*url*/, init ] = await xRequest.rip(init); }
             request = !_isEmpty(init) ? new xRequest(url, init) : url;
         } else {
             url = new this.URL(url, this.url.origin);
-            request = new xRequest(url, this._request);
-            request = new xRequest(request, { ...init, referrer: this.request.url });
+            [ /*url*/, init ] = await xRequest.rip(this._request);
+            request = new xRequest(url, { ...init, referrer: this.request.url });
         }            
         return new HttpEvent(request, this.detail, this._sessionFactory, this.storageFactory);
     }

package/src/runtime-pi/Router.js

@@ -85,9 +85,9 @@ export default class Router {
                                     }
                                 }
                                 if (_request) {
-                                    nextTick.event = thisTick.event.with(newDestination, _request, requestInit);
+                                    nextTick.event = await thisTick.event.with(newDestination, _request, requestInit);
                                 } else {
-                                    nextTick.event = thisTick.event.with(newDestination, requestInit);
+                                    nextTick.event = await thisTick.event.with(newDestination, requestInit);
                                 }
                                 nextTick.source = thisTick.destination.join('/');
                                 nextTick.destination = newDestination.split('?').shift().split('/').map(a => a.trim()).filter(a => a);

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

@@ -84,21 +84,20 @@ export default class Runtime extends _Runtime {
 		// -------------
 		// ONFETCH
 		self.addEventListener('fetch', event => {
-			console.log('[SERVICE_WORKER]: ' + event.request.url);
 			// URL schemes that might arrive here but not supported; e.g.: chrome-extension://
 			if (!event.request.url.startsWith('http')) return;
 			event.respondWith((async evt => {
 				let requestingClient = await self.clients.get(evt.clientId);
 				this.workport.setCurrentClient(requestingClient);
+				const [ url, requestInit ] = await xRequest.rip(evt.request);
 				// Now, the following is key:
 				// The browser likes to use "force-cache" for "navigate" requests, when, e.g: re-entering your site with the back button
 				// Problem here, force-cache forces out JSON not HTML as per webflo's design.
 				// So, we detect this scenerio and avoid it.
-				if (evt.request.cache === 'force-cache'/* && evt.request.mode === 'navigate' - even webflo client init call also comes with that... needs investigation */) {
-					const req = new Request(evt.request, { cache: 'default' });
-					Object.defineProperty(evt, 'request', { value: req });
+				if (requestInit.cache === 'force-cache'/* && evt.request.mode === 'navigate' - even webflo client init call also comes with that... needs investigation */) {
+					requestInit.cache = 'default';
 				}
-				return this.go(evt.request.url, evt.request, { event: evt });
+				return this.go(url, requestInit, { event: evt });
 			})(event));
 		});
 
@@ -136,7 +135,7 @@ export default class Runtime extends _Runtime {
         // ------------
 		// The request object
 		const request = this.generateRequest(url.href, init);
-		console.log('[SERVICE_WORKER]: ' + request.url, request.method);
+		if (detail.event) { Object.defineProperty(detail.event, 'request', { value: request }); }
 		// The navigation event
 		const httpEvent = new HttpEvent(request, detail, (id = null, persistent = false) => this.getSession(httpEvent, id, persistent));
 		httpEvent.port.listen(message => {

package/src/runtime-pi/xRequest.js

@@ -12,7 +12,9 @@ import { formatMessage } from './util-http.js';
 export default class xRequest extends mxHttpMessage(Request, xRequestHeaders) {
         
     constructor(input, init = {}, meta = {}) {
-        if (!(init instanceof Request) && 'body' in init) {
+        if (init instanceof Request) {
+
+        } else if ('body' in init) {
             const [ body, headers, type ] = formatMessage(init);
             meta = { ...meta, type, body: init.body };
             init = { ...init, body, headers };
@@ -28,4 +30,17 @@ export default class xRequest extends mxHttpMessage(Request, xRequestHeaders) {
         return new this(request);
     }
 
+    static async rip(request) {
+        const requestInit = [
+            'method', 'headers', 'mode', 'credentials', 'cache', 'redirect', 'referrer', 'integrity',
+        ].reduce((init, prop) => ({ [prop]: request[prop], ...init }), {});
+        if (!['GET', 'HEAD'].includes(request.method)) {
+            requestInit.body = await request.arrayBuffer();
+        }
+        if (requestInit.mode === 'navigate') {
+            requestInit.mode = 'cors';
+        }
+        return [ request.url, requestInit ];
+    }
+
 }