qqmusic-api-enhanced 1.0.1 → 1.0.2

package/module/login_status.ts

@@ -35,21 +35,27 @@ export default async function login_status(
   req = request
 ): Promise<ApiResponse<LoginStatusResult>> {
   const cookieObj = cookieToJson(query.cookie);
-  let uin = cookieObj.uin || cookieObj.qqmusic_uin || cookieObj.wxuin || "";
+  let uin = cookieObj.uin || cookieObj.qqmusic_uin || cookieObj.musicid || cookieObj.wxuin || "";
+  const musickey = cookieObj.qm_keyst || cookieObj.qqmusic_key || cookieObj.musickey || "";
 
-  const cgiRes = await req(
-    "music.UserInfo.userInfoServer",
-    "GetLoginUserInfo",
-    {},
-    {
-      cookie: query.cookie,
-      platform: "web",
-    }
-  );
+  let cgiRes: any = { status: 200, body: {} };
+  try {
+    cgiRes = await req(
+      "music.UserInfo.userInfoServer",
+      "GetLoginUserInfo",
+      {},
+      {
+        cookie: query.cookie,
+        platform: "android",
+      }
+    );
+  } catch {}
 
   const data = (cgiRes.body || {}) as any;
   const userData = data.user || data.userInfo || data;
-  const isLogin = data.code === 0 && Boolean(userData.uin || userData.encryptUin || uin);
+  let isLogin =
+    (data.code === 0 || (data.code === undefined && Boolean(userData.uin || userData.encryptUin))) &&
+    Boolean(userData.uin || userData.encryptUin || uin);
 
   if (userData.uin) {
     uin = String(userData.uin).trim();
@@ -60,13 +66,16 @@ export default async function login_status(
   let nickname = userData.nick || userData.nickname || "";
   let avatarUrl: string | undefined = userData.headurl || userData.avatar;
 
-  // 若基本信息不全且处于已登录状态，尝试从 user_detail 补全昵称与头像
-  if (isLogin && (!nickname || !avatarUrl)) {
+  // 若基本信息不全，只要有 uin，调用 user_detail 补全真实昵称与高清头像
+  if (uin && (!nickname || !avatarUrl)) {
     try {
       const detailRes = await user_detail_fn({ uin, cookie: query.cookie }, req);
-      const header = detailRes.body?.data?.data || detailRes.body?.data || {};
-      if (header.nick && !nickname) nickname = header.nick;
-      if (header.headurl && !avatarUrl) avatarUrl = header.headurl;
+      const detailData = detailRes.body?.data || {};
+      if (detailData.nick && !nickname) nickname = detailData.nick;
+      if (detailData.headurl && !avatarUrl) avatarUrl = detailData.headurl;
+      if (detailData.nick && Boolean(musickey || uin)) {
+        isLogin = true;
+      }
     } catch {}
   }
 
@@ -76,9 +85,9 @@ export default async function login_status(
 
   // 补全 VIP 会员信息
   let vip: NormalizedVipInfo = { vipStatus: "nonVip" };
-  if (isLogin) {
+  if (isLogin || uin) {
     try {
-      const vipRes = await user_vip_info_fn({ cookie: query.cookie }, req);
+      const vipRes = await user_vip_info_fn({ cookie: query.cookie, uin }, req);
       vip = vipRes.body.vip;
     } catch {
       vip = { vipStatus: "unknown" };
@@ -97,7 +106,7 @@ export default async function login_status(
   };
 
   return {
-    status: cgiRes.status,
+    status: cgiRes.status || 200,
     body: {
       code: isLogin ? 200 : 301,
       isLogin,

package/module/user_detail.js

@@ -11,19 +11,42 @@ export default async function user_detail(query = {}, req = request) {
     const targetUin = query.uin?.toString() ||
         cookieObj.uin ||
         cookieObj.qqmusic_uin ||
+        cookieObj.musicid ||
         cookieObj.wxuin ||
+        cookieObj.euin ||
         "0";
-    const cgiRes = await req("music.userHomepage.UserHomepage", "GetHomepageHeader", {
-        uin: Number(targetUin) || 0,
+    const cgiRes = await req("music.UnifiedHomepage.UnifiedHomepageSrv", "GetHomepageHeader", {
+        uin: targetUin,
+        IsQueryTabDetail: 1,
     }, {
+        uin: targetUin,
         cookie: query.cookie,
-        platform: "web",
+        platform: "android",
     });
+    const rawData = cgiRes.body?.data || cgiRes.body || {};
+    const info = rawData.Info || rawData.info || {};
+    const baseInfo = info.BaseInfo || info.base_info || {};
+    const newIconInfo = info.NewIconInfo || info.new_icon_info || {};
+    const icons = info.Icons || info.icons || [];
+    const nick = String(baseInfo.Name || baseInfo.name || "").trim();
+    const avatarUrl = String(baseInfo.BigAvatar || baseInfo.Avatar || baseInfo.avatar || "").trim();
+    const formattedData = {
+        ...rawData,
+        nick,
+        headurl: avatarUrl,
+        avatar: avatarUrl,
+        BaseInfo: baseInfo,
+        NewIconInfo: newIconInfo,
+        Icons: icons,
+        Info: info,
+    };
     return {
         status: cgiRes.status,
         body: {
             code: cgiRes.body?.code ?? 200,
-            data: cgiRes.body,
+            data: formattedData,
+            nick,
+            avatarUrl,
         },
         cookie: cgiRes.cookie,
     };

package/module/user_detail.ts

@@ -16,26 +16,52 @@ export default async function user_detail(
     query.uin?.toString() ||
     cookieObj.uin ||
     cookieObj.qqmusic_uin ||
+    cookieObj.musicid ||
     cookieObj.wxuin ||
+    cookieObj.euin ||
     "0";
 
   const cgiRes = await req(
-    "music.userHomepage.UserHomepage",
+    "music.UnifiedHomepage.UnifiedHomepageSrv",
     "GetHomepageHeader",
     {
-      uin: Number(targetUin) || 0,
+      uin: targetUin,
+      IsQueryTabDetail: 1,
     },
     {
+      uin: targetUin,
       cookie: query.cookie,
-      platform: "web",
+      platform: "android",
     }
   );
 
+  const rawData = cgiRes.body?.data || cgiRes.body || {};
+  const info = rawData.Info || rawData.info || {};
+  const baseInfo = info.BaseInfo || info.base_info || {};
+  const newIconInfo = info.NewIconInfo || info.new_icon_info || {};
+  const icons = info.Icons || info.icons || [];
+
+  const nick = String(baseInfo.Name || baseInfo.name || "").trim();
+  const avatarUrl = String(baseInfo.BigAvatar || baseInfo.Avatar || baseInfo.avatar || "").trim();
+
+  const formattedData = {
+    ...rawData,
+    nick,
+    headurl: avatarUrl,
+    avatar: avatarUrl,
+    BaseInfo: baseInfo,
+    NewIconInfo: newIconInfo,
+    Icons: icons,
+    Info: info,
+  };
+
   return {
     status: cgiRes.status,
     body: {
       code: cgiRes.body?.code ?? 200,
-      data: cgiRes.body,
+      data: formattedData,
+      nick,
+      avatarUrl,
     },
     cookie: cgiRes.cookie,
   };

package/module/user_vip_info.d.ts

@@ -6,14 +6,17 @@ export interface NormalizedVipInfo {
     vipYear?: boolean;
     vipExpireTime?: number;
 }
+export declare function parseVipFromIcons(iconList?: any[], icons?: any[]): Partial<NormalizedVipInfo> | null;
 export declare function deriveVipInfo(body: any): NormalizedVipInfo;
 /**
  * 获取当前登录用户的 VIP 会员信息及身份明细.
  *
  * @param query.cookie 登录 Cookie
+ * @param query.uin 用户 QQ/UIN
  */
 export default function user_vip_info(query?: {
     cookie?: any;
+    uin?: string | number;
 }, req?: typeof request): Promise<ApiResponse<{
     code: number;
     data: any;

package/module/user_vip_info.js

@@ -1,4 +1,27 @@
 import { request } from "../util/request.js";
+import { cookieToJson } from "../util/cookie.js";
+import user_detail_fn from "./user_detail.js";
+export function parseVipFromIcons(iconList = [], icons = []) {
+    for (const item of [...iconList, ...icons]) {
+        if (!item)
+            continue;
+        const url = String(item.srcUrl || item.IconURL || "");
+        const helptxt = String(item.Helptxt || item.Title || "");
+        const m = url.match(/(?:^|\/)(n)?(s?vip)(\d+)\.(?:png|webp)/i);
+        if (m) {
+            const isYear = Boolean(m[1]) || helptxt.includes("年费");
+            const tier = m[2].toLowerCase() === "svip" ? "svip" : "vip";
+            const level = parseInt(m[3], 10);
+            return {
+                vipStatus: "vip",
+                vipTier: tier,
+                vipLevel: level > 0 ? Math.min(Math.max(level, 1), 10) : 1,
+                vipYear: isYear,
+            };
+        }
+    }
+    return null;
+}
 export function deriveVipInfo(body) {
     if (!body) {
         return { vipStatus: "unknown" };
@@ -8,8 +31,8 @@ export function deriveVipInfo(body) {
     const svip = Number(vipData.svip || 0);
     const isVip = Number(identity.HugeVip || identity.vip || 0);
     const level = Number(identity.level || 0);
-    const isYear = Boolean(Number(identity.is_year || identity.year_vip || identity.HugeVipYear || identity.year || 0) > 0 ||
-        Number(vipData.year || vipData.is_year || 0) > 0);
+    const isYear = Boolean(Number(identity.HugeYearFlag || identity.yearflag || identity.is_year || identity.year_vip || 0) > 0 ||
+        Number(vipData.ystar || vipData.year || 0) > 0);
     let vipStatus = "nonVip";
     let vipTier = undefined;
     let vipLevel = undefined;
@@ -27,6 +50,19 @@ export function deriveVipInfo(body) {
         vipLevel = level > 0 ? Math.min(Math.max(level, 1), 10) : 1;
         vipYear = isYear;
     }
+    // 若基本 identity 未命中 VIP，尝试从附加的 Info / NewIconInfo / Icons 解析
+    if (vipStatus === "nonVip") {
+        const info = vipData.Info || vipData.info || {};
+        const iconList = info.NewIconInfo?.iconlist || vipData.NewIconInfo?.iconlist || [];
+        const icons = info.Icons || vipData.Icons || [];
+        const iconVip = parseVipFromIcons(iconList, icons);
+        if (iconVip && iconVip.vipStatus === "vip") {
+            vipStatus = "vip";
+            vipTier = iconVip.vipTier;
+            vipLevel = iconVip.vipLevel;
+            vipYear = iconVip.vipYear;
+        }
+    }
     const expireTs = Number(vipData.userinfo?.expire || 0);
     if (expireTs > 0) {
         vipExpireTime = expireTs * 1000;
@@ -53,13 +89,40 @@ export function deriveVipInfo(body) {
  * 获取当前登录用户的 VIP 会员信息及身份明细.
  *
  * @param query.cookie 登录 Cookie
+ * @param query.uin 用户 QQ/UIN
  */
 export default async function user_vip_info(query = {}, req = request) {
-    const cgiRes = await req("VipLogin.VipLoginInter", "vip_login_base", {}, {
-        cookie: query.cookie,
-        platform: "web",
-    });
-    const vip = deriveVipInfo(cgiRes.body);
+    const cookieObj = cookieToJson(query.cookie);
+    const uin = query.uin?.toString() ||
+        cookieObj.uin ||
+        cookieObj.qqmusic_uin ||
+        cookieObj.musicid ||
+        "0";
+    let cgiRes = { status: 200, body: {} };
+    try {
+        cgiRes = await req("VipLogin.VipLoginInter", "vip_login_base", {}, {
+            uin,
+            cookie: query.cookie,
+            platform: "android",
+        });
+    }
+    catch { }
+    let vip = deriveVipInfo(cgiRes.body);
+    // 若 vip_login_base 无法推断出有效 VIP，自动通过主页头部接口获取勋章母版特征
+    if (vip.vipStatus === "nonVip" && uin && uin !== "0") {
+        try {
+            const detailRes = await user_detail_fn({ uin, cookie: query.cookie }, req);
+            const detailData = detailRes.body?.data || {};
+            const fallbackVip = deriveVipInfo(detailData);
+            if (fallbackVip.vipStatus === "vip") {
+                vip = {
+                    ...vip,
+                    ...fallbackVip,
+                };
+            }
+        }
+        catch { }
+    }
     return {
         status: cgiRes.status,
         body: {

package/module/user_vip_info.ts

@@ -1,4 +1,6 @@
 import { request, type ApiResponse } from "../util/request.js";
+import { cookieToJson } from "../util/cookie.js";
+import user_detail_fn from "./user_detail.js";
 
 export interface NormalizedVipInfo {
   vipStatus: "vip" | "nonVip" | "unknown";
@@ -8,6 +10,27 @@ export interface NormalizedVipInfo {
   vipExpireTime?: number;
 }
 
+export function parseVipFromIcons(iconList: any[] = [], icons: any[] = []): Partial<NormalizedVipInfo> | null {
+  for (const item of [...iconList, ...icons]) {
+    if (!item) continue;
+    const url = String(item.srcUrl || item.IconURL || "");
+    const helptxt = String(item.Helptxt || item.Title || "");
+    const m = url.match(/(?:^|\/)(n)?(s?vip)(\d+)\.(?:png|webp)/i);
+    if (m) {
+      const isYear = Boolean(m[1]) || helptxt.includes("年费");
+      const tier = m[2].toLowerCase() === "svip" ? "svip" : "vip";
+      const level = parseInt(m[3], 10);
+      return {
+        vipStatus: "vip",
+        vipTier: tier,
+        vipLevel: level > 0 ? Math.min(Math.max(level, 1), 10) : 1,
+        vipYear: isYear,
+      };
+    }
+  }
+  return null;
+}
+
 export function deriveVipInfo(body: any): NormalizedVipInfo {
   if (!body) {
     return { vipStatus: "unknown" };
@@ -18,8 +41,8 @@ export function deriveVipInfo(body: any): NormalizedVipInfo {
   const isVip = Number(identity.HugeVip || identity.vip || 0);
   const level = Number(identity.level || 0);
   const isYear = Boolean(
-    Number(identity.is_year || identity.year_vip || identity.HugeVipYear || identity.year || 0) > 0 ||
-    Number(vipData.year || vipData.is_year || 0) > 0
+    Number(identity.HugeYearFlag || identity.yearflag || identity.is_year || identity.year_vip || 0) > 0 ||
+    Number(vipData.ystar || vipData.year || 0) > 0
   );
 
   let vipStatus: "vip" | "nonVip" | "unknown" = "nonVip";
@@ -40,6 +63,20 @@ export function deriveVipInfo(body: any): NormalizedVipInfo {
     vipYear = isYear;
   }
 
+  // 若基本 identity 未命中 VIP，尝试从附加的 Info / NewIconInfo / Icons 解析
+  if (vipStatus === "nonVip") {
+    const info = vipData.Info || vipData.info || {};
+    const iconList = info.NewIconInfo?.iconlist || vipData.NewIconInfo?.iconlist || [];
+    const icons = info.Icons || vipData.Icons || [];
+    const iconVip = parseVipFromIcons(iconList, icons);
+    if (iconVip && iconVip.vipStatus === "vip") {
+      vipStatus = "vip";
+      vipTier = iconVip.vipTier;
+      vipLevel = iconVip.vipLevel;
+      vipYear = iconVip.vipYear;
+    }
+  }
+
   const expireTs = Number(vipData.userinfo?.expire || 0);
   if (expireTs > 0) {
     vipExpireTime = expireTs * 1000;
@@ -64,22 +101,50 @@ export function deriveVipInfo(body: any): NormalizedVipInfo {
  * 获取当前登录用户的 VIP 会员信息及身份明细.
  *
  * @param query.cookie 登录 Cookie
+ * @param query.uin 用户 QQ/UIN
  */
 export default async function user_vip_info(
-  query: { cookie?: any } = {},
+  query: { cookie?: any; uin?: string | number } = {},
   req = request
 ): Promise<ApiResponse<{ code: number; data: any; vip: NormalizedVipInfo }>> {
-  const cgiRes = await req(
-    "VipLogin.VipLoginInter",
-    "vip_login_base",
-    {},
-    {
-      cookie: query.cookie,
-      platform: "web",
-    }
-  );
+  const cookieObj = cookieToJson(query.cookie);
+  const uin =
+    query.uin?.toString() ||
+    cookieObj.uin ||
+    cookieObj.qqmusic_uin ||
+    cookieObj.musicid ||
+    "0";
 
-  const vip = deriveVipInfo(cgiRes.body);
+  let cgiRes: ApiResponse<any> = { status: 200, body: {} };
+  try {
+    cgiRes = await req(
+      "VipLogin.VipLoginInter",
+      "vip_login_base",
+      {},
+      {
+        uin,
+        cookie: query.cookie,
+        platform: "android",
+      }
+    );
+  } catch {}
+
+  let vip = deriveVipInfo(cgiRes.body);
+
+  // 若 vip_login_base 无法推断出有效 VIP，自动通过主页头部接口获取勋章母版特征
+  if (vip.vipStatus === "nonVip" && uin && uin !== "0") {
+    try {
+      const detailRes = await user_detail_fn({ uin, cookie: query.cookie }, req);
+      const detailData = detailRes.body?.data || {};
+      const fallbackVip = deriveVipInfo(detailData);
+      if (fallbackVip.vipStatus === "vip") {
+        vip = {
+          ...vip,
+          ...fallbackVip,
+        };
+      }
+    } catch {}
+  }
 
   return {
     status: cgiRes.status,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qqmusic-api-enhanced",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "QQ音乐增强版API，支持扫码登录/凭证刷新/直链提取/歌词解密/歌单歌手检索 || QQ Music Enhanced API for Node.js & Bun",
   "type": "module",
   "main": "main.js",

package/util/mobile_qr_session.d.ts

@@ -4,6 +4,8 @@ export interface MobileLoginState {
     message: string;
     uin?: string;
     musickey?: string;
+    nickname?: string;
+    avatarUrl?: string;
     cookieStr?: string;
     createdAt: number;
     client?: mqtt.MqttClient;

package/util/mobile_qr_session.js

@@ -4,7 +4,8 @@ import mqtt from "mqtt";
 import { requestCgi } from "./request.js";
 import { cookieToString, parseSetCookie } from "./cookie.js";
 // Polyfill ws.createWebSocketStream for Bun runtime
-if (typeof ws.createWebSocketStream !== "function") {
+const isBun = typeof globalThis.Bun !== "undefined";
+if (isBun || typeof ws.createWebSocketStream !== "function") {
     ws.createWebSocketStream = function (socket) {
         const duplex = new Duplex({
             read() { },
@@ -27,6 +28,12 @@ const mobileSessions = new Map();
 export function registerMobileSession(qrcodeId) {
     if (!qrcodeId)
         return;
+    const existing = mobileSessions.get(qrcodeId);
+    if (existing && existing.code === 200)
+        return;
+    if (existing && Date.now() - existing.createdAt < 120_000 && existing.client && !existing.client.disconnected) {
+        return;
+    }
     const now = Date.now();
     for (const [key, s] of mobileSessions.entries()) {
         if (now - s.createdAt > 300_000) {
@@ -109,26 +116,66 @@ export function registerMobileSession(qrcodeId) {
                 }
                 else if (type === "cookies") {
                     const cookies = payload?.cookies || {};
-                    const uin = cookies.qqmusic_uin?.value;
-                    const key = cookies.qqmusic_key?.value;
+                    const uin = cookies.qqmusic_uin?.value || cookies.uin?.value || payload?.uin;
+                    const key = cookies.qqmusic_key?.value || cookies.qm_keyst?.value || payload?.musickey;
                     if (uin && key) {
-                        const loginRes = await requestCgi("music.login.LoginServer", "Login", {
-                            musicid: Number(uin),
-                            qrCodeID: qrcodeId,
-                            token: String(key),
-                        }, { platform: "android" });
-                        const resultCookies = parseSetCookie(loginRes.cookie || []);
+                        let loginData = null;
+                        let resultCookies = {};
+                        try {
+                            const loginRes = await requestCgi("music.login.LoginServer", "Login", {
+                                musicid: Number(uin),
+                                qrCodeID: qrcodeId,
+                                token: String(key),
+                            }, {
+                                platform: "android",
+                                comm: { tmeLoginType: 6 },
+                            });
+                            loginData = loginRes.body;
+                            resultCookies = parseSetCookie(loginRes.cookie || []);
+                        }
+                        catch { }
+                        const realMusickey = String(loginData?.musickey || key);
+                        const realUin = String(loginData?.musicid || uin);
+                        const nick = String(loginData?.nick || "").trim();
+                        const logo = String(loginData?.logo || "").trim();
+                        const encryptUin = String(loginData?.encryptUin || cookies.euin?.value || "");
+                        const refreshToken = String(loginData?.refresh_token || "");
+                        const accessToken = String(loginData?.access_token || "");
+                        const loginType = String(loginData?.loginType || 2);
                         const cookieObj = {
-                            uin: String(uin),
-                            qqmusic_uin: String(uin),
-                            qm_keyst: String(key),
-                            qqmusic_key: String(key),
-                            ...resultCookies,
+                            uin: realUin,
+                            qqmusic_uin: realUin,
+                            musicid: realUin,
+                            qm_keyst: realMusickey,
+                            qqmusic_key: realMusickey,
+                            musickey: realMusickey,
+                            tmeAppID: "qqmusic",
+                            tmeLoginType: loginType,
                         };
+                        if (encryptUin) {
+                            cookieObj.euin = encryptUin;
+                            cookieObj.encryptUin = encryptUin;
+                        }
+                        if (refreshToken) {
+                            cookieObj.refresh_token = refreshToken;
+                        }
+                        if (accessToken) {
+                            cookieObj.access_token = accessToken;
+                        }
+                        for (const [cookieName, cookieItem] of Object.entries(cookies)) {
+                            if (cookieItem && typeof cookieItem.value === "string" && !cookieObj[cookieName]) {
+                                cookieObj[cookieName] = cookieItem.value;
+                            }
+                        }
+                        Object.assign(cookieObj, resultCookies);
                         state.code = 200;
                         state.message = "登录成功";
-                        state.uin = String(uin);
-                        state.musickey = String(key);
+                        state.uin = realUin;
+                        state.musickey = realMusickey;
+                        if (nick)
+                            state.nickname = nick;
+                        if (logo)
+                            state.avatarUrl = logo;
                         state.cookieStr = cookieToString(cookieObj);
                         try {
                             client.end(true);