refactor(api)!: 平台 id 改两字母短码——qian→bd、joox→jx、5sing→5s、bili→bl
对外 id 统一为两字母短码,与既有的 kw/kg/tx/wy/qs/xm/me/qt/lr 对齐; migu 与 apple 保持原样(Apple Music 没有自然的短码)。 **破坏性变更**:id 出现在所有 URL、/sources 返回、OpenAPI 示例以及 data/auth.json 的凭据键里,这四个平台已存的登录态会失效,需重新登录。 - sdk/index.ts:id 与 supportQuality 映射键 - sdk/types.ts:Source 联合类型 - src/routes.ts 与 routes-login.ts:路由路径与 schema 描述 (/login/bili/qr → /login/bl/qr 等)、/login/status 的响应键 - test/smoke-test.ts、README.md、docs/API.md 同步 有意未改:sdk 目录与文件名仍用平台名(sdk/qian/、sdk/apis/joox.ts …), 规则定为「目录=平台名,id=对外短码」,映射只在 SUPPORTED_SOURCES 一处声明。 域名与正则(joox.com、5sing.kugou.com、/joox\.com\//)、jooxSign 等标识符、 错误文案里的中文平台名、以及 kg 榜单名(含「joox本地热歌榜」)全部保持原样—— 它们只是恰好含平台名,并不是 id。 验证:typecheck ✓、pnpm test 112/112 ✓;另起临时实例实证 /sources 与 /login/status 的新 id 与展示名,新旧 id 均无残留。
This commit is contained in:
1 parent
14f7295fd4
commit
3381e9b906
33 files changed
+155
-155
No files matched your search
+1
-1
@@ -1,4 +1,4 @@
|
||||
// Bilibili(B站)平台模块 —— 上游 music-lib/bilibili 的移植(平台 id: bili)
|
||||
// Bilibili(B站)平台模块 —— 上游 music-lib/bilibili 的移植(平台 id: bl)
|
||||
// 能力:搜索 / 取流(DASH,VIP 可出 FLAC/Hi-Res)/ 歌单(合集 ugc_season + 多分P稿件)/
|
||||
// 链接解析(BV/av、分P)/ 封面 / 扫码登录(sdk/bili/login.ts,凭据落 sdk/auth/store.ts)
|
||||
// 不实现:专辑、歌词(上游即空实现)、榜单、热搜、歌手、评论、个人歌单、歌单分类(上游均未实现)。
|
||||
|
||||
+3
-3
@@ -5,7 +5,7 @@
|
||||
// 0 成功 / 86038 过期 / 86090 已扫码待确认 / 86101 未扫码
|
||||
// 成功时登录态 Cookie 在 poll 响应的 Set-Cookie 与 data.url 的 crossDomain 查询串里(两处都收集)。
|
||||
// 凭据落盘到 sdk/auth/store.ts 的 `bili` 记录(cookie / refreshToken / 账号资料),与 kg/wy 一致;
|
||||
// 上游 New(cookie) 的实例化语义由 getCredentials('bili') 承担(见 util.ts getCookie)。
|
||||
// 上游 New(cookie) 的实例化语义由 getCredentials('bl') 承担(见 util.ts getCookie)。
|
||||
// 状态码沿用本仓库约定:800 过期 / 801 等待扫码 / 802 已扫码待确认 / 803 登录成功。
|
||||
import QRCode from 'qrcode'
|
||||
import { httpFetch } from '../common/request.ts'
|
||||
@@ -125,7 +125,7 @@ export const checkQRLogin = async(key: string) => {
|
||||
const cookie = cookieString(jar)
|
||||
if (!cookie) throw new Error('B站登录成功但未获取到 Cookie,请重试')
|
||||
const profile = await fetchProfile(cookie)
|
||||
setCredentials('bili', {
|
||||
setCredentials('bl', {
|
||||
cookie,
|
||||
refreshToken: String(data.refresh_token || ''),
|
||||
mid: profile.mid,
|
||||
@@ -148,7 +148,7 @@ export const checkQRLogin = async(key: string) => {
|
||||
|
||||
/** 当前登录态(凭据存在性 + 落盘时保存的账号资料) */
|
||||
export const status = () => {
|
||||
const cred = getCredentials('bili') as any
|
||||
const cred = getCredentials('bl') as any
|
||||
return cred?.cookie
|
||||
? {
|
||||
logged: true,
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
// Bilibili 歌词(上游 bilibili/lyric.go 即空实现:GetLyrics 对 bilibili 源恒返回空字符串)
|
||||
// B 站视频没有公开歌词接口(cc_subtitle 需登录且绝大多数视频没有),上游未实现,此处保持一致:
|
||||
// 返回统一结构 { lyric: '', tlyric: '' },让 /lyric/bili 有响应而不是 404。
|
||||
// 返回统一结构 { lyric: '', tlyric: '' },让 /lyric/bl 有响应而不是 404。
|
||||
export const getLyric = (_songInfo?: any, ..._rest: any[]) => {
|
||||
const requestObj = {
|
||||
promise: Promise.resolve({ lyric: '', tlyric: '' }),
|
||||
|
||||
@@ -50,7 +50,7 @@ export const search = async(keyword: string, page = 1, limit = 20) => {
|
||||
allPage: numPages || p + (list.length >= l ? 1 : 0),
|
||||
total,
|
||||
limit: l,
|
||||
source: 'bili' as const,
|
||||
source: 'bl' as const,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -57,7 +57,7 @@ export const searchPlaylist = async(keyword: string, page = 1, limit = 20) => {
|
||||
creator: view?.owner?.name || item.author || '',
|
||||
description: season.intro || '',
|
||||
link: `https://www.bilibili.com/video/${item.bvid}`,
|
||||
source: 'bili' as const,
|
||||
source: 'bl' as const,
|
||||
}
|
||||
}
|
||||
const pages: any[] = view?.pages ?? []
|
||||
@@ -73,14 +73,14 @@ export const searchPlaylist = async(keyword: string, page = 1, limit = 20) => {
|
||||
creator: view?.owner?.name || item.author || '',
|
||||
description: '',
|
||||
link: `https://www.bilibili.com/video/${item.bvid}`,
|
||||
source: 'bili' as const,
|
||||
source: 'bl' as const,
|
||||
}
|
||||
}
|
||||
return null
|
||||
})
|
||||
|
||||
const list = result.filter(Boolean)
|
||||
return { list, page: p, limit: l, total: list.length, source: 'bili' as const }
|
||||
return { list, page: p, limit: l, total: list.length, source: 'bl' as const }
|
||||
}
|
||||
|
||||
/** 由 bvid 构造歌单详情(上游 GetPlaylistSongs 的 bvid 分支 + ParsePlaylist 的元数据) */
|
||||
@@ -167,7 +167,7 @@ const pageSlice = (detail: { info: any, songs: any[] }, page: any, limit: any) =
|
||||
const p = Math.max(1, Number(page) || 1)
|
||||
const l = Math.min(Math.max(1, Number(limit) || 100), 10000)
|
||||
return {
|
||||
source: 'bili' as const,
|
||||
source: 'bl' as const,
|
||||
info: detail.info,
|
||||
list: detail.songs.slice((p - 1) * l, p * l),
|
||||
page: p,
|
||||
@@ -216,7 +216,7 @@ const parsePlaylistView = async(bvid: string, view: any) => {
|
||||
let trackCount = countSeasonEpisodes(season.sections)
|
||||
if (!trackCount) trackCount = detail.songs.length
|
||||
return {
|
||||
source: 'bili' as const,
|
||||
source: 'bl' as const,
|
||||
id,
|
||||
info: { ...detail.info, trackCount, playCount: Number(season?.stat?.view) || undefined },
|
||||
list: detail.songs,
|
||||
@@ -227,7 +227,7 @@ const parsePlaylistView = async(bvid: string, view: any) => {
|
||||
}
|
||||
const detail = await detailFromBvid(bvid)
|
||||
return {
|
||||
source: 'bili' as const,
|
||||
source: 'bl' as const,
|
||||
id: bvidKey(bvid),
|
||||
info: { ...detail.info, trackCount: detail.songs.length },
|
||||
list: detail.songs,
|
||||
|
||||
+2
-2
@@ -25,7 +25,7 @@ export const biliHeaders = (cookie = ''): Record<string, string> => ({
|
||||
})
|
||||
|
||||
/** 已保存的登录 Cookie(未登录返回空串) */
|
||||
export const getLoginCookie = (): string => String((getCredentials('bili') as any)?.cookie || '')
|
||||
export const getLoginCookie = (): string => String((getCredentials('bl') as any)?.cookie || '')
|
||||
|
||||
const cookieMapFromHeaders = (headers: any): Record<string, string> => {
|
||||
const raw = headers?.['set-cookie']
|
||||
@@ -147,7 +147,7 @@ export const makeSong = ({ bvid, cid, name, artist, album, duration, cover, page
|
||||
lrc: null,
|
||||
types: [] as any[],
|
||||
_types: {} as Record<string, any>,
|
||||
source: 'bili' as const,
|
||||
source: 'bl' as const,
|
||||
bvid,
|
||||
cid: String(cid ?? ''),
|
||||
page,
|
||||
|
||||
Reference in new issue
Block a user