@neteasecloudmusicapienhanced/api 4.30.0 → 4.30.2

package/module/voice_upload.js

@@ -1,25 +1,26 @@
 const { default: axios } = require('axios')
+const fs = require('fs')
 var xml2js = require('xml2js')
 
 const createOption = require('../util/option.js')
-var parser = new xml2js.Parser(/* options */)
+const { getFileExtension, readFileChunk } = require('../util/fileHelper')
+
+var parser = new xml2js.Parser()
+
 function createDupkey() {
-  // 格式:3b443c7c-a87f-468d-ba38-46d407aaf23a
   var s = []
   var hexDigits = '0123456789abcdef'
   for (var i = 0; i < 36; i++) {
     s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1)
   }
-  s[14] = '4' // bits 12-15 of the time_hi_and_version field to 0010
-  s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1) // bits 6-7 of the clock_seq_hi_and_reserved to 01
+  s[14] = '4'
+  s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1)
   s[8] = s[13] = s[18] = s[23] = '-'
   return s.join('')
 }
+
 module.exports = async (query, request) => {
-  let ext = 'mp3'
-  if (query.songFile.name.indexOf('flac') > -1) {
-    ext = 'flac'
-  }
+  const ext = getFileExtension(query.songFile.name)
   const filename =
     query.songName ||
     query.songFile.name
@@ -50,43 +51,58 @@ module.exports = async (query, request) => {
     createOption(query, 'weapi'),
   )
 
-  const objectKey = tokenRes.body.result.objectKey.replace('/', '%2F')
+  const objectKey = tokenRes.body.result.objectKey.replace(/\//g, '%2F')
   const docId = tokenRes.body.result.docId
   const res = await axios({
     method: 'post',
     url: `https://ymusic.nos-hz.163yun.com/${objectKey}?uploads`,
     headers: {
       'x-nos-token': tokenRes.body.result.token,
-      'X-Nos-Meta-Content-Type': 'audio/mpeg',
+      'X-Nos-Meta-Content-Type': query.songFile.mimetype || 'audio/mpeg',
     },
     data: null,
   })
-  // return xml
+
   const res2 = await parser.parseStringPromise(res.data)
 
-  const fileSize = query.songFile.data.length
-  const blockSize = 10 * 1024 * 1024 // 10MB
+  const useTempFile = !!query.songFile.tempFilePath
+  let fileSize = query.songFile.size
+
+  if (useTempFile) {
+    const stats = await fs.promises.stat(query.songFile.tempFilePath)
+    fileSize = stats.size
+  }
+
+  const blockSize = 10 * 1024 * 1024
   let offset = 0
   let blockIndex = 1
 
   let etags = []
 
   while (offset < fileSize) {
-    const chunk = query.songFile.data.slice(
-      offset,
-      Math.min(offset + blockSize, fileSize),
-    )
+    let chunk
+    if (useTempFile) {
+      chunk = await readFileChunk(
+        query.songFile.tempFilePath,
+        offset,
+        Math.min(blockSize, fileSize - offset),
+      )
+    } else {
+      chunk = query.songFile.data.slice(
+        offset,
+        Math.min(offset + blockSize, fileSize),
+      )
+    }
 
     const res3 = await axios({
       method: 'put',
       url: `https://ymusic.nos-hz.163yun.com/${objectKey}?partNumber=${blockIndex}&uploadId=${res2.InitiateMultipartUploadResult.UploadId[0]}`,
       headers: {
         'x-nos-token': tokenRes.body.result.token,
-        'Content-Type': 'audio/mpeg',
+        'Content-Type': query.songFile.mimetype || 'audio/mpeg',
       },
       data: chunk,
     })
-    // get etag
     const etag = res3.headers.etag
     etags.push(etag)
     offset += blockSize
@@ -101,19 +117,17 @@ module.exports = async (query, request) => {
   }
   completeStr += '</CompleteMultipartUpload>'
 
-  // 文件处理
   await axios({
     method: 'post',
     url: `https://ymusic.nos-hz.163yun.com/${objectKey}?uploadId=${res2.InitiateMultipartUploadResult.UploadId[0]}`,
     headers: {
       'Content-Type': 'text/plain;charset=UTF-8',
-      'X-Nos-Meta-Content-Type': 'audio/mpeg',
+      'X-Nos-Meta-Content-Type': query.songFile.mimetype || 'audio/mpeg',
       'x-nos-token': tokenRes.body.result.token,
     },
     data: completeStr,
   })
 
-  // preCheck
   await request(
     `/api/voice/workbench/voice/batch/upload/preCheck`,
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neteasecloudmusicapienhanced/api",
-  "version": "4.30.0",
+  "version": "4.30.2",
   "description": "全网最全的网易云音乐API接口 || A revival project for NeteaseCloudMusicApi Node.js Services (Half Refactor & Enhanced) || 网易云音乐 API 备份 + 增强 || 本项目自原版v4.28.0版本后开始自行维护",
   "scripts": {
     "dev": "nodemon app.js",
@@ -20,7 +20,6 @@
       "node_modules/axios",
       "node_modules/express",
       "node_modules/express-fileupload",
-      "node_modules/md5",
       "node_modules/music-metadata",
       "node_modules/pac-proxy-agent",
       "node_modules/qrcode",
@@ -66,14 +65,13 @@
     "data"
   ],
   "dependencies": {
-    "@neteasecloudmusicapienhanced/unblockmusic-utils": "^0.2.2",
+    "@neteasecloudmusicapienhanced/unblockmusic-utils": "^0.2.3",
     "axios": "^1.13.5",
     "crypto-js": "^4.2.0",
-    "dotenv": "^17.2.4",
+    "dotenv": "^17.3.1",
     "express": "^5.2.1",
     "express-fileupload": "^1.5.2",
-    "md5": "^2.3.0",
-    "music-metadata": "^11.12.0",
+    "music-metadata": "^11.12.1",
     "node-forge": "^1.3.3",
     "pac-proxy-agent": "^7.2.0",
     "qrcode": "^1.5.4",
@@ -84,26 +82,26 @@
   },
   "devDependencies": {
     "@eslint/eslintrc": "^3.3.3",
-    "@eslint/js": "^9.39.2",
+    "@eslint/js": "^9.39.3",
     "@types/express": "^5.0.6",
     "@types/express-fileupload": "^1.5.1",
     "@types/mocha": "^10.0.10",
     "@types/node": "25.0.9",
-    "@typescript-eslint/eslint-plugin": "8.46.3",
-    "@typescript-eslint/parser": "8.53.0",
-    "eslint": "9.39.0",
-    "eslint-config-prettier": "10.1.8",
-    "eslint-plugin-html": "8.1.3",
-    "eslint-plugin-prettier": "5.5.5",
+    "@typescript-eslint/eslint-plugin": "^8.56.0",
+    "@typescript-eslint/parser": "^8.56.0",
+    "eslint": "^9.39.3",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-html": "^8.1.4",
+    "eslint-plugin-prettier": "^5.5.5",
     "globals": "^16.5.0",
-    "husky": "9.1.7",
-    "intelli-espower-loader": "1.1.0",
-    "lint-staged": "16.2.7",
-    "mocha": "11.7.5",
-    "nodemon": "^3.1.11",
+    "husky": "^9.1.7",
+    "intelli-espower-loader": "^1.1.0",
+    "lint-staged": "^16.2.7",
+    "mocha": "^11.7.5",
+    "nodemon": "^3.1.14",
     "pkg": "^5.8.1",
-    "power-assert": "1.6.1",
-    "prettier": "3.7.4",
-    "typescript": "5.9.3"
+    "power-assert": "^1.6.1",
+    "prettier": "^3.8.1",
+    "typescript": "^5.9.3"
   }
 }

package/plugins/songUpload.js

@@ -1,20 +1,17 @@
 const { default: axios } = require('axios')
 const createOption = require('../util/option.js')
 const logger = require('../util/logger.js')
+const {
+  getUploadData,
+  getFileExtension,
+  sanitizeFilename,
+} = require('../util/fileHelper')
+
 module.exports = async (query, request) => {
-  let ext = 'mp3'
-  // if (query.songFile.name.indexOf('flac') > -1) {
-  //   ext = 'flac'
-  // }
-  if (query.songFile.name.includes('.')) {
-    ext = query.songFile.name.split('.').pop()
-  }
-  const filename = query.songFile.name
-    .replace('.' + ext, '')
-    .replace(/\s/g, '')
-    .replace(/\./g, '_')
+  const ext = getFileExtension(query.songFile.name)
+  const filename = sanitizeFilename(query.songFile.name)
   const bucket = 'jd-musicrep-privatecloud-audio-public'
-  //   获取key和token
+
   const tokenRes = await request(
     `/api/nos/token/alloc`,
     {
@@ -29,31 +26,82 @@ module.exports = async (query, request) => {
     createOption(query, 'weapi'),
   )
 
-  // 上传
-  const objectKey = tokenRes.body.result.objectKey.replace('/', '%2F')
+  if (!tokenRes.body.result || !tokenRes.body.result.objectKey) {
+    logger.error('Token分配失败:', tokenRes.body)
+    throw {
+      status: 500,
+      body: {
+        code: 500,
+        msg: '获取上传token失败',
+        detail: tokenRes.body,
+      },
+    }
+  }
+
+  const objectKey = tokenRes.body.result.objectKey.replace(/\//g, '%2F')
+  let lbs
   try {
-    const lbs = (
+    lbs = (
       await axios({
         method: 'get',
         url: `https://wanproxy.127.net/lbs?version=1.0&bucketname=${bucket}`,
+        timeout: 10000,
       })
     ).data
+  } catch (error) {
+    logger.error('LBS获取失败:', error.message)
+    throw {
+      status: 500,
+      body: {
+        code: 500,
+        msg: '获取上传服务器地址失败',
+        detail: error.message,
+      },
+    }
+  }
+
+  if (!lbs || !lbs.upload || !lbs.upload[0]) {
+    logger.error('无效的LBS响应:', lbs)
+    throw {
+      status: 500,
+      body: {
+        code: 500,
+        msg: '获取上传服务器地址无效',
+        detail: lbs,
+      },
+    }
+  }
+
+  try {
     await axios({
       method: 'post',
       url: `${lbs.upload[0]}/${bucket}/${objectKey}?offset=0&complete=true&version=1.0`,
       headers: {
         'x-nos-token': tokenRes.body.result.token,
         'Content-MD5': query.songFile.md5,
-        'Content-Type': 'audio/mpeg',
+        'Content-Type': query.songFile.mimetype || 'audio/mpeg',
         'Content-Length': String(query.songFile.size),
       },
-      data: query.songFile.data,
+      data: getUploadData(query.songFile),
       maxContentLength: Infinity,
       maxBodyLength: Infinity,
+      timeout: 300000,
     })
+    logger.info('上传成功:', filename)
   } catch (error) {
-    logger.info('error', error.response)
-    throw error.response
+    logger.error('上传失败:', {
+      status: error.response?.status,
+      data: error.response?.data,
+      message: error.message,
+    })
+    throw {
+      status: error.response?.status || 500,
+      body: {
+        code: error.response?.status || 500,
+        msg: '文件上传失败',
+        detail: error.response?.data || error.message,
+      },
+    }
   }
   return {
     ...tokenRes,

package/plugins/upload.js

@@ -1,5 +1,7 @@
 const { default: axios } = require('axios')
 const createOption = require('../util/option.js')
+const { getUploadData } = require('../util/fileHelper')
+
 module.exports = async (query, request) => {
   const data = {
     bucket: 'yyimgs',
@@ -10,27 +12,23 @@ module.exports = async (query, request) => {
     return_body: `{"code":200,"size":"$(ObjectSize)"}`,
     type: 'other',
   }
-  //   获取key和token
   const res = await request(
     `/api/nos/token/alloc`,
     data,
     createOption(query, 'weapi'),
   )
-  //   上传图片
+
   const res2 = await axios({
     method: 'post',
     url: `https://nosup-hz1.127.net/yyimgs/${res.body.result.objectKey}?offset=0&complete=true&version=1.0`,
     headers: {
       'x-nos-token': res.body.result.token,
-      'Content-Type': 'image/jpeg',
+      'Content-Type': query.imgFile.mimetype || 'image/jpeg',
     },
-    data: query.imgFile.data,
+    data: getUploadData(query.imgFile),
   })
 
   return {
-    // ...res.body.result,
-    // ...res2.data,
-    // ...res3.body,
     url_pre: 'https://p1.music.126.net/' + res.body.result.objectKey,
     imgId: res.body.result.docId,
   }