Merge pull request #815 from imsyy/dev-rust-dev

修点问题

Author: imsyy

electron/main/ipc/ipc-lyric.ts

@@ -137,7 +137,7 @@ const initLyricIpc = (): void => {
   // 更新歌词窗口配置
   ipcMain.on("update-desktop-lyric-option", (_, option, callback: boolean = false) => {
     const mainWin = mainWindow.getWin();
-    if (!option || !isWinAlive(lyricWin)) return;
+    if (!option) return;
     // 增量更新
     const prevOption = store.get("lyric.config");
     if (prevOption) {
@@ -193,25 +193,28 @@ const initLyricIpc = (): void => {
     if (!isWinAlive(lyricWin)) return;
     lyricWin.setBounds({ x, y, width, height });
     // 保存配置
-    store.set("lyric", { ...store.get("lyric"), x, y, width, height });
+    store.set("lyric.x", x);
+    store.set("lyric.y", y);
+    store.set("lyric.width", width);
+    store.set("lyric.height", height);
   });
 
   // 更新歌词窗口宽高
   ipcMain.on("update-lyric-size", (_, width, height) => {
     if (!isWinAlive(lyricWin)) return;
     // 更新窗口宽度
     lyricWin.setBounds({ width, height });
-    store.set("lyric", { ...store.get("lyric"), width, height });
+    store.set("lyric.width", width);
+    store.set("lyric.height", height);
   });
 
   // 更新高度
   ipcMain.on("update-window-height", (_, height) => {
     if (!isWinAlive(lyricWin)) return;
-    const store = useStore();
     const { width } = lyricWin.getBounds();
     // 更新窗口高度
     lyricWin.setBounds({ width, height });
-    store.set("lyric", { ...store.get("lyric"), height });
+    store.set("lyric.height", height);
   });
 
   // 是否固定当前最大宽高
@@ -256,23 +259,26 @@ const initLyricIpc = (): void => {
   // 锁定/解锁桌面歌词
   ipcMain.on("toggle-desktop-lyric-lock", (_, isLock: boolean, isTemp: boolean = false) => {
     const mainWin = mainWindow.getWin();
-    if (!isWinAlive(lyricWin) || !isWinAlive(mainWin)) return;
 
     // 更新锁定状态
     if (!isTemp) isLocked = isLock;
 
     // 设置鼠标事件穿透
-    if (isLock) {
-      lyricWin.setIgnoreMouseEvents(true, { forward: true });
-    } else {
-      lyricWin.setIgnoreMouseEvents(false);
+    if (isWinAlive(lyricWin)) {
+      if (isLock) {
+        lyricWin.setIgnoreMouseEvents(true, { forward: true });
+      } else {
+        lyricWin.setIgnoreMouseEvents(false);
+      }
     }
 
     if (isTemp) return;
-    store.set("lyric.config", { ...store.get("lyric.config"), isLock });
+    store.set("lyric.config.isLock", isLock);
     // 触发窗口更新
     const config = store.get("lyric.config");
-    mainWin?.webContents.send("update-desktop-lyric-option", config);
+    if (isWinAlive(mainWin)) {
+      mainWin.webContents.send("update-desktop-lyric-option", config);
+    }
   });
 };
 

native/external-media-integration/package.json

@@ -5,7 +5,7 @@
     "@napi-rs/cli": "^3.5.1"
   },
   "napi": {
-    "binaryName": "external_media_integration",
+    "binaryName": "external-media-integration",
     "triples": {}
   },
   "scripts": {

native/taskbar-lyric/package.json

@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "main": "taskbar-lyric.node",
   "napi": {
-    "binaryName": "taskbar_lyric"
+    "binaryName": "taskbar-lyric"
   },
   "scripts": {
     "build": "napi build --release --no-const-enum"

package.json

@@ -13,25 +13,26 @@
   "license-file": "LICENSE",
   "engines": {
     "node": ">=20",
-    "npm": ">=10"
+    "npm": ">=11",
+    "pnpm": ">=10"
   },
   "type": "module",
   "scripts": {
     "format": "prettier --write .",
-    "lint": "npx eslint . --fix",
+    "lint": "eslint . --fix",
     "typecheck:node": "tsc --noEmit -p tsconfig.node.json --composite false",
     "typecheck:web": "vue-tsc --noEmit -p tsconfig.web.json --composite false",
-    "typecheck": "npm run typecheck:node && npm run typecheck:web",
+    "typecheck": "pnpm typecheck:node && pnpm typecheck:web",
     "build:native": "tsx scripts/build-native.ts",
     "start": "electron-vite preview",
-    "dev": "npm run build:native && tsx scripts/dev.ts",
-    "build": "rimraf dist && npm run build:native && npm run typecheck && electron-vite build",
+    "dev": "pnpm build:native && tsx scripts/dev.ts",
+    "build": "rimraf dist && pnpm build:native && pnpm typecheck && electron-vite build",
     "postinstall": "electron-builder install-app-deps",
-    "build:web": "npm run build",
-    "build:unpack": "npm run build && electron-builder --dir",
-    "build:win": "npm run build && electron-builder --win --config electron-builder.config.ts",
-    "build:mac": "npm run build && electron-builder --mac --config electron-builder.config.ts",
-    "build:linux": "npm run build && electron-builder --linux --config electron-builder.config.ts",
+    "build:web": "pnpm build",
+    "build:unpack": "pnpm build && electron-builder --dir",
+    "build:win": "pnpm build && electron-builder --win --config electron-builder.config.ts",
+    "build:mac": "pnpm build && electron-builder --mac --config electron-builder.config.ts",
+    "build:linux": "pnpm build && electron-builder --linux --config electron-builder.config.ts",
     "docs:dev": "vitepress dev docs",
     "docs:build": "vitepress build docs",
     "docs:preview": "vitepress preview docs"

src/components/Global/GlobalErrorHandler.vue

@@ -15,10 +15,8 @@
         <n-notification-provider>
           <n-message-provider :max="1" placement="bottom">
             <n-modal-provider>
-              <GlobalErrorHandler>
-                <slot />
-                <NaiveProviderContent />
-              </GlobalErrorHandler>
+              <slot />
+              <NaiveProviderContent />
             </n-modal-provider>
           </n-message-provider>
         </n-notification-provider>
@@ -28,6 +26,8 @@
 </template>
 
 <script setup lang="ts">
+import { webConsole, errorPopupConsole } from "@/utils/log";
+import { isElectron } from "@/utils/env";
 import {
   zhCN,
   dateZhCN,
@@ -318,9 +318,29 @@ watchDebounced(
   { debounce: 500, maxWait: 1000 },
 );
 
+const handleConsoleError = (event: ErrorEvent | PromiseRejectionEvent) => {
+  const message = isElectron
+    ? errorPopupConsole.formatErrorEventMessage(event)
+    : webConsole.formatErrorEventMessage(event);
+  console.error(message);
+};
+
 onMounted(() => {
   changeGlobalTheme();
   // 自定义代码注入
   useCustomCode();
+
+  if (isElectron) {
+    errorPopupConsole.init();
+  } else {
+    webConsole.init();
+  }
+  window.addEventListener("error", handleConsoleError);
+  window.addEventListener("unhandledrejection", handleConsoleError);
+});
+
+onUnmounted(() => {
+  window.removeEventListener("error", handleConsoleError);
+  window.removeEventListener("unhandledrejection", handleConsoleError);
 });
 </script>

src/components/Global/Provider.vue

@@ -107,17 +107,25 @@
         <n-flex align="center">
           <s-input
             v-if="settingStore.fontSettingStyle === 'custom'"
-            v-model:value="desktopLyricConfig.fontFamily"
+            :value="desktopLyricConfig.fontFamily"
             :update-value-on-input="false"
             placeholder="输入字体名称"
             class="set"
-            @change="saveDesktopLyricConfig"
+            @update:value="
+              (val) => {
+                desktopLyricConfig.fontFamily = val;
+                saveDesktopLyricConfig();
+              }
+            "
           />
           <n-select
             v-else-if="settingStore.fontSettingStyle === 'multi'"
             :value="desktopLyricConfig.fontFamily.split(',').map((s) => s.trim())"
             :on-update-value="
-              (value: Array<string>) => (desktopLyricConfig.fontFamily = value.join(', '))
+              (value: Array<string>) => {
+                desktopLyricConfig.fontFamily = value.join(', ');
+                saveDesktopLyricConfig();
+              }
             "
             :options="getOptions('desktop')"
             class="set"
@@ -127,11 +135,16 @@
           />
           <n-select
             v-else-if="settingStore.fontSettingStyle === 'single'"
-            v-model:value="desktopLyricConfig.fontFamily"
+            :value="desktopLyricConfig.fontFamily"
             :options="getOptions('desktop')"
             class="set"
             filterable
-            @update:value="saveDesktopLyricConfig"
+            @update:value="
+              (val) => {
+                desktopLyricConfig.fontFamily = val;
+                saveDesktopLyricConfig();
+              }
+            "
           />
         </n-flex>
       </n-card>
@@ -256,12 +269,12 @@ const getDesktopLyricConfig = async () => {
   if (!isElectron) return;
   const config = await window.electron.ipcRenderer.invoke("request-desktop-lyric-option");
   if (config) Object.assign(desktopLyricConfig, config);
-  // 监听更新
-  window.electron.ipcRenderer.on("update-desktop-lyric-option", (_, config) => {
-    if (config && !isEqual(desktopLyricConfig, config)) {
-      Object.assign(desktopLyricConfig, config);
-    }
-  });
+};
+
+const onLyricConfigUpdate = (_: any, config: LyricConfig) => {
+  if (config && !isEqual(desktopLyricConfig, config)) {
+    Object.assign(desktopLyricConfig, config);
+  }
 };
 
 // 保存桌面歌词配置
@@ -284,6 +297,13 @@ const saveDesktopLyricConfig = () => {
 onMounted(() => {
   getAllSystemFonts();
   getDesktopLyricConfig();
+  window.electron.ipcRenderer.on("update-desktop-lyric-option", onLyricConfigUpdate);
+});
+
+onUnmounted(() => {
+  if (isElectron) {
+    window.electron.ipcRenderer.removeListener("update-desktop-lyric-option", onLyricConfigUpdate);
+  }
 });
 </script>