qqmusic-api-enhanced 1.0.0 → 1.0.2

package/module/login_refresh.ts

@@ -1,5 +1,5 @@
 import { request, type ApiResponse } from "../util/request.js";
-import { cookieToJson } from "../util/cookie.js";
+import { cookieToJson, cookieToString, parseSetCookie } from "../util/cookie.js";
 
 /**
  * 刷新登录凭证.
@@ -16,15 +16,18 @@ export default async function login_refresh(
     refresh_key?: string;
   } = {},
   req = request
-): Promise<ApiResponse> {
+): Promise<ApiResponse<{ code: number; data: any; cookieStr: string }>> {
   const cookieObj = cookieToJson(query.cookie);
   const uin = cookieObj.uin || cookieObj.qqmusic_uin || cookieObj.wxuin || "0";
   const musickey = cookieObj.qm_keyst || cookieObj.qqmusic_key || "";
 
+  const loginType = cookieObj.tmeLoginType || (musickey.startsWith("W_X") ? "1" : "2");
+
   const param = {
     openid: query.openid || cookieObj.openid || "",
     refresh_token: query.refresh_token || cookieObj.refresh_token || "",
     refresh_key: query.refresh_key || cookieObj.refresh_key || "",
+    access_token: cookieObj.access_token || "",
     musicid: Number(uin) || 0,
     str_musicid: uin,
     musickey,
@@ -37,15 +40,40 @@ export default async function login_refresh(
     param,
     {
       cookie: query.cookie,
-      platform: "web",
+      platform: "android",
+      comm: { tmeLoginType: Number(loginType) || 2 },
     }
   );
 
+  const resBody = (cgiRes.body || {}) as any;
+  const newCookies = parseSetCookie(cgiRes.cookie || []);
+  const mergedCookies = { ...cookieObj, ...newCookies };
+
+  if (resBody.musickey) {
+    mergedCookies.qm_keyst = resBody.musickey;
+    mergedCookies.qqmusic_key = resBody.musickey;
+    mergedCookies.musickey = resBody.musickey;
+  }
+  if (resBody.musicid) {
+    mergedCookies.uin = String(resBody.musicid);
+    mergedCookies.qqmusic_uin = String(resBody.musicid);
+    mergedCookies.musicid = String(resBody.musicid);
+  }
+  if (resBody.encryptUin) {
+    mergedCookies.euin = resBody.encryptUin;
+    mergedCookies.encryptUin = resBody.encryptUin;
+  }
+  if (resBody.refresh_token) {
+    mergedCookies.refresh_token = resBody.refresh_token;
+  }
+  const cookieStr = cookieToString(mergedCookies);
+
   return {
     status: cgiRes.status,
     body: {
-      code: cgiRes.body?.code ?? 200,
-      data: cgiRes.body,
+      code: resBody.code ?? (cgiRes.status === 200 ? 200 : 500),
+      data: resBody,
+      cookieStr,
     },
     cookie: cgiRes.cookie,
   };

package/module/login_status.d.ts

@@ -1,9 +1,30 @@
 import { request, type ApiResponse } from "../util/request.js";
+import { type NormalizedVipInfo } from "./user_vip_info.js";
+export interface NormalizedLoginAccount {
+    userId: string;
+    nickname: string;
+    avatarUrl?: string;
+    vipStatus: "vip" | "nonVip" | "unknown";
+    vipTier?: "svip" | "vip";
+    vipLevel?: number;
+    vipYear?: boolean;
+    vipExpireTime?: number;
+}
+export interface LoginStatusResult {
+    code: number;
+    isLogin: boolean;
+    uin: string;
+    nickname: string;
+    avatarUrl?: string;
+    vip: NormalizedVipInfo;
+    account: NormalizedLoginAccount;
+    data: any;
+}
 /**
- * 校验当前 Cookie 登录状态及获取用户信息.
+ * 校验当前 Cookie 登录状态及获取用户信息与 VIP 等级.
  *
  * @param query.cookie 登录凭据 Cookie
  */
 export default function login_status(query?: {
     cookie?: any;
-}, req?: typeof request): Promise<ApiResponse>;
+}, req?: typeof request): Promise<ApiResponse<LoginStatusResult>>;

package/module/login_status.js

@@ -1,21 +1,85 @@
 import { request } from "../util/request.js";
+import { cookieToJson } from "../util/cookie.js";
+import user_detail_fn from "./user_detail.js";
+import user_vip_info_fn from "./user_vip_info.js";
 /**
- * 校验当前 Cookie 登录状态及获取用户信息.
+ * 校验当前 Cookie 登录状态及获取用户信息与 VIP 等级.
  *
  * @param query.cookie 登录凭据 Cookie
  */
 export default async function login_status(query = {}, req = request) {
-    const cgiRes = await req("music.UserInfo.userInfoServer", "GetLoginUserInfo", {}, {
-        cookie: query.cookie,
-        platform: "web",
-    });
-    const data = cgiRes.body || {};
-    const isLogin = data.code === 0 && Boolean(data.user?.uin || data.uin || data.encryptUin);
+    const cookieObj = cookieToJson(query.cookie);
+    let uin = cookieObj.uin || cookieObj.qqmusic_uin || cookieObj.musicid || cookieObj.wxuin || "";
+    const musickey = cookieObj.qm_keyst || cookieObj.qqmusic_key || cookieObj.musickey || "";
+    let cgiRes = { status: 200, body: {} };
+    try {
+        cgiRes = await req("music.UserInfo.userInfoServer", "GetLoginUserInfo", {}, {
+            cookie: query.cookie,
+            platform: "android",
+        });
+    }
+    catch { }
+    const data = (cgiRes.body || {});
+    const userData = data.user || data.userInfo || data;
+    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();
+    }
+    else if (!uin && userData.encryptUin) {
+        uin = String(userData.encryptUin).trim();
+    }
+    let nickname = userData.nick || userData.nickname || "";
+    let avatarUrl = userData.headurl || userData.avatar;
+    // 若基本信息不全，只要有 uin，调用 user_detail 补全真实昵称与高清头像
+    if (uin && (!nickname || !avatarUrl)) {
+        try {
+            const detailRes = await user_detail_fn({ uin, cookie: query.cookie }, req);
+            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 { }
+    }
+    if (!nickname) {
+        nickname = uin ? `QQ用户_${uin.slice(-4)}` : "QQ音乐用户";
+    }
+    // 补全 VIP 会员信息
+    let vip = { vipStatus: "nonVip" };
+    if (isLogin || uin) {
+        try {
+            const vipRes = await user_vip_info_fn({ cookie: query.cookie, uin }, req);
+            vip = vipRes.body.vip;
+        }
+        catch {
+            vip = { vipStatus: "unknown" };
+        }
+    }
+    const account = {
+        userId: uin,
+        nickname,
+        avatarUrl,
+        vipStatus: vip.vipStatus,
+        vipTier: vip.vipTier,
+        vipLevel: vip.vipLevel,
+        vipYear: vip.vipYear,
+        vipExpireTime: vip.vipExpireTime,
+    };
     return {
-        status: cgiRes.status,
+        status: cgiRes.status || 200,
         body: {
             code: isLogin ? 200 : 301,
             isLogin,
+            uin,
+            nickname,
+            avatarUrl,
+            vip,
+            account,
             data,
         },
         cookie: cgiRes.cookie,

package/module/login_status.ts

@@ -1,32 +1,120 @@
 import { request, type ApiResponse } from "../util/request.js";
+import { cookieToJson } from "../util/cookie.js";
+import user_detail_fn from "./user_detail.js";
+import user_vip_info_fn, { type NormalizedVipInfo } from "./user_vip_info.js";
+
+export interface NormalizedLoginAccount {
+  userId: string;
+  nickname: string;
+  avatarUrl?: string;
+  vipStatus: "vip" | "nonVip" | "unknown";
+  vipTier?: "svip" | "vip";
+  vipLevel?: number;
+  vipYear?: boolean;
+  vipExpireTime?: number;
+}
+
+export interface LoginStatusResult {
+  code: number;
+  isLogin: boolean;
+  uin: string;
+  nickname: string;
+  avatarUrl?: string;
+  vip: NormalizedVipInfo;
+  account: NormalizedLoginAccount;
+  data: any;
+}
 
 /**
- * 校验当前 Cookie 登录状态及获取用户信息.
+ * 校验当前 Cookie 登录状态及获取用户信息与 VIP 等级.
  *
  * @param query.cookie 登录凭据 Cookie
  */
 export default async function login_status(
   query: { cookie?: any } = {},
   req = request
-): Promise<ApiResponse> {
-  const cgiRes = await req(
-    "music.UserInfo.userInfoServer",
-    "GetLoginUserInfo",
-    {},
-    {
-      cookie: query.cookie,
-      platform: "web",
+): Promise<ApiResponse<LoginStatusResult>> {
+  const cookieObj = cookieToJson(query.cookie);
+  let uin = cookieObj.uin || cookieObj.qqmusic_uin || cookieObj.musicid || cookieObj.wxuin || "";
+  const musickey = cookieObj.qm_keyst || cookieObj.qqmusic_key || cookieObj.musickey || "";
+
+  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;
+  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();
+  } else if (!uin && userData.encryptUin) {
+    uin = String(userData.encryptUin).trim();
+  }
+
+  let nickname = userData.nick || userData.nickname || "";
+  let avatarUrl: string | undefined = userData.headurl || userData.avatar;
+
+  // 若基本信息不全，只要有 uin，调用 user_detail 补全真实昵称与高清头像
+  if (uin && (!nickname || !avatarUrl)) {
+    try {
+      const detailRes = await user_detail_fn({ uin, cookie: query.cookie }, req);
+      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 {}
+  }
+
+  if (!nickname) {
+    nickname = uin ? `QQ用户_${uin.slice(-4)}` : "QQ音乐用户";
+  }
+
+  // 补全 VIP 会员信息
+  let vip: NormalizedVipInfo = { vipStatus: "nonVip" };
+  if (isLogin || uin) {
+    try {
+      const vipRes = await user_vip_info_fn({ cookie: query.cookie, uin }, req);
+      vip = vipRes.body.vip;
+    } catch {
+      vip = { vipStatus: "unknown" };
     }
-  );
+  }
 
-  const data = cgiRes.body || {};
-  const isLogin = data.code === 0 && Boolean(data.user?.uin || data.uin || data.encryptUin);
+  const account: NormalizedLoginAccount = {
+    userId: uin,
+    nickname,
+    avatarUrl,
+    vipStatus: vip.vipStatus,
+    vipTier: vip.vipTier,
+    vipLevel: vip.vipLevel,
+    vipYear: vip.vipYear,
+    vipExpireTime: vip.vipExpireTime,
+  };
 
   return {
-    status: cgiRes.status,
+    status: cgiRes.status || 200,
     body: {
       code: isLogin ? 200 : 301,
       isLogin,
+      uin,
+      nickname,
+      avatarUrl,
+      vip,
+      account,
       data,
     },
     cookie: cgiRes.cookie,

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

@@ -1,9 +1,24 @@
 import { request, type ApiResponse } from "../util/request.js";
+export interface NormalizedVipInfo {
+    vipStatus: "vip" | "nonVip" | "unknown";
+    vipTier?: "svip" | "vip";
+    vipLevel?: number;
+    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;
-}, req?: typeof request): Promise<ApiResponse>;
+    uin?: string | number;
+}, req?: typeof request): Promise<ApiResponse<{
+    code: number;
+    data: any;
+    vip: NormalizedVipInfo;
+}>>;

package/module/user_vip_info.js

@@ -1,19 +1,134 @@
 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" };
+    }
+    const vipData = body.data || body;
+    const identity = vipData.identity || {};
+    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.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;
+    let vipYear = undefined;
+    let vipExpireTime = undefined;
+    if (svip > 0) {
+        vipStatus = "vip";
+        vipTier = "svip";
+        vipLevel = level > 0 ? Math.min(Math.max(level, 1), 10) : 1;
+        vipYear = isYear;
+    }
+    else if (isVip > 0) {
+        vipStatus = "vip";
+        vipTier = "vip";
+        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;
+    }
+    else if (identity.HugeVipEnd) {
+        const parsed = Date.parse(identity.HugeVipEnd);
+        if (!isNaN(parsed))
+            vipExpireTime = parsed;
+    }
+    else if (identity.twelveEnd) {
+        const parsed = Date.parse(identity.twelveEnd);
+        if (!isNaN(parsed))
+            vipExpireTime = parsed;
+    }
+    return {
+        vipStatus,
+        vipTier,
+        vipLevel,
+        vipYear,
+        vipExpireTime,
+    };
+}
 /**
  * 获取当前登录用户的 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 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: {
             code: cgiRes.body?.code ?? 200,
             data: cgiRes.body,
+            vip,
         },
         cookie: cgiRes.cookie,
     };