@webqit/webflo 0.20.4-next.2 → 0.20.4-next.4

package/src/runtime-pi/webflo-server/webflo-devmode.js

@@ -1,6 +1,4 @@
 import Path from 'path';
-import $glob from 'fast-glob';
-import EsBuild from 'esbuild';
 import chokidar from 'chokidar';
 import { exec, spawn } from 'child_process';
 import { platform } from 'os';
@@ -108,7 +106,7 @@ export class WebfloHMR {
                     this.#jsMeta.mustRevalidate = true; // Invalidate graph
                 }
                 if ((!hasJustBeenRebuilt && type !== 'unlink') || !this.#jsMeta.dependencyMap) { // We need graph in place to process affected routes for an unlink event
-                    await this.buildJS(this.#jsMeta.mustRevalidate/*fullBuild*/);
+                    await this.buildRoutes(this.#jsMeta.mustRevalidate/*fullBuild*/);
                     hasJustBeenRebuilt = true;
                 }
                 const affectedHandlers = this.#jsMeta.dependencyMap[target] || [];
@@ -145,7 +143,7 @@ export class WebfloHMR {
                 if (/^unlink/.test(event.actionableEffect)) {
                     delete this.#app.routes[event.affectedRoute];
                 } else if (event.realm === 'server') {
-                    this.#app.routes[event.affectedRoute] = `${Path.join(this.#app.config.DEV_DIR, event.affectedHandler)}?_webflohmrhash=${Date.now()}`;
+                    this.#app.routes[event.affectedRoute] = `${Path.join(this.#app.config.RUNTIME_DIR, event.affectedHandler)}?_webflohmrhash=${Date.now()}`;
                 }
             } else if (event.fileType === 'css') {
                 this.#dirtiness.CSSAffected = true;
@@ -153,7 +151,7 @@ export class WebfloHMR {
                 this.#dirtiness.HTMLAffected = true;
             }
         }
-        if (this.#options.buildSensitivity === 1) {
+        if (this.#options.buildSensitivity === 2) {
             await this.bundleAssetsIfPending();
         }
         // Broadcast to clients
@@ -172,36 +170,29 @@ export class WebfloHMR {
         }
     }
 
-    async buildJS(fullBuild = false) {
+    async buildRoutes(fullBuild = false) {
         // 0. Generate graph
         let buildResult;
         try {
             if (this.#jsMeta.prevBuildResult) {
                 if (fullBuild) await this.#jsMeta.prevBuildResult.rebuild.dispose();
                 else buildResult = await buildResult.rebuild();
-            }
+            }``
             if (!buildResult) {
-                const routeDirs = [...this.#routeDirs];
-                const entryPoints = await $glob(routeDirs.map((d) => `${d}/**/handler{,.client,.worker,.server}.js`), { absolute: true })
-                    .then((files) => files.map((file) => file.replace(/\\/g, '/')));
-                const entryNames = routeDirs.length === 1 ? `${Path.relative(process.cwd(), routeDirs[0])}/[dir]/[name]` : `[dir]/[name]`;
                 const bundlingConfig = {
-                    entryPoints,
-                    outdir: this.#app.config.DEV_DIR,
-                    entryNames,
-                    bundle: true,
-                    format: 'esm',
-                    platform: 'browser', // optional but good for clarity
+                    client: true,
+                    worker: true,
+                    server: true,
                     metafile: true,      // This is key
-                    treeShaking: true,   // Optional optimization
                     logLevel: 'silent',  // Suppress output
-                    minify: false,
-                    sourcemap: false,
                     incremental: true,
                 };
-                buildResult = await EsBuild.build(bundlingConfig);
+                buildResult = await this.#app.buildRoutes(bundlingConfig);
             }
-        } catch (e) { return false; }
+        } catch (e) {
+            //console.error(e);
+            return false;
+        }
 
         // 1. Forward dependency graph (file -> [imported files])
         const forward = {};
@@ -241,35 +232,36 @@ export class WebfloHMR {
         return true;
     }
 
-    async bundleAssetsIfPending() {
+    async bundleAssetsIfPending(ohForce = false) {
         const entries = {};
 
-        if (this.#dirtiness.clientRoutesAffected.size || this.#dirtiness.serviceWorkerAffected) {
+        if (this.#dirtiness.clientRoutesAffected.size || this.#dirtiness.serviceWorkerAffected || ohForce) {
             entries.js = {};
-            entries.js.client = !!this.#dirtiness.clientRoutesAffected.size;
-            entries.js.worker = this.#dirtiness.serviceWorkerAffected;
+            entries.js.client = !!this.#dirtiness.clientRoutesAffected.size || ohForce;
+            entries.js.worker = this.#dirtiness.serviceWorkerAffected || ohForce;
+            entries.js.server = false;
             // Clear state
             this.#dirtiness.clientRoutesAffected.clear();
             this.#dirtiness.serviceWorkerAffected = false;
         }
 
-        if (this.#dirtiness.HTMLAffected) {
+        if (this.#dirtiness.HTMLAffected || ohForce) {
             this.#dirtiness.HTMLAffected = false;
             entries.html = {};
         }
 
-        if (this.#dirtiness.CSSAffected) {
+        if (this.#dirtiness.CSSAffected || ohForce) {
             this.#dirtiness.CSSAffected = false;
             entries.css = {};
         }
 
         for (const e in entries) {
             const buildKey = `build:${e}`;
-            let buildScript,
-                buildScriptName = this.#options.buildScripts?.[buildKey];
+            let buildScriptName = this.#options.buildScripts?.[buildKey];
             if (buildScriptName === true) {
                 buildScriptName = buildKey;
             }
+            let buildScript;
             if (buildScriptName
                 && (buildScript = this.#options.appMeta.scripts?.[buildScriptName])) {
                 await this.#spawnProcess(buildScript, entries[e]);
@@ -278,8 +270,9 @@ export class WebfloHMR {
     }
 
     async #spawnProcess(command, options = {}) {
+        const $options = Object.fromEntries(Object.entries(options).map(([k, v]) => [`--${k}`, v]));
         const commandArr = [...new Set(
-            command.split(/\s+?/).concat(Object.keys(options)).filter((s) => !(s in options) || options[s])
+            command.split(/\s+?/).concat(Object.keys($options)).filter((s) => !(s in $options) || $options[s])
         )];
         return await new Promise((resolve, reject) => {
             const child = spawn(commandArr.shift(), commandArr, {

package/src/runtime-pi/webflo-url/Url.js

@@ -1,7 +1,7 @@
 import { _with } from '@webqit/util/obj/index.js';
 import { _isArray, _isObject, _isTypeObject, _isString, _isEmpty } from '@webqit/util/js/index.js';
 import { DeepURLSearchParams } from './util.js';
-import { Observer } from '@webqit/quantum-js';
+import { Observer } from '@webqit/use-live';
 
 export class Url {
 

package/src/runtime-pi/webflo-url/xURL.js

@@ -1,5 +1,5 @@
 import { _isObject } from '@webqit/util/js/index.js';
-import { Observer } from '@webqit/quantum-js';
+import { Observer } from '@webqit/use-live';
 import { DeepURLSearchParams } from './util.js';
 
 export class xURL extends URL {

package/src/runtime-pi/webflo-worker/WebfloWorker.js

@@ -1,5 +1,6 @@
 import { _any } from '@webqit/util/arr/index.js';
 import { WebfloRuntime } from '../WebfloRuntime.js';
+import { response as responseShim } from '../webflo-fetch/index.js';
 import { WQBroadcastChannel } from '../webflo-messaging/WQBroadcastChannel.js';
 import { WorkerSideWorkport } from './WorkerSideWorkport.js';
 import { WorkerSideCookies } from './WorkerSideCookies.js';
@@ -21,13 +22,6 @@ export class WebfloWorker extends WebfloRuntime {
 
 	static get Workport() { return WorkerSideWorkport; }
 
-	static create(cx) {
-		return new this(this.Context.create(cx));
-	}
-
-    #sdk = {};
-    get sdk() { return this.#sdk; }
-
 	async initialize() {
 		const instanceController = super.initialize();
 		// ONINSTALL
@@ -98,7 +92,9 @@ export class WebfloWorker extends WebfloRuntime {
 			self.registration.showNotification(title, params);
 		};
 		self.addEventListener('fetch', fetchHandler, { signal: instanceController.signal });
-		self.addEventListener('push', webpushHandler, { signal: instanceController.signal });
+		if (this.config.CLIENT.capabilities.webpush) {
+			self.addEventListener('push', webpushHandler, { signal: instanceController.signal });
+		}
 		return instanceController;
 	}
 
@@ -114,25 +110,24 @@ export class WebfloWorker extends WebfloRuntime {
 			request: scopeObj.request
 		});
 		scopeObj.session = this.createHttpSession({
-			store: this.#sdk.storage?.('session'),
+			store: this.createStorage('session'),
 			request: scopeObj.request
 		});
 		const requestID = crypto.randomUUID();
 		scopeObj.clientRequestRealtime = new WQBroadcastChannel(requestID);
 		scopeObj.user = this.createHttpUser({
-			store: this.#sdk.storage?.('user'),
+			store: this.createStorage('user'),
 			request: scopeObj.request,
-			realtime: scopeObj.clientRequestRealtime,
+			client: scopeObj.clientRequestRealtime,
 			session: scopeObj.session,
 		});
 		scopeObj.httpEvent = this.createHttpEvent({
 			request: scopeObj.request,
-			realtime: scopeObj.clientRequestRealtime,
+			client: scopeObj.clientRequestRealtime,
 			cookies: scopeObj.cookies,
 			session: scopeObj.session,
 			user: scopeObj.user,
 			detail: scopeObj.detail,
-			sdk: {}
 		});
 		// Dispatch for response
 		scopeObj.response = await this.dispatchNavigationEvent({
@@ -144,7 +139,7 @@ export class WebfloWorker extends WebfloRuntime {
 				}
 				return await this.remoteFetch(event.request);
 			},
-			responseRealtime: `br:${scopeObj.httpEvent.realtime.name}`
+			clientPortB: `br:${scopeObj.httpEvent.client.name}`
 		});
 		return scopeObj.response;
 	}
@@ -211,7 +206,8 @@ export class WebfloWorker extends WebfloRuntime {
 
 	async refreshCache(request, response) {
 		// Check if we received a valid response
-		if (request.method !== 'GET' || !response || response.status !== 200 || (response.type !== 'basic' && response.type !== 'cors')) {
+		const statusCode = responseShim.prototype.status.get.call(response);
+		if (request.method !== 'GET' || !response || statusCode !== 200 || (response.type !== 'basic' && response.type !== 'cors')) {
 			return response;
 		}
 		// IMPORTANT: Clone the response. A response is a stream

package/src/runtime-pi/webflo-worker/WorkerSideCookies.js

@@ -1,10 +1,11 @@
 import { HttpCookies } from '../webflo-routing/HttpCookies.js';
+import { headers as headersShim } from '../webflo-fetch/index.js';
 
 export class WorkerSideCookies extends HttpCookies {
     static create({ request }) {
         return new this({
             request,
-            entries: request.headers.get('Cookie', true).map((c) => [c.name, c])
+            entries: headersShim.get.value.call(request.headers, 'Cookie', true).map((c) => [c.name, c])
         });
     }
 

package/src/runtime-pi/webflo-worker/bootstrap.js

@@ -0,0 +1,39 @@
+import Fs from 'fs';
+import Path from 'path';
+import {
+    readLayoutConfig,
+    readEnvConfig,
+    readClientConfig,
+    readWorkerConfig,
+    scanRoots,
+    scanRouteHandlers,
+} from '../../deployment-pi/util.js';
+
+export async function bootstrap(cx, offset = '') {
+    const $init = Fs.existsSync('./init.worker.js')
+        ? Path.resolve('./init.worker.js')
+        : null;
+    const config = {
+        LAYOUT: await readLayoutConfig(cx),
+        ENV: await readEnvConfig(cx),
+        CLIENT: await readClientConfig(cx),
+        WORKER: await readWorkerConfig(cx),
+    };
+    if (config.CLIENT.copy_public_variables) {
+        const publicEnvPattern = /(?:^|_)PUBLIC(?:_|$)/;
+        config.ENV.data = config.ENV.data || {};
+        for (const key in process.env) {
+            if (publicEnvPattern.test(key)) {
+                config.ENV.data[key] = process.env[key];
+            }
+        }
+    }
+    const routes = {};
+    const $roots = Fs.existsSync(config.LAYOUT.PUBLIC_DIR) ? scanRoots(config.LAYOUT.PUBLIC_DIR, 'manifest.json') : [];
+    const $sparoots = Fs.existsSync(config.LAYOUT.PUBLIC_DIR) ? scanRoots(config.LAYOUT.PUBLIC_DIR, 'index.html') : [];
+    scanRouteHandlers(config.LAYOUT, 'worker', (file, route) => {
+        routes[route] = file;
+    }, offset, $roots);
+    const outdir = Path.join(config.LAYOUT.PUBLIC_DIR, offset);
+    return { $init, config, routes, $roots, $sparoots, outdir, offset };
+}

package/src/runtime-pi/webflo-worker/index.js

@@ -1,11 +1,7 @@
 import { WebfloWorker } from './WebfloWorker.js';
 
-export async function start() {
-    const instance = WebfloWorker.create(this || {});
+export async function start(bootstrap) {
+    const instance = WebfloWorker.create(bootstrap);
     await instance.initialize();
     return instance;
-}
-
-export {
-    WebfloWorker
-}
+}

package/src/webflo-cli.js

@@ -16,12 +16,11 @@ const appMeta = jsonFile.read('./package.json');
 /**
  * @cx
  */
-const cx = WebfloPI.Context.create({
+const cx = WebfloPI.CLIContext.create({
     meta: { title: webfloMeta.title, version: webfloMeta.version },
     appMeta: { ...appMeta },
     logger: Logger,
     config: WebfloPI.config,
-    middlewares: [ WebfloPI.deployment.origins.webhook ],
 });
 
 /**

package/src/runtime-pi/webflo-fetch/cookies.js

@@ -1,10 +0,0 @@
-export function renderCookieObjToString(cookieObj) {
-    const attrsArr = [`${cookieObj.name}=${/*encodeURIComponent*/(cookieObj.value)}`];
-    for (const attrName in cookieObj) {
-        if (['name', 'value'].includes(attrName)) continue;
-        let _attrName = attrName[0].toUpperCase() + attrName.substring(1);
-        if (_attrName === 'MaxAge') { _attrName = 'Max-Age' };
-        attrsArr.push(cookieObj[attrName] === true ? _attrName : `${_attrName}=${cookieObj[attrName]}`);
-    }
-    return attrsArr.join(';');
-}

package/src/runtime-pi/webflo-fetch/fetch.js

@@ -1,16 +0,0 @@
-import { renderHttpMessageInit } from './message.js';
-
-const nativeFetch = fetch;
-export async function fetch(url, init = {}) {
-    return await nativeFetch(url);
-    if (init.body) {
-        const { body, headers } = renderHttpMessageInit(init);
-        init = { ...init, body, headers, };
-    }
-    let response = await nativeFetch(url, init), encoding;
-    if (init.decompress === false && (encoding = response.headers.get('Content-Encoding'))) {
-        const recompressedBody = response.body.pipeThrough(new CompressionStream(encoding));
-        response = new Response(recompressedBody, response);
-    }
-    return response;
-}

package/src/runtime-pi/webflo-fetch/formdata.js

@@ -1,54 +0,0 @@
-
-import { _isNumeric } from '@webqit/util/js/index.js';
-import { _before } from '@webqit/util/str/index.js';
-import { DeepURLSearchParams } from '../webflo-url/util.js';
-import { dataType } from './util.js';
-
-export function createFormDataFromJson(data = {}, jsonfy = true, getIsJsonfiable = false) {
-    const formData = new FormData;
-    let isJsonfiable = true;
-    DeepURLSearchParams.reduceValue(data, '', (value, contextPath, suggestedKeys = undefined) => {
-        if (suggestedKeys) {
-            const isJson = dataType(value) === 'json';
-            isJsonfiable = isJsonfiable && isJson;
-            return isJson && suggestedKeys;
-        }
-        if (jsonfy && [true, false, null].includes(value)) {
-            value = new Blob([value], { type: 'application/json' });
-        }
-        formData.append(contextPath, value);
-    });
-    if (getIsJsonfiable) return [formData, isJsonfiable];
-    return formData;
-}
-
-export async function renderFormDataToJson(formData, jsonfy = true, getIsJsonfiable = false) {
-    let isJsonfiable = true;
-    let json;
-    for (let [name, value] of formData.entries()) {
-        if (!json) { json = _isNumeric(_before(name, '[')) ? [] : {}; }
-        let type = dataType(value);
-        if (jsonfy && ['Blob', 'File'].includes(type) && value.type === 'application/json') {
-            let _value = await value.text();
-            value = JSON.parse(_value);
-            type = 'json';
-        }
-        isJsonfiable = isJsonfiable && type === 'json';
-        DeepURLSearchParams.set(json, name, value);
-    }
-    if (getIsJsonfiable) return [json, isJsonfiable];
-    return json;
-}
-
-Object.defineProperties(FormData, {
-    json: { value: createFormDataFromJson }
-});
-
-Object.defineProperties(FormData.prototype, {
-    json: {
-        value: async function (data = {}) {
-            const result = await renderFormDataToJson(this, ...arguments);
-            return result;
-        }
-    }
-});

package/src/runtime-pi/webflo-fetch/headers.js

@@ -1,151 +0,0 @@
-import { _after } from '@webqit/util/str/index.js';
-import { _isObject, _isTypeObject } from '@webqit/util/js/index.js';
-import { _from as _arrFrom } from '@webqit/util/arr/index.js';
-import { renderCookieObjToString } from './cookies.js';
-
-const prototypeOriginals = {
-    set: Headers.prototype.set,
-    get: Headers.prototype.get,
-    append: Headers.prototype.append,
-};
-const prototypeExtensions = {
-    set: {
-        value: function (name, value) {
-            // -------------------------
-            // Format "Set-Cookie" response header
-            if (/^Set-Cookie$/i.test(name) && _isObject(value)) {
-                value = renderCookieObjToString(value);
-            }
-            // -------------------------
-            // Format "Cookie" request header
-            if (/Cookie/i.test(name) && _isTypeObject(value)) {
-                value = [].concat(value).map(renderCookieObjToString).join(';');
-            }
-            // -------------------------
-            // Format "Content-Range" response header?
-            if (/^Content-Range$/i.test(name) && Array.isArray(value)) {
-                if (value.length < 2 || !value[0].includes('-')) {
-                    throw new Error(`A Content-Range array must be in the format: [ 'start-end', 'total' ]`);
-                }
-                value = `bytes ${value.join('/')}`;
-            }
-            // -------------------------
-            // Format "Range" request header?
-            if (/^Range$/i.test(name)) {
-                let rangeArr = [];
-                _arrFrom(value).forEach((range, i) => {
-                    let rangeStr = Array.isArray(range) ? range.join('-') : range + '';
-                    if (i === 0 && !rangeStr.includes('bytes=')) {
-                        rangeStr = `bytes=${rangeStr}`;
-                    }
-                    rangeArr.push(rangeStr);
-                });
-                value = rangeArr.join(', ');
-            }
-            // -------------------------
-            // Format "Accept" request header?
-            if (/^Accept$/i.test(name) && Array.isArray(value)) {
-                value = value.join(',');
-            }
-            // -------------------------
-            return prototypeOriginals.set.call(this, name, value);
-        }
-    },
-    append: {
-        value: function (name, value) {
-            // -------------------------
-            // Format "Set-Cookie" response header
-            if (/^Set-Cookie$/i.test(name) && _isObject(value)) {
-                value = renderCookieObjToString(value);
-            }
-            // -------------------------
-            return prototypeOriginals.append.call(this, name, value);
-        }
-    },
-    get: {
-        value: function (name, parsed = false) {
-            let value = prototypeOriginals.get.call(this, name);
-            // -------------------------
-            // Parse "Set-Cookie" response header
-            if (/^Set-Cookie$/i.test(name) && parsed) {
-                value = this.getSetCookie()/*IMPORTANT*/.map((str) => {
-                    const [cookieDefinition, attrsStr] = str.split(';');
-                    const [name, value] = cookieDefinition.split('=').map((s) => s.trim());
-                    const cookieObj = { name, value: /*decodeURIComponent*/(value), };
-                    attrsStr && attrsStr.split(/\;/g).map(attrStr => attrStr.trim().split('=')).forEach(attrsArr => {
-                        cookieObj[attrsArr[0][0].toLowerCase() + attrsArr[0].substring(1).replace('-', '')] = attrsArr.length === 1 ? true : attrsArr[1];
-                    });
-                    return cookieObj;
-                });
-            }
-            // -------------------------
-            // Parse "Cookie" request header
-            if (/^Cookie$/i.test(name) && parsed) {
-                value = value?.split(';').map((str) => {
-                    const [name, value] = str.split('=').map((s) => s.trim());
-                    return { name, value: /*decodeURIComponent*/(value), };
-                }) || [];
-            }
-            // -------------------------
-            // Parse "Content-Range" response header?
-            if (/^Content-Range$/i.test(name) && value && parsed) {
-                value = _after(value, 'bytes ').split('/');
-            }
-            // -------------------------
-            // Parse "Range" request header?
-            if (/^Range$/i.test(name) && parsed) {
-                value = !value ? [] : _after(value, 'bytes=').split(',').map((rangeStr) => {
-                    const range = rangeStr.trim().split('-').map((s) => s ? parseInt(s, 10) : null);
-                    range.render = (totalLength) => {
-                        if (range[1] === null) {
-                            range[1] = totalLength - 1;
-                        }
-                        if (range[0] === null) {
-                            range[0] = range[1] ? totalLength - range[1] - 1 : 0;
-                        }
-                        return range
-                    };
-                    range.isValid = (currentStart, totalLength) => {
-                        // Start higher than end or vice versa?
-                        if (range[0] > range[1] || range[1] < range[0]) return false;
-                        // Stretching beyond valid start/end?
-                        if (range[0] < currentStart || range[1] > totalLength) return false;
-                        return true;
-                    };
-                    return range;
-                });
-            }
-            // -------------------------
-            // Parse "Accept" request header?
-            if (/^Accept$/i.test(name) && value && parsed) {
-                const parseSpec = (spec) => {
-                    const [mime, q] = spec.trim().split(';').map((s) => s.trim());
-                    return [mime, parseFloat((q || 'q=1').replace('q=', ''))];
-                };
-                const list = value.split(',')
-                    .map((spec) => parseSpec(spec))
-                    .sort((a, b) => a[1] > b[1] ? -1 : 1) || [];
-                const $value = value;
-                value = {
-                    match(mime) {
-                        if (!mime) return 0;
-                        const splitMime = (mime) => mime.split('/').map((s) => s.trim());
-                        const $mime = splitMime(mime + '');
-                        return list.reduce((prev, [entry, q]) => {
-                            if (prev) return prev;
-                            const $entry = splitMime(entry);
-                            return [0, 1].every((i) => (($mime[i] === $entry[i]) || $mime[i] === '*' || $entry[i] === '*')) ? q : 0;
-                        }, 0);
-                    },
-                    toString() {
-                        return $value;
-                    }
-                };
-            }
-            // -------------------------
-            return value;
-        }
-    }
-};
-
-Object.defineProperties(Headers.prototype, prototypeExtensions);

package/src/runtime-pi/webflo-fetch/message.js

@@ -1,49 +0,0 @@
-import { _isTypeObject } from '@webqit/util/js/index.js';
-import { createFormDataFromJson } from './formdata.js';
-import { dataType } from './util.js';
-
-export function renderHttpMessageInit(httpMessageInit) {
-    // JSONfy headers
-    const headers = (httpMessageInit.headers instanceof Headers) ? [...httpMessageInit.headers.entries()].reduce((_headers, [name, value]) => {
-        return { ..._headers, [name/* lower-cased */]: _headers[name] ? [].concat(_headers[name], value) : value };
-    }, {}) : Object.keys(httpMessageInit.headers || {}).reduce((_headers, name) => {
-        return { ..._headers, [name.toLowerCase()]: httpMessageInit.headers[name] };
-    }, {});
-    // Process body
-    let body = httpMessageInit.body, type = dataType(httpMessageInit.body);
-    if (['Blob', 'File'].includes(type)) {
-        !headers['content-type'] && (headers['content-type'] = body.type);
-        !headers['content-length'] && (headers['content-length'] = body.size);
-    } else if (['Uint8Array', 'Uint16Array', 'Uint32Array', 'ArrayBuffer'].includes(type)) {
-        !headers['content-length'] && (headers['content-length'] = body.byteLength);
-    } else if (type === 'json' && _isTypeObject(body)/*JSON object*/) {
-        if (!headers['content-type']) {
-            const [_body, isJsonfiable] = createFormDataFromJson(body, true/*jsonfy*/, true/*getIsJsonfiable*/);
-            if (isJsonfiable) {
-                body = JSON.stringify(body, (k, v) => v instanceof Error ? { ...v, message: v.message } : v);
-                headers['content-type'] = 'application/json';
-                headers['content-length'] = (new Blob([body])).size;
-            } else {
-                body = _body;
-                type = 'FormData';
-            }
-        }
-    } else if (type === 'json'/*JSON string*/ && !headers['content-length']) {
-        (headers['content-length'] = (body + '').length);
-    }
-    return { body, headers, $type: type };
-}
-
-export async function parseHttpMessage(httpMessage) {
-    let result;
-    const contentType = httpMessage.headers.get('Content-Type') || '';
-    if (contentType === 'application/x-www-form-urlencoded' || contentType.startsWith('multipart/form-data')) {
-        const formData = await httpMessage.formData();
-        result = await formData?.json();
-    } else if (contentType.startsWith('application/json')/*can include charset*/) {
-        result = await httpMessage.json();
-    } else /*if (contentType === 'text/plain')*/ {
-        result = httpMessage.body;
-    }
-    return result;
-}

package/src/runtime-pi/webflo-fetch/request.js

@@ -1,62 +0,0 @@
-import { _wq } from '../../util.js';
-import { renderHttpMessageInit } from './message.js';
-
-const prototypeOriginals = { clone: Request.prototype.clone };
-const prototypeExtensions = {
-    carries: { get: function () { return new Set(_wq(this, 'meta').get('carries') || []); } },
-    clone: {
-        value: function (init = {}) {
-            const clone = prototypeOriginals.clone.call(this, init);
-            const requestMeta = _wq(this, 'meta');
-            _wq(clone).set('meta', requestMeta);
-            return clone;
-        }
-    },
-    parse: { value: function () { return parseHttpMessage(this); } },
-};
-
-const staticExtensions = {
-    from: {
-        value: function (url, init = {}) {
-            if (url instanceof Request) return url;
-            let $$type, $$body = init.body;
-            if ('body' in init) {
-                const { body, headers, $type } = renderHttpMessageInit(init);
-                init = { ...init, body, headers };
-                $$type = $type;
-            }
-            const instance = new Request(url, init);
-            const responseMeta = _wq(instance, 'meta');
-            responseMeta.set('body', $$body);
-            responseMeta.set('type', $$type);
-            return instance;
-        }
-    },
-    copy: {
-        value: async function (request, init = {}) {
-            const requestInit = [
-                'method', 'headers', 'mode', 'credentials', 'cache', 'redirect', 'referrer', 'integrity',
-            ].reduce(($init, prop) => (
-                { ...$init, [prop]: prop in init ? init[prop] : (prop === 'headers' ? new Headers(request[prop]) : request[prop]) }
-            ), {});
-            if (!['GET', 'HEAD'].includes(init.method?.toUpperCase() || request.method)) {
-                if ('body' in init) {
-                    requestInit.body = init.body
-                    if (!('headers' in init)) {
-                        requestInit.headers.delete('Content-Type');
-                        requestInit.headers.delete('Content-Length');
-                    }
-                } else {
-                    requestInit.body = await request.clone().arrayBuffer();
-                }
-            }
-            if (requestInit.mode === 'navigate') {
-                requestInit.mode = 'cors';
-            }
-            return { url: request.url, ...requestInit };
-        }
-    }
-};
-
-Object.defineProperties(Request.prototype, prototypeExtensions);
-Object.defineProperties(Request, staticExtensions);