build(deps): remove unblockneteasemusic

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

.env.prod.example

@@ -10,8 +10,8 @@ PROXY_URL = "https://your-proxy-url.com/?proxy="
 
 
 ### UnblockNeteaseMusic 设置项
-## 启用全局解灰, 无论是否调用参数都会使用解灰(推荐开启)
-ENABLE_GENERAL_UNBLOCK = true
+## 启用全局解灰, 无论是否调用参数都会使用解灰(不推荐开启)
+ENABLE_GENERAL_UNBLOCK = false
 ## 歌曲启用无损音质
 ENABLE_FLAC = true
 ## 启用无损音质时，是否选择音质最高的

module/song_url_match.js

@@ -9,11 +9,11 @@ module.exports = async (query, request) => {
     const {
       matchID,
     } = require('@neteasecloudmusicapienhanced/unblockmusic-utils')
-    const result = await matchID(query.id)
+    const result = await matchID(query.id, query.source)
     const proxy = process.env.PROXY_URL
     logger.info('开始解灰', query.id, result)
     const useProxy = process.env.ENABLE_PROXY || 'false'
-    if (result.data.url.includes('kuwo')) {
+    if (result.data.url && result.data.url.includes('kuwo')) {
       result.proxyUrl =
         useProxy === 'true' ? proxy + result.data.url : result.data.url
     }
@@ -22,6 +22,7 @@ module.exports = async (query, request) => {
       body: {
         code: 200,
         data: result.data.url,
+        proxyUrl: result.proxyUrl || '',
       },
     }
   } catch (e) {

module/song_url_v1.js

@@ -6,8 +6,9 @@
 const logger = require('../util/logger.js')
 const createOption = require('../util/option.js')
 module.exports = async (query, request) => {
-  const match = require('@unblockneteasemusic/server')
-  const source = ['pyncmd', 'bodian', 'kuwo', 'qq', 'migu', 'kugou']
+  const {
+    matchID,
+  } = require('@neteasecloudmusicapienhanced/unblockmusic-utils')
   require('dotenv').config()
   const data = {
     ids: '[' + query.id + ']',
@@ -16,35 +17,25 @@ module.exports = async (query, request) => {
   }
   if (query.unblock === 'true') {
     try {
-      const result = await match(query.id, source)
+      const result = await matchID(query.id, query.source)
       logger.info('Starting unblock(uses modules unblock):', query.id, result)
-      // avoid optional chaining for compatibility
-      let url
-      if (Array.isArray(result)) {
-        url = result[0] && result[0].url ? result[0].url : result[0]
-      } else {
-        url = result && result.url ? result.url : result
-      }
-      // decide proxyUrl after we resolved the actual url value
-      let proxyUrl = ''
-      if (url) {
-        if (url.includes('kuwo')) {
       const useProxy = process.env.ENABLE_PROXY || 'false'
-          if (useProxy === 'true' && process.env.PROXY_URL) {
-            proxyUrl = process.env.PROXY_URL + url
-          } else {
-            proxyUrl = url
-          }
+      let proxyUrl = ''
+      if (result.data.url && result.data.url.includes('kuwo')) {
+        proxyUrl =
+          useProxy === 'true' && process.env.PROXY_URL
+            ? process.env.PROXY_URL + result.data.url
+            : result.data.url
       }
       return {
         status: 200,
         body: {
           code: 200,
-            msg: 'Warning: you can only adjust unblock source in dotenv config, use /song/url/match instead.',
+          msg: 'Warning: Customizing unblock sources is not supported on this endpoint. Please use `/song/url/match` instead.',
           data: [
             {
               id: Number(query.id),
-                url,
+              url: result.data.url,
               type: 'flac',
               level: query.level,
               freeTrialInfo: 'null',
@@ -55,7 +46,6 @@ module.exports = async (query, request) => {
         },
         cookie: [],
       }
-      }
     } catch (e) {
       console.error('Error in unblockneteasemusic:', e)
     }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neteasecloudmusicapienhanced/api",
-  "version": "4.29.19",
+  "version": "4.29.20",
   "description": "A revival project for NeteaseCloudMusicApi Node.js Services (Half Refactor & Enhanced)|| 网易云音乐 API 备份 + 增强 || 本项目自原版v4.28.0版本后开始自行维护",
   "scripts": {
     "dev": "nodemon app.js",
@@ -66,8 +66,7 @@
     "data"
   ],
   "dependencies": {
-    "@neteasecloudmusicapienhanced/unblockmusic-utils": "^0.1.1",
-    "@unblockneteasemusic/server": "^0.28.0",
+    "@neteasecloudmusicapienhanced/unblockmusic-utils": "^0.1.2",
     "axios": "^1.13.2",
     "crypto-js": "^4.2.0",
     "dotenv": "^17.2.3",

pnpm-lock.yaml

@@ -9,11 +9,8 @@ importers:
   .:
     dependencies:
       '@neteasecloudmusicapienhanced/unblockmusic-utils':
-        specifier: ^0.1.1
-        version: 0.1.1
-      '@unblockneteasemusic/server':
-        specifier: ^0.28.0
-        version: 0.28.0
+        specifier: ^0.1.2
+        version: 0.1.2
       axios:
         specifier: ^1.13.2
         version: 1.13.2
@@ -228,8 +225,8 @@ packages:
   '@jridgewell/trace-mapping@0.3.31':
     resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==}
 
-  '@neteasecloudmusicapienhanced/unblockmusic-utils@0.1.1':
-    resolution: {integrity: sha512-CihuY2gOVTnBY1wkHZBAEW2SCUHPo16KrNuxl1O8ESFdn+1TJRzlEjaPKFrG2yrwrEbzj0SV/na8tvNVyPqz1g==}
+  '@neteasecloudmusicapienhanced/unblockmusic-utils@0.1.2':
+    resolution: {integrity: sha512-yhzMU+AaNI3QBm4KnKSJ2k0qy9oDKE0SjEfEHiGYNC0eTnAvCYvk+dZ1AuLzpm6b8yVLzK+oo+RvQwOd/zo5JQ==}
     hasBin: true
 
   '@nodelib/fs.scandir@2.1.5':
@@ -2757,7 +2754,7 @@ snapshots:
       '@jridgewell/resolve-uri': 3.1.2
       '@jridgewell/sourcemap-codec': 1.5.5
 
-  '@neteasecloudmusicapienhanced/unblockmusic-utils@0.1.1':
+  '@neteasecloudmusicapienhanced/unblockmusic-utils@0.1.2':
     dependencies:
       '@unblockneteasemusic/server': 0.28.0
       axios: 1.13.2

server.js

@@ -254,13 +254,12 @@ async function consturctServer(moduleDefs) {
             !song.url ||
             [1, 4].includes(song.fee)
           ) {
-            const match = require('@unblockneteasemusic/server')
-            const source = process.env.UNBLOCK_SOURCE
-              ? process.env.UNBLOCK_SOURCE.split(',')
-              : ['pyncmd', 'bodian', 'kuwo', 'qq', 'migu', 'kugou']
-            logger.info('Starting unblock(uses general unblock):', source)
-            const { url } = await match(req.query.id, source)
-            song.url = url
+            const {
+              matchID,
+            } = require('@neteasecloudmusicapienhanced/unblockmusic-utils')
+            logger.info('Starting unblock(uses general unblock):', req.query.id)
+            const result = await matchID(req.query.id)
+            song.url = result.data.url
             song.freeTrialInfo = 'null'
             logger.info('Unblock success! url:', song.url)
           }

vercel.json

@@ -20,6 +20,6 @@
   "env": {
     "NODE_ENV": "production",
     "ENABLE_FLAC": "true",
-    "ENABLE_GENERAL_UNBLOCK": "true"
+    "ENABLE_GENERAL_UNBLOCK": "false"
   }
 }