qqmusic-api-enhanced 1.0.7 → 1.0.8

package/LICENSE

@@ -0,0 +1,26 @@
+MIT License
+
+Copyright (c) 2026 BakaGame
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+---
+
+Portions of this software are licensed under the Apache License, Version 2.0.
+See THIRD_PARTY_NOTICES.md and LICENSES/Apache-2.0.txt for details.

package/LICENSES/Apache-2.0.txt

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/README.md

@@ -150,6 +150,14 @@ import {
 
 ---
 
+## 许可证
+
+本项目自有代码以 MIT 许可发布。`util/des.ts` 的 QRC 解密实现移植自
+[lx-music-desktop](https://github.com/lyswhut/lx-music-desktop)（Apache-2.0），
+详见 `THIRD_PARTY_NOTICES.md` 与 `LICENSES/Apache-2.0.txt`。
+
+---
+
 ## 协议与免责声明
 
 本项目仅供个人学习、技术研究与教育用途。所有接口数据与媒体资源版权归腾讯公司所有。请勿将本项目用于任何商业用途或违反相关法律法规的场景。

package/THIRD_PARTY_NOTICES.md

@@ -0,0 +1,16 @@
+# Third-Party Notices
+
+This package includes the following third-party source code.
+
+## lx-music-desktop `qrcDecode.js`
+
+- File: `util/des.ts`
+- Source: https://github.com/lyswhut/lx-music-desktop/blob/master/src/renderer/utils/musicSdk/tx/qrcDecode.js
+- Copyright: Copyright (c) lyswhut and lx-music-desktop contributors
+- License: Apache License, Version 2.0
+
+`util/des.ts` is a TypeScript port of the QRC 3DES decryption routine from
+lx-music-desktop. The algorithm is a QQ Music-specific DES variant (the S-box
+values differ from standard DES), so it is kept as-is.
+
+The full Apache-2.0 license text is in `LICENSES/Apache-2.0.txt`.

package/module/login_qr_check.js

@@ -1,7 +1,6 @@
 import { request, requestCgi } from "../util/request.js";
 import { getGtk, getStableGuid } from "../util/crypto.js";
-import { cookieToJson, cookieToString, mergeLoginPayloadCookies, parseSetCookie, } from "../util/cookie.js";
-import { getMobileSession, registerMobileSession } from "../util/mobile_qr_session.js";
+import { cookieToString, mergeLoginPayloadCookies, parseSetCookie, } from "../util/cookie.js";
 /**
  * 轮询检查二维码登录状态.
  *
@@ -156,52 +155,8 @@ export default async function login_qr_check(query = {}, req = request) {
             };
         }
         const guid = query.guid || getStableGuid(qrcodeID);
-        // 1. 确保后台 MQTT 会话已启动
-        let session = getMobileSession(qrcodeID);
-        if (!session) {
-            try {
-                registerMobileSession(qrcodeID);
-            }
-            catch { }
-            session = getMobileSession(qrcodeID);
-        }
-        // 2. 优先检查实时会话事件
-        if (session && session.code === 200) {
-            const cookieObj = cookieToJson(session.cookieStr);
-            cookieObj.guid = cookieObj.guid || guid;
-            return {
-                status: 200,
-                body: {
-                    code: 200,
-                    message: "登录成功",
-                    uin: session.uin || "",
-                    musickey: session.musickey || "",
-                    nickname: session.nickname || "",
-                    avatarUrl: session.avatarUrl || "",
-                    guid,
-                    cookieStr: cookieToString(cookieObj),
-                },
-            };
-        }
-        if (session && session.code === 802) {
-            return {
-                status: 200,
-                body: { code: 802, message: session.message || "已扫码，等待确认" },
-            };
-        }
-        if (session && session.code === 800) {
-            return {
-                status: 200,
-                body: { code: 800, message: session.message || "二维码已过期，请刷新" },
-            };
-        }
-        if (session && session.code === 803) {
-            return {
-                status: 200,
-                body: { code: 803, message: session.message || "用户取消授权" },
-            };
-        }
-        // 3. 兜底轮询 CheckQRCode CGI 状态
+        // 移动端扫码统一走 CheckQRCode 轮询。早期版本额外开了 MQTT/WS 实时会话，
+        // 但那会把整个 mqtt/ws 依赖树带进包里；CGI 轮询已覆盖同一流程。
         try {
             const cgiRes = await req("music.login.LoginServer", "CheckQRCode", {
                 qrcodeID,
@@ -249,10 +204,7 @@ export default async function login_qr_check(query = {}, req = request) {
         catch { }
         return {
             status: 200,
-            body: {
-                code: session?.code || 801,
-                message: session?.message || "等待 QQ 音乐 App 扫码",
-            },
+            body: { code: 801, message: "等待 QQ 音乐 App 扫码" },
         };
     }
     // 微信扫码轮询

package/module/login_qr_check.ts

@@ -1,12 +1,10 @@
 import { request, requestCgi, type ApiResponse } from "../util/request.js";
 import { getGtk, getStableGuid } from "../util/crypto.js";
 import {
-  cookieToJson,
   cookieToString,
   mergeLoginPayloadCookies,
   parseSetCookie,
 } from "../util/cookie.js";
-import { getMobileSession, registerMobileSession } from "../util/mobile_qr_session.js";
 
 /**
  * 轮询检查二维码登录状态.
@@ -206,56 +204,8 @@ export default async function login_qr_check(
     }
     const guid = query.guid || getStableGuid(qrcodeID);
 
-    // 1. 确保后台 MQTT 会话已启动
-    let session = getMobileSession(qrcodeID);
-    if (!session) {
-      try {
-        registerMobileSession(qrcodeID);
-      } catch {}
-      session = getMobileSession(qrcodeID);
-    }
-
-    // 2. 优先检查实时会话事件
-    if (session && session.code === 200) {
-      const cookieObj = cookieToJson(session.cookieStr);
-      cookieObj.guid = cookieObj.guid || guid;
-      return {
-        status: 200,
-        body: {
-          code: 200,
-          message: "登录成功",
-          uin: session.uin || "",
-          musickey: session.musickey || "",
-          nickname: session.nickname || "",
-          avatarUrl: session.avatarUrl || "",
-          guid,
-          cookieStr: cookieToString(cookieObj),
-        },
-      };
-    }
-
-    if (session && session.code === 802) {
-      return {
-        status: 200,
-        body: { code: 802, message: session.message || "已扫码，等待确认" },
-      };
-    }
-
-    if (session && session.code === 800) {
-      return {
-        status: 200,
-        body: { code: 800, message: session.message || "二维码已过期，请刷新" },
-      };
-    }
-
-    if (session && session.code === 803) {
-      return {
-        status: 200,
-        body: { code: 803, message: session.message || "用户取消授权" },
-      };
-    }
-
-    // 3. 兜底轮询 CheckQRCode CGI 状态
+    // 移动端扫码统一走 CheckQRCode 轮询。早期版本额外开了 MQTT/WS 实时会话，
+    // 但那会把整个 mqtt/ws 依赖树带进包里；CGI 轮询已覆盖同一流程。
     try {
       const cgiRes = await req(
         "music.login.LoginServer",
@@ -311,10 +261,7 @@ export default async function login_qr_check(
 
     return {
       status: 200,
-      body: {
-        code: session?.code || 801,
-        message: session?.message || "等待 QQ 音乐 App 扫码",
-      },
+      body: { code: 801, message: "等待 QQ 音乐 App 扫码" },
     };
   }
 

package/module/login_qr_create.js

@@ -1,7 +1,6 @@
 import { request } from "../util/request.js";
 import { getStableGuid, hash33 } from "../util/crypto.js";
 import { parseSetCookie } from "../util/cookie.js";
-import { registerMobileSession } from "../util/mobile_qr_session.js";
 /**
  * 获取登录二维码 (QQ / 微信 / 移动端App).
  *
@@ -85,12 +84,6 @@ export default async function login_qr_create(query = {}, req = request) {
         tmeAppID: "qqmusic",
     }, { platform: "android" });
     const qrcodeID = cgiRes.body?.qrcodeID;
-    if (qrcodeID) {
-        try {
-            registerMobileSession(qrcodeID);
-        }
-        catch { }
-    }
     const guid = query.guid || (qrcodeID ? getStableGuid(qrcodeID) : "");
     return {
         status: cgiRes.status,

package/module/login_qr_create.ts

@@ -1,7 +1,6 @@
 import { request, type ApiResponse } from "../util/request.js";
 import { getStableGuid, hash33 } from "../util/crypto.js";
 import { parseSetCookie } from "../util/cookie.js";
-import { registerMobileSession } from "../util/mobile_qr_session.js";
 
 /**
  * 获取登录二维码 (QQ / 微信 / 移动端App).
@@ -106,11 +105,6 @@ export default async function login_qr_create(
   );
 
   const qrcodeID = cgiRes.body?.qrcodeID;
-  if (qrcodeID) {
-    try {
-      registerMobileSession(qrcodeID);
-    } catch {}
-  }
   const guid = query.guid || (qrcodeID ? getStableGuid(qrcodeID) : "");
 
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qqmusic-api-enhanced",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "QQ音乐增强版API，支持扫码登录/凭证刷新/直链提取/歌词解密/歌单歌手检索 || QQ Music Enhanced API for Node.js & Bun",
   "type": "module",
   "main": "main.js",
@@ -17,7 +17,7 @@
     "music"
   ],
   "author": "BakaGame",
-  "license": "MIT",
+  "license": "MIT AND Apache-2.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Cosmosuperbaka/qqmusic-api-enhanced.git"
@@ -32,16 +32,14 @@
     "main.js",
     "main.ts",
     "interface.d.ts",
-    "README.md"
+    "README.md",
+    "LICENSE",
+    "THIRD_PARTY_NOTICES.md",
+    "LICENSES"
   ],
   "devDependencies": {
     "@types/node": "^22.13.0",
-    "@types/ws": "^8.18.2",
     "bun-types": "^1.4.3",
     "typescript": "^5.7.3"
-  },
-  "dependencies": {
-    "mqtt": "^5.16.0",
-    "ws": "^8.22.0"
   }
 }

package/util/crypto.js

@@ -1,5 +1,5 @@
 import { createHash } from "node:crypto";
-import { inflateSync } from "node:zlib";
+import { constants, inflateSync } from "node:zlib";
 import { DECRYPT, tripleDesCrypt, tripleDesKeySetup } from "./des.js";
 const QRC_3DES_KEY = Buffer.from("!@#)(*$%123ZXC!@!@#)(NHL");
 /**
@@ -94,7 +94,9 @@ export function qrcDecrypt(encryptedQrc) {
             chunks.push(Buffer.from(decryptedBlock));
         }
         const merged = Buffer.concat(chunks);
-        const decompressed = inflateSync(merged);
+        // 真实 QRC 偶有尾部不完整的 zlib 流；Z_SYNC_FLUSH 容忍这种情况，
+        // 与上游 lx-music 实现保持一致。
+        const decompressed = inflateSync(merged, { finishFlush: constants.Z_SYNC_FLUSH });
         return decompressed.toString("utf8");
     }
     catch {

package/util/crypto.ts

@@ -1,5 +1,5 @@
 import { createHash } from "node:crypto";
-import { inflateSync } from "node:zlib";
+import { constants, inflateSync } from "node:zlib";
 import { DECRYPT, tripleDesCrypt, tripleDesKeySetup } from "./des.js";
 
 const QRC_3DES_KEY = Buffer.from("!@#)(*$%123ZXC!@!@#)(NHL");
@@ -100,7 +100,9 @@ export function qrcDecrypt(encryptedQrc: string | Uint8Array): string | null {
       chunks.push(Buffer.from(decryptedBlock));
     }
     const merged = Buffer.concat(chunks);
-    const decompressed = inflateSync(merged);
+    // 真实 QRC 偶有尾部不完整的 zlib 流；Z_SYNC_FLUSH 容忍这种情况，
+    // 与上游 lx-music 实现保持一致。
+    const decompressed = inflateSync(merged, { finishFlush: constants.Z_SYNC_FLUSH });
     return decompressed.toString("utf8");
   } catch {
     return null;

package/util/des.d.ts

@@ -1,6 +1,6 @@
 export declare const ENCRYPT = 1;
 export declare const DECRYPT = 0;
-export declare function desCrypt(inputData: Uint8Array, key: number[][]): Uint8Array;
-export declare function keySchedule(key: Uint8Array, mode: number): number[][];
-export declare function tripleDesKeySetup(key: Uint8Array, mode: number): number[][][];
-export declare function tripleDesCrypt(data: Uint8Array, key: number[][][]): Uint8Array;
+export declare function desCrypt(input: Uint8Array, schedule: Uint8Array[]): Uint8Array;
+export declare function keySchedule(key: Uint8Array, mode: number): Uint8Array[];
+export declare function tripleDesKeySetup(key: Uint8Array, mode: number): Uint8Array[][];
+export declare function tripleDesCrypt(data: Uint8Array, schedules: Uint8Array[][]): Uint8Array;