Merge branch 'master' of github.com:Binaryify/NeteaseCloudMusicApi

25cc98fe · binaryify · 289dbd13 · 90fa4948 · 25cc98fe · 25cc98fe
隐藏空白更改
内联并排

Showing with 83 addition and 60 deletion

package-lock.json package-lock.json +10 -10

package.json package.json +2 -2

public/cloud.html public/cloud.html +71 -48

未找到文件。
--- a/package-lock.json
+++ b/package-lock.json
 {
  "name": "NeteaseCloudMusicApi",
-  "version": "4.0.2",
+  "version": "4.0.3",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -132,9 +132,9 @@
      "dev": true
    },
    "@types/node": {
-      "version": "14.14.21",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.21.tgz",
-      "integrity": "sha512-cHYfKsnwllYhjOzuC5q1VpguABBeecUp24yFluHpn/BQaVxB1CuQ1FSRZCzrPxrkIfWISXV2LbeoBthLWg0+0A=="
+      "version": "14.14.25",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.25.tgz",
+      "integrity": "sha512-EPpXLOVqDvisVxtlbvzfyqSsFeQxltFbluZNRndIb8tr9KiBnYNLzrc1N3pyKUCww2RNrfHDViqDWWE1LCJQtQ=="
    },
    "@types/parse-json": {
      "version": "4.0.0",
@@ -1293,9 +1293,9 @@
      }
    },
    "eslint": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.18.0.tgz",
-      "integrity": "sha512-fbgTiE8BfUJZuBeq2Yi7J3RB3WGUQ9PNuNbmgi6jt9Iv8qrkxfy19Ds3OpL1Pm7zg3BtTVhvcUZbIRQ0wmSjAQ==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.19.0.tgz",
+      "integrity": "sha512-CGlMgJY56JZ9ZSYhJuhow61lMPPjUzWmChFya71Z/jilVos7mR/jPgaEfVGgMBY5DshbKdG8Ezb8FDCHcoMEMg==",
      "dev": true,
      "requires": {
        "@babel/code-frame": "^7.0.0",
@@ -1832,9 +1832,9 @@
      }
    },
    "flatted": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.0.tgz",
-      "integrity": "sha512-tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz",
+      "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==",
      "dev": true
    },
    "follow-redirects": {

--- a/package.json
+++ b/package.json
@@ -46,10 +46,10 @@
    "tunnel": "^0.0.6"
  },
  "devDependencies": {
-    "@types/node": "14.14.21",
+    "@types/node": "14.14.25",
    "@typescript-eslint/eslint-plugin": "4.4.1",
    "@typescript-eslint/parser": "4.4.1",
-    "eslint": "7.18.0",
+    "eslint": "7.19.0",
    "eslint-config-prettier": "7.1.0",
    "eslint-plugin-html": "6.0.3",
    "eslint-plugin-prettier": "3.3.1",

--- a/public/cloud.html
+++ b/public/cloud.html
 <!DOCTYPE html>
 <html lang="zh">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>云盘上传</title>
-  </head>

-  <body>
-    <input id="file" type="file" accept="audio/mpeg" />
+<head>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>云盘上传</title>
+</head>

-    <script src="https://cdn.bootcdn.net/ajax/libs/axios/0.20.0-0/axios.min.js"></script>
-    <script>
+<body>
+  <input id="file" type="file" multiple/>

-      const phone = ''
-      const password = ''
-      let cookieToken = ''
-      if (!phone || !password) {
-        const msg = '请设置你的手机号码和密码'
-        alert(msg)
-        throw new Error(msg)
-      }
-      login()
-      main()
-      async function login() {
-        const res = await axios({
-          url: `/login/cellphone?phone=${phone}&password=${password}`,
-          withCredentials: true, //关键
+  <script src="https://cdn.bootcdn.net/ajax/libs/axios/0.20.0-0/axios.min.js"></script>
+  <script>
+    const phone = '' // 这里填手机号
+    const password = '' // 这里填密码
+    const fileUpdateTime = {}
+    let fileLength = 0
+    let cookieToken = ''
+    if (!phone || !password) {
+      const msg = '请设置你的手机号码和密码'
+      alert(msg)
+      throw new Error(msg)
+    }
+    login()
+    main()
+    async function login() {
+      const res = await axios({
+        url: `/login/cellphone?phone=${phone}&password=${encodeURIComponent(password)}`,
+        withCredentials: true, //关键
+      })
+      cookieToken = res.data.cookie
+    }
+    function main() {
+      document
+        .querySelector('input[type="file"]')
+        .addEventListener('change', function (e) {
+          console.log(this.files)
+          let currentIndx = 0
+          fileLength = this.files.length
+          for (const item of this.files) {
+            currentIndx += 1
+            upload(item, currentIndx)
+          }
        })
-        cookieToken = res.data.cookie
-      }
-      async function main() {
-        document
-          .querySelector('input[type="file"]')
-          .addEventListener('change', function (e) {
-            var file = this.files[0]
-            upload(file)
-          })
-      }
+    }

-      async function upload(file) {
-        var formData = new FormData()
-        formData.append('songFile', file)
-        const res = await axios({
-          method: 'post',
-          url: `http://localhost:3000/cloud?time=${Date.now()}`,
-          headers: {
-            'Content-Type': 'multipart/form-data',
-          },
-          data: formData,
-        })
-      }
-    </script>
-  </body>
-</html>
+    function upload(file, currentIndx) {
+      var formData = new FormData()
+      formData.append('songFile', file)
+      axios({
+        method: 'post',
+        url: `http://localhost:3000/cloud?time=${Date.now()}`,
+        headers: {
+          'Content-Type': 'multipart/form-data',
+        },
+        data: formData,
+      }).then(res => {
+        console.log(`${file.name} 上传成功`)
+        if (currentIndx >= fileLength) { console.log('上传完毕') }
+      }).catch(async err => {
+        console.log(err)
+        console.log(fileUpdateTime)
+        fileUpdateTime[file.name] ? fileUpdateTime[file.name] += 1 : fileUpdateTime[file.name] = 1
+        if (fileUpdateTime[file.name] >= 4) {
+          console.error(`丢，这首歌怎么都传不上：${file.name}`)
+          return
+        } else {
+          console.error(`${file.name} 失败 ${fileUpdateTime[file.name]} 次`)
+        }
+        await login()
+        upload(file, currentIndx)
+      })
+    }
+  </script>
+</body>
+
+</html>
\ No newline at end of file