@sansenjian/qq-music-api 1.0.6 → 2.0.0

package/module/apis/singers/getSingerStarNum.js

@@ -1,36 +1,36 @@
-const moment = require('moment');
-const y_common = require('../y_common');
-
-module.exports = ({ method = 'get', params = {}, option = {} }) => {
-	const data = Object.assign(params, {
-		format: 'json',
-		outCharset: 'utf-8',
-		utf8: 1,
-		rnd: moment().valueOf(),
-	});
-	const options = Object.assign(option, {
-		params: data,
-	});
-	return y_common({
-		url: '/rsc/fcgi-bin/fcg_order_singer_getnum.fcg',
-		method,
-		options,
-	})
-		.then(res => {
-			const response = res.data;
-			return {
-				status: 200,
-				body: {
-					response,
-				},
-			};
-		})
-		.catch(error => {
-			console.log('error', error);
-			return {
-				body: {
-					error,
-				},
-			};
-		});
-};
+const dayjs = require('dayjs');
+const y_common = require('../y_common');
+
+module.exports = ({ method = 'get', params = {}, option = {} }) => {
+	const data = Object.assign(params, {
+		format: 'json',
+		outCharset: 'utf-8',
+		utf8: 1,
+		rnd: dayjs().valueOf(),
+	});
+	const options = Object.assign(option, {
+		params: data,
+	});
+	return y_common({
+		url: '/rsc/fcgi-bin/fcg_order_singer_getnum.fcg',
+		method,
+		options,
+	})
+		.then(res => {
+			const response = res.data;
+			return {
+				status: 200,
+				body: {
+					response,
+				},
+			};
+		})
+		.catch(error => {
+			console.log('error', error);
+			return {
+				body: {
+					error,
+				},
+			};
+		});
+};

package/module/apis/songLists/songListCategories.js

@@ -1,33 +1,33 @@
-const y_common = require('../y_common');
-
-module.exports = ({ method = 'get', params = {}, option = {} }) => {
-	const data = Object.assign(params, {
-		format: 'json',
-		outCharset: 'utf-8',
-	});
-	const options = Object.assign(option, {
-		params: data,
-	});
-	return y_common({
-		url: '/splcloud/fcgi-bin/fcg_get_diss_tag_conf.fcg',
-		method,
-		options,
-	})
-		.then(res => {
-			const response = res.data;
-			return {
-				status: 200,
-				body: {
-					response,
-				},
-			};
-		})
-		.catch(error => {
-			console.log('error', error);
-			return {
-				body: {
-					error,
-				},
-			};
-		});
-};
+const y_common = require('../y_common');
+
+module.exports = ({ method = 'get', params = {}, option = {} }) => {
+	const data = Object.assign(params, {
+		format: 'json',
+		outCharset: 'utf-8',
+	});
+	const options = Object.assign(option, {
+		params: data,
+	});
+	return y_common({
+		url: '/splcloud/fcgi-bin/fcg_get_diss_tag_conf.fcg',
+		method,
+		options,
+	})
+		.then(res => {
+			const response = res.data;
+			return {
+				status: 200,
+				body: {
+					response,
+				},
+			};
+		})
+		.catch(error => {
+			console.log('error', error);
+			return {
+				body: {
+					error,
+				},
+			};
+		});
+};

package/module/apis/songLists/songListDetail.js

@@ -1,38 +1,38 @@
-const y_common = require('../y_common');
-
-module.exports = ({ method = 'get', params = {}, option = {} }) => {
-	const data = Object.assign(params, {
-		format: 'json',
-		outCharset: 'utf-8',
-		type: 1,
-		json: 1,
-		utf8: 1,
-		onlysong: 0,
-		new_format: 1,
-	});
-	const options = Object.assign(option, {
-		params: data,
-	});
-	return y_common({
-		url: '/qzone/fcg-bin/fcg_ucc_getcdinfo_byids_cp.fcg',
-		method,
-		options,
-	})
-		.then(res => {
-			const response = res.data;
-			return {
-				status: 200,
-				body: {
-					response,
-				},
-			};
-		})
-		.catch(error => {
-			console.log('error', error);
-			return {
-				body: {
-					error,
-				},
-			};
-		});
-};
+const y_common = require('../y_common');
+
+module.exports = ({ method = 'get', params = {}, option = {} }) => {
+	const data = Object.assign(params, {
+		format: 'json',
+		outCharset: 'utf-8',
+		type: 1,
+		json: 1,
+		utf8: 1,
+		onlysong: 0,
+		new_format: 1,
+	});
+	const options = Object.assign(option, {
+		params: data,
+	});
+	return y_common({
+		url: '/qzone/fcg-bin/fcg_ucc_getcdinfo_byids_cp.fcg',
+		method,
+		options,
+	})
+		.then(res => {
+			const response = res.data;
+			return {
+				status: 200,
+				body: {
+					response,
+				},
+			};
+		})
+		.catch(error => {
+			console.log('error', error);
+			return {
+				body: {
+					error,
+				},
+			};
+		});
+};

package/module/apis/songLists/songLists.js

@@ -1,41 +1,41 @@
-const y_common = require('../y_common');
-
-module.exports = ({ method = 'get', params = {}, option = {} }) => {
-	const data = Object.assign(params, {
-		format: 'json',
-		outCharset: 'utf-8',
-		picmid: 1,
-	});
-	const options = Object.assign(option, {
-		params: data,
-	});
-	return y_common({
-		url: '/splcloud/fcgi-bin/fcg_get_diss_by_tag.fcg',
-		method,
-		options,
-	})
-		.then(res => {
-			const response = res.data;
-			if (typeof response === 'string') {
-				const reg = /^\w+\(({[^()]+})\)$/;
-				const matches = response.match(reg);
-				if (matches) {
-					response = JSON.parse(matches[1]);
-				}
-			}
-			return {
-				status: 200,
-				body: {
-					response,
-				},
-			};
-		})
-		.catch(error => {
-			console.log('error', error);
-			return {
-				body: {
-					error,
-				},
-			};
-		});
-};
+const y_common = require('../y_common');
+
+module.exports = ({ method = 'get', params = {}, option = {} }) => {
+	const data = Object.assign(params, {
+		format: 'json',
+		outCharset: 'utf-8',
+		picmid: 1,
+	});
+	const options = Object.assign(option, {
+		params: data,
+	});
+	return y_common({
+		url: '/splcloud/fcgi-bin/fcg_get_diss_by_tag.fcg',
+		method,
+		options,
+	})
+		.then(res => {
+			let response = res.data;
+			if (typeof response === 'string') {
+				const reg = /^\w+\(({[^()]+})\)$/;
+				const matches = response.match(reg);
+				if (matches) {
+					response = JSON.parse(matches[1]);
+				}
+			}
+			return {
+				status: 200,
+				body: {
+					response,
+				},
+			};
+		})
+		.catch(error => {
+			console.log('error', error);
+			return {
+				body: {
+					error,
+				},
+			};
+		});
+};

package/module/apis/u_common.js

@@ -1,16 +1,17 @@
-const request = require('../../util/request');
-const config = require('../config');
-const userInfoConfig = require('../../config/user-info');
-
-module.exports = ({ options = {}, method = 'get' }) => {
-	let opts = Object.assign(options, config.commonParams, {
-		headers: {
-			referer: 'https://y.qq.com/portal/player.html',
-			host: 'u.y.qq.com',
-			'content-type': 'application/x-www-form-urlencoded',
-			'cookie': userInfoConfig.cookie,
-		},
-	});
-	console.log('https://u.y.qq.com/cgi-bin/musicu.fcg', { opts })
-	return request('https://u.y.qq.com/cgi-bin/musicu.fcg', method, opts, 'u');
-};
+const request = require('../../util/request');
+const config = require('../config');
+const userInfoConfig = require('../../config/user-info');
+
+module.exports = ({ options = {}, method = 'get' }) => {
+	const opts = Object.assign(options, config.commonParams, {
+		headers: {
+			referer: 'https://y.qq.com/portal/player.html',
+			host: 'u.y.qq.com',
+			'content-type': 'application/x-www-form-urlencoded',
+			cookie: userInfoConfig.cookie,
+		},
+	});
+	const logOpts = { ...opts, headers: { ...opts.headers, cookie: '[REDACTED]' } };
+	console.log('https://u.y.qq.com/cgi-bin/musicu.fcg', { opts: logOpts });
+	return request('https://u.y.qq.com/cgi-bin/musicu.fcg', method, opts, 'u');
+};

package/module/apis/user/checkQQLoginQr.js

@@ -1,86 +1,125 @@
-const { getGtk, getGuid } = require('../../../util/loginUtils');
-const { refreshData } = require('../../../config/user-info');
-
-module.exports = async ({ method = 'get', params = {}, option = {} }) => {
-  const { ptqrtoken, qrsig } = params;
-  if (!ptqrtoken || !qrsig) return { body: '参数错误' };
-  const url = `https://ssl.ptlogin2.qq.com/ptqrlogin?u1=https%3A%2F%2Fgraph.qq.com%2Foauth2.0%2Flogin_jump&ptqrtoken=${ptqrtoken}&ptredirect=0&h=1&t=1&g=1&from_ui=1&ptlang=2052&action=0-0-1711022193435&js_ver=23111510&js_type=1&login_sig=du-YS1h8*0GqVqcrru0pXkpwVg2DYw-DtbFulJ62IgPf6vfiJe*4ONVrYc5hMUNE&pt_uistyle=40&aid=716027609&daid=383&pt_3rd_aid=100497308&&o1vId=3674fc47871e9c407d8838690b355408&pt_js_version=v1.48.1`;
-  const response = await fetch(url, { headers: { Cookie: `qrsig=${qrsig}` }});
-  const { data = '' } = await response.text();
-  let allCookie = [];
-  const setCookie = cookies => {
-    allCookie = [...allCookie, ...cookies.map(i => i.split(';')[0]).filter(i => i.split('=')[1])];
-  };
-  const refresh = data.includes('已失效')
-  if (!data.includes('登录成功')) return { status: 200, isOk: false, refresh, message: refresh && '二维码已失效' || '未扫描二维码' };
-
-  // 获取p_skey 与gtk
-  const checkSigUrl = data.match(/(?:'((?:https?|ftp):\/\/[^\s/$.?#].[^\s]*)')/g)[0].replaceAll('\'', '');
-  const checkSigRes = await fetch(checkSigUrl, { redirect: 'manual', headers: { Cookie: allCookie.join('; ') } });
-  const p_skey = checkSigRes.headers.get('Set-Cookie').match(/p_skey=([^;]+)/)[1];
-  const gtk = getGtk(p_skey);
-  setCookie(checkSigRes.headers.get('Set-Cookie').split(';, '));
-
-  // authorize
-  const authorizeUrl = 'https://graph.qq.com/oauth2.0/authorize';
-  const getAuthorizeData = (gtk) => {
-    let data = new FormData()
-    data.append('response_type', 'code')
-    data.append('client_id', 100497308)
-    data.append('redirect_uri', 'https://y.qq.com/portal/wx_redirect.html?login_type=1&surl=https://y.qq.com/')
-    data.append('scope', 'get_user_info,get_app_friends')
-    data.append('state', 'state')
-    data.append('switch', '')
-    data.append('from_ptlogin', 1)
-    data.append('src', 1)
-    data.append('update_auth', 1)
-    data.append('openapi', '1010_1030')
-    data.append('g_tk', gtk)
-    data.append('auth_time', new Date)
-    data.append('ui', getGuid())
-    return data
-  };
-
-  const authorizeRes = await fetch(authorizeUrl, {
-    redirect: 'manual',
-    method: 'POST',
-    body: getAuthorizeData(gtk),
-    headers: {
-      Cookie: allCookie.join('; ')
-    }
-  });
-  const code = authorizeRes.headers.get('Location').match(/[?&]code=([^&]+)/)[1];
-
-  // login
-  const getFcgReqData = (g_tk, code) => {
-    const data = {
-      comm: {
-        "g_tk":g_tk,
-        "platform":"yqq",
-        "ct":24,
-        "cv":0
-      }, req: {
-        "module":"QQConnectLogin.LoginServer",
-        "method":"QQLogin",
-        "param": {
-          "code":code
-        }
-      }
-    }
-    return JSON.stringify(data)
-  };
-
-  const loginUrl = 'https://u.y.qq.com/cgi-bin/musicu.fcg';
-  const loginRes = await fetch(loginUrl, {
-    method: 'POST',
-    body: getFcgReqData(gtk, code),
-    headers: {
-      'Content-Type': 'application/x-www-form-urlencoded',
-      Cookie: allCookie.join('; ')
-    }
-  });
-  setCookie(loginRes.headers.get('Set-Cookie').split(';, '));
-  global.userInfo = { ...refreshData(allCookie.join('; ')) }
-  
-  return { status: 200, isOk: true, message: '登录成功' };
-};
+const { getGtk, getGuid } = require('../../../util/loginUtils');
+const { refreshData } = require('../../../config/user-info');
+
+const parseSetCookie = setCookieHeader => {
+	if (!setCookieHeader) return [];
+	const cookies = [];
+	const parts = setCookieHeader.split(/,(?=\s*[a-zA-Z_]+=)/);
+	for (const part of parts) {
+		const cookiePair = part.split(';')[0].trim();
+		if (cookiePair && cookiePair.includes('=') && cookiePair.split('=')[1]) {
+			cookies.push(cookiePair);
+		}
+	}
+	return cookies;
+};
+
+module.exports = async ({ method = 'get', params = {}, option = {} }) => {
+	const { ptqrtoken, qrsig } = params;
+	if (!ptqrtoken || !qrsig) return { body: '参数错误' };
+	const url = `https://ssl.ptlogin2.qq.com/ptqrlogin?u1=https%3A%2F%2Fgraph.qq.com%2Foauth2.0%2Flogin_jump&ptqrtoken=${ptqrtoken}&ptredirect=0&h=1&t=1&g=1&from_ui=1&ptlang=2052&action=0-0-1711022193435&js_ver=23111510&js_type=1&login_sig=du-YS1h8*0GqVqcrru0pXkpwVg2DYw-DtbFulJ62IgPf6vfiJe*4ONVrYc5hMUNE&pt_uistyle=40&aid=716027609&daid=383&pt_3rd_aid=100497308&&o1vId=3674fc47871e9c407d8838690b355408&pt_js_version=v1.48.1`;
+	const response = await fetch(url, { headers: { Cookie: `qrsig=${qrsig}` } });
+	const data = await response.text() || '';
+
+	const cookieMap = new Map();
+	const setCookie = setCookieHeader => {
+		const cookies = parseSetCookie(setCookieHeader);
+		for (const cookie of cookies) {
+			const [name] = cookie.split('=');
+			cookieMap.set(name, cookie);
+		}
+	};
+
+	setCookie(response.headers.get('Set-Cookie'));
+
+	const refresh = data.includes('已失效');
+	if (!data.includes('登录成功'))
+		return { status: 200, isOk: false, refresh, message: (refresh && '二维码已失效') || '未扫描二维码' };
+
+	const allCookie = () => Array.from(cookieMap.values());
+
+	const urlMatch = data.match(/(?:'((?:https?|ftp):\/\/[^\s/$.?#].[^\s]*)')/g);
+	if (!urlMatch || !urlMatch[0]) {
+		return { status: 502, body: { error: 'Failed to extract checkSigUrl from response' } };
+	}
+	const checkSigUrl = urlMatch[0].replaceAll("'", '');
+	const checkSigRes = await fetch(checkSigUrl, { redirect: 'manual', headers: { Cookie: allCookie().join('; ') } });
+
+	const checkSigCookie = checkSigRes.headers.get('Set-Cookie');
+	const pSkeyMatch = checkSigCookie?.match(/p_skey=([^;]+)/);
+	if (!pSkeyMatch || !pSkeyMatch[1]) {
+		return { status: 502, body: { error: 'Failed to extract p_skey from response' } };
+	}
+	const p_skey = pSkeyMatch[1];
+	const gtk = getGtk(p_skey);
+	setCookie(checkSigCookie);
+
+	const authorizeUrl = 'https://graph.qq.com/oauth2.0/authorize';
+	const getAuthorizeData = gtk => {
+		const data = new FormData();
+		data.append('response_type', 'code');
+		data.append('client_id', 100497308);
+		data.append('redirect_uri', 'https://y.qq.com/portal/wx_redirect.html?login_type=1&surl=https://y.qq.com/');
+		data.append('scope', 'get_user_info,get_app_friends');
+		data.append('state', 'state');
+		data.append('switch', '');
+		data.append('from_ptlogin', 1);
+		data.append('src', 1);
+		data.append('update_auth', 1);
+		data.append('openapi', '1010_1030');
+		data.append('g_tk', gtk);
+		data.append('auth_time', new Date());
+		data.append('ui', getGuid());
+		return data;
+	};
+
+	const authorizeRes = await fetch(authorizeUrl, {
+		redirect: 'manual',
+		method: 'POST',
+		body: getAuthorizeData(gtk),
+		headers: {
+			Cookie: allCookie().join('; '),
+		},
+	});
+	setCookie(authorizeRes.headers.get('Set-Cookie'));
+
+	const location = authorizeRes.headers.get('Location');
+	const codeMatch = location?.match(/[?&]code=([^&]+)/);
+	if (!codeMatch || !codeMatch[1]) {
+		return { status: 502, body: { error: 'Failed to extract code from authorize response' } };
+	}
+	const code = codeMatch[1];
+
+	const getFcgReqData = (g_tk, code) => {
+		const data = {
+			comm: {
+				g_tk,
+				platform: 'yqq',
+				ct: 24,
+				cv: 0,
+			},
+			req: {
+				module: 'QQConnectLogin.LoginServer',
+				method: 'QQLogin',
+				param: {
+					code,
+				},
+			},
+		};
+		return JSON.stringify(data);
+	};
+
+	const loginUrl = 'https://u.y.qq.com/cgi-bin/musicu.fcg';
+	const loginRes = await fetch(loginUrl, {
+		method: 'POST',
+		body: getFcgReqData(gtk, code),
+		headers: {
+			'Content-Type': 'application/x-www-form-urlencoded',
+			Cookie: allCookie().join('; '),
+		},
+	});
+	setCookie(loginRes.headers.get('Set-Cookie'));
+	global.userInfo = { ...refreshData(allCookie().join('; ')) };
+
+	return { status: 200, isOk: true, message: '登录成功' };
+};

package/module/apis/user/getQQLoginQr.js

@@ -1,11 +1,17 @@
-const { hash33 } = require('../../../util/loginUtils');
-
-module.exports = async ({ method = 'get', params = {}, option = {} }) => {
-  const url = 'https://ssl.ptlogin2.qq.com/ptqrshow?appid=716027609&e=2&l=M&s=3&d=72&v=4&t=0.9698127522807933&daid=383&pt_3rd_aid=100497308&u1=https%3A%2F%2Fgraph.qq.com%2Foauth2.0%2Flogin_jump';
-  const response = await fetch(url, { responseType: 'arraybuffer' });
-  const data = await response.arrayBuffer();
-  const img = "data:image/png;base64," + (data && Buffer.from(data).toString('base64'));
-  const qrsig = response.headers.get('Set-Cookie')?.match(/qrsig=([^;]+)/)[1];
-  
-  return {status: 200, body: { img, ptqrtoken: hash33(qrsig), qrsig } };
-};
+const { hash33 } = require('../../../util/loginUtils');
+
+module.exports = async ({ method = 'get', params = {}, option = {} }) => {
+	const url =
+		'https://ssl.ptlogin2.qq.com/ptqrshow?appid=716027609&e=2&l=M&s=3&d=72&v=4&t=0.9698127522807933&daid=383&pt_3rd_aid=100497308&u1=https%3A%2F%2Fgraph.qq.com%2Foauth2.0%2Flogin_jump';
+	const response = await fetch(url, { responseType: 'arraybuffer' });
+	const data = await response.arrayBuffer();
+	const img = 'data:image/png;base64,' + (data && Buffer.from(data).toString('base64'));
+	const cookieHeader = response.headers.get('Set-Cookie');
+	const match = cookieHeader?.match(/qrsig=([^;]+)/);
+	if (!match) {
+		return { status: 502, body: { error: 'Failed to get qrsig from response' } };
+	}
+	const qrsig = match[1];
+
+	return { status: 200, body: { img, ptqrtoken: hash33(qrsig), qrsig } };
+};

package/module/apis/y_common.js

@@ -1,14 +1,27 @@
-const request = require('../../util/request');
-const config = require('../config');
-
-module.exports = ({ url, method = 'get', options = {}, hasCommonParams = true }) => {
-	let commonParams = hasCommonParams ? config.commonParams : {};
-	let opts = Object.assign(options, commonParams, {
-		headers: {
-			referer: 'https://c.y.qq.com/',
-			host: 'c.y.qq.com',
-		},
-	});
-	console.log(url, {opts})
-	return request(url, method, opts);
-};
+const request = require('../../util/request');
+const config = require('../config');
+
+module.exports = ({ url, method = 'get', options = {}, hasCommonParams = true }) => {
+	const commonParams = hasCommonParams ? config.commonParams : {};
+	const opts = Object.assign(options, commonParams, {
+		headers: {
+			referer: 'https://c.y.qq.com/',
+			host: 'c.y.qq.com',
+		},
+	});
+	if (process.env.DEBUG === 'true') {
+		const logOpts = { ...opts, headers: { ...opts.headers } };
+		const SENSITIVE_HEADER_KEYS = ['cookie', 'authorization', 'proxy-authorization'];
+
+		if (logOpts.headers) {
+			Object.keys(logOpts.headers).forEach(key => {
+				if (SENSITIVE_HEADER_KEYS.includes(key.toLowerCase())) {
+					logOpts.headers[key] = '[masked]';
+				}
+			});
+		}
+
+		console.log(url, { opts: logOpts });
+	}
+	return request(url, method, opts);
+};