@webqit/webflo 0.11.60 → 0.11.61

package/src/runtime-pi/xxHttpMessage.js

@@ -1,102 +1,102 @@
-
-/**
- * @imports
- */
-import { _isTypeObject } from '@webqit/util/js/index.js';
-import xFormData from './xFormData.js';
-
-/**
- * The _Request Mixin
- */
-const xxHttpMessage = (whatwagHttpMessage, xHeaders) => {
-    const HttpMessage = class extends whatwagHttpMessage {
-        
-        constructor(input, init, meta) {
-            // ------------
-            if (init.headers) { init = { ...init, headers: new xHeaders(init.headers) }; }
-            super(input, init);
-            if (meta.headers) { this.headers.json(meta.headers); }
-            // ------------
-            let attrs = {};
-            Object.defineProperty(this, '_attrs', { get: () => attrs });
-            Object.defineProperty(this, 'meta', { get: () => meta });
-        }
-
-        get attrs() {
-            return this._attrs || {};
-        }
-
-        clone() {
-            return new this.constructor(super.clone());
-        }
-
-        get headers() {
-            xHeaders.compat(super.headers);
-            return super.headers;
-        }
-
-        get url() {
-            return 'url' in this.attrs ? this.attrs.url : super.url;
-        }
-
-        async arrayBuffer() {
-            if (this.meta.type === 'ArrayBuffer') { return this.meta.body; }
-            return super.arrayBuffer();
-        }
-
-        async blob() {
-            if (['Blob', 'File'].includes(this.meta.type)) { return this.meta.body; }
-            return super.blob();
-        }
-
-        async formData() {
-            let formData;
-            if (this.meta.type === 'FormData' && this.meta.body instanceof FormData) {
-                formData = this.meta.body;
-            } else { formData = await super.formData(); }
-            if (formData) { formData = xFormData.compat(formData); }
-            return formData;
-        }
-
-        async json() {
-            if (this.meta.type === 'json' && _isTypeObject(this.meta.body)) { return this.meta.body; }
-            return super.json();
-        }
-
-        async text() {
-            if (this.meta.type === 'json' && !_isTypeObject(this.meta.body)) { return this.meta.body; }
-            return super.text();
-        }
-                
-        // Resolve
-        jsonfy(force = false) {
-            if (!this.meta.jsonfied || force) {
-                this.meta.jsonfied = new Promise(async (resolve, reject) => {
-                    let jsonfied;
-                    let contentType = this.headers.get('Content-Type') || '';
-                    try {
-                        if (contentType === 'application/x-www-form-urlencoded' || contentType.startsWith('multipart/form-data')) {
-                            const formData = await this.formData();
-                            jsonfied = await formData?.json();
-                        } else if (contentType === 'application/json') {
-                            jsonfied = await this.json();
-                        } else if (contentType === 'text/plain') {
-                            jsonfied = await this.text();
-                        }
-                        resolve(jsonfied);
-                    } catch(e) {
-                        reject(e);
-                    }
-                });
-            }
-            return this.meta.jsonfied;
-        }
-
-    };
-    // ----------
-    HttpMessage.Headers = xHeaders;
-    // ----------
-    return HttpMessage;
-}
-
+
+/**
+ * @imports
+ */
+import { _isTypeObject } from '@webqit/util/js/index.js';
+import xFormData from './xFormData.js';
+
+/**
+ * The _Request Mixin
+ */
+const xxHttpMessage = (whatwagHttpMessage, xHeaders) => {
+    const HttpMessage = class extends whatwagHttpMessage {
+        
+        constructor(input, init, meta) {
+            // ------------
+            if (init.headers) { init = { ...init, headers: new xHeaders(init.headers) }; }
+            super(input, init);
+            if (meta.headers) { this.headers.json(meta.headers); }
+            // ------------
+            let attrs = {};
+            Object.defineProperty(this, '_attrs', { get: () => attrs });
+            Object.defineProperty(this, 'meta', { get: () => meta });
+        }
+
+        get attrs() {
+            return this._attrs || {};
+        }
+
+        clone() {
+            return new this.constructor(super.clone());
+        }
+
+        get headers() {
+            xHeaders.compat(super.headers);
+            return super.headers;
+        }
+
+        get url() {
+            return 'url' in this.attrs ? this.attrs.url : super.url;
+        }
+
+        async arrayBuffer() {
+            if (this.meta.type === 'ArrayBuffer') { return this.meta.body; }
+            return super.arrayBuffer();
+        }
+
+        async blob() {
+            if (['Blob', 'File'].includes(this.meta.type)) { return this.meta.body; }
+            return super.blob();
+        }
+
+        async formData() {
+            let formData;
+            if (this.meta.type === 'FormData' && this.meta.body instanceof FormData) {
+                formData = this.meta.body;
+            } else { formData = await super.formData(); }
+            if (formData) { formData = xFormData.compat(formData); }
+            return formData;
+        }
+
+        async json() {
+            if (this.meta.type === 'json' && _isTypeObject(this.meta.body)) { return this.meta.body; }
+            return super.json();
+        }
+
+        async text() {
+            if (this.meta.type === 'json' && !_isTypeObject(this.meta.body)) { return this.meta.body; }
+            return super.text();
+        }
+                
+        // Resolve
+        jsonfy(force = false) {
+            if (!this.meta.jsonfied || force) {
+                this.meta.jsonfied = new Promise(async (resolve, reject) => {
+                    let jsonfied;
+                    let contentType = this.headers.get('Content-Type') || '';
+                    try {
+                        if (contentType === 'application/x-www-form-urlencoded' || contentType.startsWith('multipart/form-data')) {
+                            const formData = await this.formData();
+                            jsonfied = await formData?.json();
+                        } else if (contentType === 'application/json') {
+                            jsonfied = await this.json();
+                        } else if (contentType === 'text/plain') {
+                            jsonfied = await this.text();
+                        }
+                        resolve(jsonfied);
+                    } catch(e) {
+                        reject(e);
+                    }
+                });
+            }
+            return this.meta.jsonfied;
+        }
+
+    };
+    // ----------
+    HttpMessage.Headers = xHeaders;
+    // ----------
+    return HttpMessage;
+}
+
 export default xxHttpMessage;

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);
+})();

package/src/services-pi/cert/index.js

@@ -1,80 +1,80 @@
-
-/**
- * imports
- */
-import Fs from 'fs';
-import { spawn } from 'child_process';
-import { _from as _arrFrom } from '@webqit/util/arr/index.js';
-
-/**
- * @description
- */
-export const desc = {
-    generate: 'Generate an SSL cert for a domain or list of domains.',
-};
-
-/**
- * Reads SSL from file.
- * 
- * @param string    allDomains
- * 
- * @return object
- */
-export async function generate(allDomains) {
-    const cx = this || {};
-    if (!cx.config.runtime?.Server) {
-        throw new Error(`The Server configurator "config.runtime.Server" is required in context.`);
-    }
-    const domains = _arrFrom(allDomains).reduce((all, d) => all.concat(d.split(',')), []).filter(d => d.trim());
-    const args = [
-        'certonly',
-        '--manual',
-        '--preferred-challenges', 'http', 
-    ].concat(domains.reduce((all, d) => all.concat('-d', d), []))
-    .concat([
-        '--manual-auth-hook', 'webflo-certbot-http-auth-hook',
-        '--manual-cleanup-hook', 'webflo-certbot-http-cleanup-hook',
-        '--debug-challenges',
-        '--force-interactive',
-    ]);
-    const child = spawn('certbot', args);
-    process.stdin.pipe(child.stdin);
-
-    child.stdout.on('data', data => {
-        if (cx.logger) {
-            cx.logger.log('[' + cx.logger.style.keyword('CERTBOT') + '][' + cx.logger.style.var('OUT') + ']:', data + '');
-        }
-    });
-
-    child.stderr.on('data', data => {
-        if (cx.logger) {
-            cx.logger.log('[' + cx.logger.style.keyword('CERTBOT') + '][' + cx.logger.style.err('ERR') + ']:', (data + '').trim());
-        }
-    });
-    
-    child.on('error', data => {
-        cx.logger && cx.logger.error(data);
-        process.exit();
-    });
-
-    child.on('exit', async exitCode => {
-        const serverConfig = new cx.config.runtime.Server(cx);
-        const server = await serverConfig.read();
-        const domain = domains[0], certDir = `/etc/letsencrypt/live/${domain}`;
-        if (!exitCode && cx.flags && (cx.flags['auto-config'] || cx.flags.c)) {
-            if (Fs.existsSync(certDir)) {
-                cx.logger && cx.logger.log('Automatically configuring the server with the generated cert.');
-                if (!server.https) {
-                    server.https = {};
-                }
-                server.https.keyfile = `${certDir}/privkey.pem`;
-                server.https.certfile = `${certDir}/fullchain.pem`;
-                await serverConfig.write(server);
-            } else {
-                cx.logger && cx.logger.log(`Generated cert files not found in ${certDir}; be sure to configure the server with the valid cert files.`);
-            }
-        }
-        process.exit();
-    });
-
+
+/**
+ * imports
+ */
+import Fs from 'fs';
+import { spawn } from 'child_process';
+import { _from as _arrFrom } from '@webqit/util/arr/index.js';
+
+/**
+ * @description
+ */
+export const desc = {
+    generate: 'Generate an SSL cert for a domain or list of domains.',
+};
+
+/**
+ * Reads SSL from file.
+ * 
+ * @param string    allDomains
+ * 
+ * @return object
+ */
+export async function generate(allDomains) {
+    const cx = this || {};
+    if (!cx.config.runtime?.Server) {
+        throw new Error(`The Server configurator "config.runtime.Server" is required in context.`);
+    }
+    const domains = _arrFrom(allDomains).reduce((all, d) => all.concat(d.split(',')), []).filter(d => d.trim());
+    const args = [
+        'certonly',
+        '--manual',
+        '--preferred-challenges', 'http', 
+    ].concat(domains.reduce((all, d) => all.concat('-d', d), []))
+    .concat([
+        '--manual-auth-hook', 'webflo-certbot-http-auth-hook',
+        '--manual-cleanup-hook', 'webflo-certbot-http-cleanup-hook',
+        '--debug-challenges',
+        '--force-interactive',
+    ]);
+    const child = spawn('certbot', args);
+    process.stdin.pipe(child.stdin);
+
+    child.stdout.on('data', data => {
+        if (cx.logger) {
+            cx.logger.log('[' + cx.logger.style.keyword('CERTBOT') + '][' + cx.logger.style.var('OUT') + ']:', data + '');
+        }
+    });
+
+    child.stderr.on('data', data => {
+        if (cx.logger) {
+            cx.logger.log('[' + cx.logger.style.keyword('CERTBOT') + '][' + cx.logger.style.err('ERR') + ']:', (data + '').trim());
+        }
+    });
+    
+    child.on('error', data => {
+        cx.logger && cx.logger.error(data);
+        process.exit();
+    });
+
+    child.on('exit', async exitCode => {
+        const serverConfig = new cx.config.runtime.Server(cx);
+        const server = await serverConfig.read();
+        const domain = domains[0], certDir = `/etc/letsencrypt/live/${domain}`;
+        if (!exitCode && cx.flags && (cx.flags['auto-config'] || cx.flags.c)) {
+            if (Fs.existsSync(certDir)) {
+                cx.logger && cx.logger.log('Automatically configuring the server with the generated cert.');
+                if (!server.https) {
+                    server.https = {};
+                }
+                server.https.keyfile = `${certDir}/privkey.pem`;
+                server.https.certfile = `${certDir}/fullchain.pem`;
+                await serverConfig.write(server);
+            } else {
+                cx.logger && cx.logger.log(`Generated cert files not found in ${certDir}; be sure to configure the server with the valid cert files.`);
+            }
+        }
+        process.exit();
+    });
+
 }

package/src/services-pi/index.js

@@ -1,9 +1,9 @@
-
-/**
- * @imports
- */
-import * as cert from './cert/index.js';
-
-export {
-    cert,
+
+/**
+ * @imports
+ */
+import * as cert from './cert/index.js';
+
+export {
+    cert,
 }

package/src/static-pi/index.js

@@ -1,11 +1,11 @@
-
-/**
- * @imports
-import * as client from './client/index.js';
-import * as server from './server/index.js';
- */
-
-export {
-    //client,
-    //server,
+
+/**
+ * @imports
+import * as client from './client/index.js';
+import * as server from './server/index.js';
+ */
+
+export {
+    //client,
+    //server,
 }

package/src/webflo.js

@@ -1,31 +1,31 @@
 #!/usr/bin/env node
-
-/**
- * @imports
- */
-import Url from 'url';
-import Path from 'path';
-import { jsonFile } from '@webqit/backpack/src/dotfile/index.js';
-import { Logger, Cli } from '@webqit/backpack';
-import * as WebfloPI from './index.js';
-
-const dirSelf = Path.dirname(Url.fileURLToPath(import.meta.url));
-const webfloJson = jsonFile.read(Path.join(dirSelf, '../package.json'));
-const appJson = jsonFile.read('./package.json');
-
-/**
- * @cx
- */
-const cx = WebfloPI.Context.create({
-    meta: { title: webfloJson.title, version: webfloJson.version },
-    app: { title: appJson.title, version: appJson.version },
-    logger: Logger,
-    config: WebfloPI.config,
-    middlewares: [ WebfloPI.deployment.origins.webhook ],
-});
-
-/**
- * @cli
- */
-const cli = new Cli(WebfloPI);
-await cli.exec(cx);
+
+/**
+ * @imports
+ */
+import Url from 'url';
+import Path from 'path';
+import { jsonFile } from '@webqit/backpack/src/dotfile/index.js';
+import { Logger, Cli } from '@webqit/backpack';
+import * as WebfloPI from './index.js';
+
+const dirSelf = Path.dirname(Url.fileURLToPath(import.meta.url));
+const webfloJson = jsonFile.read(Path.join(dirSelf, '../package.json'));
+const appJson = jsonFile.read('./package.json');
+
+/**
+ * @cx
+ */
+const cx = WebfloPI.Context.create({
+    meta: { title: webfloJson.title, version: webfloJson.version },
+    app: { title: appJson.title, version: appJson.version },
+    logger: Logger,
+    config: WebfloPI.config,
+    middlewares: [ WebfloPI.deployment.origins.webhook ],
+});
+
+/**
+ * @cli
+ */
+const cli = new Cli(WebfloPI);
+await cli.exec(cx);

package/test/index.test.js

@@ -1,26 +1,26 @@
-
-/**
- * @imports
- */
-import { config, runtime, Context } from '../src/index.js';
-
-let client = {
-    handle: function( httpEvent ) {
-        return new httpEvent.Response({ abcd: '1234' }, {
-            status: 302,
-            headers: {
-                //location: '/dddd',
-                cookies: {
-                    cookie1: { value: 'value1' },
-                    cookie2: { value: 'value2' },
-                }
-            }
-        });
-    },
-};
-
-const cx = Context.create( { config: config, } );
-const clientCallback = ( _cx, hostName, defaultClientCallback ) => client;
-const app = await runtime.server.start.call( cx, clientCallback );
-
-const response = await app.go( 'http://localhost/', { headers: { range: 'bytes=0-5, 6' } } );
+
+/**
+ * @imports
+ */
+import { config, runtime, Context } from '../src/index.js';
+
+let client = {
+    handle: function( httpEvent ) {
+        return new httpEvent.Response({ abcd: '1234' }, {
+            status: 302,
+            headers: {
+                //location: '/dddd',
+                cookies: {
+                    cookie1: { value: 'value1' },
+                    cookie2: { value: 'value2' },
+                }
+            }
+        });
+    },
+};
+
+const cx = Context.create( { config: config, } );
+const clientCallback = ( _cx, hostName, defaultClientCallback ) => client;
+const app = await runtime.server.start.call( cx, clientCallback );
+
+const response = await app.go( 'http://localhost/', { headers: { range: 'bytes=0-5, 6' } } );

package/test/site/package.json

@@ -1,9 +1,9 @@
-{
-  "title": "Webflo Test",
-  "type": "module",
-  "scripts": {
-    "generate": "webflo generate::client --recursive --compression --auto-embed",
-    "bundle": "cd public && oohtml bundle --recursive --auto-embed=routes",
-    "build": "npm run generate && npm run bundle"
-  }
-}
+{
+  "title": "Webflo Test",
+  "type": "module",
+  "scripts": {
+    "generate": "webflo generate::client --recursive --compression --auto-embed",
+    "bundle": "cd public && oohtml bundle --recursive --auto-embed=routes",
+    "build": "npm run generate && npm run bundle"
+  }
+}

package/test/site/public/bundle.html

@@ -1,6 +1,6 @@
-
-<template name="page-3">
-    <img src="/page-3/logo-130x130.png"  exportgroup="logo-130x130.png" />
-</template>
-<template name="page-4">
+
+<template def="page-3">
+    <img src="/logo-130x130.png"  def="logo-130x130.png" />
+</template>
+<template def="page-4">
 </template>

package/test/site/public/bundle.html.json

@@ -1,4 +1,4 @@
-{
-    "page-3": {},
-    "page-4": {}
+{
+    "page-3": {},
+    "page-4": {}
 }

package/test/site/public/bundle.js

@@ -1,2 +1,2 @@
-/** @webqit/webflo */
-var{start:e}=WebQit.Webflo,r={},o={bundle_filename:"bundle.js",public_base_url:"/",spa_routing:!0,oohtml_support:"full",service_worker_support:!0,worker_scope:"/",worker_filename:"worker.js",routing:{root:"/",subroots:["/page-2","/page-4/subpage"],targets:2}};e.call({layout:r,params:o});
+/** @webqit/webflo */
+var{start:e}=WebQit.Webflo,r={},o={bundle_filename:"bundle.js",public_base_url:"/",spa_routing:!0,oohtml_support:"full",service_worker_support:!0,worker_scope:"/",worker_filename:"worker.js",routing:{root:"/",subroots:["/page-2","/page-4/subpage"],targets:2}};e.call({layout:r,params:o});