@webqit/webflo 0.11.31 → 0.11.32

package/package.json

@@ -12,7 +12,7 @@
     "vanila-javascript"
   ],
   "homepage": "https://webqit.io/tooling/webflo",
-  "version": "0.11.31",
+  "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

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

@@ -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/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

@@ -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,
@@ -228,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

@@ -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, {
@@ -399,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
             }
         }
 
@@ -521,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/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) {

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

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