@webqit/webflo 0.9.2 → 0.9.5

package/package.json

@@ -12,7 +12,7 @@
     "vanila-javascript"
   ],
   "homepage": "https://webqit.io/tooling/webflo",
-  "version": "0.9.2",
+  "version": "0.9.5",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -30,7 +30,7 @@
     "postpublish": "git push && git push --tags"
   },
   "bin": {
-    "webflo": "src/index.js",
+    "webflo": "src/webflo.js",
     "webflo-certbot-http-auth-hook": "src/services/certbot/http-auth-hook.js",
     "webflo-certbot-http-cleanup-hook": "src/services/certbot/http-cleanup-hook.js"
   },

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

@@ -191,7 +191,7 @@ export default class Runtime {
             this._abortController.abort();
         }
         this._abortController = new AbortController();
-        this._xRedirectCode = 300;
+        this._xRedirectCode = 200;
         // ------------
         url = typeof url === 'string' ? new whatwag.URL(url) : url;
         init = { referrer: this.location.href, ...init };
@@ -213,7 +213,7 @@ export default class Runtime {
 		// The navigation event
 		let httpEvent = new HttpEvent(request, detail, (id = null, persistent = false) => this.getSession(httpEvent, id, persistent));
 		// Response
-		let response = await this.clients.get('*').handle(httpEvent, (...args) => this.remoteFetch(...args));
+		let response = await this.clients.get('*').handle(httpEvent, ( ...args ) => this.remoteFetch( ...args ));
 		let finalResponse = this.handleResponse(httpEvent, response);
         // Return value
 		return finalResponse;
@@ -240,9 +240,9 @@ export default class Runtime {
 	}
 
 	// Initiates remote fetch and sets the status
-	remoteFetch(request) {
+	remoteFetch(request, ...args) {
 		Observer.set(this.network, 'remote', true);
-		let _response = fetch(request);
+		let _response = fetch(request, ...args);
 		// This catch() is NOT intended to handle failure of the fetch
 		_response.catch(e => Observer.set(this.network, 'error', e.message));
 		// Return xResponse

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

@@ -76,6 +76,7 @@ export default class Worker {
 		// -------------
 		// ONFETCH		
 		self.addEventListener('fetch', async evt => {
+			return; // TODO
 			// URL schemes that might arrive here but not supported; e.g.: chrome-extension://
 			if (!evt.request.url.startsWith('http')) return;
 			const requestInit = [
@@ -88,6 +89,9 @@ export default class Worker {
         Observer.set(this, 'location', {});
         Observer.set(this, 'network', {});
         // ---------------
+		Observer.observe(this.network, es => {
+			//console.log('//////////', ...es.map(e => `${e.name}: ${e.value}`))
+		});
 	}
 
 	/**
@@ -106,6 +110,10 @@ export default class Worker {
         // ------------
 		// The request object
 		let request = this.generateRequest(url.href, init);
+		if (detail.event instanceof self.Request) {
+			request = detail.event.request;
+			//Object.defineProperty(detail.event, 'request', { value: request });
+		}
 		// The navigation event
 		let httpEvent = new HttpEvent(request, detail, (id = null, persistent = false) => this.getSession(httpEvent, id, persistent));
 		httpEvent.port.listen(message => {
@@ -117,7 +125,7 @@ export default class Worker {
 		// Response
 		let response;
 		if (httpEvent.request.url.startsWith(self.origin)/* && httpEvent.request.mode === 'navigate'*/) {
-			response = await this.clients.get('*').handle(httpEvent, (...args) => this.remoteFetch(...args));
+			response = await this.clients.get('*').handle(httpEvent, ( ...args ) => this.remoteFetch( ...args ));
 		} else {
 			response = await this.remoteFetch(httpEvent.request);
 		}
@@ -149,7 +157,10 @@ export default class Worker {
 	}
 
 	// Initiates remote fetch and sets the status
-	remoteFetch(request) {
+	remoteFetch(request, ...args) {
+		if (arguments.length > 1) {
+			request = this.generateRequest(request, ...args);
+		}
 		const execFetch = () => {
 			if (_any((this.cx.params.cache_only_urls || []).map(c => c.trim()).filter(c => c), pattern => Minimatch.Minimatch(request.url, pattern))) {
 				Observer.set(this.network, 'strategy', 'cache-only');

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

@@ -247,7 +247,7 @@ export default class Runtime {
         if (this.cx.app.title && this.cx.logger) {
             this.cx.logger.info(`> Server running (${this.cx.app.title || ''})`);
         }
-    }
+     }
 
     /**
      * Performs a request.
@@ -303,7 +303,7 @@ export default class Runtime {
         if (this.cx.server.shared) {
             client = this.clients.get(url.hostname);
         }
-        let response = await client.handle(httpEvent, (...args) => this.remoteFetch(...args));
+        let response = await client.handle(httpEvent, ( ...args ) => this.remoteFetch( ...args ));
         let finalResponse = await this.handleResponse(httpEvent, response, autoHeaders.filter(header => header.type === 'response'));
         // Logging
         if (this.cx.logger) {
@@ -335,7 +335,6 @@ export default class Runtime {
                 });
             }
         } else {
-            baseObject = e.detail.request;
             Sessions({
                 duration: 0,                                            // how long the session will stay valid in ms
                 activeDuration: 0,                                      // if expiresIn < activeDuration, the session will be extended by activeDuration milliseconds
@@ -348,6 +347,7 @@ export default class Runtime {
                     callback(e);
                 }
             });
+            baseObject = e.detail.request;
         }
         // Where theres no error, instance is available
         let instance = Object.getOwnPropertyDescriptor(baseObject, id);
@@ -356,9 +356,9 @@ export default class Runtime {
     }
 
     // Initiates remote fetch and sets the status
-    remoteFetch(request) {
+    remoteFetch(request, ...args) {
         Observer.set(this.network, 'remote', true);
-        let _response = fetch(request);
+        let _response = fetch(request, ...args);
         // This catch() is NOT intended to handle failure of the fetch
         _response.catch(e => Observer.set(this.network, 'error', e.message));
         // Save a reference to this
@@ -401,6 +401,7 @@ export default class Runtime {
                 response.attrs.status = xRedirectCode;
                 response.headers.json({
                     'X-Redirect-Code': response.status,
+                    'Access-Control-Allow-Origin': '*',
                     'Cache-Control': 'no-store',
                 });
             }