Merge branch 'master' of https://github.com/qier222/YesPlayMusic

src/electron/ipcMain.js

@@ -1,5 +1,5 @@
 import { app, ipcMain } from "electron";
-import match from "@nondanee/unblockneteasemusic";
+import match from "@njzy/unblockneteasemusic";
 
 export function initIpcMain(win) {
   // Make vuex copy for electron.
@@ -9,10 +9,27 @@ export function initIpcMain(win) {
     global.vuexCopy = state;
   });
 
-  ipcMain.on("unblock-music", (event, id) => {
-    match(id, ["qq", "kuwo", "migu"]).then((res) => {
-      event.returnValue = res;
+  ipcMain.on("unblock-music", (event, track) => {
+    // 兼容 unblockneteasemusic 所使用的 api 字段
+    track.alias = track.alia || [];
+    track.duration = track.dt || 0;
+    track.album = track.al || [];
+    track.artists = track.ar || [];
+
+    const matchPromise = match(track.id, ["qq", "kuwo", "migu"], track);
+    const timeoutPromise = new Promise((_, reject) => {
+      setTimeout(() => {
+        reject("timeout");
+      }, 3000);
     });
+    Promise.race([matchPromise, timeoutPromise])
+      .then((res) => {
+        event.returnValue = res;
+      })
+      .catch((err) => {
+        console.log("unblock music error: ", err);
+        event.returnValue = null;
+      });
   });
 
   ipcMain.on("close", () => {

src/store/actions.js

@@ -43,7 +43,7 @@ export default {
       if (track.playable === false) {
         let res = undefined;
         if (process.env.IS_ELECTRON === true) {
-          res = ipcRenderer.sendSync("unblock-music", track.id);
+          res = ipcRenderer.sendSync("unblock-music", track);
         }
         if (res?.url) {
           commitMP3(res.url);