Compare commits

..

No commits in common. "9f70e343569928df112a2f29d5b07e213780f754" and "c649cd6da13818baff5d0cc18a5259a9d0236e23" have entirely different histories.

7 changed files with 62 additions and 48 deletions

View File

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

View File

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

View File

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

View File

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

13
pnpm-lock.yaml generated
View File

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

View File

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

View File

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