fixup!

Author: avivkeller

apps/site/next-data/generators/supportersData.mjs

@@ -1,4 +1,5 @@
 import { OPENCOLLECTIVE_MEMBERS_URL } from '#site/next.constants.mjs';
+import { fetchWithRetry } from '#site/util/fetch';
 
 /**
  * Fetches supporters data from Open Collective API, filters active backers,
@@ -7,7 +8,7 @@ import { OPENCOLLECTIVE_MEMBERS_URL } from '#site/next.constants.mjs';
  * @returns {Promise<Array<import('#site/types/supporters').OpenCollectiveSupporter>>} Array of supporters
  */
 export default () =>
-  fetch(OPENCOLLECTIVE_MEMBERS_URL)
+  fetchWithRetry(OPENCOLLECTIVE_MEMBERS_URL)
     .then(response => response.json())
     .then(payload =>
       payload
@@ -20,5 +21,4 @@ export default () =>
           profile,
           source: 'opencollective',
         }))
-    )
-    .catch(() => []);
+    );

apps/site/next-data/generators/vulnerabilities.mjs

@@ -1,6 +1,9 @@
 import { VULNERABILITIES_URL } from '#site/next.constants.mjs';
+import { fetchWithRetry } from '#site/util/fetch';
 
 const RANGE_REGEX = /([<>]=?)\s*(\d+)(?:\.(\d+))?/;
+const V0_REGEX = /^0\.\d+(\.x)?$/;
+const VER_REGEX = /^\d+\.x$/;
 
 /**
  * Fetches vulnerability data from the Node.js Security Working Group repository,
@@ -9,7 +12,7 @@ const RANGE_REGEX = /([<>]=?)\s*(\d+)(?:\.(\d+))?/;
  * @returns {Promise<import('#site/types/vulnerabilities').GroupedVulnerabilities>} Grouped vulnerabilities
  */
 export default () =>
-  fetch(VULNERABILITIES_URL)
+  fetchWithRetry(VULNERABILITIES_URL)
     .then(response => response.json())
     .then(payload => {
       /** @type {Array<import('#site/types/vulnerabilities').RawVulnerability>} */
@@ -27,14 +30,14 @@ export default () =>
       // Helper function to process version patterns
       const processVersion = (version, vulnerability) => {
         // Handle 0.X versions (pre-semver)
-        if (/^0\.\d+(\.x)?$/.test(version)) {
+        if (V0_REGEX.test(version)) {
           addToGroup('0', vulnerability);
 
           return;
         }
 
         // Handle simple major.x patterns (e.g., 12.x)
-        if (/^\d+\.x$/.test(version)) {
+        if (VER_REGEX.test(version)) {
           const majorVersion = version.split('.')[0];
 
           addToGroup(majorVersion, vulnerability);
@@ -79,5 +82,4 @@ export default () =>
       }
 
       return grouped;
-    })
-    .catch(() => ({}));
+    });

apps/site/next.calendar.mjs

@@ -4,6 +4,7 @@ import {
   BASE_CALENDAR_URL,
   SHARED_CALENDAR_KEY,
 } from './next.calendar.constants.mjs';
+import { fetchWithRetry } from './util/fetch';
 
 /**
  *
@@ -33,7 +34,7 @@ export const getCalendarEvents = async (calendarId = '', maxResults = 20) => {
     calendarQueryUrl.searchParams.append(key, value)
   );
 
-  return fetch(calendarQueryUrl)
+  return fetchWithRetry(calendarQueryUrl)
     .then(response => response.json())
     .then(calendar => calendar.items ?? []);
 };

apps/site/types/supporters.ts

@@ -1,9 +1,9 @@
-export type Supporter = {
+export type Supporter<T extends string> = {
   name: string;
   image: string;
   url: string;
   profile: string;
-  source: string;
+  source: T;
 };
 
-export type OpenCollectiveSupporter = Supporter & { source: 'opencollective' };
+export type OpenCollectiveSupporter = Supporter<'opencollective'>;

apps/site/util/fetch.ts

@@ -0,0 +1,24 @@
+import { setTimeout } from 'node:timers/promises';
+
+type RetryOptions = RequestInit & {
+  maxRetry: number;
+  delay: number;
+};
+
+export const fetchWithRetry = async (
+  url: string,
+  { maxRetry = 3, delay = 100, ...options }: RetryOptions
+) => {
+  for (let i = 1; i <= maxRetry; i++) {
+    try {
+      return fetch(url, options);
+    } catch (e) {
+      if (i === maxRetry) {
+        throw e;
+      }
+
+      await setTimeout(delay);
+      continue;
+    }
+  }
+};