qqmusic-api-enhanced 1.0.1 → 1.0.2

package/main.js

@@ -13,7 +13,7 @@ import song_detail_fn from "./module/song_detail.js";
 import song_url_fn from "./module/song_url.js";
 import user_detail_fn from "./module/user_detail.js";
 import user_playlist_fn from "./module/user_playlist.js";
-import user_vip_info_fn, { deriveVipInfo, } from "./module/user_vip_info.js";
+import user_vip_info_fn, { deriveVipInfo, parseVipFromIcons, } from "./module/user_vip_info.js";
 import { cookieToJson, cookieToString, parseSetCookie } from "./util/cookie.js";
 import { getGtk, getGuid, getSearchId, hash33, qrcDecrypt } from "./util/crypto.js";
 import { request, requestCgi, requestRaw } from "./util/request.js";
@@ -34,7 +34,7 @@ export const song_url = (query = {}) => song_url_fn(query, request);
 export const user_detail = (query = {}) => user_detail_fn(query, request);
 export const user_playlist = (query = {}) => user_playlist_fn(query, request);
 export const user_vip_info = (query = {}) => user_vip_info_fn(query, request);
-export { request, requestCgi, requestRaw, zzcSign, qrcDecrypt, hash33, getGtk, getGuid, getSearchId, cookieToJson, cookieToString, parseSetCookie, deriveVipInfo, };
+export { request, requestCgi, requestRaw, zzcSign, qrcDecrypt, hash33, getGtk, getGuid, getSearchId, cookieToJson, cookieToString, parseSetCookie, deriveVipInfo, parseVipFromIcons, };
 const api = {
     artist_detail,
     artist_songs,
@@ -53,6 +53,7 @@ const api = {
     user_playlist,
     user_vip_info,
     deriveVipInfo,
+    parseVipFromIcons,
     request,
     requestCgi,
     requestRaw,

package/main.ts

@@ -18,6 +18,7 @@ import user_detail_fn from "./module/user_detail.js";
 import user_playlist_fn from "./module/user_playlist.js";
 import user_vip_info_fn, {
   deriveVipInfo,
+  parseVipFromIcons,
   type NormalizedVipInfo,
 } from "./module/user_vip_info.js";
 
@@ -88,6 +89,7 @@ export {
   cookieToString,
   parseSetCookie,
   deriveVipInfo,
+  parseVipFromIcons,
   type ApiResponse,
   type NormalizedVipInfo,
   type NormalizedLoginAccount,
@@ -112,6 +114,7 @@ const api = {
   user_playlist,
   user_vip_info,
   deriveVipInfo,
+  parseVipFromIcons,
   request,
   requestCgi,
   requestRaw,

package/module/login_qr_check.js

@@ -1,6 +1,7 @@
 import { request, requestCgi } from "../util/request.js";
 import { getGtk, getGuid } from "../util/crypto.js";
 import { cookieToString, parseSetCookie } from "../util/cookie.js";
+import { getMobileSession, registerMobileSession } from "../util/mobile_qr_session.js";
 /**
  * 轮询检查二维码登录状态.
  *
@@ -147,65 +148,104 @@ export default async function login_qr_check(query = {}, req = request) {
                 body: { code: 400, message: "缺少必要参数 qrcodeID" },
             };
         }
-        const cgiRes = await requestCgi("music.login.LoginServer", "CheckQRCode", {
-            qrcodeID,
-            tmeAppID: "qqmusic",
-        }, {
-            platform: "android",
-        });
-        const cgiBody = (cgiRes.body || {});
-        const code = cgiBody.code;
-        if (code === 40000) {
+        // 1. 确保后台 MQTT 会话已启动
+        let session = getMobileSession(qrcodeID);
+        if (!session) {
+            try {
+                registerMobileSession(qrcodeID);
+            }
+            catch { }
+            session = getMobileSession(qrcodeID);
+        }
+        // 2. 优先检查实时会话事件
+        if (session && session.code === 200) {
             return {
                 status: 200,
-                body: { code: 801, message: "等待 QQ 音乐 App 扫码" },
+                body: {
+                    code: 200,
+                    message: "登录成功",
+                    uin: session.uin || "",
+                    musickey: session.musickey || "",
+                    nickname: session.nickname || "",
+                    avatarUrl: session.avatarUrl || "",
+                    cookieStr: session.cookieStr || "",
+                },
             };
         }
-        if (code === 40001) {
+        if (session && session.code === 802) {
             return {
                 status: 200,
-                body: { code: 802, message: "已扫码，等待确认" },
+                body: { code: 802, message: session.message || "已扫码，等待确认" },
             };
         }
-        if (code === 40002) {
+        if (session && session.code === 800) {
             return {
                 status: 200,
-                body: { code: 800, message: "二维码已过期，请刷新" },
+                body: { code: 800, message: session.message || "二维码已过期，请刷新" },
             };
         }
-        if (code === 0) {
-            const cookies = cgiRes.cookie || [];
-            const cookieObj = parseSetCookie(cookies);
-            if (cgiBody.musicid && !cookieObj.uin)
-                cookieObj.uin = String(cgiBody.musicid);
-            if (cgiBody.musickey && !cookieObj.qm_keyst)
-                cookieObj.qm_keyst = String(cgiBody.musickey);
-            if (cgiBody.musickey && !cookieObj.qqmusic_key)
-                cookieObj.qqmusic_key = String(cgiBody.musickey);
-            if (cgiBody.openid && !cookieObj.openid)
-                cookieObj.openid = String(cgiBody.openid);
-            if (cgiBody.refresh_token && !cookieObj.refresh_token)
-                cookieObj.refresh_token = String(cgiBody.refresh_token);
-            const cookieStr = cookieToString(cookieObj);
+        if (session && session.code === 803) {
             return {
                 status: 200,
-                body: {
-                    code: 200,
-                    message: "登录成功",
-                    uin: cookieObj.uin || String(cgiBody.musicid || ""),
-                    musickey: cookieObj.qm_keyst || String(cgiBody.musickey || ""),
-                    cookieStr,
-                    data: cgiBody,
-                },
-                cookie: cookies,
+                body: { code: 803, message: session.message || "用户取消授权" },
             };
         }
+        // 3. 兜底轮询 CheckQRCode CGI 状态
+        try {
+            const cgiRes = await req("music.login.LoginServer", "CheckQRCode", {
+                qrcodeID,
+                tmeAppID: "qqmusic",
+            }, {
+                platform: "android",
+            });
+            const cgiBody = (cgiRes.body || {});
+            const code = cgiBody.code !== undefined ? cgiBody.code : cgiBody.ret;
+            if (code === 40001) {
+                return {
+                    status: 200,
+                    body: { code: 802, message: "已扫码，等待确认" },
+                };
+            }
+            if (code === 40002) {
+                return {
+                    status: 200,
+                    body: { code: 800, message: "二维码已过期，请刷新" },
+                };
+            }
+            if (code === 0) {
+                const cookies = cgiRes.cookie || [];
+                const cookieObj = parseSetCookie(cookies);
+                if (cgiBody.musicid && !cookieObj.uin)
+                    cookieObj.uin = String(cgiBody.musicid);
+                if (cgiBody.musickey && !cookieObj.qm_keyst)
+                    cookieObj.qm_keyst = String(cgiBody.musickey);
+                if (cgiBody.musickey && !cookieObj.qqmusic_key)
+                    cookieObj.qqmusic_key = String(cgiBody.musickey);
+                if (cgiBody.openid && !cookieObj.openid)
+                    cookieObj.openid = String(cgiBody.openid);
+                if (cgiBody.refresh_token && !cookieObj.refresh_token)
+                    cookieObj.refresh_token = String(cgiBody.refresh_token);
+                const cookieStr = cookieToString(cookieObj);
+                return {
+                    status: 200,
+                    body: {
+                        code: 200,
+                        message: "登录成功",
+                        uin: cookieObj.uin || String(cgiBody.musicid || ""),
+                        musickey: cookieObj.qm_keyst || String(cgiBody.musickey || ""),
+                        cookieStr,
+                        data: cgiBody,
+                    },
+                    cookie: cookies,
+                };
+            }
+        }
+        catch { }
         return {
             status: 200,
             body: {
-                code: 801,
-                message: cgiBody.msg || "等待扫码",
-                data: cgiBody,
+                code: session?.code || 801,
+                message: session?.message || "等待 QQ 音乐 App 扫码",
             },
         };
     }

package/module/login_qr_check.ts

@@ -1,6 +1,7 @@
 import { request, requestCgi, type ApiResponse } from "../util/request.js";
 import { getGtk, getGuid } from "../util/crypto.js";
 import { cookieToString, parseSetCookie } from "../util/cookie.js";
+import { getMobileSession, registerMobileSession } from "../util/mobile_qr_session.js";
 
 /**
  * 轮询检查二维码登录状态.
@@ -191,69 +192,111 @@ export default async function login_qr_check(
       };
     }
 
-    const cgiRes = await requestCgi(
-      "music.login.LoginServer",
-      "CheckQRCode",
-      {
-        qrcodeID,
-        tmeAppID: "qqmusic",
-      },
-      {
-        platform: "android",
-      }
-    );
-
-    const cgiBody = (cgiRes.body || {}) as any;
-    const code = cgiBody.code;
+    // 1. 确保后台 MQTT 会话已启动
+    let session = getMobileSession(qrcodeID);
+    if (!session) {
+      try {
+        registerMobileSession(qrcodeID);
+      } catch {}
+      session = getMobileSession(qrcodeID);
+    }
 
-    if (code === 40000) {
+    // 2. 优先检查实时会话事件
+    if (session && session.code === 200) {
       return {
         status: 200,
-        body: { code: 801, message: "等待 QQ 音乐 App 扫码" },
+        body: {
+          code: 200,
+          message: "登录成功",
+          uin: session.uin || "",
+          musickey: session.musickey || "",
+          nickname: session.nickname || "",
+          avatarUrl: session.avatarUrl || "",
+          cookieStr: session.cookieStr || "",
+        },
       };
     }
-    if (code === 40001) {
+
+    if (session && session.code === 802) {
       return {
         status: 200,
-        body: { code: 802, message: "已扫码，等待确认" },
+        body: { code: 802, message: session.message || "已扫码，等待确认" },
       };
     }
-    if (code === 40002) {
+
+    if (session && session.code === 800) {
       return {
         status: 200,
-        body: { code: 800, message: "二维码已过期，请刷新" },
+        body: { code: 800, message: session.message || "二维码已过期，请刷新" },
       };
     }
-    if (code === 0) {
-      const cookies = cgiRes.cookie || [];
-      const cookieObj = parseSetCookie(cookies);
-      if (cgiBody.musicid && !cookieObj.uin) cookieObj.uin = String(cgiBody.musicid);
-      if (cgiBody.musickey && !cookieObj.qm_keyst) cookieObj.qm_keyst = String(cgiBody.musickey);
-      if (cgiBody.musickey && !cookieObj.qqmusic_key) cookieObj.qqmusic_key = String(cgiBody.musickey);
-      if (cgiBody.openid && !cookieObj.openid) cookieObj.openid = String(cgiBody.openid);
-      if (cgiBody.refresh_token && !cookieObj.refresh_token) cookieObj.refresh_token = String(cgiBody.refresh_token);
-
-      const cookieStr = cookieToString(cookieObj);
+
+    if (session && session.code === 803) {
       return {
         status: 200,
-        body: {
-          code: 200,
-          message: "登录成功",
-          uin: cookieObj.uin || String(cgiBody.musicid || ""),
-          musickey: cookieObj.qm_keyst || String(cgiBody.musickey || ""),
-          cookieStr,
-          data: cgiBody,
-        },
-        cookie: cookies,
+        body: { code: 803, message: session.message || "用户取消授权" },
       };
     }
 
+    // 3. 兜底轮询 CheckQRCode CGI 状态
+    try {
+      const cgiRes = await req(
+        "music.login.LoginServer",
+        "CheckQRCode",
+        {
+          qrcodeID,
+          tmeAppID: "qqmusic",
+        },
+        {
+          platform: "android",
+        }
+      );
+
+      const cgiBody = (cgiRes.body || {}) as any;
+      const code = cgiBody.code !== undefined ? cgiBody.code : cgiBody.ret;
+
+      if (code === 40001) {
+        return {
+          status: 200,
+          body: { code: 802, message: "已扫码，等待确认" },
+        };
+      }
+      if (code === 40002) {
+        return {
+          status: 200,
+          body: { code: 800, message: "二维码已过期，请刷新" },
+        };
+      }
+      if (code === 0) {
+        const cookies = cgiRes.cookie || [];
+        const cookieObj = parseSetCookie(cookies);
+        if (cgiBody.musicid && !cookieObj.uin) cookieObj.uin = String(cgiBody.musicid);
+        if (cgiBody.musickey && !cookieObj.qm_keyst) cookieObj.qm_keyst = String(cgiBody.musickey);
+        if (cgiBody.musickey && !cookieObj.qqmusic_key) cookieObj.qqmusic_key = String(cgiBody.musickey);
+        if (cgiBody.openid && !cookieObj.openid) cookieObj.openid = String(cgiBody.openid);
+        if (cgiBody.refresh_token && !cookieObj.refresh_token) cookieObj.refresh_token = String(cgiBody.refresh_token);
+
+        const cookieStr = cookieToString(cookieObj);
+        return {
+          status: 200,
+          body: {
+            code: 200,
+            message: "登录成功",
+            uin: cookieObj.uin || String(cgiBody.musicid || ""),
+            musickey: cookieObj.qm_keyst || String(cgiBody.musickey || ""),
+            cookieStr,
+            data: cgiBody,
+          },
+          cookie: cookies,
+        };
+      }
+    } catch {}
+
     return {
       status: 200,
       body: {
-        code: 801,
-        message: cgiBody.msg || "等待扫码",
-        data: cgiBody,
+        code: session?.code || 801,
+        message: session?.message || "等待 QQ 音乐 App 扫码",
       },
     };
   }

package/module/login_qr_create.js

@@ -1,6 +1,7 @@
 import { request } from "../util/request.js";
 import { hash33 } from "../util/crypto.js";
 import { parseSetCookie } from "../util/cookie.js";
+import { registerMobileSession } from "../util/mobile_qr_session.js";
 /**
  * 获取登录二维码 (QQ / 微信 / 移动端App).
  *
@@ -78,13 +79,20 @@ export default async function login_qr_create(query = {}, req = request) {
     const cgiRes = await req("music.login.LoginServer", "CreateQRCode", {
         tmeAppID: "qqmusic",
     }, { platform: "android" });
+    const qrcodeID = cgiRes.body?.qrcodeID;
+    if (qrcodeID) {
+        try {
+            registerMobileSession(qrcodeID);
+        }
+        catch { }
+    }
     return {
         status: cgiRes.status,
         body: {
             code: 200,
             type: "mobile",
             qrcode: cgiRes.body?.qrcode,
-            qrcodeID: cgiRes.body?.qrcodeID,
+            qrcodeID,
         },
         cookie: cgiRes.cookie,
     };

package/module/login_qr_create.ts

@@ -1,6 +1,7 @@
 import { request, type ApiResponse } from "../util/request.js";
 import { hash33 } from "../util/crypto.js";
 import { parseSetCookie } from "../util/cookie.js";
+import { registerMobileSession } from "../util/mobile_qr_session.js";
 
 /**
  * 获取登录二维码 (QQ / 微信 / 移动端App).
@@ -99,13 +100,20 @@ export default async function login_qr_create(
     { platform: "android" }
   );
 
+  const qrcodeID = cgiRes.body?.qrcodeID;
+  if (qrcodeID) {
+    try {
+      registerMobileSession(qrcodeID);
+    } catch {}
+  }
+
   return {
     status: cgiRes.status,
     body: {
       code: 200,
       type: "mobile",
       qrcode: cgiRes.body?.qrcode,
-      qrcodeID: cgiRes.body?.qrcodeID,
+      qrcodeID,
     },
     cookie: cgiRes.cookie,
   };

package/module/login_refresh.js

@@ -11,10 +11,12 @@ export default async function login_refresh(query = {}, req = request) {
     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,
@@ -22,16 +24,28 @@ export default async function login_refresh(query = {}, req = request) {
     };
     const cgiRes = await req("music.login.LoginServer", "Login", param, {
         cookie: query.cookie,
-        platform: "web",
+        platform: "android",
+        comm: { tmeLoginType: Number(loginType) || 2 },
     });
     const resBody = (cgiRes.body || {});
     const newCookies = parseSetCookie(cgiRes.cookie || []);
     const mergedCookies = { ...cookieObj, ...newCookies };
-    if (resBody.musickey && !mergedCookies.qm_keyst) {
+    if (resBody.musickey) {
         mergedCookies.qm_keyst = resBody.musickey;
-    }
-    if (resBody.musickey && !mergedCookies.qqmusic_key) {
         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 {

package/module/login_refresh.ts

@@ -21,10 +21,13 @@ export default async function login_refresh(
   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,18 +40,31 @@ 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) {
+
+  if (resBody.musickey) {
     mergedCookies.qm_keyst = resBody.musickey;
-  }
-  if (resBody.musickey && !mergedCookies.qqmusic_key) {
     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);
 

package/module/login_status.js

@@ -9,14 +9,20 @@ import user_vip_info_fn from "./user_vip_info.js";
  */
 export default async function login_status(query = {}, req = request) {
     const cookieObj = cookieToJson(query.cookie);
-    let uin = cookieObj.uin || cookieObj.qqmusic_uin || cookieObj.wxuin || "";
-    const cgiRes = await req("music.UserInfo.userInfoServer", "GetLoginUserInfo", {}, {
-        cookie: query.cookie,
-        platform: "web",
-    });
+    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;
-    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();
     }
@@ -25,15 +31,18 @@ export default async function login_status(query = {}, req = request) {
     }
     let nickname = userData.nick || userData.nickname || "";
     let avatarUrl = 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 { }
     }
@@ -42,9 +51,9 @@ export default async function login_status(query = {}, req = request) {
     }
     // 补全 VIP 会员信息
     let vip = { 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 {
@@ -62,7 +71,7 @@ export default async function login_status(query = {}, req = request) {
         vipExpireTime: vip.vipExpireTime,
     };
     return {
-        status: cgiRes.status,
+        status: cgiRes.status || 200,
         body: {
             code: isLogin ? 200 : 301,
             isLogin,