@webqit/webflo 0.11.52 → 0.11.53-0

package/package.json

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

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

@@ -202,14 +202,16 @@ export default class Runtime extends _Runtime {
      * Performs a request.
      *
      * @param object|string 	href
-     * @param object 			init
+     * @param object|Request 	init
      * @param object 			src
      *
      * @return Response
      */
     async go(url, init = {}, detail = {}) {
         url = typeof url === 'string' ? new URL(url, this.location.origin) : url;
-        init = { referrer: this.location.href, ...init };
+		if (!(init instanceof Request) && !init.referrer) {
+			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
@@ -226,7 +228,7 @@ export default class Runtime extends _Runtime {
 		// States
 		// ------------
         Observer.set(this.network, 'error', null);
-        Observer.set(this.network, 'requesting', { ...init, ...detail });
+        Observer.set(this.network, 'requesting', { init, ...detail });
         if (['link', 'form'].includes(detail.srcType)) {
             detail.src.state && (detail.src.state.active = true);
             detail.submitter && detail.submitter.state && (detail.submitter.state.active = true);

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

@@ -89,15 +89,14 @@ export default class Runtime extends _Runtime {
 			event.respondWith((async (req, evt) => {
 				let requestingClient = await self.clients.get(event.clientId);
 				this.workport.setCurrentClient(requestingClient);
-				const [ url, requestInit ] = await xRequest.rip(req);
 				// 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';
+					req = new Request(req, {cache: 'default'});
 				}
-				return this.go(url, requestInit, { event: evt });
+				return this.go(req.url, req, { event: evt });
 			})(event.request, event));
 		});
 
@@ -121,7 +120,7 @@ export default class Runtime extends _Runtime {
      * Performs a request.
      *
      * @param object|string 	url
-     * @param object 			init
+     * @param object|Request	init
      * @param object 			detail
      *
      * @return Response
@@ -129,11 +128,12 @@ export default class Runtime extends _Runtime {
 	async go(url, init = {}, detail = {}) {
 		// ------------
         url = typeof url === 'string' ? new URL(url, self.location.origin) : url;
-		init = { referrer: this.location.href, ...init };
+		if (!(init instanceof Request) && !init.referrer) {
+			init = { referrer: this.location.href, ...init };
+		}
         // ------------
 		// The request object
-		const request = await this.generateRequest(url.href, init);
-
+		const request = this.generateRequest(url.href, init);
 		if (detail.event) {
 			Object.defineProperty(detail.event, 'request', { value: request });
 		}
@@ -152,7 +152,7 @@ export default class Runtime extends _Runtime {
 		} else {
 			response = await this.remoteFetch(httpEvent.request);
 		}
-		const finalResponse = this.handleResponse(httpEvent, response);
+		const finalResponse = await this.handleResponse(httpEvent, response);
         // Return value
         return finalResponse;
 	}

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

@@ -219,7 +219,7 @@ export default class Runtime extends _Runtime {
      * Performs a request.
      *
      * @param object|string 	url
-     * @param object 			init
+     * @param object|Request 	init
      * @param object 			detail
      *
      * @return Response
@@ -229,7 +229,9 @@ export default class Runtime extends _Runtime {
 
         // ------------
         url = typeof url === 'string' ? new URL(url) : url;
-        init = { referrer: this.location.href, ...init };
+        if (!(init instanceof Request) && !init.referrer) {
+			init = { referrer: this.location.href, ...init };
+		}
         // ------------
         const hosts = [];
         this.servers.forEach(server => hosts.push(...server.domains));
@@ -258,7 +260,7 @@ export default class Runtime extends _Runtime {
         // ------------
 
         // ------------
-        Observer.set(this.location, url, { detail: { ...init, ...detail, } });
+        Observer.set(this.location, url, { detail: { init, ...detail, } });
         Observer.set(this.network, 'redirecting', null);
         // ------------
 
@@ -299,10 +301,16 @@ export default class Runtime extends _Runtime {
         url2.port = vhost.port;
         if (vhost.proto) { url2.protocol = vhost.proto; }
         // ---------
-        const init2 = { ...init, decompress: false/* honoured in xfetch() */ };
-        if (!init2.headers) init2.headers = {};
-        init2.headers.host = url2.host;
-        delete init2.headers.connection;
+        let init2;
+        if (init instanceof Request) {
+            init2 = init.clone();
+            init.headers.set('Host', url2.host);
+        } else {
+            init2 = { ...init, decompress: false/* honoured in xfetch() */ };
+            if (!init2.headers) init2.headers = {};
+            init2.headers.host = url2.host;
+            delete init2.headers.connection;
+        }
         // ---------
         let response;
         try {

package/src/runtime-pi/util-http.js

@@ -2,62 +2,78 @@
 /**
  * @imports
  */
-import { _isString, _isNumeric, _isObject, _isPlainObject, _isArray, _isPlainArray, _isTypeObject, _isNumber } from '@webqit/util/js/index.js';
+import { _isString, _isNumeric, _isObject, _isPlainObject, _isArray, _isPlainArray, _isTypeObject, _isNumber, _isBoolean } from '@webqit/util/js/index.js';
 import { _before } from '@webqit/util/str/index.js';
 import { params } from './util-url.js';
 
-export function formatMessage(body) {
-    let type = dataType(body);
-    let headers = {};
+export function formatMessage(message) {
+    const headers = (message.headers instanceof Headers) ? [...message.headers.keys()].reduce((_headers, name) => {
+        return { ..._headers, [name/* lower-cased */]: message.headers.get(name) };
+    }, {}) : Object.keys(message.headers || {}).reduce((_headers, name) => {
+        return { ..._headers, [name.toLowerCase()]: message.headers[name] };
+    }, {});
+    let body = message.body, type = dataType(message.body);
     if ([ 'Blob', 'File' ].includes(type)) {
-        headers = { 'Content-Type': body.type,  'Content-Length': body.size, };
+        !headers['content-type'] && (headers['content-type'] = body.type);
+        !headers['content-length'] && (headers['content-length'] = body.size);
     } else if ([ 'Uint8Array', 'Uint16Array', 'Uint32Array', 'ArrayBuffer' ].includes(type)) {
-        headers = {  'Content-Length': body.byteLength, };
+        !headers['content-length'] && (headers['content-length'] = body.byteLength);
     } else if (type === 'json' && _isTypeObject(body)) {
-        const [ _body, isJsonfiable ] = formData(body);
-        if (isJsonfiable) {
-            body = JSON.stringify(body, (k, v) => v instanceof Error ? { ...v, message: v.message } : v);
-            headers = { 'Content-Type': 'application/json', 'Content-Length': (new Blob([ body ])).size, };
-        } else {
-            body = _body;
-            type = 'FormData';
+        if (!headers['content-type']) {
+            const [ _body, isJsonfiable ] = formDatarizeJson(body);
+            if (isJsonfiable) {
+                body = JSON.stringify(body, (k, v) => v instanceof Error ? { ...v, message: v.message } : v);
+                headers['content-type'] = 'application/json';
+                headers['content-length'] = (new Blob([ body ])).size;
+            } else {
+                body = _body;
+                type = 'FormData';
+            }
         }
     } else if (type === 'json') {
-        headers = { 'Content-Length': (body + '').length, };
+        !headers['content-length'] && (headers['content-length'] = (body + '').length);
     }
     return [ body, headers, type ];
 }
 
-export function formData(data = {}) {
-    const formData = this instanceof FormData ? this : new FormData;
+export function formDatarizeJson(data = {}, jsonfy = true) {
+    const formData = new FormData;
+    let isJsonfiable = true;
+    params.reduceValue(data, '', (value, contextPath, suggestedKeys = undefined) => {
+        if (suggestedKeys) {
+            const isJson = dataType(value) === 'json';
+            isJsonfiable = isJsonfiable && isJson;
+            return isJson && suggestedKeys;
+        }
+        if (jsonfy && [true, false, null].includes(value)) {
+            value = new Blob([value], { type: 'application/json' });
+        }
+        formData.append(contextPath, value);
+    });
+    return [ formData, isJsonfiable ];
+}
+
+export async function jsonfyFormData(formData, jsonfy = true) {
     let isJsonfiable = true;
-    if (arguments.length) {
-        params.reduceValue(data, '', (value, contextPath, suggestedKeys = undefined) => {
-            if (suggestedKeys) {
-                const isJson = dataType(value) === 'json';
-                isJsonfiable = isJsonfiable && isJson;
-                return isJson && suggestedKeys;
-            }
-            formData.append(contextPath, value);
-        });
-        return [ formData, isJsonfiable ];
-    }
     let json;
     for (let [ name, value ] of formData.entries()) {
         if (!json) { json = _isNumeric(_before(name, '[')) ? [] : {}; }
-        const isJson = dataType(value) === 'json';
-        isJsonfiable = isJsonfiable && isJson;
-        if (value === 'false') { value = false; }
-        if (value === 'true') { value = true; }
-        if (value === 'null') { value = null; }
-        if (value === 'undefined') { value = undefined; }
+        let type = dataType(value);
+        if (jsonfy && type === 'Blob' && value.type === 'application/json' && [4, 5].includes(value.size)) {
+            let _value = await value.text();
+            if (['true', 'false', 'null'].includes(_value)) {
+                type = 'json';
+                value = JSON.parse(_value);
+            }
+        }
+        isJsonfiable = isJsonfiable && type === 'json';
         params.set(json, name, value);
     }
     return [ json, isJsonfiable ];
 }
 
 export function dataType(value) {
-    if (_isString(value) || _isNumber(value) || value === null) return 'json';
+    if (_isString(value) || _isNumber(value) || _isBoolean(value)) return 'json';
     if (!_isTypeObject(value)) return;
     const toStringTag = value[Symbol.toStringTag];
     const type = [

package/src/runtime-pi/xFormData.js

@@ -2,7 +2,7 @@
 /**
  * @imports
  */
-import { formData } from './util-http.js';
+import { jsonfyFormData } from './util-http.js';
 
  /**
   * The _Headers Mixin
@@ -10,7 +10,7 @@ import { formData } from './util-http.js';
 export default class xFormData extends FormData {
 
     json(data = {}) {
-        const result = formData.call(this, ...arguments);
+        const result = jsonfyFormData(this, ...arguments);
         return result[0];
     }
 

package/src/runtime-pi/xRequest.js

@@ -2,53 +2,23 @@
 /**
  * @imports
  */
-import { formatMessage } from './util-http.js';
 import mxHttpMessage from './xxHttpMessage.js';
 import xRequestHeaders from './xRequestHeaders.js';
+import { formatMessage } from './util-http.js';
 
 /**
  * The xRequest Mixin
  */
 export default class xRequest extends mxHttpMessage(Request, xRequestHeaders) {
         
-    constructor(input, init = {}) {
-        let meta = {};
-        if ((input instanceof Request)) {
-            // On method change...
-            if (init.method && input.method !== init.method.toUpperCase() && [ 'GET', 'HEAD' ].includes(init.method.toUpperCase())) {
-                // Body must not be inherited.
-                input = input.url;
-                init = { ...init };
-                // We should now simply copy attributes
-                [ 'headers', 'mode', 'credentials', 'cache', 'redirect', 'referrer', 'integrity' ].forEach(attr => {
-                    if (!(attr in init)) { init[attr] = input[attr]; }
-                });
-            }
-        }
-        let isNavigateMode;
-        if (!(init instanceof Request)) {
-            // Init can contain "already-parsed request content"
-            if (('body' in init) && !(init.headers instanceof Headers)) {
-                const [ body, headers, type ] = formatMessage(init.body);
-                meta = { type, body: init.body };
-                init = { ...init, body, headers: { ...headers, ...(init.headers || {}), } };
-            }
-            if (init.mode === 'navigate') {
-                isNavigateMode = true;
-                init = { ...init };
-                delete init.mode;
-            }
+    constructor(input, init = {}, meta = {}) {
+        console.log('--------------------');
+        if (!(init instanceof Request) && 'body' in init) {
+            const [ body, headers, type ] = formatMessage(init);
+            meta = { ...meta, type, body: init.body };
+            init = { ...init, body, headers };
         }
-        // ---------------
         super(input, init, meta);
-        // ---------------
-        if (isNavigateMode) {
-            this.attrs.mode = 'navigate';
-        }
-    }
-
-    get mode() {
-        return 'mode' in this.attrs ? this.attrs.mode : super.mode;
     }
 
     static compat(request) {
@@ -58,14 +28,4 @@ export default class xRequest extends mxHttpMessage(Request, xRequestHeaders) {
         }
     }
 
-    static 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 = request.body;
-        }
-        return [ request.url, requestInit ];
-    }
-
 }

package/src/runtime-pi/xResponse.js

@@ -2,9 +2,9 @@
 /**
  * @imports
  */
-import { formatMessage } from './util-http.js';
 import mxHttpMessage from './xxHttpMessage.js';
 import xResponseHeaders from './xResponseHeaders.js';
+import { formatMessage } from './util-http.js';
 
 /**
  * The xResponse Mixin
@@ -12,55 +12,14 @@ import xResponseHeaders from './xResponseHeaders.js';
 export default class xResponse extends mxHttpMessage(Response, xResponseHeaders) {
 
     // construct
-    constructor(body = undefined, init = {}) {
-        let meta = {}, isResponseInput;
-        if (arguments.length) {
-            if (body instanceof Response) {
-                isResponseInput = body;
-                // Inherit init
-                init = { status: body.status, statusText: body.statusText, headers: body.headers, ...init };
-                if (body.status === 0) delete init.status;
-                // Inherit meta and body
-                meta = body.meta || {};
-                body = body.body;
-            } else if (!(init.headers instanceof Headers)) {
-                let headers, type, _body = body;
-                [ body, headers, type ] = formatMessage(body);
-                meta = { type, body: _body };
-                init = { ...init, headers: { ...headers, ...(init.headers || {}), } };
-            }
+    constructor(body = null, init = {}, meta = {}) {
+        if (body || body === 0) {
+            let headers, type, _body = body;
+            [ body, headers, type ] = formatMessage({ body, headers: init.headers });
+            meta = { ...init, type, body: _body };
+            init = { ...init, headers };
         }
-        // ---------------
         super(body, init, meta);
-        // ---------------
-        if (isResponseInput) {
-            // Through the backdoor
-            this.attrs.url = isResponseInput.url;
-            this.attrs.ok = isResponseInput.ok;
-            this.attrs.status = isResponseInput.status; // In case it was earlier deleted
-            this.attrs.type = isResponseInput.type;
-            this.attrs.redirected = isResponseInput.redirected;
-        }
-    }
-
-    get ok() {
-        return 'ok' in this.attrs ? this.attrs.ok : super.ok;
-    }
-
-    get status() {
-        return 'status' in this.attrs ? this.attrs.status : super.status;
-    }
-
-    get statusText() {
-        return 'statusText' in this.attrs ? this.attrs.statusText : super.statusText;
-    }
-
-    get type() {
-        return 'type' in this.attrs ? this.attrs.type : super.type;
-    }
-
-    get redirected() {
-        return 'redirected' in this.attrs ? this.attrs.redirected : super.redirected;
     }
 
     static compat(response) {

package/src/runtime-pi/xfetch.js

@@ -9,8 +9,8 @@ import { formatMessage } from './util-http.js';
  */
 const xfetch = async (url, init = {}) => {
     if (init.body) {
-        const [ body, headers ] = formatMessage(init.body);
-        init = { ...init, body, headers: { ...headers, ...(init.headers || {}), } };
+        const [ body, headers ] = formatMessage(init);
+        init = { ...init, body, headers, };
     }
     let response = await fetch(url, init), encoding;
     if (init.decompress === false && (encoding = response.headers.get('Content-Encoding'))) {