@webqit/webflo 0.10.0 → 0.10.3

package/package.json

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

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

@@ -88,7 +88,7 @@ export default class Runtime {
 			// Needed to allow window.document.location
 			// to update to window.location
 			window.setTimeout(() => {
-				this.go(Url.copy(window.document.location), { src: window.document.location, srcType: 'history', });
+				this.go(Url.copy(window.document.location), {}, { src: window.document.location, srcType: 'history', });
 			}, 0);
 		});
 
@@ -186,19 +186,21 @@ export default class Runtime {
      * @return Response
      */
     async go(url, init = {}, detail = {}) {
-        if (this._abortController) {
-            this._abortController.abort();
-        }
-        this._abortController = new AbortController();
-        this._xRedirectCode = 200;
-        // ------------
         url = typeof url === 'string' ? new whatwag.URL(url) : url;
         init = { referrer: this.location.href, ...init };
         // ------------
+		// Put his forward before instantiating a request and aborting previous
+		// Same-page hash-links clicks on chrome recurse here from histroy popstate
         if (detail.srcType !== 'init' && (_before(url.href, '#') === _before(init.referrer, '#') && (init.method || 'GET').toUpperCase() === 'GET')) {
 			return;
         }
 		// ------------
+        if (this._abortController) {
+            this._abortController.abort();
+        }
+        this._abortController = new AbortController();
+        this._xRedirectCode = 200;
+        // ------------
         if (['link', 'form'].includes(detail.srcType)) {
             Observer.set(detail.src, 'active', true);
             Observer.set(detail.submitter || {}, 'active', true);

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

@@ -72,14 +72,25 @@ export default class Worker {
 
 		// -------------
 		// ONFETCH		
-		self.addEventListener('fetch', async evt => {
+		self.addEventListener('fetch', event => {
 			// URL schemes that might arrive here but not supported; e.g.: chrome-extension://
-			if (!evt.request.url.startsWith('http')) return;
-			const deriveInit = req => [
-				'method', 'headers', 'body', 'mode', 'credentials', 'cache', 'redirect', 'referrer', 'integrity',
-			].reduce((init, prop) => ({ [prop]: req[prop], ...init }), {});
-			const requestInit = deriveInit(evt.request);
-			evt.respondWith(this.go(evt.request.url, requestInit, { event: evt }));
+			if (!event.request.url.startsWith('http')) return;
+			event.respondWith((async (req, evt) => {
+				const requestInit = [
+					'method', 'headers', 'mode', 'credentials', 'cache', 'redirect', 'referrer', 'integrity',
+				].reduce((init, prop) => ({ [prop]: req[prop], ...init }), {});
+				if (!['GET', 'HEAD'].includes(req.method)) {
+					requestInit.body = await req.text();
+				}
+				// 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 (req.cache === 'force-cache'/* && req.mode === 'navigate' - even webflo client init call also comes with that... needs investigation */) {
+					requestInit.cache = 'default';
+				}
+				return this.go(req.url, requestInit, { event: evt });
+			})(event.request, event));
 		});
 
 		// ---------------
@@ -107,16 +118,15 @@ export default class Worker {
 		init = { referrer: this.location.href, ...init };
         // ------------
 		// The request object
-		let request = this.generateRequest(url.href, init);
-		if (detail.event instanceof self.Request) {
-			request = detail.event.request;
+		let request = await this.generateRequest(url.href, init);
+		if (detail.event) {
 			Object.defineProperty(detail.event, 'request', { value: request });
 		}
 		// The navigation event
 		let httpEvent = new HttpEvent(request, detail, (id = null, persistent = false) => this.getSession(httpEvent, id, persistent));
 		httpEvent.port.listen(message => {
 			if (message.$type === 'handler:hints' && message.session) {
-				// TODO: Sync sesseion data from client
+				// TODO: Sync session data from client
 				return Promise.resolve();
 			}
 		});
@@ -134,15 +144,7 @@ export default class Worker {
 
     // Generates request object
     generateRequest(href, init) {
-		// Now, the following is key:
-		// The browser likes to use "force-cache" for "navigate" requests
-		// when, for example, the back button was used.
-		// Thus the origin server would still not be contacted by the self.fetch() below, leading to inconsistencies in responses.
-		// So, we detect this scenerio and avoid it.
-		if (init.mode === 'navigate' && init.cache === 'force-cache') {
-			init = { ...init, cache: 'default' };
-		}
-        let request = new Request(href, init);
+		let request = new Request(href, init);
 		return request;
     }
 

package/src/runtime-pi/xHttpMessage.js

@@ -94,7 +94,7 @@ const xHttpMessage = (whatwagHttpMessage, Headers, FormData) => {
                 this.bodyAttrs.jsonfied = new Promise(async (resolve, reject) => {
                     var messageInstance = this, jsonfied, contentType = messageInstance.headers.get('content-type') || '';
                     var type = contentType === 'application/json' || this.bodyAttrs.json ? 'json' : (
-                        contentType === 'application/x-www-form-urlencoded' || contentType.startsWith('multipart/') || this.bodyAttrs.formData ? 'formData' : (
+                        contentType === 'application/x-www-form-urlencoded' || contentType.startsWith('multipart/form-data') || this.bodyAttrs.formData ? 'formData' : (
                             contentType === 'text/plain' ? 'plain' : 'other'
                         )
                     );

package/src/runtime-pi/xRequest.js

@@ -62,6 +62,13 @@ const xRequest = (whatwagRequest, Headers, FormData, Blob) => class extends xHtt
         return 'referrer' in this.attrs ? this.attrs.referrer : super.referrer;
     }
 
+    static compat(request, url = null) {
+        if (request instanceof whatwagRequest) {
+            return Object.setPrototypeOf(request, new this);
+        }
+        return new this(url, request);
+    }
+
 };
 
 export default xRequest;