timeouts

Author: plehegar

lib/2026.js

@@ -6,6 +6,15 @@ import { hal } from './hal.js';
 // Get configuration, including URL parameters
 const config = newConfig();
 
+const delay = (ms) => new Promise(resolve => setTimeout(resolve, ms));
+
+function abortSignal(ms = 10000) { // 10s max per fetch request
+    const controller = new AbortController();
+    const signal = controller.signal;
+    setTimeout(() => controller.abort(), ms);
+    return signal;
+}
+
 // Define sources for fetching data
 //  Except for group, W3C API calls uses hal.js instead of direct fetch
 function sources(type) {
@@ -60,19 +69,19 @@ window.addEventListener('load', init);
 function loadSources() {
     return Promise.all([
         fetchGroupData(),
-        html(sources('template')),
-        html(sources('deliverables'), { credentials: 'include' }).then(doc => {
+        html(sources('template'), { signal: abortSignal() }),
+        html(sources('deliverables'), { credentials: 'include', signal: abortSignal() }).then(doc => {
             return doc.getElementById('deliverables').parentNode.querySelectorAll('dl');
         }),
-        html(sources('charter'), { credentials: 'include' }),
+        html(sources('charter'), { credentials: 'include', signal: abortSignal() }),
     ]);
 }
 
 function generate() {
-    loadSources().then(([group, template, deliverables, charter]) => {
-        return compute(group, template, deliverables, charter);
-    }).then((draft) => {
-        draft.querySelectorAll('.remove').forEach(s => s.remove());
+    Promise.all([
+        loadSources().then(([group, template, deliverables, charter]) => compute(group, template, deliverables, charter)),
+        delay(3000) // ensure the status is shown for at least 3s
+    ]).then(([draft, timeOut]) => {
         document.documentElement.replaceWith(draft.documentElement);
         addExportButton(`charter-${config.group}-${new Date().getFullYear()}.html`);
     }).catch(err => {
@@ -292,9 +301,8 @@ async function compute(group, template, deliverables, charter) {
             if (a.href.startsWith('http://')) {
                 a.href = a.href.replace('http://', 'https:/');
             }
-            if (a.href.startsWith('https://www.w3.org/')) {
-                checkGroups.push(a);
-            }
+            // add all W3C Groups for further checks.
+            checkGroups.push(a);
         });
     }
 
@@ -398,7 +406,9 @@ async function compute(group, template, deliverables, charter) {
         head.appendChild(scriptConfig);
         if (config.debug) console.log(config);
     }
-    
+
+    // clean up if needed
+    draft.querySelectorAll('.remove').forEach(s => s.remove());
 
     return draft;
 }
@@ -460,7 +470,7 @@ function replaceAnchor(group, element=document) {
 
 async function fetchGroupData() {
     status('Loading group data...');
-    const group = await json(sources('group')).catch(err => err);
+    const group = await json(sources('group'), {signal: abortSignal()}).catch(err => err);
     if (group instanceof Error) {
         failed(`Could not load group data from W3C Groups API: ${group.message}`);
         throw new Error('abort', { cause: group });