Skip to content

Commit a8716df

Browse files
committed
fix: 修复 macOS 退出时重复注册协议报错 #445
1 parent de0757e commit a8716df

4 files changed

Lines changed: 48 additions & 8 deletions

File tree

‎electron/main/core/index.ts‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,12 @@ import { init as initSongCache } from "@main/services/songCache";
1919
import { init as initDownload } from "@main/services/downloadManager";
2020
import { pluginRegistry } from "@main/plugins/registry";
2121
import { init as initPlaybackBridge } from "@main/plugins/playbackBridge";
22-
import { registerCacheScheme, handleCacheProtocol } from "@main/utils/protocol";
22+
import {
23+
registerCacheScheme,
24+
handleCacheProtocol,
25+
handleCacheProtocolOnPartition,
26+
MAIN_PARTITION,
27+
} from "@main/utils/protocol";
2328
import { startServer } from "@main/server";
2429
import { startMcpServer } from "@main/services/mcp/http";
2530
import { initUpdater } from "@main/services/updater";
@@ -108,6 +113,7 @@ export const initApp = (): void => {
108113
electronApp.setAppUserModelId("top.imsyy.splayer-next");
109114
// 注册 cache:// 协议处理
110115
handleCacheProtocol();
116+
handleCacheProtocolOnPartition(MAIN_PARTITION);
111117
app.on("browser-window-created", (_, window) => {
112118
optimizer.watchWindowShortcuts(window);
113119
});
@@ -156,6 +162,7 @@ export const initApp = (): void => {
156162
setTimeout(logProcessMemory, MEMORY_LOG_FIRST_DELAY_MS);
157163
setInterval(logProcessMemory, MEMORY_LOG_INTERVAL_MS);
158164
app.on("activate", () => {
165+
if (isAppQuitting()) return;
159166
if (isMac) {
160167
if (getMainWindow()) focusMainWindow();
161168
else createMainWindow();

‎electron/main/core/lifecycle.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,20 @@ const cleanupTasks: Array<[string, () => void | Promise<void>]> = [
2727
["数据库", closeDatabase],
2828
];
2929

30+
/** 退出卡住时用于定位的当前阶段 */
31+
let quitStage = "";
32+
3033
/** 按依赖顺序等待清理任务,单项失败不阻止后续资源释放 */
3134
const runCleanupTasks = async (): Promise<void> => {
3235
for (const [name, cleanup] of cleanupTasks) {
36+
quitStage = name;
3337
try {
3438
await cleanup();
3539
} catch (error) {
3640
coreLog.error("退出清理失败:" + name, error);
3741
}
3842
}
43+
quitStage = "关闭窗口";
3944
};
4045

4146
/** 注册应用退出处理,等待全部清理任务后退出 */
@@ -54,6 +59,11 @@ export const initAppLifecycle = (): void => {
5459
if (cleanupStarted) return;
5560
cleanupStarted = true;
5661
coreLog.info("应用即将退出,清理资源");
62+
// 清理和关窗都可能卡住,进程正常退出时计时器随之消失
63+
setTimeout(() => {
64+
coreLog.error("应用退出超过 10 秒,强制结束进程,卡在:" + quitStage);
65+
app.exit(1);
66+
}, 10_000);
5767
void runCleanupTasks().finally(() => {
5868
cleanupFinished = true;
5969
app.quit();

‎electron/main/window/main.spec.ts‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ vi.mock("@main/store", () => ({
2828
}));
2929
vi.mock("@main/utils/protocol", () => ({
3030
MAIN_PARTITION: "persist:main",
31-
handleCacheProtocolOnPartition: vi.fn(),
3231
}));
3332
vi.mock("@main/utils/lifecycle", () => ({ isAppQuitting: () => false }));
3433
vi.mock("@main/utils/broadcast", () => ({ broadcast: vi.fn() }));
@@ -154,3 +153,22 @@ describe("主窗口启动交接", () => {
154153
expect(mocks.main.show).not.toHaveBeenCalled();
155154
});
156155
});
156+
157+
it("macOS 全屏隐藏等待退出全屏事件,避免留下黑色空间", async () => {
158+
const platform = Object.getOwnPropertyDescriptor(process, "platform")!;
159+
Object.defineProperty(process, "platform", { value: "darwin" });
160+
try {
161+
const service = await import("./main");
162+
mocks.main.isFullScreen = () => true;
163+
mocks.main.setFullScreen = vi.fn();
164+
mocks.main.hide = vi.fn();
165+
service.createMainWindow();
166+
service.hideMainWindow();
167+
expect(mocks.main.setFullScreen).toHaveBeenCalledWith(false);
168+
expect(mocks.main.hide).not.toHaveBeenCalled();
169+
mocks.main.emit("leave-full-screen");
170+
expect(mocks.main.hide).toHaveBeenCalledOnce();
171+
} finally {
172+
Object.defineProperty(process, "platform", platform);
173+
}
174+
});

‎electron/main/window/main.ts‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { initThumbar } from "@main/services/thumbar";
66
import { enableTaskbarThumbnail } from "@main/services/thumbnail";
77
import { initTray } from "@main/services/tray";
88
import { store } from "@main/store";
9-
import { handleCacheProtocolOnPartition, MAIN_PARTITION } from "@main/utils/protocol";
9+
import { MAIN_PARTITION } from "@main/utils/protocol";
1010
import { isAppQuitting } from "@main/utils/lifecycle";
1111
import { broadcast } from "@main/utils/broadcast";
1212
import { CURRENT_AGREEMENT_VERSION } from "@shared/constants/agreement";
@@ -32,8 +32,6 @@ export const createMainWindow = (): BrowserWindow => {
3232
/** 旧版窗口状态 */
3333
const legacyState = remember ? store.get("windowStates.main") : undefined;
3434

35-
// 注册 cache:// 协议
36-
handleCacheProtocolOnPartition(MAIN_PARTITION);
3735
const borderlessWindow = store.get("system.borderlessWindow") ?? true;
3836

3937
mainWindow = createWindow({
@@ -86,7 +84,7 @@ export const createMainWindow = (): BrowserWindow => {
8684
mainWindow.on("close", (event) => {
8785
if (isAppQuitting()) return;
8886
event.preventDefault();
89-
mainWindow?.hide();
87+
hideMainWindow();
9088
});
9189
// 最大化
9290
mainWindow.on("maximize", () => {
@@ -217,9 +215,16 @@ export const toggleFullscreenMainWindow = (): void => {
217215
/** 查询是否全屏 */
218216
export const isMainWindowFullscreen = (): boolean => !!getMainWindow()?.isFullScreen();
219217

220-
/** 隐藏主窗口 */
218+
/** 隐藏主窗口,macOS 全屏空间退出后再隐藏以避免残留黑屏 */
221219
export const hideMainWindow = (): void => {
222-
getMainWindow()?.hide();
220+
const win = getMainWindow();
221+
if (!win) return;
222+
if (process.platform === "darwin" && win.isFullScreen()) {
223+
win.once("leave-full-screen", () => win.hide());
224+
win.setFullScreen(false);
225+
return;
226+
}
227+
win.hide();
223228
};
224229

225230
/** 应用界面缩放:百分比 → setZoomFactor(clamp 0.5~2.0) */

0 commit comments

Comments
 (0)