Update index.js

index.js

@@ -210,7 +210,7 @@ let mime = await fileTypeFromBuffer(buffer)
       return fileUrl?.url_response
     }
   } catch (error) {
-    return error
+    return null
   }
 }
 async function streamToBuffer(stream) {
@@ -279,11 +279,12 @@ function formatSize(bytes, si = false, dp = 2) {
 async function ytmp4(url, quality = 'highestvideo') {
   try {
     const ID = ytdl.getVideoID(url),
-          data = await ytdl.getInfo('https://www.youtube.com/watch?v=' + ID)
-      const videoStream = await ytdl(ID, { filter: 'videoandaudio', quality: 'highestvideo' });
-      let buffer = await streamToBuffer(videoStream)
-      let upload = await uploadBuffer(buffer)
-      let format = ytdl.chooseFormat(data.formats, { filter: 'videoandaudio', quality: quality });
+          data = await ytdl.getInfo('https://www.youtube.com/watch?v=' + ID);
+    const videoStream = await ytdl(ID, { filter: 'videoandaudio', quality: 'highestvideo' });
+    let buffer = await streamToBuffer(videoStream);
+    let upload = await uploadBuffer(buffer);
+    let urel = upload != null ? { url_v2: upload } : null;
+    let format = ytdl.chooseFormat(data.formats, { filter: 'videoandaudio', quality: quality });
 
     if (format) {
       return {
@@ -297,65 +298,69 @@ async function ytmp4(url, quality = 'highestvideo') {
         quality: format.qualityLabel,
         thumb: data.videoDetails.thumbnails[0].url,
         dl_url: format.url,
-       url_v2: upload,
-          }
+        ...urel,
+      };
     } else {
       throw new Error('No suitable format found');
     }
   } catch (error) {
     console.error('Error occurred:', error);
-    return null;
+    return error;
   }
 }
+
 async function ytmp3(url, bitrate = 'lowestaudio') {
   try {
     const ID = ytdl.getVideoID(url),
-          data = await ytdl.getInfo('https://www.youtube.com/watch?v=' + ID)
+          data = await ytdl.getInfo('https://www.youtube.com/watch?v=' + ID);
     const audioStream = await ytdl(ID, { filter: 'audioonly', quality: bitrate });
-    let buffer = await streamToBuffer(audioStream)
+    let buffer = await streamToBuffer(audioStream);
+
     async function convertToAudio(buffer, ext) {
-        try {
-          const tmp = path.join(os.tmpdir(), `${+new Date()}.${ext}`);
-          const out = `${tmp}.mp3`;
-          await fs.promises.writeFile(tmp, buffer);
-          
-          const ffmpegProcess = cp.spawn('ffmpeg', [
-            '-y',
-            '-i', tmp,
-            '-vn',
-            '-ac', '2',
-            '-b:a', '128k',
-            '-ar', '44100',
-            '-f', 'mp3',
-            out
-          ]);
-          
-          await new Promise((resolve, reject) => {
-            ffmpegProcess.on('error', (err) => {
-              console.error(err);
-              reject(err);
-            });
-            ffmpegProcess.on('close', (code) => {
-              if (code !== 0) {
-                reject(`ffmpeg process closed with code: ${code}`);
-              } else {
-                resolve();
-              }
-            });
+      try {
+        const tmp = path.join(os.tmpdir(), `${+new Date()}.${ext}`);
+        const out = `${tmp}.mp3`;
+        await fs.promises.writeFile(tmp, buffer);
+
+        const ffmpegProcess = cp.spawn('ffmpeg', [
+          '-y',
+          '-i', tmp,
+          '-vn',
+          '-ac', '2',
+          '-b:a', '128k',
+          '-ar', '44100',
+          '-f', 'mp3',
+          out
+        ]);
+
+        await new Promise((resolve, reject) => {
+          ffmpegProcess.on('error', (err) => {
+            console.error(err);
+            reject(err);
           });
-          
-          const result = await fs.promises.readFile(out);
-          await fs.promises.unlink(tmp);
-          await fs.promises.unlink(out);
-          return result;
-        } catch (e) {
-          console.error(e);
-          throw e;
-        }
+          ffmpegProcess.on('close', (code) => {
+            if (code !== 0) {
+              reject(`ffmpeg process closed with code: ${code}`);
+            } else {
+              resolve();
+            }
+          });
+        });
+
+        const result = await fs.promises.readFile(out);
+        await fs.promises.unlink(tmp);
+        await fs.promises.unlink(out);
+        return result;
+      } catch (e) {
+        console.error(e);
+        throw e;
       }
-      let konver = await convertToAudio(buffer, "mp4")
-      let upload = await uploadBuffer(konver)
-      let format = ytdl.chooseFormat(data.formats, { filter: 'audioonly', quality: bitrate });
+    }
+
+    let konver = await convertToAudio(buffer, "mp4");
+    let upload = await uploadBuffer(konver);
+    let urel = upload != null ? { url_v2: upload } : null;
+    let format = ytdl.chooseFormat(data.formats, { filter: 'audioonly', quality: bitrate });
 
     if (format) {
       return {
@@ -369,14 +374,14 @@ async function ytmp3(url, bitrate = 'lowestaudio') {
         quality: format.audioQuality,
         thumb: data.videoDetails.thumbnails[0].url,
         dl_url: format.url,
-        url_v2: upload
-      }
+        ...urel,
+      };
     } else {
       throw new Error('No suitable format found');
     }
   } catch (error) {
     console.error('Error occurred:', error);
-    return null;
+    return error;
   }
 }