Merge branch 'UnblockNeteaseMusic:enhanced' into enhanced

UnblockNeteaseMusic · Sep 9, 2023 · a012240 · a012240
2 parents 5e0e488 + 959d927
commit a012240
Show file tree

Hide file tree

Showing 17 changed files with 730 additions and 710 deletions.
diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml
@@ -35,7 +35,7 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
             - name: Use Node.js 18
               uses: actions/setup-node@v3

diff --git a/.github/workflows/build-precompiled.yml b/.github/workflows/build-precompiled.yml
@@ -21,7 +21,7 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             - name: Cleanup precompiled
               run: rm -rf precompiled/*

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -50,7 +50,7 @@ jobs:
 
         steps:
             - name: Checkout repository
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             # Initializes the CodeQL tools for scanning.
             - name: Initialize CodeQL

diff --git a/.github/workflows/jest.yml b/.github/workflows/jest.yml
@@ -32,7 +32,7 @@ jobs:
         steps:
             # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
             - name: Checkout
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             - name: Use Node.js 18
               uses: actions/setup-node@v3

diff --git a/.github/workflows/prettier.yml b/.github/workflows/prettier.yml
@@ -17,7 +17,7 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             - name: Use Node.js 18
               uses: actions/setup-node@v3

diff --git a/.github/workflows/publish-packages.yml b/.github/workflows/publish-packages.yml
@@ -14,7 +14,7 @@ jobs:
         steps:
             # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
             - name: Checkout
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
               # Setup .npmrc file to publish to npm
             - uses: actions/setup-node@v3
@@ -35,7 +35,7 @@ jobs:
         steps:
             # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
             - name: Checkout
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
               # Setup .npmrc file to publish to npm
             - uses: actions/setup-node@v3

diff --git a/.github/workflows/push-docker.yml b/.github/workflows/push-docker.yml
@@ -29,7 +29,7 @@ jobs:
         steps:
             # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
             - name: Checkout
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             - name: Get the current tag name
               uses: olegtarasov/[email protected]

diff --git a/.yarn/releases/yarn-3.6.1.cjs → .yarn/releases/yarn-3.6.3.cjs b/.yarn/releases/yarn-3.6.1.cjs → .yarn/releases/yarn-3.6.3.cjs
diff --git a/.yarn/sdks/prettier/package.json b/.yarn/sdks/prettier/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prettier",
-  "version": "3.0.1-sdk",
+  "version": "3.0.3-sdk",
   "main": "./index.js",
   "type": "commonjs"
 }
diff --git a/.yarn/sdks/typescript/package.json b/.yarn/sdks/typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "typescript",
-  "version": "5.1.6-sdk",
+  "version": "5.2.2-sdk",
   "main": "./lib/typescript.js",
   "type": "commonjs"
 }
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -8,4 +8,4 @@ plugins:
     - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
       spec: '@yarnpkg/plugin-interactive-tools'
 
-yarnPath: .yarn/releases/yarn-3.6.1.cjs
+yarnPath: .yarn/releases/yarn-3.6.3.cjs
diff --git a/README.md b/README.md
@@ -165,18 +165,18 @@ optional arguments:
 node app.js -o bilibili ytdlp
 ```
 
-| 名称                        | 代号         | 默认启用 | 注意事项                                                                       |
-| --------------------------- | ------------ | -------- | ------------------------------------------------------------------------------ |
-| QQ 音乐                     | `qq`         |          | 需要准备自己的 `QQ_COOKIE`（请参阅下方〈环境变量〉处）。必须使用 QQ 登录。     |
-| 酷狗音乐                    | `kugou`      | ✅       |                                                                                |
-| 酷我音乐                    | `kuwo`       | ✅       | 需要准备自己的 `KUWO_COOKIE`（请参阅下方〈环境变量〉处）。                     |
-| 咪咕音乐                    | `migu`       | ✅       | 需要准备自己的 `MIGU_COOKIE`（请参阅下方〈环境变量〉处）。                     |
-| JOOX                        | `joox`       |          | 需要准备自己的 `JOOX_COOKIE`（请参阅下方〈环境变量〉处）。似乎有严格地区限制。 |
-| YouTube（纯 JS 解析方式）   | `youtube`    |          | 需要 Google 认定的**非中国大陆区域** IP 地址。                                 |
-| YouTube（通过 `youtube-dl`) | `youtubedl`  |          | 需要自行安装 `youtube-dl`。                                                    |
-| YouTube（通过 `yt-dlp`)     | `ytdlp`      | ✅       | 需要自行安装 `yt-dlp`（`youtube-dl` 仍在活跃维护的 fork）。                    |
-| B 站音乐                    | `bilibili`   | ✅       |                                                                                |
-| 第三方网易云 API            | `pyncmd`     |          |                                                                                |
+| 名称                        | 代号        | 默认启用 | 注意事项                                                                       |
+| --------------------------- | ----------- | -------- | ------------------------------------------------------------------------------ |
+| QQ 音乐                     | `qq`        |          | 需要准备自己的 `QQ_COOKIE`（请参阅下方〈环境变量〉处）。必须使用 QQ 登录。     |
+| 酷狗音乐                    | `kugou`     | ✅       |                                                                                |
+| 酷我音乐                    | `kuwo`      | ✅       |                                                                                |
+| 咪咕音乐                    | `migu`      | ✅       | 需要准备自己的 `MIGU_COOKIE`（请参阅下方〈环境变量〉处）。                     |
+| JOOX                        | `joox`      |          | 需要准备自己的 `JOOX_COOKIE`（请参阅下方〈环境变量〉处）。似乎有严格地区限制。 |
+| YouTube（纯 JS 解析方式）   | `youtube`   |          | 需要 Google 认定的**非中国大陆区域** IP 地址。                                 |
+| YouTube（通过 `youtube-dl`) | `youtubedl` |          | 需要自行安装 `youtube-dl`。                                                    |
+| YouTube（通过 `yt-dlp`)     | `ytdlp`     | ✅       | 需要自行安装 `yt-dlp`（`youtube-dl` 仍在活跃维护的 fork）。                    |
+| B 站音乐                    | `bilibili`  | ✅       |                                                                                |
+| 第三方网易云 API            | `pyncmd`    |          |                                                                                |
 
 ### 环境变量
 
@@ -197,7 +197,6 @@ node app.js -o bilibili ytdlp
 | LOG_LEVEL             | str  | 日志输出等级。请见〈日志等级〉部分。                                                                    | `LOG_LEVEL=debug`                                                |
 | LOG_FILE              | str  | 从 Pino 端设置日志输出的文件位置。也可以用 `*sh` 的输出重导向功能 (`node app.js >> app.log`) 代替       | `LOG_FILE=app.log`                                               |
 | JOOX_COOKIE           | str  | JOOX 音源的 wmid 和 session_key cookie                                                                  | `JOOX_COOKIE="wmid=<your_wmid>; session_key=<your_session_key>"` |
-| KUWO_COOKIE           | str  | 酷我音源的 CSRF Token                                                                                   | `KUWO_COOKIE=Hm_<encpwd>=<token>; Secret=<secret>`               |
 | MIGU_COOKIE           | str  | 咪咕音源的 aversionid cookie                                                                            | `MIGU_COOKIE="<your_aversionid>"`                                |
 | QQ_COOKIE             | str  | QQ 音源的 uin 和 qm_keyst cookie                                                                        | `QQ_COOKIE="uin=<your_uin>; qm_keyst=<your_qm_keyst>"`           |
 | YOUTUBE_KEY           | str  | Youtube 音源的 Data API v3 Key                                                                          | `YOUTUBE_KEY="<your_data_api_key>"`                              |

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@unblockneteasemusic/server",
-	"version": "0.27.3",
+	"version": "0.27.4",
 	"description": "Revive unavailable songs for Netease Cloud Music",
 	"main": "src/provider/match.js",
 	"bin": {
@@ -41,19 +41,19 @@
 		"pino-pretty": "^7.6.1"
 	},
 	"devDependencies": {
-		"@swc/core": "^1.3.76",
-		"@types/node": "^20.5.0",
+		"@swc/core": "^1.3.83",
+		"@types/node": "^20.5.9",
 		"@types/pino": "6.3.12",
-		"@yarnpkg/sdks": "^3.0.0-rc.48",
+		"@yarnpkg/sdks": "^3.0.0-rc.50",
 		"browserslist": "^4.21.10",
-		"core-js": "^3.32.0",
+		"core-js": "^3.32.1",
 		"cross-env": "^7.0.3",
-		"jest": "^29.6.2",
+		"jest": "^29.6.4",
 		"pkg": "^5.8.1",
-		"prettier": "^3.0.1",
+		"prettier": "^3.0.3",
 		"swc-loader": "^0.2.3",
 		"terser-webpack-plugin": "^5.3.9",
-		"typescript": "^5.1.6",
+		"typescript": "^5.2.2",
 		"webpack": "^5.88.2",
 		"webpack-cli": "^5.1.4"
 	},
@@ -66,5 +66,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"packageManager": "[email protected].1"
+	"packageManager": "[email protected].3"
 }
diff --git a/precompiled/app.js b/precompiled/app.js
diff --git a/precompiled/bridge.js b/precompiled/bridge.js
diff --git a/src/dotenv.js b/src/dotenv.js
@@ -24,7 +24,7 @@ async function parseDotenv(filePath) {
 	for await (const line of rl) {
 		if (line.startsWith('#')) continue;
 
-		const [key, value] = line.split('=', 2);
+		const [key, value] = line.split(/=(.+)/, 2);
 		env[key.trimEnd()] = value.trimStart();
 	}