updating thumbnail getting once again... also changing how it checks if instance is ok

utils/metadata.js

@@ -1,51 +1,55 @@
 const fetch = require('node-fetch')
 
 async function getInstance() {
+    for (let i = 0; i < 5; i++) {
+        const test = await actualRequest()
+        if (test) return test
+    }
+
+    async function getActualInstance() {
         const instances = await (await fetch('https://piped-instances.kavin.rocks/')).json()
         return (instances[Math.floor(Math.random() * instances.length)]).api_url    
+    }
+
+    async function testInstance(instance) {
+        try {
+            const videoRequest = await fetch(`${instance}/streams/dQw4w9WgXcQ`)
+            const videoJson = await videoRequest.json()
+            const thumbnailRequest = await fetch(videoJson.thumbnailUrl)
+        
+            return (videoRequest.status == 200) && (thumbnailRequest.status == 200)
+        } catch (e) {
+            return false
+        }
+    }
+
+    async function actualRequest() {
+        try {
+            const instance = await getActualInstance()
+            const instanceTest = await testInstance(instance)
+
+            if (instanceTest) return instance
+            else return false
+        } catch (e) {
+            return false
+        }
+    }
+
 }
 
 async function getVideoMetadata(id) {
-    for (let i = 0; i < 5; i++) {
-        const video = await actualRequest()
-        if (video) return video
-    }
-
-    async function actualRequest() {
-        try {
     const instance = await getInstance()
     const json = await (await fetch(`${instance}/streams/${id}`)).json()
     return json
-        } catch (e) {
-            return false
-        }
-    }
 }
 
 async function getChannel(id) {
-    for (let i = 0; i < 5; i++) {
-        const channel = await actualRequest()
-        if (channel) return channel
-    }
-
-    async function actualRequest() {
-        try {
     const instance = await getInstance()
     const json = await (await fetch(`${instance}/channel/${id}`)).json()
     return json
-        } catch (e) {
-            return false
-        }
-    }
 }
 
 async function getChannelVideos(id) {
-    for (let i = 0; i < 5; i++) {
-        const videos = await actualRequest()
-        if (videos) return videos
-    }
-
-    async function actualRequest() {
     return new Promise(async (resolve, reject) => {
         try {
             const videos = []
@@ -68,24 +72,12 @@ async function getChannelVideos(id) {
             resolve(false)
         }
     })
-    }
 }
 
 async function getPlaylistVideos(id) {
-    for (let i = 0; i < 5; i++) {
-        const playlists = await actualRequest()
-        if (playlists) return playlists
-    }
-
-    async function actualRequest() {
-        try {
     const instance = await getInstance()
     const json = await (await fetch(`${instance}/playlists/${id}`)).json()
     return json
-        } catch (e) {
-            return false
-        }
-    }
 }
 
 module.exports = { getInstance, getVideoMetadata, getChannel, getChannelVideos, getPlaylistVideos }

utils/websocket.js

@@ -7,7 +7,7 @@ const upload = require('./upload.js')
 async function createDatabaseVideo(id, videoUrl, playlistId) {
     const data = await metadata.getVideoMetadata(id)
     const uploaderAvatar = await upload.uploadImage((data.uploaderUrl).replace('/channel/', ''), data.uploaderAvatar)
-    const thumbnailUrl = await upload.uploadImage(id, `https://i.ytimg.com/vi_webp/${id}/maxresdefault.webp`)
+    const thumbnailUrl = await upload.uploadImage(id, data.thumbnailUrl)
     
     await prisma.videos.create({
         data: {