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

src/background.js

@@ -17,6 +17,10 @@ const isDevelopment = process.env.NODE_ENV !== "production";
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
 let win;
+// eslint-disable-next-line no-unused-vars
+let tray;
+
+let willQuitApp = false;
 
 // ipcMain
 initIpcMain(win);
@@ -39,7 +43,7 @@ function createWindow() {
   win.setMenuBarVisibility(false);
 
   if (process.platform !== "darwin") {
-    createTray(win);
+    tray = createTray(win);
   }
 
   if (process.env.WEBPACK_DEV_SERVER_URL) {
@@ -60,9 +64,19 @@ function createWindow() {
     e.preventDefault();
     shell.openExternal(url);
   });
-  win.on("closed", () => {
+  win.on("close", (e) => {
+    if (willQuitApp) {
+      /* the user tried to quit the app */
       win = null;
+    } else {
+      /* the user only tried to close the window */
+      e.preventDefault();
+      win.hide();
+    }
   });
+  // win.on("closed", () => {
+  //   win = null;
+  // });
   return win;
 }
 
@@ -71,7 +85,7 @@ app.on("window-all-closed", () => {
   // On macOS it is common for applications and their menu bar
   // to stay active until the user quits explicitly with Cmd + Q
   if (process.platform !== "darwin") {
-    app.quit();
+    // app.quit();
   }
 });
 
@@ -80,9 +94,16 @@ app.on("activate", () => {
   // dock icon is clicked and there are no other windows open.
   if (win === null) {
     createWindow();
+  } else {
+    win.show();
   }
 });
 
+/**
+ * 'before-quit' is emitted when Electron receives the signal to exit and wants to start closing windows
+ */
+app.on("before-quit", () => (willQuitApp = true));
+
 // This method will be called when Electron has finished
 // initialization and is ready to create browser windows.
 // Some APIs can only be used after this event occurs.

src/electron/ipcMain.js

@@ -33,8 +33,9 @@ export function initIpcMain(win) {
   });
 
   ipcMain.on("close", () => {
-    win.close();
+    win.hide();
-    app.quit();
+    // win.close();
+    // app.quit();
   });
 
   ipcMain.on("minimize", () => {

src/electron/menu.js

@@ -128,6 +128,7 @@ export function createMenu(win) {
     {
       label: "Window",
       submenu: [
+        { role: "close" },
         { role: "minimize" },
         { role: "zoom" },
         { role: "reload" },

src/electron/tray.js

@@ -1,5 +1,6 @@
+/* global __static */
 import path from "path";
-import { nativeImage, Tray } from "electron";
+import { app, nativeImage, Tray, Menu } from "electron";
 
 export function createTray(win) {
   let icon = nativeImage
@@ -17,5 +18,18 @@ export function createTray(win) {
       win.show();
     }
   });
+
+  tray.on("right-click", () => {
+    const contextMenu = Menu.buildFromTemplate([
+      {
+        label: "Quit",
+        click: () => {
+          app.exit();
+        },
+      },
+    ]);
+    tray.popUpContextMenu(contextMenu);
+  });
+
   return tray;
 }

src/store/actions.js

@@ -1,5 +1,5 @@
 import { updateMediaSessionMetaData } from "@/utils/mediaSession";
-import { getTrackDetail, scrobble, getMP3 } from "@/api/track";
+import { getTrackDetail, scrobble, getMP3 as getMP3Api } from "@/api/track";
 import { isAccountLoggedIn } from "@/utils/auth";
 import { updateHttps } from "@/utils/common";
 import localforage from "localforage";
@@ -40,18 +40,19 @@ export default {
       updateMediaSessionMetaData(track);
       document.title = `${track.name} · ${track.ar[0].name} - YesPlayMusic`;
 
+      let unblockSongUrl = null;
       if (track.playable === false) {
         let res = undefined;
         if (process.env.IS_ELECTRON === true) {
           res = ipcRenderer.sendSync("unblock-music", track);
         }
         if (res?.url) {
-          commitMP3(res.url);
+          unblockSongUrl = res.url;
         } else {
           dispatch("nextTrack");
-        }
           return;
         }
+      }
 
       function commitMP3(mp3) {
         commit("replaceMP3", { mp3, autoplay });
@@ -59,31 +60,56 @@ export default {
           dispatch("nextTrack");
         });
       }
+
+      function getMP3(id) {
+        return getMP3Api(id).then((data) => {
+          // 未知情况下会没有返回数据导致报错，增加防范逻辑
+          if (data.data[0]) {
+            const url = updateHttps(data.data[0].url);
+            commitMP3(url);
+            return url;
+          }
+        });
+      }
+
       if (isAccountLoggedIn()) {
         if (store.state.settings.automaticallyCacheSongs === true) {
           let tracks = localforage.createInstance({
             name: "tracks",
           });
-          tracks.getItem(`${track.id}`).then((t) => {
+          tracks
+            .getItem(`${track.id}`)
+            .then((t) => {
               if (t !== null) {
-              commitMP3(URL.createObjectURL(t.mp3));
+                const blob = new Blob([t.mp3]);
+                commitMP3(URL.createObjectURL(blob));
               } else {
-              cacheTrack(`${track.id}`).then((t) => {
+                if (unblockSongUrl) {
-                commitMP3(URL.createObjectURL(t.mp3));
+                  commitMP3(unblockSongUrl);
+                  cacheTrack(`${track.id}`, unblockSongUrl);
+                } else {
+                  getMP3(track.id).then((url) => {
+                    cacheTrack(`${track.id}`, url);
                   });
                 }
+              }
+            })
+            .catch((err) => {
+              console.log(err.messaeg);
+              if (unblockSongUrl) {
+                commitMP3(unblockSongUrl);
+              } else {
+                getMP3(track.id);
+              }
             });
         } else {
-          getMP3(track.id).then((data) => {
+          getMP3(track.id);
-            // 未知情况下会没有返回数据导致报错，增加防范逻辑
-            if (data.data[0]) {
-              const url = updateHttps(data.data[0].url);
-              commitMP3(url);
-            }
-          });
         }
       } else {
-        commitMP3(`https://music.163.com/song/media/outer/url?id=${track.id}`);
+        commitMP3(
+          unblockSongUrl ||
+            `https://music.163.com/song/media/outer/url?id=${track.id}`
+        );
       }
     });
   },

src/store/index.js

@@ -43,10 +43,11 @@ Howler.volume(store.state.player.volume);
 // 防止软件第一次打开资源加载2次
 Howler.autoUnlock = false;
 
-const currentTrackId = store.state?.player?.currentTrack?.id;
+const currentTrack = store.state?.player?.currentTrack;
-if (currentTrackId) {
+if (currentTrack?.id) {
   store.dispatch("switchTrack", {
-    id: currentTrackId,
+    id: currentTrack.id,
+    sort: currentTrack.sort,
     autoplay: false,
   });
 }

src/utils/db.js

@@ -1,11 +1,10 @@
-// import axios from "axios";
+import axios from "axios";
 import localforage from "localforage";
-import { getMP3 } from "@/api/track";
 
-export function cacheTrack(id) {
+export function cacheTrack(id, url) {
-  // let tracks = localforage.createInstance({
+  let tracks = localforage.createInstance({
-  //   name: "tracks",
+    name: "tracks",
-  // });
+  });
 
   // TODO: limit cache songs number
   // tracks.length().then(function (length) {
@@ -17,16 +16,13 @@ export function cacheTrack(id) {
   // });
 
   // TODO: cache track details
-  return getMP3(id).then((data) => {
+  return axios
-    // return axios
+    .get(url, {
-    //   .get(data.data[0].url.replace(/^http:/, "https:"), {
+      responseType: "arraybuffer",
-    //     responseType: "blob",
+    })
-    //   })
+    .then((response) => {
-    //   .then((data) => {
+      tracks.setItem(`${id}`, { mp3: response.data });
-    //     tracks.setItem(`${id}`, { mp3: data.data });
+      return { mp3: response.data };
-    //     return { mp3: data.data };
-    //   });
-    return { mp3: data.data[0].url.replace(/^http:/, "https:") };
     });
 }
 
@@ -37,11 +33,11 @@ export function countDBSize(dbName) {
   let trackSizes = [];
   return db
     .iterate((value) => {
-      trackSizes.push(value.mp3.size);
+      trackSizes.push(value.mp3.byteLength);
     })
     .then(() => {
       return {
-        bytes: trackSizes.reduce((s1, s2) => s1 + s2),
+        bytes: trackSizes.reduce((s1, s2) => s1 + s2, 0),
         length: trackSizes.length,
       };
     })