@webqit/webflo 0.8.55-0 → 0.8.58

package/package.json

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

package/src/runtime/client/Worker.js

@@ -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/** , truecacheRefresh */);
 		}
 		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,6 +144,9 @@ 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;

package/src/services/origins/index.js

@@ -140,28 +140,24 @@ export async function deploy(Ui, origin, flags = {}, layout = {}) {
  */
 export async function hook(Ui, event, deployCallback, flags = {}, layout = {}) {
     const eventHandler = Webhooks.createEventHandler();
-    console.log('-------------------------event.request.headers', event.request.headers)
     if (event.request.headers.has('user-agent') && event.request.headers.get('user-agent').startsWith('GitHub-Hookshot/')) {
-        console.log('-------------------------111111111111111111')
-        const submits = await event.request.parse();
-        console.log('-------------------------submits', submits)
-        const matches = (await origins.match(submits.payload.repository.full_name, flags, layout)).filter(o => o.autodeploy);
-        console.log('-------------------------matches', matches)
+        const payload = await event.request.json();
+        const matches = (await origins.match(payload.repository.full_name, flags, layout)).filter(o => o.autodeploy);
         var deployParams;
         if (!(deployParams = matches[0])) {
             return;
         }
         if (matches.length > 1) {
-            throw new Error(`Failed deploy attempt (${submits.payload.repository.full_name}): Multiple deploy settings found.`);
+            throw new Error(`Failed deploy attempt (${payload.repository.full_name}): Multiple deploy settings found.`);
         }
         if (!deployParams.autodeploy_secret) {
-            throw new Error(`Failed deploy attempt (${submits.payload.repository.full_name}): The deploy settings do not contain a secret.`);
+            throw new Error(`Failed deploy attempt (${payload.repository.full_name}): The deploy settings do not contain a secret.`);
         }
-        if (!Webhooks.verify(deployParams.autodeploy_secret, submits.payload, event.request.headers['x-hub-signature'])) {
-            throw new Error(`Failed deploy attempt (${submits.payload.repository.full_name}): Signature mismatch.`);
+        if (!Webhooks.verify(deployParams.autodeploy_secret, payload, event.request.headers.get('x-hub-signature'))) {
+            throw new Error(`Failed deploy attempt (${payload.repository.full_name}): Signature mismatch.`);
         }
-        if (submits.payload.repository.disabled || submits.payload.repository.archived) {
-            throw new Error(`Failed deploy attempt (${submits.payload.repository.full_name}): Repository disabled or archived.`);
+        if (payload.repository.disabled || payload.repository.archived) {
+            throw new Error(`Failed deploy attempt (${payload.repository.full_name}): Repository disabled or archived.`);
         }
         eventHandler.on('push', async ({ name, payload }) => {
             Ui.log('---------------------------');
@@ -182,37 +178,9 @@ export async function hook(Ui, event, deployCallback, flags = {}, layout = {}) {
             }
         });
         return eventHandler.receive({
-            id: event.request.headers['x-github-delivery'],
-            name: event.request.headers['x-github-event'],
-            payload: submits.payload /* JSON object */,
+            id: event.request.headers.get('x-github-delivery'),
+            name: event.request.headers.get('x-github-event'),
+            payload: payload /* JSON object */,
         });
     }
-}
--------------------------event.request.headers Headers {
-    [Symbol(map)]: [Object: null prototype] {
-      host: [ 'webqit.io' ],
-      'user-agent': [ 'GitHub-Hookshot/0b09aa9' ],
-      'content-length': [ '8832' ],
-      Accept: [ '*/*' ],
-      'x-github-delivery': [ 'df789d9e-6a54-11ec-8718-4cd5824afac9' ],
-      'x-github-event': [ 'push' ],
-      'x-github-hook-id': [ '276190607' ],
-      'x-github-hook-installation-target-id': [ '319800404' ],
-      'x-github-hook-installation-target-type': [ 'repository' ],
-      'x-hub-signature': [ 'sha1=498b45d6bf3403f5e28c17c9c77ff6666e9e4529' ],
-      'x-hub-signature-256': [
-        'sha256=034225e0d05dedd523bb429ddf9e61a4863ac7b45de3bb0b429205664e795b8f'
-      ],
-      'content-type': [ 'application/json' ],
-      connection: [ 'close' ]
-    }
-  }
-  -------------------------event.request.headers Headers {
-    [Symbol(map)]: [Object: null prototype] {
-      Accept: [ '*/*' ],
-      'user-agent': [ 'node-fetch/1.0 (+https://github.com/bitinn/node-fetch)' ],
-      'accept-encoding': [ 'gzip,deflate' ],
-      connection: [ 'close' ],
-      host: [ 'webqit.io' ]
-    }
-  }
+}