@webqit/webflo 0.11.30 → 0.11.31

package/package.json

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

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

@@ -298,7 +298,7 @@ export default class Runtime {
 			// ------------
 			// Rendering
 			// ------------
-			if (finalResponse.ok && finalResponse.headers.contentType === 'application/json') {
+			if (finalResponse.ok && (finalResponse.headers.contentType === 'application/json' || finalResponse.headers.contentType.startsWith('multipart/form-data'))) {
 				client.render && await client.render(httpEvent, finalResponse);
 			} else if (!finalResponse.ok) {
 				if ([404, 500].includes(finalResponse.status)) {
@@ -317,8 +317,13 @@ export default class Runtime {
     }
 
 	// Initiates remote fetch and sets the status
-	remoteFetch(request, ...args) {
-		let href = typeof request === 'string' ? request : (request.url || request.href);
+	async remoteFetch(request, ...args) {
+		let href = request;
+		if (request instanceof Request) {
+			href = request.url;
+		} else if (request instanceof self.URL) {
+			href = request.href;
+		}
 		Observer.set(this.network, 'remote', href);
 		let _response = fetch(request, ...args);
 		// This catch() is NOT intended to handle failure of the fetch

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

@@ -45,7 +45,7 @@ export default class RuntimeClient {
 
 	// Renderer
     async render(httpEvent, response) {
-		let data = await response.json();
+		let data = await response.jsonfy();
 		const router = new Router(this.cx, httpEvent.url.pathname);
 		return router.route('render', httpEvent, data, async (httpEvent, data) => {
 			// --------

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

@@ -401,7 +401,7 @@ async function bundle(gen, outfile, asModule = false) {
         }
     }
     // Remove moduleFile build
-    Fs.unlinkSync(bundlingConfig.entryPoints[0]);
+    //Fs.unlinkSync(bundlingConfig.entryPoints[0]);
     removals.forEach(file => Fs.existsSync(file) && Fs.unlinkSync(file));
     if (waiting) waiting.stop();
     // ----------------

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

@@ -99,12 +99,7 @@ export default class Worker {
 			event.respondWith((async (req, evt) => {
 				let requestingClient = await self.clients.get(event.clientId);
 				this.workport.setCurrentClient(requestingClient);
-				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();
-				}
+				const [ url, requestInit ] = await Request.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.
@@ -112,7 +107,7 @@ export default class Worker {
 				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 });
+				return this.go(url, requestInit, { event: evt });
 			})(event.request, event));
 		});
 

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

@@ -164,7 +164,7 @@ export default class Runtime {
                 const requestInit = { method: request.method, headers: request.headers };
                 if (request.method !== 'GET' && request.method !== 'HEAD') {
                     requestInit.body = await new Promise((resolve, reject) => {
-                        var formidable = new Formidable.IncomingForm({ multiples: true, allowEmptyFiles: false, keepExtensions: true });
+                        var formidable = new Formidable.IncomingForm({ multiples: true, allowEmptyFiles: true, keepExtensions: true });
                         formidable.parse(request, (error, fields, files) => {
                             if (error) {
                                 reject(error);
@@ -371,7 +371,13 @@ export default class Runtime {
 
     // Initiates remote fetch and sets the status
     remoteFetch(request, ...args) {
-        Observer.set(this.network, 'remote', true);
+        let href = request;
+		if (request instanceof Request) {
+			href = request.url;
+		} else if (request instanceof self.URL) {
+			href = request.href;
+		}
+        Observer.set(this.network, 'remote', href);
         let _response = fetch(request, ...args);
         // This catch() is NOT intended to handle failure of the fetch
         _response.catch(e => Observer.set(this.network, 'error', e.message));
@@ -515,7 +521,7 @@ export default class Runtime {
         log.push(style.keyword(e.request.method));
         log.push(style.url(e.request.url));
         if (response.attrs.hint) log.push(`(${style.comment(response.attrs.hint)})`);
-        if (response.headers.contentType) log.push(`(${style.comment(response.headers.contentType)})`);
+        if (response.headers.contentType) log.push(`(${style.comment(response.headers.contentType)}--)`);
         if (response.headers.get('Content-Encoding')) log.push(`(${style.comment(response.headers.get('Content-Encoding'))})`);
         if (errorCode) log.push(style.err(`${errorCode} ${response.statusText}`));
         else log.push(style.val(`${statusCode} ${response.statusText}`));

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

@@ -70,7 +70,7 @@ export default class RuntimeClient {
 
     // Renderer
     async render(httpEvent, router, response) {
-        let data = await response.json();
+        let data = await response.jsonfy();
         let rendering = await router.route('render', httpEvent, data, async (httpEvent, data) => {
             var renderFile, pathnameSplit = httpEvent.url.pathname.split('/');
             while ((renderFile = Path.join(this.cx.CWD, this.cx.layout.PUBLIC_DIR, './' + pathnameSplit.join('/'), 'index.html')) 

package/src/runtime-pi/xHeaders.js

@@ -71,6 +71,17 @@ const xHeaders = whatwagHeaders => class extends whatwagHeaders {
         return this.get('Content-Type');
     }
 
+    static compat(headers) {
+        if (!(headers instanceof this) && !headers.json) {
+            const descs = getAllPropertyDescriptors(new this);
+            Object.keys(descs).forEach(key => {
+                if (typeof key === 'symbol' || (key in headers)) return;
+                Object.defineProperty(headers, key, descs[key]);
+            });
+        }
+        return headers;
+    }
+
 }
 
 export default xHeaders;

package/src/runtime-pi/xHttpMessage.js

@@ -12,17 +12,8 @@ const xHttpMessage = (whatwagHttpMessage, Headers, FormData) => {
     const HttpMessage = class extends whatwagHttpMessage {
         
         constructor(input, init, bodyAttrs) {
-            if (('headers' in init) && !(init.headers instanceof Headers)) {
-                init = { ...init };
-                init.headers = new Headers(init.headers);
-                arguments[1] = init;
-            }
-            if (_isEmpty(init)) {
-                super(input);
-            } else {
-                super(input, init);
-            }
-            this._headers = init.headers;
+            if (init.headers) { init = { ...init, headers: new Headers(init.headers) }; }
+            super(input, init);
             if (bodyAttrs.headers) {
                 this.headers.json(bodyAttrs.headers);
             }
@@ -36,10 +27,8 @@ const xHttpMessage = (whatwagHttpMessage, Headers, FormData) => {
         }
 
         get headers() {
-            if (!this._headers) {
-                this._headers = new Headers(super.headers);
-            }
-            return this._headers;
+            Headers.compat(super.headers);
+            return super.headers;
         }
 
         get attrs() {
@@ -126,10 +115,13 @@ export default xHttpMessage;
 export function encodeBody(body, FormData, Blob) {
     const detailsObj = { body, input: body };
     const encodeFormData = (detailsObj, formData) => {
-        if (!FormData.encode) return;
-        let [ body, headers ] = FormData.encode(formData);
-        detailsObj.body = body;
-        detailsObj.headers = headers;
+        if (FormData.encode) {
+            let [ body, headers ] = FormData.encode(formData);
+            detailsObj.body = body;
+            detailsObj.headers = headers;
+            return;
+        }
+        detailsObj.body = formData;
     }
     if (_isString(body) || _isNumber(body)) {
         detailsObj.inputType = 'text';

package/src/runtime-pi/xRequest.js

@@ -62,11 +62,21 @@ const xRequest = (whatwagRequest, Headers, FormData, Blob) => class extends xHtt
         return 'referrer' in this.attrs ? this.attrs.referrer : super.referrer;
     }
 
-    static compat(request, url = null) {
+    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.text();
+        }
+        return [ request.url, requestInit ];
+    }
+
+    static compat(request) {
+        if (request instanceof this) return request;
         if (request instanceof whatwagRequest) {
             return Object.setPrototypeOf(request, new this);
         }
-        return new this(url, request);
     }
 
 };

package/src/runtime-pi/xResponse.js

@@ -58,10 +58,10 @@ const xResponse = (whatwagResponse, Headers, FormData, Blob) => class extends xH
     }
 
     static compat(response) {
+        if (response instanceof this) return response;
         if (response instanceof whatwagResponse) {
             return Object.setPrototypeOf(response, new this);
         }
-        return new this(response);
     }
 
 };

package/src/services-pi/certbot/http-auth-hook.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 /**
  * imports

package/src/services-pi/certbot/http-cleanup-hook.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 /**
  * imports

package/src/webflo.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 /**
  * @imports