Merge pull request #241 from 1254qwer/fix/song-url-v1

fix: 支持获取臻音全景声

interface.d.ts

@@ -1378,6 +1378,7 @@ export const enum SoundQualityType {
   jyeffect = 'jyeffect',
   jymaster = 'jymaster',
   sky = 'sky',
+  vivid = 'vivid',
 }
 
 export function song_url_v1(

module/song_download_url_v1.js

@@ -1,13 +1,23 @@
 // 获取客户端歌曲下载链接 - v1
 // 此版本不再采用 br 作为音质区分的标准
-// 而是采用 standard, exhigh, lossless, hires, jyeffect(高清环绕声), sky(沉浸环绕声), jymaster(超清母带) 进行音质判断
+// 而是采用 standard, exhigh, lossless, hires, jyeffect(高清环绕声), sky(沉浸环绕声), vivid(臻音全景声), jymaster(超清母带) 进行音质判断
 
 const createOption = require('../util/option.js')
+const { cookieToJson } = require('../util/index.js')
 module.exports = (query, request) => {
   const data = {
     id: query.id,
     immerseType: 'c51',
     level: query.level,
   }
-  return request(`/api/song/enhance/download/url/v1`, data, createOption(query))
+  const options = createOption(query)
+  if (query.level === 'vivid') {
+    const cookie = options.cookie
+    options.cookie = {
+      ...(typeof cookie === 'string' ? cookieToJson(cookie) : cookie),
+      os: 'android',
+      appver: '9.5.61',
+    }
+  }
+  return request(`/api/song/enhance/download/url/v1`, data, options)
 }

module/song_url_v1.js

@@ -1,11 +1,12 @@
 // 歌曲链接 - v1
 // 此版本不再采用 br 作为音质区分的标准
-// 而是采用 standard, exhigh, lossless, hires, jyeffect(高清环绕声), sky(沉浸环绕声), jymaster(超清母带) 进行音质判断
+// 而是采用 standard, exhigh, lossless, hires, jyeffect(高清环绕声), sky(沉浸环绕声), vivid(臻音全景声), jymaster(超清母带) 进行音质判断
 // 当unblock为true时, 会尝试使用unblockmusic-utils进行解锁, 同时音质设置不会生效, 但仍然为必须传入参数
 // 当level为sky时, 可通过 immerseType 选择沉浸声类型, 支持 c51(c51类型)、ste(环绕立体声类型)、aac(aac类型), 默认为 c51
 
 const logger = require('../util/logger.js')
 const createOption = require('../util/option.js')
+const { cookieToJson } = require('../util/index.js')
 module.exports = async (query, request) => {
   const {
     matchID,
@@ -16,6 +17,7 @@ module.exports = async (query, request) => {
     level: query.level,
     encodeType: 'flac',
   }
+  const options = createOption(query, 'xeapi')
   if (query.unblock === 'true') {
     try {
       const result = await matchID(query.id, query.source)
@@ -54,9 +56,14 @@ module.exports = async (query, request) => {
   if (data.level == 'sky') {
     data.immerseType = query.immerseType || 'c51'
   }
-  return request(
-    `/api/song/enhance/player/url/v1`,
-    data,
-    createOption(query, 'xeapi'),
-  )
+  if (data.level == 'vivid') {
+    data.encodeType = 'mp3'
+    const cookie = options.cookie
+    options.cookie = {
+      ...(typeof cookie === 'string' ? cookieToJson(cookie) : cookie),
+      os: 'android',
+      appver: '9.5.61',
+    }
+  }
+  return request(`/api/song/enhance/player/url/v1`, data, options)
 }

module/song_url_v1_302.js

@@ -1,20 +1,30 @@
 // 获取客户端歌曲下载链接 - v1
 // 此版本不再采用 br 作为音质区分的标准
-// 而是采用 standard, exhigh, lossless, hires, jyeffect(高清环绕声), sky(沉浸环绕声), jymaster(超清母带) 进行音质判断
+// 而是采用 standard, exhigh, lossless, hires, jyeffect(高清环绕声), sky(沉浸环绕声), vivid(臻音全景声), jymaster(超清母带) 进行音质判断
 
 const createOption = require('../util/option.js')
+const { cookieToJson } = require('../util/index.js')
 module.exports = async (query, request) => {
   const data = {
     id: query.id,
     immerseType: 'c51',
     level: query.level,
   }
+  const options = createOption(query)
+  if (query.level === 'vivid') {
+    const cookie = options.cookie
+    options.cookie = {
+      ...(typeof cookie === 'string' ? cookieToJson(cookie) : cookie),
+      os: 'android',
+      appver: '9.5.61',
+    }
+  }
   const response = await request(
     `/api/song/enhance/download/url/v1`,
     data,
-    createOption(query),
+    options,
   )
-  let url = response?.body?.data?.[0]?.url
+  let url = response?.body?.data?.url || response?.body?.data?.[0]?.url
 
   if (!url) {
     const fallbackData = {
@@ -25,10 +35,13 @@ module.exports = async (query, request) => {
     if (query.level === 'sky') {
       fallbackData.immerseType = 'c51'
     }
+    if (query.level === 'vivid') {
+      fallbackData.encodeType = 'mp3'
+    }
     const fallback = await request(
       `/api/song/enhance/player/url/v1`,
       fallbackData,
-      createOption(query),
+      options,
     )
     url = fallback?.body?.data?.[0]?.url
 

public/docs/home.md

@@ -1304,14 +1304,14 @@ tags: 歌单标签
 
 **必选参数 :** `id` : 音乐 id
 `level`: 播放音质等级, 分为 `standard` => `标准`,`higher` => `较高`, `exhigh`=>`极高`,
-`lossless`=>`无损`, `hires`=>`Hi-Res`, `jyeffect` => `高清环绕声`, `sky` => `沉浸环绕声`, `dolby` => `杜比全景声`, `jymaster` => `超清母带`
+`lossless`=>`无损`, `hires`=>`Hi-Res`, `jyeffect` => `高清环绕声`, `sky` => `沉浸环绕声`, `vivid` => `臻音全景声`, `dolby` => `杜比全景声`, `jymaster` => `超清母带`
 `unblock`: 是否使用使用歌曲解锁, 分为`true`和`false`
 
 **可选参数 :** `immerseType`: 沉浸声环绕声类型, 分为 `c51` => `c51类型`, `ste` => `环绕立体声类型`, `aac` => `aac类型`, 仅在 `level=sky` 时生效, 默认为 `c51`
 
 **接口地址 :** `/song/url/v1`
 
-**调用例子 :** `/song/url/v1?id=1969519579&level=exhigh` `/song/url/v1?id=1969519579,33894312&level=lossless` `/song/url/v1?id=1969519579&level=sky&immerseType=ste`
+**调用例子 :** `/song/url/v1?id=1969519579&level=exhigh` `/song/url/v1?id=1969519579,33894312&level=lossless` `/song/url/v1?id=1969519579&level=sky&immerseType=ste` `/song/url/v1?id=1969519579&level=vivid`
 
 说明：`杜比全景声`音质需要设备支持，不同的设备可能会返回不同码率的 url。cookie 需要传入`os=pc`保证返回正常码率的 url。
 
@@ -1321,7 +1321,7 @@ tags: 歌单标签
 
 **必选参数 :** `id` : 音乐 id
 `level`: 播放音质等级, 分为 `standard` => `标准`,`higher` => `较高`, `exhigh`=>`极高`,
-`lossless`=>`无损`, `hires`=>`Hi-Res`, `jyeffect` => `高清环绕声`, `sky` => `沉浸环绕声`, `dolby` => `杜比全景声`, `jymaster` => `超清母带`
+`lossless`=>`无损`, `hires`=>`Hi-Res`, `jyeffect` => `高清环绕声`, `sky` => `沉浸环绕声`, `vivid` => `臻音全景声`, `dolby` => `杜比全景声`, `jymaster` => `超清母带`
 `unblock`: 是否使用使用歌曲解锁, 分为`true`和`false`
 
 **接口地址 :** `/song/url/v1/302`
@@ -4774,7 +4774,7 @@ bitrate = Math.floor(br / 1000)
 
 **必选参数 :** `id` : 音乐 id
 `level`: 播放音质等级, 分为 `standard` => `标准`,`higher` => `较高`, `exhigh`=>`极高`,
-`lossless`=>`无损`, `hires`=>`Hi-Res`, `jyeffect` => `高清环绕声`, `sky` => `沉浸环绕声`, `dolby` => `杜比全景声`, `jymaster` => `超清母带`
+`lossless`=>`无损`, `hires`=>`Hi-Res`, `jyeffect` => `高清环绕声`, `sky` => `沉浸环绕声`, `vivid` => `臻音全景声`, `dolby` => `杜比全景声`, `jymaster` => `超清母带`
 
 **接口地址 :** `/song/download/url/v1`