@webqit/webflo 0.11.61-0 → 1.0.0

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

@@ -1,147 +1,147 @@
-
-/**
- * @imports
- */
-import { _isString, _isNumeric, _isArray, _isTypeObject } from '@webqit/util/js/index.js';
-if (typeof URLPattern === 'undefined') {
-    await import('urlpattern-polyfill');
-}
-
-export const params = {
-    // Parse a search params string into an object
-    parse(str, delim = '&') {
-        str = str || '';
-        const target = {};
-        (str.startsWith('?') ? str.substr(1) : str)
-            .split(delim).filter(q => q).map(q => q.split('=').map(q => q.trim()))
-            .forEach(q => this.set(target, q[0], decodeURIComponent(q[1])));
-        return target;
-    },
-    // Stringify an object into a search params string
-    stringify(targetObject, delim = '&') {
-        const q = [];
-        Object.keys(targetObject).forEach(key => {
-            this.reduceValue(targetObject[key], key, (_value, _pathNotation, suggestedKeys = undefined) => {
-                if (suggestedKeys) return suggestedKeys;
-                q.push(`${_pathNotation}=${encodeURIComponent(_value)}`);
-            });
-        });
-        return q.join(delim);
-    },
-
-    // Get value by path notation
-    get(targetObject, pathNotation) {
-        return this.reducePath(pathNotation, targetObject, (key, _targetObject) => {
-            if (!_targetObject && _targetObject !== 0) return;
-            return _targetObject[key];
-        });
-    },
-    // Set value by path notation
-    set(targetObject, pathNotation, value) {
-        this.reducePath(pathNotation, targetObject, function(_key, _targetObject, suggestedBranch = undefined) {
-            let _value = value;
-            if (suggestedBranch) { _value = suggestedBranch; }
-            if (_key === '' && _isArray(_targetObject)) {
-                _targetObject.push(_value);
-            } else {
-                _targetObject[_key] = _value;
-            }
-            return _value;
-        });
-    },
-    
-    // Resolve a value to its leaf nodes
-    reduceValue(value, contextPath, callback) {
-        if (_isTypeObject(value)) {
-            let suggestedKeys = Object.keys(value);
-            let keys = callback(value, contextPath, suggestedKeys);
-            if (_isArray(keys)) {
-                return keys.forEach(key => {
-                    this.reduceValue(value[key], contextPath ? `${contextPath}[${key}]` : key, callback);
-                });
-            }
-        }
-        callback(value, contextPath);
-    },
-    // Resolve a path to its leaf index
-    reducePath(pathNotation, contextObject, callback) {
-        if (_isString(pathNotation) && pathNotation.endsWith(']') && _isTypeObject(contextObject)) {
-            let [ key, ...rest ] = pathNotation.split('[');
-            if (_isNumeric(key)) { key = parseInt(key); }
-            rest = rest.join('[').replace(']', '');
-            let branch;
-            if (key in contextObject) {
-                branch = contextObject[key];
-            } else {
-                let suggestedBranch = rest === '' || _isNumeric(rest.split('[')[0]) ? [] : {};
-                branch = callback(key, contextObject, suggestedBranch);
-            }
-            return this.reducePath(rest, branch, callback);
-        }
-        if (_isNumeric(pathNotation)) { pathNotation = parseInt(pathNotation); }
-        return callback(pathNotation, contextObject);
-    },    
-};
-
-export const path = {
-    join(/* path segments */) {
-        // Split the inputs into a list of path commands.
-        var parts = [], backsteps = 0;
-        for (var i = 0, l = arguments.length; i < l; i++) {
-            parts = parts.concat(arguments[i].split("/"));
-        }
-        // Interpret the path commands to get the new resolved path.
-        var newParts = [];
-        for (i = 0, l = parts.length; i < l; i++) {
-            var part = parts[i];
-            // Remove leading and trailing slashes
-            // Also remove "." segments
-            if (!part || part === ".") continue;
-            // Interpret ".." to pop the last segment
-            if (part === "..") {
-                if (!newParts.length) backsteps ++;
-                else newParts.pop();
-            }
-            // Push new path segments.
-            else newParts.push(part);
-        }
-        // Preserve the initial slash if there was one.
-        if (parts[0] === "") newParts.unshift("");
-        // Turn back into a single string path.
-        return '../'.repeat(backsteps) + newParts.join("/") || (newParts.length ? "/" : ".");
-    },
-    // A simple function to get the dirname of a path
-    // Trailing slashes are ignored. Leading slash is preserved.
-    dirname(path) {
-        return this.join(path, "..");
-    }
-};
-
-export const pattern = (pattern, baseUrl = null) => ({
-    pattern: new URLPattern(pattern, baseUrl),
-    isPattern() {
-        return Object.keys(this.pattern.keys || {}).some(compName => this.pattern.keys[compName].length);
-    },
-    test(...args) { return this.pattern.test(...args) }, 
-    exec(...args) {
-        let components = this.pattern.exec(...args);
-        if (!components) return;
-        components.vars = Object.keys(this.pattern.keys).reduce(({ named, unnamed }, compName) => {
-            this.pattern.keys[compName].forEach(key => {
-                let value = components[compName].groups[key.name];
-                if (typeof key.name === 'number') {
-                    unnamed.push(value);
-                } else {
-                    named[key.name] = value;
-                }
-            });
-            return { named, unnamed };
-        }, { named: {}, unnamed: [] });
-        components.render = str => {
-            return str.replace(/\$(\$|[0-9A-Z]+)/gi, (a, b) => {
-                return b === '$' ? '$' : (_isNumeric(b) ? components.vars.unnamed[b - 1] : components.vars.named[b]) || '';
-            });
-        }
-        return components;
-    }
+
+/**
+ * @imports
+ */
+import { _isString, _isNumeric, _isArray, _isTypeObject } from '@webqit/util/js/index.js';
+if (typeof URLPattern === 'undefined') {
+    await import('urlpattern-polyfill');
+}
+
+export const params = {
+    // Parse a search params string into an object
+    parse(str, delim = '&') {
+        str = str || '';
+        const target = {};
+        (str.startsWith('?') ? str.substr(1) : str)
+            .split(delim).filter(q => q).map(q => q.split('=').map(q => q.trim()))
+            .forEach(q => this.set(target, q[0], decodeURIComponent(q[1])));
+        return target;
+    },
+    // Stringify an object into a search params string
+    stringify(targetObject, delim = '&') {
+        const q = [];
+        Object.keys(targetObject).forEach(key => {
+            this.reduceValue(targetObject[key], key, (_value, _pathNotation, suggestedKeys = undefined) => {
+                if (suggestedKeys) return suggestedKeys;
+                q.push(`${_pathNotation}=${encodeURIComponent(_value)}`);
+            });
+        });
+        return q.join(delim);
+    },
+
+    // Get value by path notation
+    get(targetObject, pathNotation) {
+        return this.reducePath(pathNotation, targetObject, (key, _targetObject) => {
+            if (!_targetObject && _targetObject !== 0) return;
+            return _targetObject[key];
+        });
+    },
+    // Set value by path notation
+    set(targetObject, pathNotation, value) {
+        this.reducePath(pathNotation, targetObject, function(_key, _targetObject, suggestedBranch = undefined) {
+            let _value = value;
+            if (suggestedBranch) { _value = suggestedBranch; }
+            if (_key === '' && _isArray(_targetObject)) {
+                _targetObject.push(_value);
+            } else {
+                _targetObject[_key] = _value;
+            }
+            return _value;
+        });
+    },
+    
+    // Resolve a value to its leaf nodes
+    reduceValue(value, contextPath, callback) {
+        if (_isTypeObject(value)) {
+            let suggestedKeys = Object.keys(value);
+            let keys = callback(value, contextPath, suggestedKeys);
+            if (_isArray(keys)) {
+                return keys.forEach(key => {
+                    this.reduceValue(value[key], contextPath ? `${contextPath}[${key}]` : key, callback);
+                });
+            }
+        }
+        callback(value, contextPath);
+    },
+    // Resolve a path to its leaf index
+    reducePath(pathNotation, contextObject, callback) {
+        if (_isString(pathNotation) && pathNotation.endsWith(']') && _isTypeObject(contextObject)) {
+            let [ key, ...rest ] = pathNotation.split('[');
+            if (_isNumeric(key)) { key = parseInt(key); }
+            rest = rest.join('[').replace(']', '');
+            let branch;
+            if (key in contextObject) {
+                branch = contextObject[key];
+            } else {
+                let suggestedBranch = rest === '' || _isNumeric(rest.split('[')[0]) ? [] : {};
+                branch = callback(key, contextObject, suggestedBranch);
+            }
+            return this.reducePath(rest, branch, callback);
+        }
+        if (_isNumeric(pathNotation)) { pathNotation = parseInt(pathNotation); }
+        return callback(pathNotation, contextObject);
+    },    
+};
+
+export const path = {
+    join(/* path segments */) {
+        // Split the inputs into a list of path commands.
+        let parts = [], backsteps = 0;
+        for ( let i = 0, l = arguments.length; i < l; i++ ) {
+            parts = parts.concat( arguments[ i ].split( '/' ) );
+        }
+        // Interpret the path commands to get the new resolved path.
+        let newParts = [];
+        for ( let i = 0, l = parts.length; i < l; i++ ) {
+            let part = parts[ i ];
+            // Remove leading and trailing slashes
+            // Also remove "." segments
+            if ( !part || part === '.' ) continue;
+            // Interpret ".." to pop the last segment
+            if ( part === '..' ) {
+                if ( !newParts.length ) backsteps ++;
+                else newParts.pop();
+            }
+            // Push new path segments.
+            else newParts.push( part );
+        }
+        // Preserve the initial slash if there was one.
+        if ( parts[ 0 ] === '' ) newParts.unshift( '' );
+        // Turn back into a single string path.
+        return '../'.repeat( backsteps ) + newParts.join( '/' ) || ( newParts.length ? '/' : '.' );
+    },
+    // A simple function to get the dirname of a path
+    // Trailing slashes are ignored. Leading slash is preserved.
+    dirname( path ) {
+        return this.join( path, '..' );
+    }
+};
+
+export const pattern = (pattern, baseUrl = null) => ({
+    pattern: new URLPattern(pattern, baseUrl),
+    isPattern() {
+        return Object.keys(this.pattern.keys || {}).some(compName => this.pattern.keys[compName].length);
+    },
+    test(...args) { return this.pattern.test(...args) }, 
+    exec(...args) {
+        let components = this.pattern.exec(...args);
+        if (!components) return;
+        components.vars = Object.keys(this.pattern.keys).reduce(({ named, unnamed }, compName) => {
+            this.pattern.keys[compName].forEach(key => {
+                let value = components[compName].groups[key.name];
+                if (typeof key.name === 'number') {
+                    unnamed.push(value);
+                } else {
+                    named[key.name] = value;
+                }
+            });
+            return { named, unnamed };
+        }, { named: {}, unnamed: [] });
+        components.render = str => {
+            return str.replace(/\$(\$|[0-9A-Z]+)/gi, (a, b) => {
+                return b === '$' ? '$' : (_isNumeric(b) ? components.vars.unnamed[b - 1] : components.vars.named[b]) || '';
+            });
+        }
+        return components;
+    }
 });

package/src/runtime-pi/xURL.js

@@ -1,105 +1,108 @@
-
-/**
- * @imports
- */
-import { _isObject, _isArray } from '@webqit/util/js/index.js';
-import { params } from './util-url.js';
-
-/**
- * ---------------------------
- * The xURL Mixin
- * ---------------------------
- */
-export default class xURL extends URL {
-	
-	// constructor
-	constructor(...args) {
-		super(...args);
-		var query = params.parse(this.search);
-		const updateSearch = query => {
-			// "query" was updated. So we update "search"
-			var search = params.stringify(query);
-			search = search ? '?' + search : '';
-			if (search !== this.search) {
-				this.search = search;
-			}
-		};
-		this.__query = {
-			value: query,
-			proxy: new Proxy(query, {
-				set(t, n, v) {
-					t[n] = v;
-					updateSearch(t);
-					return true;
-				},
-				deleteProperty(t, n) {
-					delete t[n];
-					updateSearch(t);
-					return true;
-				}
-			})
-		};
-	}
-
-	// Set search
-	set search(value) {
-		super.search = value;
-		// "search" was updated. So we update "query"
-		var query = params.parse(value);
-		if (!_strictEven(query, this.query)) {
-			this.query = query;
-		}
-	}
-
-	// Get search
-	get search() {
-		return super.search;
-	}
-
-	// Get query
-	get query() {
-		return this.__query.proxy;
-	}
-
-};
-// ----------
-xURL.Observable = class extends xURL {
-
-	constructor() {
-		super(...arguments);
-		const { Observer } = WebQit;
-		Observer.accessorize(this, [
-			'protocol', 
-			'username',
-			'password',
-			'host',
-			'hostname',
-			'port',
-			'origin',
-			'pathname',
-			'search',
-			'query',
-			'hash',
-			'href',
-		]);
-	}
-
-};
-
-/**
- * ---------------------------
- * Helpers
- * ---------------------------
- */
-var _strictEven = (a, b) => {
-	if (_isObject(a) && _isObject(b)) {
-		return _strictEven(Object.keys(a), Object.keys(b)) 
-		&& _strictEven(Object.values(a), Object.values(b));
-	}
-	if (_isArray(a) && _isArray(b)) {
-		return a.length === b.length 
-		&& a.reduce((recieved, item, i) => recieved && item === b[i], true);
-	}
-	return a === b;
-};
-
+
+/**
+ * @imports
+ */
+import { _isObject, _isArray } from '@webqit/util/js/index.js';
+import { params } from './util-url.js';
+
+/**
+ * ---------------------------
+ * The xURL Mixin
+ * ---------------------------
+ */
+export default class xURL extends URL {
+	
+	// constructor
+	constructor(...args) {
+		super(...args);
+		const query = params.parse(this.search);
+		const updateSearch = () => {
+			// "query" was updated. So we update "search"
+			let search = params.stringify(query);
+			search = search ? '?' + search : '';
+			if (search !== this.search) {
+				this.search = search;
+			}
+		};
+		const $this = this;
+		this._query = new Proxy(query, {
+			set(t, k, v) {
+				t[k] = v;
+				if (!$this._updatingSearch) updateSearch();
+				return true;
+			},
+			deleteProperty(t, k) {
+				delete t[k];
+				if (!$this._updatingSearch) updateSearch();
+				return true;
+			}
+		});
+	}
+
+	// Set search
+	set search(value) {
+		super.search = value;
+		// "search" was updated. So we update "query"
+		this._updatingSearch = true;
+		const query = params.parse(value);
+		const keys_a = Object.keys(query);
+		const keys_b = Object.keys(this._query);
+		for (const k of new Set([...keys_a,...keys_b])) {
+			if (!keys_a.includes(k)) delete this.query[k];
+			if (!keys_b.includes(k)) this.query[k] = query[k];
+		}
+		this._updatingSearch = false;
+	}
+
+	// Get search
+	get search() {
+		return super.search;
+	}
+
+	// Get query
+	get query() {
+		return this._query;
+	}
+
+};
+// ----------
+xURL.Observable = class extends xURL {
+
+	constructor() {
+		super(...arguments);
+		const { Observer } = webqit;
+		Observer.accessorize(this, [
+			'protocol', 
+			'username',
+			'password',
+			'host',
+			'hostname',
+			'port',
+			'origin',
+			'pathname',
+			'search',
+			'query',
+			'hash',
+			'href',
+		]);
+	}
+
+};
+
+/**
+ * ---------------------------
+ * Helpers
+ * ---------------------------
+ */
+var _strictEven = (a, b) => {
+	if (_isObject(a) && _isObject(b)) {
+		return _strictEven(Object.keys(a), Object.keys(b)) 
+		&& _strictEven(Object.values(a), Object.values(b));
+	}
+	if (_isArray(a) && _isArray(b)) {
+		return a.length === b.length 
+		&& a.reduce((recieved, item, i) => recieved && item === b[i], true);
+	}
+	return a === b;
+};
+

package/src/runtime-pi/xfetch.js

@@ -1,23 +1,23 @@
-
-/**
- * @imports
- */
-import { formatMessage } from './util-http.js';
-
-/**
- * The xfetch Mixin
- */
-const xfetch = async (url, init = {}) => {
-    if (init.body) {
-        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'))) {
-        let recompressedBody = response.body.pipeThrough(new CompressionStream(encoding));
-        response = new Response(recompressedBody, response);
-    }
-    return response;
-};
-
+
+/**
+ * @imports
+ */
+import { renderHttpMessageInit } from './util-http.js';
+
+/**
+ * The xfetch Mixin
+ */
+const xfetch = async (url, init = {}) => {
+    if (init.body) {
+        const { body, headers } = renderHttpMessageInit(init);
+        init = { ...init, body, headers, };
+    }
+    let response = await fetch(url, init), encoding;
+    if (init.decompress === false && (encoding = response.headers.get('Content-Encoding'))) {
+        let recompressedBody = response.body.pipeThrough(new CompressionStream(encoding));
+        response = new Response(recompressedBody, response);
+    }
+    return response;
+};
+
 export default xfetch;

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

@@ -1,23 +1,23 @@
 #!/usr/bin/env node
-
-/**
- * imports
- */
-import Fs from 'fs';
-import Path from 'path';
-import Layout from '../../config-pi/deployment/Layout.js';
-
-// ------------------------------------------
-
-const domain = process.env.CERTBOT_DOMAIN,
-    validation = process.env.CERTBOT_VALIDATION,
-    token = process.env.CERTBOT_TOKEN,
-    remainingChallenges = process.env.CERTBOT_REMAINING_CHALLENGES || 0/*,
-    allDomains = process.env.CERTBOT_ALL_DOMAINS.split(',')*/
-    ;
-(async function() {
-    const layout = await (new Layout({ name: 'webflo', flags: {} })).read();
-    const acmeDir = Path.join(layout.PUBLIC_DIR, './.well-known/acme-challenge/');
-    Fs.mkdirSync(acmeDir, {recursive:true});
-    Fs.writeFileSync(Path.join(acmeDir, token), validation);
-})();
+
+/**
+ * imports
+ */
+import Fs from 'fs';
+import Path from 'path';
+import Layout from '../../config-pi/deployment/Layout.js';
+
+// ------------------------------------------
+
+const domain = process.env.CERTBOT_DOMAIN,
+    validation = process.env.CERTBOT_VALIDATION,
+    token = process.env.CERTBOT_TOKEN,
+    remainingChallenges = process.env.CERTBOT_REMAINING_CHALLENGES || 0/*,
+    allDomains = process.env.CERTBOT_ALL_DOMAINS.split(',')*/
+    ;
+(async function() {
+    const layout = await (new Layout({ name: 'webflo', flags: {} })).read();
+    const acmeDir = Path.join(layout.PUBLIC_DIR, './.well-known/acme-challenge/');
+    Fs.mkdirSync(acmeDir, {recursive:true});
+    Fs.writeFileSync(Path.join(acmeDir, token), validation);
+})();

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

@@ -1,23 +1,23 @@
 #!/usr/bin/env node
-
-/**
- * imports
- */
-import Fs from 'fs';
-import Path from 'path';
-import Layout from '../../config-pi/deployment/Layout.js';
-
-// ------------------------------------------
-
-const domain = process.env.CERTBOT_DOMAIN,
-    validation = process.env.CERTBOT_VALIDATION,
-    token = process.env.CERTBOT_TOKEN,
-    authOutput = process.env.CERTBOT_AUTH_OUTPUT,
-    remainingChallenges = process.env.CERTBOT_REMAINING_CHALLENGES || 0/*,
-    allDomains = process.env.CERTBOT_ALL_DOMAINS.split(',')*/
-    ;
-(async function() {
-    const layout = await (new Layout({ name: 'webflo', flags: {} })).read();
-    const acmeFile = Path.join(layout.PUBLIC_DIR, './.well-known/acme-challenge/', token);
-    Fs.unlinkSync(acmeFile);
-})();
+
+/**
+ * imports
+ */
+import Fs from 'fs';
+import Path from 'path';
+import Layout from '../../config-pi/deployment/Layout.js';
+
+// ------------------------------------------
+
+const domain = process.env.CERTBOT_DOMAIN,
+    validation = process.env.CERTBOT_VALIDATION,
+    token = process.env.CERTBOT_TOKEN,
+    authOutput = process.env.CERTBOT_AUTH_OUTPUT,
+    remainingChallenges = process.env.CERTBOT_REMAINING_CHALLENGES || 0/*,
+    allDomains = process.env.CERTBOT_ALL_DOMAINS.split(',')*/
+    ;
+(async function() {
+    const layout = await (new Layout({ name: 'webflo', flags: {} })).read();
+    const acmeFile = Path.join(layout.PUBLIC_DIR, './.well-known/acme-challenge/', token);
+    Fs.unlinkSync(acmeFile);
+})();