fetch refactoring

src/_data/now.js

@@ -1,12 +1,12 @@
-const EleventyFetch = require('@11ty/eleventy-fetch')
+const fetch = require('node-fetch')
+const { AssetCache } = require('@11ty/eleventy-fetch')
 
 module.exports = async function () {
     const url = 'https://utils.coryd.dev/api/now?endpoints=artists,albums,books,movies,tv'
-    const res = EleventyFetch(url, {
+    const asset = new AssetCache('now_data')
-        duration: '1h',
+    if (asset.isCacheValid('1h')) return await asset.getCachedValue()
-        type: 'json',
+    const now = await fetch(url).then((res) => res.json())
-    })
+    await asset.save(now, 'json')
-    const now = await res
     return {
         artists: now.artists,
         albums: now.albums,

src/_data/nowplaying.js

@@ -1,15 +1,15 @@
-const EleventyFetch = require('@11ty/eleventy-fetch')
+const fetch = require('node-fetch')
+const { AssetCache } = require('@11ty/eleventy-fetch')
 
 module.exports = async function () {
     const url = 'https://utils.coryd.dev/api/music?limit=1&period=7day'
-    const res = EleventyFetch(url, {
+    const asset = new AssetCache('now_playing_data')
-        duration: '0s',
+    if (asset.isCacheValid('3m')) return await asset.getCachedValue()
-        type: 'json',
+    const nowPlaying = await fetch(url).then((res) => res.json())
-    })
+    await asset.save(nowPlaying, 'json')
-    const music = await res
     return {
-        artist: music.recenttracks.track[0].artist['#text'],
+        artist: nowPlaying.recenttracks.track[0].artist['#text'],
-        title: music.recenttracks.track[0].name,
+        title: nowPlaying.recenttracks.track[0].name,
-        url: music.recenttracks.track[0].url,
+        url: nowPlaying.recenttracks.track[0].url,
     }
 }

src/_data/status.js

@@ -1,11 +1,11 @@
-const EleventyFetch = require('@11ty/eleventy-fetch')
+const fetch = require('node-fetch')
+const { AssetCache } = require('@11ty/eleventy-fetch')
 
 module.exports = async function () {
     const url = 'https://api.omg.lol/address/cory/statuses/'
-    const res = EleventyFetch(url, {
+    const asset = new AssetCache('status_data')
-        duration: '1d',
+    if (asset.isCacheValid('1h')) return await asset.getCachedValue()
-        type: 'json',
+    const status = await fetch(url).then((res) => res.json())
-    })
+    await asset.save(status, 'json')
-    const status = await res
     return status.response.statuses[0]
 }

src/_data/webmentions.js

@@ -1,12 +1,12 @@
-const EleventyFetch = require('@11ty/eleventy-fetch')
+const fetch = require('node-fetch')
+const { AssetCache } = require('@11ty/eleventy-fetch')
 
 module.exports = async function () {
     const url = 'https://utils.coryd.dev/api/webmentions'
-    const res = EleventyFetch(url, {
+    const asset = new AssetCache('webmentions_data')
-        duration: '1d',
+    if (asset.isCacheValid('1h')) return await asset.getCachedValue()
-        type: 'json',
+    const webmentions = await fetch(url).then((res) => res.json())
-    })
+    await asset.save(webmentions, 'json')
-    const webmentions = await res
     return {
         mentions: webmentions.children,
     }