From 7c1efb64e623b7b238aa07065e0211a6a6fc6344 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=8B=E5=88=80=E9=B1=BC?=
 <9903082+qdyovo@user.noreply.gitee.com>
Date: Tue, 12 Nov 2024 13:50:33 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=A6=84=20reactor:=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E4=BA=91=E7=9B=98=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/songRequest.js | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/apps/songRequest.js b/apps/songRequest.js
index b4fe8a2..9d2327e 100644
--- a/apps/songRequest.js
+++ b/apps/songRequest.js
@@ -296,8 +296,8 @@ export class songRequest extends plugin {
 
     // 上传云盘
     async uploadCloud(e) {
-        const autoSelectNeteaseApi = await this.pickApi()
         let msg = await e?.getReply();
+        const autoSelectNeteaseApi = await this.pickApi()
         const musicUrlReg = /(http:|https:)\/\/music.163.com\/song\/media\/outer\/url\?id=(\d+)/;
         const musicUrlReg2 = /(http:|https:)\/\/y.music.163.com\/m\/song\?(.*)&id=(\d+)/;
         const musicUrlReg3 = /(http:|https:)\/\/music.163.com\/m\/song\/(\d+)/;
@@ -310,19 +310,15 @@ export class songRequest extends plugin {
         const desc = msg.message[0].data.match(/"desc":"([^"]+)"/)[1]
         if (id === "") return
         let path = this.getCurDownloadPath(e) + '/' + title + '-' + desc + '.flac'
-        try {
-            await formData.append('songFile', fs.createReadStream(path))
-        } catch (error) {
-            logger.error(error);
-        }
-        let formData = new FormData()
-        const headers = {
-            ...formData.getHeaders(),
-            'Cookie': this.neteaseCookie,
-        };
-        const updateUrl = autoSelectNeteaseApi + `/cloud?time=${Date.now()}`
         let tryCount = 0
-        const tryUpload = () => {
+        const tryUpload = async () => {
+            let formData = new FormData()
+            await formData.append('songFile', fs.createReadStream(path))
+            const headers = {
+                ...formData.getHeaders(),
+                'Cookie': this.neteaseCookie,
+            };
+            const updateUrl = autoSelectNeteaseApi + `/cloud?time=${Date.now()}`
             axios({
                 method: 'post',
                 url: updateUrl,