@webqit/webflo 0.8.58-0 → 0.8.60

package/package.json

@@ -12,7 +12,7 @@
     "vanila-javascript"
   ],
   "homepage": "https://webqit.io/tooling/webflo",
-  "version": "0.8.58-0",
+  "version": "0.8.60",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -38,7 +38,8 @@
     "@octokit/webhooks": "^7.15.1",
     "@webqit/backpack": "^0.0.37",
     "@webqit/browser-pie": "^0.0.16",
-    "@webqit/pseudo-browser": "^0.3.35",
+    "@webqit/observer": "^1.7.5",
+    "@webqit/pseudo-browser": "^1.0.0",
     "@webqit/util": "^0.8.7",
     "client-sessions": "^0.8.0",
     "cookie": "^0.4.1",

package/src/runtime/_URL.js

@@ -2,7 +2,6 @@
 /**
  * @imports
  */
-import { Observer } from '@webqit/pseudo-browser/index2.js';
 import _isArray from '@webqit/util/js/isArray.js';
 import _isObject from '@webqit/util/js/isObject.js';
 import { wwwFormUnserialize, wwwFormSerialize } from './util.js';
@@ -70,6 +69,7 @@ const _URL = NativeURL => {
 	
 		constructor() {
 			super(...arguments);
+			const { Observer } = WebQit;
 			Observer.accessorize(this, [
 				'protocol', 
 				'username',

package/src/runtime/client/Http.js

@@ -2,13 +2,13 @@
 /**
  * @imports
  */
-import { Observer } from '@webqit/pseudo-browser/index2.js';
 import _before from '@webqit/util/str/before.js';
 import _after from '@webqit/util/str/after.js';
 import _toTitle from '@webqit/util/str/toTitle.js';
 import _arrFrom from '@webqit/util/arr/from.js';
 import { wwwFormUnserialize, wwwFormSet, wwwFormSerialize } from '../util.js';
 import StdRequest from './StdRequest.js';
+import { Observer } from './Runtime.js';
 import Url from './Url.js';
 
 /**
@@ -16,7 +16,7 @@ import Url from './Url.js';
  * The Client class
  * ---------------------------
  */
-			
+
 export default class Http {
 
 	/**
@@ -208,6 +208,7 @@ export default class Http {
 			}
 		}, {diff: false /* method might be the difference */});
 		// Startup route
+
 		handleResponse(await client.call(instance, createRequest(window.document.location.href, document.referrer)));
 
 		return instance;

package/src/runtime/client/Runtime.js

@@ -2,7 +2,6 @@
 /**
  * @imports
  */
-import { OOHTML, Observer } from '@webqit/pseudo-browser/index2.js';
 import _isObject from '@webqit/util/js/isObject.js';
 import _before from '@webqit/util/str/before.js';
 import _unique from '@webqit/util/arr/unique.js';
@@ -13,20 +12,13 @@ import Storage from './Storage.js';
 import Router from './Router.js';
 import Http from './Http.js';
 
-/**
- * ---------------------------
- * OOHTML
- * ---------------------------
- */
-
-OOHTML.call(window);
-
 /**
  * ---------------------------
  * The Client Initializer
  * ---------------------------
  */
 
+export const { Observer } = window.WebQit;
 export default function(layout, params) {
 
 	const session = Storage();
@@ -162,7 +154,7 @@ export default function(layout, params) {
 						window.scroll({top: 0, left: 0});
 						setTimeout(() => {
 							document.documentElement.classList.remove('scroll-reset');
-						}, 200);
+						}, 50);
 					}
 				}, 0);
 			}

package/src/runtime/client/Storage.js

@@ -3,8 +3,8 @@
 /**
  * @imports
  */
-import { Observer } from '@webqit/pseudo-browser/index2.js';
 import { _isString, _isUndefined } from '@webqit/util/js/index.js';
+import { Observer } from './Runtime.js';
 
 export default function(persistent = false) {
 

package/src/runtime/client/Url.js

@@ -2,7 +2,6 @@
 /**
  * @imports
  */
-import { Observer } from '@webqit/pseudo-browser/index2.js';
 import _isArray from '@webqit/util/js/isArray.js';
 import _isObject from '@webqit/util/js/isObject.js';
 import _isTypeObject from '@webqit/util/js/isTypeObject.js';
@@ -10,12 +9,14 @@ import _isString from '@webqit/util/js/isString.js';
 import _isEmpty from '@webqit/util/js/isEmpty.js';
 import _with from '@webqit/util/obj/with.js';
 import { wwwFormUnserialize, wwwFormSerialize } from '../util.js';
+import { Observer } from './Runtime.js';
 
 /**
  * ---------------------------
  * The Url class
  * ---------------------------
  */
+
 export default class Url {
 
 	/**

package/src/runtime/client/Worker.js

@@ -5,7 +5,7 @@
 import Router from './Router.js';
 import _isGlobe from 'is-glob';
 import Minimatch from 'minimatch';
-import { Observer } from '@webqit/pseudo-browser/index2.js';
+import Observer from '@webqit/observer';
 import _isArray from '@webqit/util/js/isArray.js';
 import _afterLast from '@webqit/util/str/afterLast.js';
 import _after from '@webqit/util/str/after.js';
@@ -19,7 +19,7 @@ import NavigationEvent from './NavigationEvent.js';
  * The Worker Initializer
  * ---------------------------
  */
-			
+
 export default function(layout, params) {
 
 	// Copy...
@@ -133,7 +133,7 @@ export default function(layout, params) {
 		// Thus the origin server would still not be contacted by the self.fetch() below, leading to inconsistencies in responses.
 		// So, we detect this scenerio and avoid it.
 		if (evt.request.mode === 'navigate' && evt.request.cache === 'force-cache' && evt.request.destination === 'document') {
-			return cache_fetch(evt, true/** cacheRefresh */);
+			return cache_fetch(evt, false, true);
 		}
 		if (_any((params.cache_first_url_list || []).map(c => c.trim()).filter(c => c), pattern => Minimatch.Minimatch(evt.request.url, pattern))) {
 			return cache_fetch(evt, true/** cacheRefresh */);
@@ -144,23 +144,45 @@ export default function(layout, params) {
 		return network_fetch(evt);
 	};
 
+	//evt.request.mode navigate evt.request.cache force-cache evt.request.destination document request.headers.get('Accept') text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9
+	//evt.request.mode navigate evt.request.cache force-cache evt.request.destination document request.headers.get('Accept') text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9
+
 	const getCacheName = request => request.headers.get('Accept') === 'application/json'
 			? params.cache_name + '_json' 
 			: params.cache_name;
 			
 	// Caching strategy: cache_first
-	const cache_fetch = (evt, cacheRefresh = false) => {
+	const cache_fetch = (evt, cacheRefresh = false, is_Navigate_ForceCache_Document = false) => {
 
 		return self.caches.open(getCacheName(evt.request)).then(cache => {
 			return cache.match(evt.request).then(response => {
+				const force_network_fetch = evt => {
+					let request = evt.request;
+					if (is_Navigate_ForceCache_Document) {
+						let url = new URL(request.url);
+						url.searchParams.set('$force-cache', '1');
+						request = new Request(url, {
+							method: request.method,
+							headers: request.headers,
+							body: request.body,
+							mode: request.mode,
+							credentials: request.credentials,
+							cache: request.cache,
+							redirect: request.redirect,
+							referrer: request.referrer,
+							integrity: request.integrity,
+						});
+					}
+					return self.fetch(request);
+				}
 				if (response) {
 					if (cacheRefresh) {
 						// Fetch, but return this immediately
-						self.fetch(evt.request).then(response => refreshCache(evt.request, response));
+						force_network_fetch(evt).then(response => refreshCache(evt.request, response));
 					}
 					return response;
 				}
-				return self.fetch(evt.request).then(response => refreshCache(evt.request, response));
+				return force_network_fetch(evt).then(response => refreshCache(evt.request, response));
 			});
 		});
 		
@@ -201,6 +223,8 @@ export default function(layout, params) {
 		return response;
 	};
 
+	// -----------------------------
+
 	const relay = function(evt, messageData) {
 		return self.clients.matchAll().then(clientList => {
 			clientList.forEach(client => {
@@ -211,8 +235,6 @@ export default function(layout, params) {
 			});
 		});
 	};
-
-	// -----------------------------
 	
 	self.addEventListener('message', evt => {
 

package/src/runtime/client/WorkerClient.js

@@ -3,8 +3,8 @@
 /**
  * @imports
  */
-import { Observer } from '@webqit/pseudo-browser/index2.js';
 import { _isFunction } from '@webqit/util/js/index.js';
+import { Observer } from './Runtime.js';
 
 export default class WorkerClient {
 

package/src/runtime/server/Router.js

@@ -88,7 +88,7 @@ export default class Router extends _Router {
 
                         // if the file is found, set Content-type and send data
                         const type = Mime.lookup(ext);
-                        resolve(new event.Response(data, {
+                        resolve( new event.Response(data, {
                             headers: {
                                 contentType: type === 'application/javascript' ? 'text/javascript' : type,
                                 contentLength: Buffer.byteLength(data),
@@ -98,7 +98,7 @@ export default class Router extends _Router {
                                 static: true,
                                 autoIndex,
                             }
-                        }));
+                        } ) );
                         
                     }
                 });

package/src/runtime/server/Runtime.js

@@ -341,7 +341,7 @@ export async function run(instanceSetup, hostSetup, request, response, Ui, flags
             $context.response = await router.route([httpMethodName === 'delete' ? 'del' : httpMethodName, 'default'], serverNavigationEvent, null, async function(event) {
                 var file = await router.fetch(event);
                 // JSON request should ignore static files
-                if (file && !event.request.headers.accept.match(file.headers.contentType)) {
+                if (file && event.request.headers.get('Accept') && !event.request.headers.accept.match(file.headers.contentType)) {
                     return;
                 }
                 // ----------------

package/vm

@@ -53,4 +53,6 @@ sudo certbot run -a webroot -i apache -w /home/webqit_io/www/neatly.fit/public -
 certbot certonly --manual --preferred-challenges http -d neatly.fit --manual-auth-hook certbot-http-auth-hook --manual-cleanup-hook certbot-http-cleanup-hook --debug-challenges
 
 An unexpected error occurred:
-There were too many requests of a given type :: Error creating new order :: too many failed authorizations recently: see https://letsencrypt.org/docs/rate-limits/
+There were too many requests of a given type :: Error creating new order :: too many failed authorizations recently: see https://letsencrypt.org/docs/rate-limits/
+
+sudo launchctl list | grep postgres