@webqit/webflo 0.11.30 → 0.11.32

package/package.json

@@ -12,7 +12,7 @@
     "vanila-javascript"
   ],
   "homepage": "https://webqit.io/tooling/webflo",
-  "version": "0.11.30",
+  "version": "0.11.32",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -31,8 +31,8 @@
   },
   "bin": {
     "webflo": "src/webflo.js",
-    "webflo-certbot-http-auth-hook": "src/services-pi/certbot/http-auth-hook.js",
-    "webflo-certbot-http-cleanup-hook": "src/services-pi/certbot/http-cleanup-hook.js"
+    "webflo-certbot-http-auth-hook": "src/services-pi/cert/http-auth-hook.js",
+    "webflo-certbot-http-cleanup-hook": "src/services-pi/cert/http-cleanup-hook.js"
   },
   "dependencies": {
     "@octokit/webhooks": "^7.15.1",

package/src/runtime-pi/Cookies.js

@@ -0,0 +1,75 @@
+
+/**
+ * @imports
+ */
+import { _isString, _isObject } from "@webqit/util/js/index.js";
+
+export default class Cookies extends Map {
+
+    constructor(...args) {
+        super(...args);
+        Object.defineProperty(this, 'inLock', { value: false, writable: true });
+        Object.defineProperty(this, 'outLock', { value: false, writable: true });
+    }
+
+    set(name, value) {
+        if (this.inLock) return;
+        if (this.has(name)) this.delete(name);
+        this.inLock = true;
+        // -----------------
+        let valueObj = value, valueStr = value, retrn;
+        if (_isString(value)) { valueObj = this.parseEntry(`=${ value }`)[1]; }
+        retrn = super.set(name, valueObj);
+        if (!this.outLock) {
+            if (_isObject(value)) { valueStr = this.stringifyEntry(value); }
+            this.headers.append(this.headers.cookieHeaderName, `${ name }=${ valueStr }`);
+        }
+        // -----------------
+        this.inLock = false;
+        return retrn;
+    }
+
+    delete(name) {
+        if (this.inLock) return;
+        this.inLock = true;
+        // -----------------
+        let retrn = super.delete(name);
+        this.headers.delete(this.headers.cookieHeaderName);
+        for (let [ name, definition ] of this) {
+            this.headers.append(this.headers.cookieHeaderName, `${ name }=${ this.stringifyEntry(definition) }`);
+        }
+        // -----------------
+        this.inLock = false;
+        return retrn;
+    }
+
+    clear() {
+        if (this.inLock) return;
+        this.inLock = true;
+        // -----------------
+        let retrn = super.clear();
+        this.headers.delete(this.headers.cookieHeaderName);
+        // -----------------
+        this.inLock = false;
+        return retrn;
+    }
+
+    json(json = {}) {
+        if (arguments.length) {
+            this.clear();
+            for (let name in json) {
+                this.set(name, json[name])
+            }
+            return;
+        }
+        for (let [ name, definition ] of this) {
+            json[name] = definition;
+        }
+        return json;
+    }
+
+    toString() {
+        return this.headers.get(this.headers.cookieHeaderName);
+    }
+
+}

package/src/runtime-pi/Router.js

@@ -67,7 +67,7 @@ export default class Router {
                         const _next = async (..._args) => {
                             const nextTick = { ...thisTick, arg: _args[0] };
                             if (_args.length > 1) {
-                                var _url = _args[1], _request, requestInit = { ...(_args[2] || {}) };
+                                let _url = _args[1], _request, requestInit = { ...(_args[2] || {}) };
                                 if (_args[1] instanceof nextTick.event.Request) {
                                     _request = _args[1];
                                     _url = _request.url;
@@ -85,9 +85,9 @@ export default class Router {
                                     }
                                 }
                                 if (_request) {
-                                    nextTick.event = thisTick.event.retarget(_request, { ...requestInit, _proxy: { url: newDestination/** non-standard but works */ } });
+                                    nextTick.event = thisTick.event.with(newDestination, _request, requestInit);
                                 } else {
-                                    nextTick.event = thisTick.event.retarget(newDestination, requestInit);
+                                    nextTick.event = thisTick.event.with(newDestination, requestInit);
                                 }
                                 
                                 nextTick.source = thisTick.destination.join('/');

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

@@ -25,7 +25,7 @@ const RequestHeaders = xRequestHeaders(whatwag.Headers);
 const ResponseHeaders = xResponseHeaders(whatwag.Headers);
 const Request = xRequest(whatwag.Request, RequestHeaders, FormData, whatwag.Blob);
 const Response = xResponse(whatwag.Response, ResponseHeaders, FormData, whatwag.Blob);
-const fetch = xfetch(whatwag.fetch);
+const fetch = xfetch(whatwag.fetch, Request);
 const HttpEvent = xHttpEvent(Request, Response, URL);
 
 export {
@@ -190,7 +190,7 @@ export default class Runtime {
 	// Check is-hash-action
 	isHashAction(urlObj) {
 		const isHashNav = _before(window.document.location.href, '#') === _before(urlObj.href, '#') && urlObj.href.includes('#');
-		return isHashNav && urlObj.hash.length > 1 && document.querySelector(urlObj.hash);
+		return isHashNav// && urlObj.hash.length > 1 && document.querySelector(urlObj.hash);
 	}
 
 	// Check is-spa-route
@@ -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) => {
 			// --------
@@ -82,7 +82,7 @@ export default class RuntimeClient {
 
 	// Normalize scroll position
 	async scrollIntoView(httpEvent) {
-		if (!(httpEvent.detail.src instanceof Element)) return;
+		if (!(httpEvent.detail.srcType === 'link')) return;
 		await new Promise(res => setTimeout(res, 10));
 		let viewportTop, urlTarget;
 		if (httpEvent.url.hash && (urlTarget = document.querySelector(httpEvent.url.hash))) {

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

@@ -9,12 +9,13 @@ import { Observer } from './Runtime.js';
 export default class Workport {
 
     constructor(file, params = {}) {
-        this.ready = navigator.serviceWorker.ready;
+        this.ready = navigator.serviceWorker ? navigator.serviceWorker.ready : new Promise;
 
         // --------
         // Registration and lifecycle
         // --------
         this.registration = new Promise((resolve, reject) => {
+            if (!navigator.serviceWorker) return;
             const register = () => {
                 navigator.serviceWorker.register(file, { scope: params.scope || '/' }).then(async registration => {
 
@@ -81,7 +82,9 @@ export default class Workport {
                 return this.post;
             },
             listen: callback => {
-                navigator.serviceWorker.addEventListener('message', callback);
+                if (navigator.serviceWorker) {
+                    navigator.serviceWorker.addEventListener('message', callback);
+                }
                 return this.post;
             },
             request: (message, onAvailability = 1) => {

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

@@ -4,7 +4,7 @@
  */
 import { _any } from '@webqit/util/arr/index.js';
 import { urlPattern } from '../../util.js';
-import { HttpEvent, Request, Response, Observer } from '../Runtime.js';
+import { HttpEvent, Request, Response, fetch as xfetch, Observer } from '../Runtime.js';
 import Workport from './Workport.js';
 export {
 	URL,
@@ -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));
 		});
 
@@ -233,9 +228,9 @@ export default class Worker {
 	networkFetch(request, params = {}) {
 		if (!params.cacheFallback) {
 			Observer.set(this.network, 'remote', true);
-			return self.fetch(request);
+			return xfetch(request);
 		}
-		return self.fetch(request).then(response => {
+		return xfetch(request).then(response => {
 			if (params.cacheRefresh) this.refreshCache(request, response);
 			Observer.set(this.network, 'remote', true);
 			return response;

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);
@@ -340,7 +340,7 @@ export default class Runtime {
         let baseObject;
         if (!(e.detail.request && e.detail.response)) {
             baseObject = this.mockSessionStore;
-            let cookieAvailability = e.request.headers.cookies[id];     // We just want to know availability... not validity, as this is understood to be for testing purposes only
+            let cookieAvailability = e.request.headers.cookies.get(id);     // We just want to know availability... not validity, as this is understood to be for testing purposes only
             if (!(this.mockSessionStore[id] && cookieAvailability)) {
                 let cookieObj = {};
                 Object.defineProperty(this.mockSessionStore, id, {
@@ -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));
@@ -393,7 +399,7 @@ export default class Runtime {
         // Mock-Cookies?
         if (!(e.detail.request && e.detail.response)) {
             for (let cookieName of Object.getOwnPropertyNames(this.mockSessionStore)) {
-                response.headers.set('Set-Cookie', `${cookieName}=1`);      // We just want to know availability... not validity, as this is understood to be for testing purposes only
+                response.headers.append('Set-Cookie', `${cookieName}=1`);      // We just want to know availability... not validity, as this is understood to be for testing purposes only
             }
         }
 

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

@@ -13,6 +13,9 @@ const xHeaders = whatwagHeaders => class extends whatwagHeaders {
 
     // construct
     constructor(definition = {}) {
+        const cookies = definition.cookies;
+        delete definition.cookies;
+        // -----------------        
         if (definition instanceof whatwagHeaders) {
             // It's another Headers instance
             super(definition);
@@ -20,6 +23,59 @@ const xHeaders = whatwagHeaders => class extends whatwagHeaders {
             super();
             this.json(definition);
         }
+        // -----------------        
+        this.cookies = cookies;
+    }
+
+    set(name, value) {
+        // Will sync forth to this._cookies if is cookie
+        this.catchCookies(name, value);
+        return super.set(name, value);
+    }
+    
+    append(name, value) {
+        // Will sync forth to this._cookies if is cookie
+        this.catchCookies(name, value, true);
+        return super.append(name, value);
+    }
+        
+    delete(name) {
+        // Will sync forth to this._cookies if is cookie
+        this.catchCookies(name);
+        return super.delete(name);
+    }
+
+    set cookies(cookies) {
+        if (cookies instanceof Map) {
+            this.cookies.clear();
+            for (let [ name, value ] of cookies) {
+                this.cookies.set(name, value);
+            }
+        } else if (cookies) { this.set(this.cookieHeaderName, cookies); }
+        return true;
+    }
+
+    get cookies() {
+        if (!this._cookies) {
+            this._cookies = new this.Cookies;
+            Object.defineProperty(this._cookies, 'headers', { value: this });
+        }
+        return this._cookies;
+    }
+        
+    catchCookies(name, value, append = false) {
+        if (!this.cookies || name.toLowerCase() !== this.cookieHeaderName.toLowerCase()) return;
+        this.cookies.outLock = true;
+        // -----------------
+        if (arguments.length > 1) {
+            if (!append) {  this.cookies.clear(); }
+            const cookiesObj = this.cookies.parse(value);
+            for (let name in cookiesObj) {
+                this.cookies.set(name, cookiesObj[name]);
+            }
+        } else { this.cookies.clear(); }
+        // -----------------
+        this.cookies.outLock = false;
     }
 
     json(headers = {}, replace = true) {
@@ -71,6 +127,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/xHttpEvent.js

@@ -69,15 +69,23 @@ const xHttpEvent = (Request, Response, URL) => {
             return this._sessionFactory(...args);
         }
 
-        // RDR
-        retarget(url, init = {}) {
-            var request;
+        // Redirect Response
+        redirect(url, code = 302) {
+            return new this.Response(null, { status: code, headers: { Location: url } });
+        }
+
+        // "with()"
+        with(url, init = {}, _url = null) {
+            let request;
             if (url instanceof Request) {
                 if (!_isEmpty(init)) {
                     request = new Request(url, init);
                 } else {
                     request = url;
                 }
+                if (_url) {
+                    request.attrs.url = `${this.url.origin}${_url}`;
+                }
             } else {
                 request = new Request(this._request, init);
                 request.attrs.url = `${this.url.origin}${url}`;

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/xRequestHeaders.js

@@ -5,13 +5,41 @@
 import { _after } from "@webqit/util/str/index.js";
 import { _from as _arrFrom } from "@webqit/util/arr/index.js";
 import { _getType, _isObject } from "@webqit/util/js/index.js";
-import { wwwFormUnserialize, wwwFormSerialize } from './util.js';
+import { wwwFormUnserialize } from './util.js';
 import xHeaders from './xHeaders.js';
+import xCookies from './Cookies.js';
+
+/**
+ * Cookies
+ */
+class Cookies extends xCookies {
+
+    parse(str) {
+        return wwwFormUnserialize(str, {}, ';');
+    }
+    
+    parseEntry(str) {
+        return str.trim().split('=');
+    }
+
+    stringifyEntry(cookieBody) {
+        return cookieBody;
+    }
+
+}
 
 /**
  * The xHeaders Mixin
  */
 const xRequestHeaders = NativeHeaders => class extends xHeaders(NativeHeaders) {
+    
+    get cookieHeaderName() {
+        return 'Cookie';
+    }
+
+    get Cookies() {
+        return Cookies;
+    }
 
     set accept(value) {
         return this.set('Accept', value);
@@ -34,22 +62,6 @@ const xRequestHeaders = NativeHeaders => class extends xHeaders(NativeHeaders) {
         };
     }
 
-    set cookies(cookieJar) {
-        if (!_isObject(cookieJar)) {
-            throw new Error(`Cookies must be of type object. Received type: ${_getType(cookieJar)}.`);
-        }
-        this.set('Cookie', wwwFormSerialize(cookieJar, ';'));
-        this._cookies = null;
-        return true;
-    }
-
-    get cookies() {
-        if (!this._cookies) {
-            this._cookies = wwwFormUnserialize(this.get('cookie'), {}, ';');
-        }
-        return this._cookies;
-    }
-
     set range(value) {
         let rangeArr = [];
         _arrFrom(value).forEach((range, i) => {
@@ -90,6 +102,7 @@ const xRequestHeaders = NativeHeaders => class extends xHeaders(NativeHeaders) {
         return this.get('Access-Control-Allow-Origin');
     }
 
+
 }
 
 export default xRequestHeaders;

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/runtime-pi/xResponseHeaders.js

@@ -5,48 +5,61 @@
 import { _after, _beforeLast } from "@webqit/util/str/index.js";
 import { _isString, _getType, _isObject } from "@webqit/util/js/index.js";
 import _Headers from './xHeaders.js';
+import xCookies from './Cookies.js';
 
 /**
- * The _Headers Mixin
+ * Cookies
  */
-const _ResponseHeaders = NativeHeaders => class extends _Headers(NativeHeaders) {
+class Cookies extends xCookies {
+
+    parse(cookieStr) {
+        const obj = {};
+        cookieStr && cookieStr.split(',').forEach(str => {
+            let [ cookieName, definition ] = this.parseEntry(str);
+            obj[cookieName] = definition;
+        });
+        return obj;
+    }
 
-    set cookies(cookieJar) {
-        if (!_isObject(cookieJar)) {
-            throw new Error(`The "cookies" response directive cannot be of type: ${_getType(cookieJar)}`);
-        }
-        for (let cookieName in cookieJar) {
-            let cookieBody = cookieJar[cookieName];
-            if (_isObject(cookieBody)) {
-                let attrsArr = [ cookieBody.value ];
-                for (let attrName in cookieBody) {
-                    if (attrName === 'value') continue;
-                    let _attrName = attrName[0].toUpperCase() + attrName.substring(1);
-                    if (_attrName === 'MaxAge') { _attrName = 'Max-Age' };
-                    attrsArr.push(cookieBody[attrName] === true ? _attrName : `${_attrName}=${cookieBody[attrName]}`);
-                }
-                cookieBody = attrsArr.join('; ');
-            } 
-            this.append('Set-Cookie', `${cookieName}=${cookieBody}`);
-        }
-        return true;
+    parseEntry(str) {
+        let [ cookieDefinition, attrsStr ] = str.split(';');
+        let [ cookieName, cookieValue ] = cookieDefinition.trim().split('=');
+        let attrs = { value: cookieValue, };
+        attrsStr && (attrsStr || '').split(/\;/g).map(attrStr => attrStr.trim().split('=')).forEach(attrsArr => {
+            attrs[attrsArr[0][0].toLowerCase() + attrsArr[0].substring(1).replace('-', '')] = attrsArr.length === 1 ? true : attrsArr[1];
+        });
+        return [ cookieName, attrs ];
     }
 
-    get cookies() {
-        const cookiesStr = this.get('Set-Cookie');
-        return cookiesStr && cookiesStr.split(',').reduce((cookieJar, str) => {
-            let [ cookieDefinition, attrsStr ] = str.split(';');
-            let [ cookieName, cookieValue ] = cookieDefinition.trim().split('=');
-            cookieJar[cookieName] = { value: cookieValue, };
-            if (attrsStr) {
-                (attrsStr || '').split(/\;/g).map(attrStr => attrStr.trim().split('=')).forEach(attrsArr => {
-                    cookieJar[cookieName][attrsArr[0][0].toLowerCase() + attrsArr[0].substring(1).replace('-', '')] = attrsArr.length === 1 ? true : attrsArr[1];
-                });
+    stringifyEntry(cookieBody) {
+        if (_isObject(cookieBody)) {
+            let attrsArr = [ cookieBody.value ];
+            for (let attrName in cookieBody) {
+                if (attrName === 'value') continue;
+                let _attrName = attrName[0].toUpperCase() + attrName.substring(1);
+                if (_attrName === 'MaxAge') { _attrName = 'Max-Age' };
+                attrsArr.push(cookieBody[attrName] === true ? _attrName : `${_attrName}=${cookieBody[attrName]}`);
             }
-            return cookieJar;
-        }, {});
+            cookieBody = attrsArr.join(';');
+        }
+        return cookieBody;
+    }
+
+}
+
+/**
+ * The _Headers Mixin
+ */
+const _ResponseHeaders = NativeHeaders => class extends _Headers(NativeHeaders) {
+
+    get cookieHeaderName() {
+        return 'Set-Cookie';
     }
 
+    get Cookies() {
+        return Cookies;
+    }
+    
     set contentRange(value) {
         if (Array.isArray(value)) {
             if ((value.length === 2 && !value[0].includes('-')) || value.length < 2) {
@@ -97,14 +110,6 @@ const _ResponseHeaders = NativeHeaders => class extends _Headers(NativeHeaders)
         return this.set('Location', value);
     }
 
-    get redirect() {
-        return this.get('Location');
-    }
-
-    set redirect(value) {
-        return this.set('Location', value);
-    }
-
 }
 
-export default _ResponseHeaders;
+export default _ResponseHeaders;

package/src/runtime-pi/xfetch.js

@@ -2,6 +2,13 @@
 /**
  * The xfetch Mixin
  */
-const xfetch = whatwagFetch => whatwagFetch;
+const xfetch = (whatwagFetch, xRequest) => {
+    return (url, init = {}) => {
+        if (init.body && (typeof init.body === 'object')) {
+            return whatwagFetch(new xRequest(url, init));
+        }
+        return whatwagFetch(url, init);
+    }
+};
 
 export default xfetch;

package/src/services-pi/{certbot → cert}/http-auth-hook.js

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

package/src/services-pi/{certbot → cert}/http-cleanup-hook.js

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

package/src/services-pi/index.js

@@ -2,8 +2,8 @@
 /**
  * @imports
  */
-import * as certbot from './certbot/index.js';
+import * as cert from './cert/index.js';
 
 export {
-    certbot,
+    cert,
 }

package/src/webflo.js

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