merge: Update codebase (#261)

UnblockNeteaseMusic · Nov 17, 2022 · 178a290 · 178a290
2 parents c4fa1a7 + b7dcb4c
commit 178a290
Show file tree

Hide file tree

Showing 29 changed files with 239 additions and 180 deletions.
diff --git a/.github/workflows/napi-build.yml b/.github/workflows/napi-build.yml
@@ -205,7 +205,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: Build
         id: build
-        uses: vmactions/freebsd-vm@v0.2.9
+        uses: vmactions/freebsd-vm@v0.3.0
         env:
           DEBUG: napi:*
           RUSTUP_HOME: /usr/local/rustup

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/README.md b/README.md
@@ -104,12 +104,14 @@ N-API 和 RESTful API 支援的引擎（以下簡稱「預設引擎集」）與
 | Bilbili Music    | `bilibili` |                                                                 | ✅         |
 | 酷狗音乐         | `kugou`    |                                                                 | ✅         |
 | 酷我音乐         | `kuwo`     | 目前僅支援 320kbps MP3                                          | ✅         |
-| 咪咕音乐         | `migu`     |                                                                 | ✅         |
+| 咪咕音乐         | `migu`     |                                                                 |            |
 | JOOX             | `joox`     | 需要設定 `joox:cookie`，見引擎文件。                            | ✅         |
 | YtDl             | `ytdl`     | 預設使用的 `youtube-dl` 後端是 `yt-dlp`，可設定 `ytdl:exe` 調整 | ✅         |
 | 第三方網易雲 API | `pyncm`    |                                                                 | ✅         |
 | QQ音乐          | `qq`       | 需要設定 `qq:cookie`，見引擎文件。                              | ✅         |
 
+- `migu` 的 API 壞掉了。等到有更好的 API 會再更新。
+
 #### 引擎文件
 
 - JOOX 引擎：<https://docs.rs/unm_engine_joox>

diff --git a/api-utils/Cargo.toml b/api-utils/Cargo.toml
@@ -16,7 +16,6 @@ unm_engine_bilibili = { version = "0.3.0", path = "../engines/bilibili" }
 unm_engine_joox = { version = "0.3.0", path = "../engines/joox" }
 unm_engine_kugou = { version = "0.3.0", path = "../engines/kugou" }
 unm_engine_kuwo = { version = "0.3.0", path = "../engines/kuwo" }
-unm_engine_migu = { version = "0.3.0", path = "../engines/migu" }
 unm_engine_pyncm = { version = "0.3.0", path = "../engines/pyncm" }
 unm_engine_qq = { version = "0.3.0", path = "../engines/qq" }
 unm_engine_ytdl = { version = "0.3.0", path = "../engines/ytdl" }
diff --git a/api-utils/src/executor.rs b/api-utils/src/executor.rs
@@ -10,7 +10,7 @@ use unm_engine::executor::Executor;
 
 /// Build an [`Executor`] with all the official engines registered.
 ///
-/// Currently, it includes `bilibili`, `kugou`, `migu`, `pyncm`,
+/// Currently, it includes `bilibili`, `kugou`, `pyncm`,
 /// `ytdl`, `kuwo`, and `joox`.
 ///
 /// # Example
@@ -36,7 +36,6 @@ pub fn build_full_executor() -> Executor {
 
     push_engine!(bilibili: BilibiliEngine);
     push_engine!(kugou: KugouEngine);
-    push_engine!(migu: MiguEngine);
     push_engine!(pyncm: PyNCMEngine);
     push_engine!(ytdl: YtDlEngine);
     push_engine!(kuwo: KuwoEngine);

diff --git a/crypto/Cargo.toml b/crypto/Cargo.toml
@@ -18,7 +18,7 @@ md5 = "0.7.0"
 once_cell = "1.16.0"
 openssl = { version = "0.10.42", features = ["vendored"] }
 
-regex = "1.6.0"
+regex = "1.7.0"
 
 serde = { version = "1.0.147", features = ["derive"] }
 serde_json = "1.0.87"

diff --git a/crypto/src/base64.rs b/crypto/src/base64.rs
@@ -8,5 +8,5 @@ pub fn encode_crypto_base64(src: &[u8]) -> String {
 
 pub fn decode_crypto_base64(src: &str) -> CryptoResult<Vec<u8>> {
     let src = src.replace('+', "-").replace('/', "_");
-    Ok(decode(&src)?)
+    Ok(decode(src)?)
 }
diff --git a/crypto/src/weapi.rs b/crypto/src/weapi.rs
@@ -134,7 +134,7 @@ mod tests {
         let encrypted_bytes = encrypt_with_weapi_rsa(b"a1b2c3d4", &mut buf).unwrap();
         assert_eq!(encrypted_bytes, 128);
 
-        let encrypted_base64 = base64::encode(&buf);
+        let encrypted_base64 = base64::encode(buf);
         assert_eq!(
             encrypted_base64,
             r#"nknIprgQgDE2Ana3dka2qYhwE4ch/My68kTk0pGZmtkeWCTslpn9Co32as7sd5fyitf5lyXwMff/g/kDzaz6IVA/tMAtbbzkgWPDMivRy5b8z1Ypd7UV7r6aM6OgNT1bFjPo4jEAkmUl6UxCBAsrsMaaYqmW6rZl0BdJdb0/Tq0="#

diff --git a/engine-demo/Cargo.toml b/engine-demo/Cargo.toml
@@ -11,7 +11,7 @@ publish = false
 
 [dependencies]
 futures = "0.3.25"
-mimalloc = "0.1.30"
+mimalloc = "0.1.32"
 tokio = { version = "1.21.2", features = ["macros", "rt-multi-thread"] }
 unm_api_utils = { version = "0.3.0", path = "../api-utils" }
 unm_test_utils = { version = "0.1.0", path = "../test-utils" }

diff --git a/engines/joox/Cargo.toml b/engines/joox/Cargo.toml
@@ -15,8 +15,8 @@ base64 = "0.13.1"
 http = "0.2.8"
 log = "0.4.17"
 once_cell = "1.16.0"
-regex = "1.6.0"
-reqwest = { version = "0.11.12", features = ["native-tls-vendored"] }
+regex = "1.7.0"
+reqwest = { version = "0.11.13", features = ["native-tls-vendored"] }
 serde_json = "1.0.87"
 unm_engine = { version = "0.3.0", path = "../../engine-base" }
 unm_request = { version = "0.3.0", path = "../../request" }

diff --git a/engines/kugou/Cargo.toml b/engines/kugou/Cargo.toml
@@ -15,7 +15,7 @@ concat-string = "1.0.1"
 futures = "0.3.25"
 http = "0.2.8"
 log = "0.4.17"
-reqwest = { version = "0.11.12", features = ["native-tls-vendored"] }
+reqwest = { version = "0.11.13", features = ["native-tls-vendored"] }
 serde = { version = "1.0.147", features = ["derive"] }
 serde_json = "1.0.87"
 unm_engine = { version = "0.3.0", path = "../../engine-base" }

diff --git a/engines/kuwo/Cargo.toml b/engines/kuwo/Cargo.toml
@@ -16,7 +16,7 @@ concat-string = "1.0.1"
 http = "0.2.8"
 log = "0.4.17"
 random-string = "1.0.0"
-reqwest = { version = "0.11.12", features = ["native-tls-vendored"] }
+reqwest = { version = "0.11.13", features = ["native-tls-vendored"] }
 serde = { version = "1.0.147", features = ["derive"] }
 unm_engine = { version = "0.3.0", path = "../../engine-base" }
 unm_request = { version = "0.3.0", path = "../../request" }

diff --git a/engines/migu/Cargo.toml b/engines/migu/Cargo.toml
@@ -22,6 +22,6 @@ unm_types = { version = "0.3.0", path = "../../types" }
 url = "2.3.1"
 
 [dev-dependencies]
-reqwest = { version = "0.11.12", features = ["native-tls-vendored"] }
+reqwest = { version = "0.11.13", features = ["native-tls-vendored"] }
 tokio = { version = "1.21.2", features = ["macros", "rt-multi-thread"] }
 unm_test_utils = { path = "../../test-utils" }
diff --git a/engines/pyncm/Cargo.toml b/engines/pyncm/Cargo.toml
@@ -18,3 +18,7 @@ unm_engine = { version = "0.3.0", path = "../../engine-base" }
 unm_request = { version = "0.3.0", path = "../../request" }
 unm_types = { version = "0.3.0", path = "../../types" }
 url = "2.3.1"
+
+[dev-dependencies]
+tokio = { version = "1.21.2", features = ["macros", "rt-multi-thread"] }
+unm_test_utils = { path = "../../test-utils" }