@webqit/webflo 0.11.54 → 0.11.56-0

package/package.json

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

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

@@ -276,7 +276,7 @@ export default class Runtime extends _Runtime {
 		} catch(e) {
 			console.error(e);
 			Observer.set(this.network, 'error', { ...e, retry: () => this.go(url, init = {}, detail) });
-			finalResponse = new xResponse(null, { status: 500, statusText: e.message });
+			finalResponse = new xResponse(e.message, { status: 500 });
 		}
 		// ------------
         // Return value
@@ -299,14 +299,14 @@ export default class Runtime extends _Runtime {
 		return _response.then(async response => {
 			// Stop loading status
 			Observer.set(this.network, 'remote', null);
-			return new xResponse(response);
+			return xResponse.compat(response);
 		});
 	}
 
 	// Handles response object
 	handleResponse(e, response) {
-		if (typeof response === 'undefined') { response = new xResponse(undefined, { status: 404 }); }
-		else if (!(response instanceof xResponse)) { response = new xResponse(response); }
+		if (!response && response !== 0) { response = new xResponse(null, { status: 404 }); }
+		else if (!(response instanceof xResponse)) { response = xResponse.compat(response); }
 		Observer.set(this.network, 'requesting', null);
 		Observer.set(this.network, 'redirecting', null);
 		if (!response.redirected) {

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

@@ -86,18 +86,19 @@ export default class Runtime extends _Runtime {
 		self.addEventListener('fetch', event => {
 			// URL schemes that might arrive here but not supported; e.g.: chrome-extension://
 			if (!event.request.url.startsWith('http')) return;
-			event.respondWith((async (req, evt) => {
-				let requestingClient = await self.clients.get(event.clientId);
+			event.respondWith((async evt => {
+				let requestingClient = await self.clients.get(evt.clientId);
 				this.workport.setCurrentClient(requestingClient);
 				// 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 */) {
-					req = new Request(req, {cache: 'default'});
+				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 });
 				}
-				return this.go(req.url, req, { event: evt });
-			})(event.request, event));
+				return this.go(evt.request.url, evt.request, { event: evt });
+			})(event));
 		});
 
 		// -------------
@@ -134,9 +135,6 @@ export default class Runtime extends _Runtime {
         // ------------
 		// The request object
 		const request = this.generateRequest(url.href, init);
-		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 => {
@@ -262,7 +260,7 @@ export default class Runtime extends _Runtime {
 
 	// Handles response object
 	handleResponse(e, response) {
-		if (typeof response === 'undefined') { response = new xResponse(undefined, { status: 404 }); }
+		if (!response && response !== 0) { response = new xResponse(null, { status: 404 }); }
 		else if (!(response instanceof xResponse)) { response = xResponse.compat(response); }
 		return response;
 	}

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

@@ -44,7 +44,7 @@ export default class Application extends _Application {
                 return router.file(event);
             }, remoteFetch);
             if (!(response instanceof httpEvent.Response)) {
-                response = new httpEvent.Response(response);
+                response = httpEvent.Response.compat(response);
             }
             // --------
             // Rendering

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

@@ -131,7 +131,7 @@ export default class Runtime extends _Runtime {
                 // --------
                 _each(clientResponse.headers.json(), (name, value) => {
                     response.setHeader(name, value);
-                });
+                }); 
                 // --------
                 response.statusCode = clientResponse.status;
                 response.statusMessage = clientResponse.statusText;
@@ -316,17 +316,18 @@ export default class Runtime extends _Runtime {
         try {
             response = await this.remoteFetch(url2, init2);
         } catch(e) {
-            response = new xResponse(e.message, { status: 500 });
+            response = new xResponse(`Reverse Proxy Error: ${e.message}`, { status: 500 });
             console.error(e);
         }
         if (this.cx.logger) {
-            const log = this.generateLog({ url: url2.href, ...init2 }, response);
+            const log = this.generateLog({ url: url2.href, ...init2 }, response, true);
             this.cx.logger.log(log);
         }
         return response;
 
     }
 
+
     // Generates request object
     generateRequest(href, init = {}, autoHeaders = []) {
         const request = new xRequest(href, init);
@@ -384,13 +385,13 @@ export default class Runtime extends _Runtime {
         return _response.then(async response => {
             // Stop loading status
             Observer.set(this.network, 'remote', false);
-            return new xResponse(response);
+            return xResponse.compat(response);
         });
     }
 
     // Handles response object
     async handleResponse(cx, e, response, autoHeaders = []) {
-        if (!(response instanceof xResponse)) { response = new xResponse(response); }
+        if (!(response instanceof xResponse)) { response = xResponse.compat(response); }
         Observer.set(this.network, 'remote', false);
         Observer.set(this.network, 'error', null);
 
@@ -434,9 +435,9 @@ export default class Runtime extends _Runtime {
 
         // ----------------
         // 404
-        if (response.meta.body === undefined) {
+        if (!response.meta.body && response.meta.body !== 0) {
             if (response.status === 200 || response.status === 0) {
-                response.attrs.status = 404;
+                response = new xResponse(response.body, { status: 404, headers: response.headers });
             }
             return response;
         }
@@ -444,7 +445,7 @@ export default class Runtime extends _Runtime {
         // ----------------
         // Not acceptable
         if (e.request.headers.get('Accept') && !e.request.headers.accept.match(response.headers.contentType)) {
-            response.attrs.status = 406;
+            response = new xResponse(response.body, { status: 406, headers: response.headers });
             return response;
         }
 
@@ -508,7 +509,7 @@ export default class Runtime extends _Runtime {
     }
 
     // Generates log
-    generateLog(request, response) {
+    generateLog(request, response, isproxy = false) {
         let log = [];
         // ---------------
         const style = this.cx.logger.style || { keyword: str => str, comment: str => str, url: str => str, val: str => str, err: str => str, };
@@ -519,9 +520,11 @@ export default class Runtime extends _Runtime {
         // ---------------
         log.push(`[${style.comment((new Date).toUTCString())}]`);
         log.push(style.keyword(request.method));
+        if (isproxy) log.push(style.keyword('>>'));
         log.push(style.url(request.url));
         if (response.attrs.hint) log.push(`(${style.comment(response.attrs.hint)})`);
-        if (response.headers.contentType) log.push(`(${style.comment(response.headers.contentType)})`);
+        const contentInfo = [response.headers.contentType, response.headers.contentLength].filter(x => x);
+        if (contentInfo.length) log.push(`(${style.comment(contentInfo.join('; '))})`);
         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/xRequest.js

@@ -25,6 +25,7 @@ export default class xRequest extends mxHttpMessage(Request, xRequestHeaders) {
         if (request instanceof Request) {
             return Object.setPrototypeOf(request, new this);
         }
+        return new this(request);
     }
 
 }

package/src/runtime-pi/xResponse.js

@@ -27,6 +27,7 @@ export default class xResponse extends mxHttpMessage(Response, xResponseHeaders)
         if (response instanceof Response) {
             return Object.setPrototypeOf(response, new this);
         }
+        return new this(response);
     }
 
 }

package/src/runtime-pi/xxHttpMessage.js

@@ -18,6 +18,10 @@ const xxHttpMessage = (whatwagHttpMessage, xHeaders) => {
             if (meta.headers) { this.headers.json(meta.headers); }
             // ------------
             let attrs = {};
+            
+            if (meta.body instanceof Response) {
+                throw new Error('0000000000000000');
+            }
             Object.defineProperty(this, '_attrs', { get: () => attrs });
             Object.defineProperty(this, 'meta', { get: () => meta });
         }
@@ -45,7 +49,7 @@ const xxHttpMessage = (whatwagHttpMessage, xHeaders) => {
         }
 
         async blob() {
-            if (this.meta.type === 'Blob') { return this.meta.body; }
+            if (['Blob', 'File'].includes(this.meta.type)) { return this.meta.body; }
             return super.blob();
         }
 
@@ -54,7 +58,7 @@ const xxHttpMessage = (whatwagHttpMessage, xHeaders) => {
             if (this.meta.type === 'FormData' && this.meta.body instanceof FormData) {
                 formData = this.meta.body;
             } else { formData = await super.formData(); }
-            if (formData) { xFormData.compat(formData); }
+            if (formData) { formData = xFormData.compat(formData); }
             return formData;
         }