Merge branch 'dev' of https://github.com/flystar233/SPlayer into dev

Author: flystar233

.github/workflows/dev.yml

@@ -22,7 +22,7 @@ on:
 
 env:
   NODE_VERSION: 22.x
-  PNPM_VERSION: 8
+  PNPM_VERSION: 10
 
 jobs:
   # ===================================================================

README.md

@@ -75,6 +75,7 @@
 - ⏭️ 音乐渐入渐出
 - 🔄 支持 PWA
 - 💬 支持评论区
+- 🎵 支持 Last.fm Scrobble（播放记录上报）
 - ~~📱 移动端基础适配~~
 
 ## 🖼️ screenshots

auto-imports.d.ts

@@ -48,7 +48,6 @@ declare global {
   const isRef: typeof import('vue').isRef
   const isShallow: typeof import('vue').isShallow
   const makeDestructurable: typeof import('@vueuse/core').makeDestructurable
-  const manualResetRef: typeof import('@vueuse/core').manualResetRef
   const markRaw: typeof import('vue').markRaw
   const nextTick: typeof import('vue').nextTick
   const onActivated: typeof import('vue').onActivated
@@ -86,7 +85,6 @@ declare global {
   const refAutoReset: typeof import('@vueuse/core').refAutoReset
   const refDebounced: typeof import('@vueuse/core').refDebounced
   const refDefault: typeof import('@vueuse/core').refDefault
-  const refManualReset: typeof import('@vueuse/core').refManualReset
   const refThrottled: typeof import('@vueuse/core').refThrottled
   const refWithControl: typeof import('@vueuse/core').refWithControl
   const resolveComponent: typeof import('vue').resolveComponent

components.d.ts

@@ -157,6 +157,7 @@ declare module 'vue' {
     SongUnlockManager: typeof import('./src/components/Modal/Setting/SongUnlockManager.vue')['default']
     SvgIcon: typeof import('./src/components/Global/SvgIcon.vue')['default']
     TextContainer: typeof import('./src/components/Global/TextContainer.vue')['default']
+    ThirdSetting: typeof import('./src/components/Setting/ThirdSetting.vue')['default']
     UpdateApp: typeof import('./src/components/Modal/UpdateApp.vue')['default']
     UpdatePlaylist: typeof import('./src/components/Modal/UpdatePlaylist.vue')['default']
     User: typeof import('./src/components/Layout/User.vue')['default']

electron-builder.config.ts

@@ -84,7 +84,7 @@ const config: Configuration = {
     // 可执行文件名
     executableName: "SPlayer",
     // 应用程序的图标文件路径
-    icon: "public/icons/favicon-512x512.png",
+    icon: "public/icons/icon.icns",
     // 权限继承的文件路径
     entitlementsInherit: "build/entitlements.mac.plist",
     // macOS 平台全局文件名模板

electron.vite.config.ts

@@ -1,6 +1,6 @@
 import { resolve } from "path";
 import { MainEnv } from "./env";
-import { defineConfig, externalizeDepsPlugin, loadEnv } from "electron-vite";
+import { defineConfig, loadEnv } from "electron-vite";
 import { NaiveUiResolver } from "unplugin-vue-components/resolvers";
 import vue from "@vitejs/plugin-vue";
 import AutoImport from "unplugin-auto-import/vite";
@@ -9,20 +9,18 @@ import viteCompression from "vite-plugin-compression";
 // import VueDevTools from "vite-plugin-vue-devtools";
 import wasm from "vite-plugin-wasm";
 
-export default defineConfig(({ command, mode }) => {
+export default defineConfig(({ mode }) => {
   // 读取环境变量
   const getEnv = (name: keyof MainEnv): string => {
     return loadEnv(mode, process.cwd())[name];
   };
-  console.log(command);
   // 获取端口
   const webPort: number = Number(getEnv("VITE_WEB_PORT") || 14558);
   const servePort: number = Number(getEnv("VITE_SERVER_PORT") || 25884);
   // 返回配置
   return {
     // 主进程
     main: {
-      plugins: [externalizeDepsPlugin()],
       build: {
         publicDir: resolve(__dirname, "public"),
         rollupOptions: {
@@ -34,7 +32,6 @@ export default defineConfig(({ command, mode }) => {
     },
     // 预加载
     preload: {
-      plugins: [externalizeDepsPlugin()],
       build: {
         rollupOptions: {
           input: {

electron/main/services/CacheService.ts

@@ -130,7 +130,21 @@ export class CacheService {
 
       for (const type of Object.keys(this.CACHE_SUB_DIR) as CacheResourceType[]) {
         const dir = join(basePath, this.CACHE_SUB_DIR[type]);
-        if (!existsSync(dir)) await mkdir(dir, { recursive: true });
+        if (!existsSync(dir)) {
+          await mkdir(dir, { recursive: true });
+        } else {
+          // 清理可能残留的临时文件 (.tmp)
+          try {
+            const files = await readdir(dir);
+            for (const file of files) {
+              if (file.endsWith(".tmp")) {
+                await rm(join(dir, file), { force: true });
+              }
+            }
+          } catch (e) {
+            cacheLog.warn(`⚠️ 无法清理目录中的临时文件: ${dir}`, e);
+          }
+        }
         // 计算初始大小
         this.sizes[type] = await this.calculateDirSize(dir);
       }

electron/main/services/LocalMusicService.ts

@@ -1,3 +1,4 @@
+import { nativeImage } from "electron";
 import { join, basename } from "path";
 import { readFile, mkdir } from "fs/promises";
 import { CacheService } from "./CacheService";
@@ -7,7 +8,6 @@ import { useStore } from "../store";
 import { type IAudioMetadata, parseFile } from "music-metadata";
 import FastGlob, { type Entry } from "fast-glob";
 import pLimit from "p-limit";
-import sharp from "sharp";
 
 /** 当前本地音乐库 DB 版本，用于控制缓存结构升级 */
 const CURRENT_DB_VERSION = 2;
@@ -138,18 +138,34 @@ export class LocalMusicService {
     const { coverDir } = this.paths;
     const picture = metadata.common.picture?.[0];
     if (!picture) return undefined;
-    const fileName = `${fileId}.webp`;
+
+    // 使用 jpg 格式，兼容性更好且无需外部依赖
+    const fileName = `${fileId}.jpg`;
     const savePath = join(coverDir, fileName);
+
     // 已存在
     if (existsSync(savePath)) return fileName;
-    // 压缩封面处理
-    const cacheService = CacheService.getInstance();
-    const buffer = await sharp(picture.data)
-      .resize(256, 256, { fit: "cover", position: "centre" })
-      .webp({ quality: 80 })
-      .toBuffer();
-    await cacheService.put("local-data", `covers/${fileName}`, buffer);
-    return fileName;
+
+    try {
+      const img = nativeImage.createFromBuffer(Buffer.from(picture.data));
+      if (img.isEmpty()) return undefined;
+
+      // 调整大小并压缩
+      const buffer = img
+        .resize({
+          width: 256,
+          height: 256,
+          quality: "better",
+        })
+        .toJPEG(80);
+
+      const cacheService = CacheService.getInstance();
+      await cacheService.put("local-data", `covers/${fileName}`, buffer);
+      return fileName;
+    } catch (e) {
+      console.error("Failed to extract cover using nativeImage:", e);
+      return undefined;
+    }
   }
 
   /**

electron/main/services/MusicCacheService.ts

@@ -1,5 +1,5 @@
 import { existsSync, createWriteStream } from "fs";
-import { unlink } from "fs/promises";
+import { unlink, rename } from "fs/promises";
 import { pipeline } from "stream/promises";
 import { CacheService } from "./CacheService";
 import { useStore } from "../store";
@@ -52,9 +52,11 @@ export class MusicCacheService {
     // 模糊查找 (API请求失败时，只要有缓存就用)
     try {
       const items = await this.cacheService.list("music");
-      // 查找以 id_ 开头的文件
+      // 查找以 id_ 开头且以 .sc 结尾的文件（排除 .tmp 文件）
       const prefix = `${id}_`;
-      const match = items.find((item) => item.key.startsWith(prefix));
+      const match = items.find(
+        (item) => item.key.startsWith(prefix) && item.key.endsWith(".sc"),
+      );
       if (match) {
         return this.cacheService.getFilePath("music", match.key);
       }
@@ -73,7 +75,7 @@ export class MusicCacheService {
    */
   public async cacheMusic(id: number | string, url: string, quality: string): Promise<string> {
     const store = useStore();
-    const limitSizeGB = store.get("cacheLimit") || 10;
+    const limitSizeGB = store.get("cacheLimit") ?? 10;
     const limitSizeBytes = limitSizeGB * 1024 * 1024 * 1024;
 
     // 如果设置为 0，则不限制
@@ -91,25 +93,29 @@ export class MusicCacheService {
 
     const key = this.getCacheKey(id, quality);
     const filePath = this.cacheService.getFilePath("music", key);
+    const tempPath = `${filePath}.tmp`;
 
     // 确保目录存在
     await this.cacheService.init();
 
     // 下载并写入
     try {
       const downloadStream = got.stream(url);
-      const fileStream = createWriteStream(filePath);
+      const fileStream = createWriteStream(tempPath);
 
       await pipeline(downloadStream, fileStream);
 
+      // 下载成功后，将临时文件重命名为正式缓存文件
+      await rename(tempPath, filePath);
+
       // 更新 CacheService 的大小记录
       await this.cacheService.notifyFileChange("music", key);
 
       return filePath;
     } catch (error) {
-      // 下载失败，清理残余
-      if (existsSync(filePath)) {
-        await unlink(filePath);
+      // 下载失败，清理残余的临时文件
+      if (existsSync(tempPath)) {
+        await unlink(tempPath).catch(() => {});
       }
       cacheLog.error("Music download failed:", error);
       throw error;

package.json

@@ -1,7 +1,7 @@
 {
   "name": "splayer",
   "productName": "SPlayer",
-  "version": "3.0.0-beta.7",
+  "version": "3.0.0-beta.8",
   "description": "A minimalist music player",
   "main": "./out/main/index.js",
   "author": "imsyy",
@@ -40,7 +40,7 @@
     "@electron-toolkit/utils": "^4.0.0",
     "@imsyy/color-utils": "^1.0.2",
     "@material/material-color-utilities": "^0.3.0",
-    "@neteasecloudmusicapienhanced/api": "^4.29.17",
+    "@neteasecloudmusicapienhanced/api": "^4.29.18",
     "@pixi/app": "^7.4.3",
     "@pixi/core": "^7.4.3",
     "@pixi/display": "^7.4.3",
@@ -75,7 +75,6 @@
     "pinia": "^3.0.4",
     "pinia-plugin-persistedstate": "^4.7.1",
     "plyr": "^3.8.3",
-    "sharp": "^0.34.5",
     "sortablejs": "^1.15.6",
     "vue-virtual-scroller": "2.0.0-beta.8"
   },
@@ -99,7 +98,7 @@
     "electron": "38.2.2",
     "electron-builder": "^26.0.12",
     "electron-log": "^5.4.3",
-    "electron-vite": "^4.0.1",
+    "electron-vite": "^5.0.0",
     "eslint": "^9.39.1",
     "eslint-plugin-vue": "^10.6.2",
     "fast-glob": "^3.3.3",
@@ -112,7 +111,7 @@
     "typescript": "^5.9.3",
     "unplugin-auto-import": "^20.3.0",
     "unplugin-vue-components": "^29.2.0",
-    "vite": "^7.2.6",
+    "vite": "^7.3.0",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-vue-devtools": "^8.0.5",
     "vite-plugin-wasm": "^3.5.0",
@@ -134,7 +133,6 @@
       "electron",
       "electron-winstaller",
       "esbuild",
-      "sharp",
       "vue-demi"
     ]
   }