@webqit/webflo 1.0.18 → 1.0.19

package/package.json

@@ -12,7 +12,7 @@
     "vanila-javascript"
   ],
   "homepage": "https://webqit.io/tooling/webflo",
-  "version": "1.0.18",
+  "version": "1.0.19",
   "license": "MIT",
   "repository": {
     "type": "git",

package/src/runtime-pi/WebfloRouter.js

@@ -8,7 +8,7 @@ export class WebfloRouter {
         this.path = _isArray(path) ? path : (path + '').split('/').filter(a => a);
     }
 
-    async route(method, event, arg, _default, remoteFetch = null) {
+    async route(method, event, arg, _default, remoteFetch = null, requestLifecycle = null) {
 
         const $this = this;
         const $runtime = this.cx.runtime;
@@ -74,9 +74,10 @@ export class WebfloRouter {
                         _next.stepname = nextPathname[0];
                         // -------------
                         return new Promise(async (res) => {
-                            thisTick.event.onRespondWith = (response) => {
+                            thisTick.event.onRespondWith = async (response) => {
                                 thisTick.event.onRespondWith = null;
                                 res(response);
+                                await requestLifecycle.responsePromise;
                             };
                             const $returnValue = Promise.resolve(handler.call(thisContext, thisTick.event, thisTick.arg, _next/*next*/, remoteFetch));
                             // This should listen first before waitUntil's listener

package/src/runtime-pi/WebfloRuntime.js

@@ -3,24 +3,27 @@ import { _isObject } from '@webqit/util/js/index.js';
 export class WebfloRuntime {
 
     async dispatch(httpEvent, context, crossLayerFetch) {
-        // Exec routing
-        const router = new this.constructor.Router(this.cx, httpEvent.url.pathname);
-        const route = async () => {
-            return await router.route([httpEvent.request.method, 'default'], httpEvent, context, async (event) => {
-                return crossLayerFetch(event);
-            }, (...args) => this.remoteFetch(...args));
-        };
-        try {
-            // Route for response
-            return await (this.cx.middlewares || []).concat(route).reverse().reduce((next, fn) => {
-                return () => fn.call(this.cx, httpEvent, router, next);
-            }, null)();
-            
-        } catch (e) {
-            console.error(e);
-            return new Response(null, { status: 500, statusText: e.message });
-        }
-    }
+        const requestLifecycle = {};
+        requestLifecycle.responsePromise = new Promise(async (res) => {
+            // Exec routing
+            const router = new this.constructor.Router(this.cx, httpEvent.url.pathname);
+            const route = async () => {
+                return await router.route([httpEvent.request.method, 'default'], httpEvent, context, async (event) => {
+                    return crossLayerFetch(event);
+                }, (...args) => this.remoteFetch(...args), requestLifecycle);
+            };
+            try {
+                // Route for response
+                res(await (this.cx.middlewares || []).concat(route).reverse().reduce((next, fn) => {
+                    return () => fn.call(this.cx, httpEvent, router, next);
+                }, null)());
+            } catch (e) {
+                console.error(e);
+                res(new Response(null, { status: 500, statusText: e.message }));
+            }
+        });
+        return await requestLifecycle.responsePromise;
+   }
 
     async normalizeResponse(httpEvent, response, forceCommit = false) {
         // Normalize response

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

@@ -369,7 +369,7 @@ export class WebfloClient extends WebfloRuntime {
         scope.context = {};
         if (window.webqit?.oohtml?.configs) {
             const { BINDINGS_API: { api: bindingsConfig } = {}, } = window.webqit.oohtml.configs;
-            scope.context = this.host[bindingsConfig.bindings].data || {};
+            scope.context = this.host[bindingsConfig.bindings] || {};
         }
         if (scope.request.method === 'GET' || (scope.request.method === 'POST' && scope.url.pathname !== this.location.pathname)) {
             // Ping existing background process
@@ -385,7 +385,7 @@ export class WebfloClient extends WebfloRuntime {
         });
         // ---------------
         // Response processing
-        scope.hasBackgroundActivity = scope.eventLifecyclePromises.size || (scope.redirectMessage && !(scope.response instanceof Response && scope.response.headers.get('Location')));
+        scope.hasBackgroundActivity = scope.clientMessaging.isMessaging() || scope.eventLifecyclePromises.size || (scope.redirectMessage && !(scope.response instanceof Response && scope.response.headers.get('Location')));
         scope.response = await this.normalizeResponse(scope.httpEvent, scope.response);
         if (scope.response.headers.get('Location')) {
             if (scope.redirectMessage) {
@@ -436,7 +436,7 @@ export class WebfloClient extends WebfloRuntime {
         // Only render now
         if ([202/*Accepted*/, 304/*Not Modified*/].includes(scope.response.status)) {
             if (scope.backgroundMessaging) {
-                scope.backgroundMessaging.addEventListener('response', () => {
+                scope.backgroundMessaging.addEventListener('response', (e) => {
                     scope.resetStates();
                 });
                 return;

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

@@ -183,7 +183,7 @@ export class WebfloWorker extends WebfloRuntime {
 		});
 		// ---------------
         // Response processing
-        scope.hasBackgroundActivity = scope.eventLifecyclePromises.size || (scope.redirectMessage && !(scope.response instanceof Response && scope.response.headers.get('Location')));
+        scope.hasBackgroundActivity = scope.clientMessaging.isMessaging() || scope.eventLifecyclePromises.size || (scope.redirectMessage && !(scope.response instanceof Response && scope.response.headers.get('Location')));
         scope.response = await this.normalizeResponse(scope.httpEvent, scope.response, scope.hasBackgroundActivity);
 		if (scope.hasBackgroundActivity) {
 			scope.response.headers.set('X-Background-Messaging', `ch:${scope.clientMessaging.port.name}`);

package/src/runtime-pi/server/WebfloServer.js

@@ -485,7 +485,9 @@ export class WebfloServer extends WebfloRuntime {
                 promise = Promise.resolve(promise);
                 scope.eventLifecyclePromises.add(promise);
                 scope.eventLifecyclePromises.dirty = true;
-                promise.then(() => scope.eventLifecyclePromises.delete(promise));
+                promise.then(() => {
+                    scope.eventLifecyclePromises.delete(promise);
+                });
             },
             respondWith: async (response, isRedirectMessage = false) => {
                 if (!isRedirectMessage && scope.eventLifecyclePromises.dirty && !scope.eventLifecyclePromises.size) {
@@ -533,7 +535,7 @@ export class WebfloServer extends WebfloRuntime {
         });
         // ---------------
         // Response processing
-        scope.hasBackgroundActivity = scope.eventLifecyclePromises.size || (scope.redirectMessage && !(scope.response instanceof Response && scope.response.headers.get('Location')));
+        scope.hasBackgroundActivity = scope.clientMessaging.isMessaging() || scope.eventLifecyclePromises.size || (scope.redirectMessage && !(scope.response instanceof Response && scope.response.headers.get('Location')));
         scope.response = await this.normalizeResponse(scope.httpEvent, scope.response, scope.hasBackgroundActivity);
         if (scope.hasBackgroundActivity) {
             scope.response.headers.set('X-Background-Messaging', `ws:${scope.clientMessaging.portID}`);
@@ -562,7 +564,9 @@ export class WebfloServer extends WebfloRuntime {
                         scope.clientMessaging.close();
                     }, 100);
                 });
-            } else scope.clientMessaging.close();
+            } else {
+                scope.clientMessaging.close();
+            }
         });
         return scope.response;
     }