@webqit/webflo 0.20.13 → 0.20.15

package/package.json

@@ -12,7 +12,7 @@
     "vanila-javascript"
   ],
   "homepage": "https://webqit.io/tooling/webflo",
-  "version": "0.20.13",
+  "version": "0.20.15",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -44,7 +44,7 @@
   "dependencies": {
     "@octokit/webhooks": "^7.15.1",
     "@webqit/backpack": "^0.1.12",
-    "@webqit/oohtml-ssr": "^2.2.1",
+    "@webqit/oohtml-ssr": "^2.2.2",
     "@webqit/use-live": "^0.5.44",
     "@webqit/util": "^0.8.11",
     "chokidar": "^4.0.3",

package/src/runtime-pi/WebfloRuntime.js

@@ -109,7 +109,7 @@ export class WebfloRuntime {
 
         // Dispatch event
         const router = new this.constructor.Router(this, httpEvent.url.pathname);
-        await router.route(['SETUP'], httpEvent);
+        await router.route(['SETUP'], httpEvent.extend());
 
         // Do proper routing for respone
         const response = await new Promise(async (resolve) => {

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

@@ -144,9 +144,9 @@ export const response = {
         status: {
             get: function () {
                 return _wq(this, 'meta').get('status')
-                    || this instanceof Response
-                    ? responseOriginals.prototype.status.get.call(this)
-                    : this.status;
+                    || (this instanceof Response
+                        ? responseOriginals.prototype.status.get.call(this)
+                        : this.status);
             }
         },
         carry: { get: function () { return _wq(this, 'meta').get('carry'); } },
@@ -364,7 +364,7 @@ export async function parseHttpMessage(httpMessage) {
     const contentType = httpMessage.headers.get('Content-Type') || '';
     if (contentType === 'application/x-www-form-urlencoded' || contentType.startsWith('multipart/form-data')) {
         const fd = await httpMessage.formData();
-        result = fd && await formData.json.value(fd);
+        result = fd && await formData.prototype.json.value.call(fd);
     } else if (contentType.startsWith('application/json')/*can include charset*/) {
         result = await httpMessage.json();
     } else /*if (contentType === 'text/plain')*/ {

package/src/runtime-pi/webflo-routing/HttpState.js

@@ -1,5 +1,6 @@
 import { _isObject } from '@webqit/util/js/index.js';
 import { _even } from '@webqit/util/obj/index.js';
+import { HttpEvent } from './HttpEvent.js';
 
 export class HttpState {
 
@@ -134,6 +135,10 @@ export class HttpState {
                         entries.push(returnValue);
                         continue main;
                     }
+                    if (callback instanceof HttpEvent) {
+                        await callback.redirectWith(handler.url, handler.with || {});
+                        return new Promise(() => { });
+                    }
                     const urlRewrite = new URL(handler.url, this.#request.url);
                     const newThread = this.#thread.extend(urlRewrite.searchParams.get('_thread'));
                     urlRewrite.searchParams.set('_thread', newThread.threadID);
@@ -152,7 +157,9 @@ export class HttpState {
             }
             entries.push(await this.get(attr));
         }
-        if (callback) return await callback(...entries);
+        if (callback && !(callback instanceof HttpEvent)) {
+            return await callback(...entries);
+        }
         return entries;
     }
 }

package/src/runtime-pi/webflo-routing/WebfloRouter.js

@@ -172,7 +172,7 @@ export class WebfloRouter {
 
                     // Call the handler
                     const returnValue = await handler.call(thisContext, thisTick.event, $next/*next*/, $fetch/*fetch*/);
-
+                    
                     // Handle cleanup on abort
                     if (LiveResponse.test(returnValue) === 'LiveProgramHandle') {
                         thisTick.event.signal.addEventListener('abort', () => {