🎨 文件系统读取或写入失败时退出内核 https://github.com/siyuan-note/siyuan/issues/7707

app/electron/main.js

@@ -15,14 +15,7 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 const {
-    app,
+    app, BrowserWindow, shell, Menu, screen, ipcMain, globalShortcut, Tray,
-    BrowserWindow,
-    shell,
-    Menu,
-    screen,
-    ipcMain,
-    globalShortcut,
-    Tray,
 } = require("electron");
 const path = require("path");
 const fs = require("fs");
@@ -53,8 +46,7 @@ try {
     }
 } catch (e) {
     console.error(e);
-    require("electron").dialog.showErrorBox("创建配置目录失败 Failed to create config directory",
+    require("electron").dialog.showErrorBox("创建配置目录失败 Failed to create config directory", "思源需要在用户家目录下创建配置文件夹（~/.config/siyuan），请确保该路径具有写入权限。\n\nSiYuan needs to create a configuration folder (~/.config/siyuan) in the user's home directory. Please make sure that the path has write permissions.");
-        "思源需要在用户家目录下创建配置文件夹（~/.config/siyuan），请确保该路径具有写入权限。\n\nSiYuan needs to create a configuration folder (~/.config/siyuan) in the user's home directory. Please make sure that the path has write permissions.");
     app.exit();
 }
 
@@ -108,8 +100,10 @@ const exitApp = (type, id, errorWindowId) => {
         } catch (e) {
             writeLog(e);
         }
+
         if (errorWindowId) {
-            BrowserWindow.getAll().forEach((item) => {
+            BrowserWindow.getAllWindows().forEach((item) => {
+                writeLog(errorWindowId + " " + item.id);
                 if (errorWindowId !== item.id) {
                     item.destroy();
                 }
@@ -141,10 +135,7 @@ const showErrorWindow = (title, content) => {
         frame: false,
         icon: path.join(appDir, "stage", "icon-large.png"),
         webPreferences: {
-            nodeIntegration: true,
+            nodeIntegration: true, webviewTag: true, webSecurity: false, contextIsolation: false,
-            webviewTag: true,
-            webSecurity: false,
-            contextIsolation: false,
         },
     });
     require("@electron/remote/main").enable(errWindow.webContents);
@@ -175,8 +166,7 @@ const writeLog = (out) => {
             }
         }
         out = out.toString();
-        out = new Date().toISOString().replace(/T/, " ").replace(/\..+/, "") + " " +
+        out = new Date().toISOString().replace(/T/, " ").replace(/\..+/, "") + " " + out;
-            out;
         log += out + "\n";
         fs.writeFileSync(logFile, log);
     } catch (e) {
@@ -206,7 +196,8 @@ const boot = () => {
         isMaximized: true,
         fullscreen: false,
         isDevToolsOpened: false,
-        x: 0, y: 0,
+        x: 0,
+        y: 0,
         width: defaultWidth,
         height: defaultHeight,
     }, oldWindowState);
@@ -215,8 +206,7 @@ const boot = () => {
     let y = windowState.y;
     if (workArea) {
         // 窗口大小等同于或大于 workArea 时，缩小会隐藏到左下角
-        if (windowState.width >= workArea.width || windowState.height >=
+        if (windowState.width >= workArea.width || windowState.height >= workArea.height) {
-            workArea.height) {
             windowState.width = Math.min(defaultWidth, workArea.width);
             windowState.height = Math.min(defaultHeight, workArea.height);
         }
@@ -265,40 +255,37 @@ const boot = () => {
         icon: path.join(appDir, "stage", "icon-large.png"),
     });
     require("@electron/remote/main").enable(currentWindow.webContents);
-    currentWindow.webContents.userAgent = "SiYuan/" + appVer +
+    currentWindow.webContents.userAgent = "SiYuan/" + appVer + " https://b3log.org/siyuan Electron";
-        " https://b3log.org/siyuan Electron";
 
     currentWindow.webContents.session.setSpellCheckerLanguages(["en-US"]);
 
     // 发起互联网服务请求时绕过安全策略 https://github.com/siyuan-note/siyuan/issues/5516
-    currentWindow.webContents.session.webRequest.onBeforeSendHeaders(
+    currentWindow.webContents.session.webRequest.onBeforeSendHeaders((details, cb) => {
-        (details, cb) => {
+        if (-1 < details.url.indexOf("bili")) {
-            if (-1 < details.url.indexOf("bili")) {
+            // B 站不移除 Referer https://github.com/siyuan-note/siyuan/issues/94
-                // B 站不移除 Referer https://github.com/siyuan-note/siyuan/issues/94
-                cb({requestHeaders: details.requestHeaders});
-                return;
-            }
-
-            for (let key in details.requestHeaders) {
-                if ("referer" === key.toLowerCase()) {
-                    delete details.requestHeaders[key];
-                }
-            }
             cb({requestHeaders: details.requestHeaders});
-        });
+            return;
-    currentWindow.webContents.session.webRequest.onHeadersReceived(
+        }
-        (details, cb) => {
+
-            for (let key in details.responseHeaders) {
+        for (let key in details.requestHeaders) {
-                if ("x-frame-options" === key.toLowerCase()) {
+            if ("referer" === key.toLowerCase()) {
-                    delete details.responseHeaders[key];
+                delete details.requestHeaders[key];
-                } else if ("content-security-policy" === key.toLowerCase()) {
-                    delete details.responseHeaders[key];
-                } else if ("access-control-allow-origin" === key.toLowerCase()) {
-                    delete details.responseHeaders[key];
-                }
             }
-            cb({responseHeaders: details.responseHeaders});
+        }
-        });
+        cb({requestHeaders: details.requestHeaders});
+    });
+    currentWindow.webContents.session.webRequest.onHeadersReceived((details, cb) => {
+        for (let key in details.responseHeaders) {
+            if ("x-frame-options" === key.toLowerCase()) {
+                delete details.responseHeaders[key];
+            } else if ("content-security-policy" === key.toLowerCase()) {
+                delete details.responseHeaders[key];
+            } else if ("access-control-allow-origin" === key.toLowerCase()) {
+                delete details.responseHeaders[key];
+            }
+        }
+        cb({responseHeaders: details.responseHeaders});
+    });
 
     currentWindow.webContents.on("did-finish-load", () => {
         let siyuanOpenURL;
@@ -338,58 +325,28 @@ const boot = () => {
     });
 
     // 加载主界面
-    currentWindow.loadURL(getServer() + "/stage/build/app/index.html?v=" +
+    currentWindow.loadURL(getServer() + "/stage/build/app/index.html?v=" + new Date().getTime());
-        new Date().getTime());
 
     // 菜单
     const productName = "SiYuan";
-    const template = [
+    const template = [{
-        {
+        label: productName, submenu: [{
-            label: productName,
+            label: `About ${productName}`, role: "about",
-            submenu: [
+        }, {type: "separator"}, {role: "services"}, {type: "separator"}, {
-                {
+            label: `Hide ${productName}`, role: "hide",
-                    label: `About ${productName}`,
+        }, {role: "hideOthers"}, {role: "unhide"}, {type: "separator"}, {
-                    role: "about",
+            label: `Quit ${productName}`, role: "quit",
-                },
+        },],
-                {type: "separator"},
+    }, {
-                {role: "services"},
+        role: "editMenu",
-                {type: "separator"},
+        submenu: [{role: "cut"}, {role: "copy"}, {role: "paste"}, {
-                {
+            role: "pasteAndMatchStyle",
-                    label: `Hide ${productName}`,
+            accelerator: "CmdOrCtrl+Shift+C"
-                    role: "hide",
+        }, {role: "selectAll"},],
-                },
+    }, {
-                {role: "hideOthers"},
+        role: "windowMenu",
-                {role: "unhide"},
+        submenu: [{role: "minimize"}, {role: "zoom"}, {role: "togglefullscreen"}, {type: "separator"}, {role: "toggledevtools"}, {type: "separator"}, {role: "front"},],
-                {type: "separator"},
+    },];
-                {
-                    label: `Quit ${productName}`,
-                    role: "quit",
-                },
-            ],
-        },
-        {
-            role: "editMenu",
-            submenu: [
-                {role: "cut"},
-                {role: "copy"},
-                {role: "paste"},
-                {role: "pasteAndMatchStyle", accelerator: "CmdOrCtrl+Shift+C"},
-                {role: "selectAll"},
-            ],
-        },
-        {
-            role: "windowMenu",
-            submenu: [
-                {role: "minimize"},
-                {role: "zoom"},
-                {role: "togglefullscreen"},
-                {type: "separator"},
-                {role: "toggledevtools"},
-                {type: "separator"},
-                {role: "front"},
-            ],
-        },
-    ];
     const menu = Menu.buildFromTemplate(template);
     Menu.setApplicationMenu(menu);
     // 当前页面链接使用浏览器打开
@@ -410,8 +367,7 @@ const boot = () => {
         event.preventDefault();
     });
     workspaces.push({
-        browserWindow: currentWindow,
+        browserWindow: currentWindow, id: currentWindow.id,
-        id: currentWindow.id,
     });
 };
 
@@ -439,13 +395,10 @@ const initKernel = (workspace, port, lang) => {
             transparent: "linux" !== process.platform,
         });
 
-        const kernelName = "win32" === process.platform
+        const kernelName = "win32" === process.platform ? "SiYuan-Kernel.exe" : "SiYuan-Kernel";
-            ? "SiYuan-Kernel.exe"
-            : "SiYuan-Kernel";
         const kernelPath = path.join(appDir, "kernel", kernelName);
         if (!fs.existsSync(kernelPath)) {
-            showErrorWindow("⚠️ 内核文件丢失 Kernel is missing",
+            showErrorWindow("⚠️ 内核文件丢失 Kernel is missing", "<div>内核可执行文件丢失，请重新安装思源，并将思源加入杀毒软件信任列表。</div><div>The kernel binary is not found, please reinstall SiYuan and add SiYuan into the trust list of your antivirus software.</div>");
-                "<div>内核可执行文件丢失，请重新安装思源，并将思源加入杀毒软件信任列表。</div><div>The kernel binary is not found, please reinstall SiYuan and add SiYuan into the trust list of your antivirus software.</div>");
             bootWindow.destroy();
             resolve(false);
             return;
@@ -492,17 +445,14 @@ const initKernel = (workspace, port, lang) => {
         if (lang && "" !== lang) {
             cmds.push("--lang", lang);
         }
-        let cmd = `ui version [${appVer}], booting kernel [${kernelPath} ${cmds.join(
+        let cmd = `ui version [${appVer}], booting kernel [${kernelPath} ${cmds.join(" ")}]`;
-            " ")}]`;
         writeLog(cmd);
         if (!isDevEnv || workspaces.length > 0) {
             const cp = require("child_process");
-            const kernelProcess = cp.spawn(kernelPath,
+            const kernelProcess = cp.spawn(kernelPath, cmds, {
-                cmds, {
+                detached: false, // 桌面端内核进程不再以游离模式拉起 https://github.com/siyuan-note/siyuan/issues/6336
-                    detached: false, // 桌面端内核进程不再以游离模式拉起 https://github.com/siyuan-note/siyuan/issues/6336
+                stdio: "ignore",
-                    stdio: "ignore",
+            },);
-                },
-            );
 
             writeLog("booted kernel process [pid=" + kernelProcess.pid + ", port=" + kernelPort + "]");
             kernelProcess.on("close", (code) => {
@@ -511,39 +461,32 @@ const initKernel = (workspace, port, lang) => {
                     let errorWindowId;
                     switch (code) {
                         case 20:
-                            errorWindowId = showErrorWindow("⚠️ 数据库被锁定 The database is locked",
+                            errorWindowId = showErrorWindow("⚠️ 数据库被锁定 The database is locked", "<div>数据库文件正在被其他进程占用，请检查是否同时存在多个内核进程（SiYuan Kernel）服务相同的工作空间。</div><div>The database file is being occupied by other processes, please check whether there are multiple kernel processes (SiYuan Kernel) serving the same workspace at the same time.</div>");
-                                "<div>数据库文件正在被其他进程占用，请检查是否同时存在多个内核进程（SiYuan Kernel）服务相同的工作空间。</div><div>The database file is being occupied by other processes, please check whether there are multiple kernel processes (SiYuan Kernel) serving the same workspace at the same time.</div>");
                             break;
                         case 21:
-                            errorWindowId = showErrorWindow("⚠️ 监听端口 " + kernelPort + " 失败 Failed to listen to port " + kernelPort,
+                            errorWindowId = showErrorWindow("⚠️ 监听端口 " + kernelPort + " 失败 Failed to listen to port " + kernelPort, "<div>监听 " + kernelPort + " 端口失败，请确保程序拥有网络权限并不受防火墙和杀毒软件阻止。</div><div>Failed to listen to port " + kernelPort + ", please make sure the program has network permissions and is not blocked by firewalls and antivirus software.</div>");
-                                "<div>监听 " + kernelPort + " 端口失败，请确保程序拥有网络权限并不受防火墙和杀毒软件阻止。</div><div>Failed to listen to port " + kernelPort + ", please make sure the program has network permissions and is not blocked by firewalls and antivirus software.</div>");
                             break;
                         case 22:
-                            errorWindowId = showErrorWindow("⚠️ 创建配置目录失败 Failed to create config directory",
+                            errorWindowId = showErrorWindow("⚠️ 创建配置目录失败 Failed to create config directory", "<div>思源需要在用户家目录下创建配置文件夹（~/.config/siyuan），请确保该路径具有写入权限。</div><div>SiYuan needs to create a configuration folder (~/.config/siyuan) in the user\'s home directory. Please make sure that the path has write permissions.</div>");
-                                "<div>思源需要在用户家目录下创建配置文件夹（~/.config/siyuan），请确保该路径具有写入权限。</div><div>SiYuan needs to create a configuration folder (~/.config/siyuan) in the user\'s home directory. Please make sure that the path has write permissions.</div>");
                             break;
                         case 24: // 工作空间已被锁定，尝试切换到第一个打开的工作空间
                             if (workspaces && 0 < workspaces.length) {
                                 showWindow(workspaces[0].browserWindow);
                             }
 
-                            errorWindowId = showErrorWindow("⚠️ 工作空间已被锁定 The workspace is locked",
+                            errorWindowId = showErrorWindow("⚠️ 工作空间已被锁定 The workspace is locked", "<div>该工作空间正在被使用。</div><div>The workspace is in use.</div>");
-                                "<div>该工作空间正在被使用。</div><div>The workspace is in use.</div>");
                             break;
                         case 25:
-                            showErrorWindow("⚠️ 创建工作空间目录失败 Failed to create workspace directory",
+                            showErrorWindow("⚠️ 创建工作空间目录失败 Failed to create workspace directory", "<div>创建工作空间目录失败。</div><div>Failed to create workspace directory.</div>");
-                                "<div>创建工作空间目录失败。</div><div>Failed to create workspace directory.</div>");
                             break;
                         case 26:
-                            errorWindowId = showErrorWindow("⚠️ 文件系统读写错误 File system access error",
+                            errorWindowId = showErrorWindow("⚠️ 文件系统读写错误 File system access error", "<div>请检查文件系统权限，并确保没有其他程序正在读写文件；<br>请勿使用第三方同步盘进行数据同步，否则数据会被损坏（iCloud/OneDrive/Dropbox/Google Drive/坚果云/百度网盘/腾讯微云等）</div><div>Please check file system permissions and make sure no other programs are reading or writing to the file;<br>Do not use a third-party sync disk for data sync, otherwise the data will be damaged (OneDrive/Dropbox/Google Drive/Nutstore/Baidu Netdisk/Tencent Weiyun, etc.)</div>");
-                                "<div>请检查文件系统权限，并确保没有其他程序正在读写文件；<br>请勿使用第三方同步盘进行数据同步，否则数据会被损坏（iCloud/OneDrive/Dropbox/Google Drive/坚果云/百度网盘/腾讯微云等）</div><div>Please check file system permissions and make sure no other programs are reading or writing to the file;<br>Do not use a third-party sync disk for data sync, otherwise the data will be damaged (OneDrive/Dropbox/Google Drive/Nutstore/Baidu Netdisk/Tencent Weiyun, etc.)</div>");
                             break;
                         case 0:
                         case 1: // Fatal error
                             break;
                         default:
-                            errorWindowId = showErrorWindow("⚠️ 内核因未知原因退出 The kernel exited for unknown reasons",
+                            errorWindowId = showErrorWindow("⚠️ 内核因未知原因退出 The kernel exited for unknown reasons", `<div>思源内核因未知原因退出 [code=${code}]，请尝试重启操作系统后再启动思源。如果该问题依然发生，请检查杀毒软件是否阻止思源内核启动。</div><div>SiYuan Kernel exited for unknown reasons [code=${code}], please try to reboot your operating system and then start SiYuan again. If occurs this problem still, please check your anti-virus software whether kill the SiYuan Kernel.</div>`);
-                                `<div>思源内核因未知原因退出 [code=${code}]，请尝试重启操作系统后再启动思源。如果该问题依然发生，请检查杀毒软件是否阻止思源内核启动。</div><div>SiYuan Kernel exited for unknown reasons [code=${code}], please try to reboot your operating system and then start SiYuan again. If occurs this problem still, please check your anti-virus software whether kill the SiYuan Kernel.</div>`);
                             break;
                     }
 
@@ -573,8 +516,7 @@ const initKernel = (workspace, port, lang) => {
                 count++;
                 if (14 < count) {
                     writeLog("get kernel ver failed");
-                    showErrorWindow("⚠️ 获取内核服务端口失败 Failed to get kernel serve port",
+                    showErrorWindow("⚠️ 获取内核服务端口失败 Failed to get kernel serve port", "<div>获取内核服务端口失败，请确保程序拥有网络权限并不受防火墙和杀毒软件阻止。</div><div>Failed to get kernel serve port, please make sure the program has network permissions and is not blocked by firewalls and antivirus software.</div>");
-                        "<div>获取内核服务端口失败，请确保程序拥有网络权限并不受防火墙和杀毒软件阻止。</div><div>Failed to get kernel serve port, please make sure the program has network permissions and is not blocked by firewalls and antivirus software.</div>");
                     bootWindow.destroy();
                     resolve(false);
                 }
@@ -588,8 +530,7 @@ const initKernel = (workspace, port, lang) => {
         if (0 === apiData.code) {
             writeLog("got kernel version [" + apiData.data + "]");
             if (!isDevEnv && apiData.data !== appVer) {
-                writeLog(
+                writeLog(`kernel [${apiData.data}] is running, shutdown it now and then start kernel [${appVer}]`);
-                    `kernel [${apiData.data}] is running, shutdown it now and then start kernel [${appVer}]`);
                 fetch(getServer() + "/api/system/exit", {method: "POST"});
                 bootWindow.destroy();
                 resolve(false);
@@ -632,46 +573,33 @@ app.setPath("userData", app.getPath("userData") + "-Electron"); // `~/.config`
 
 app.whenReady().then(() => {
     const resetTrayMenu = (tray, lang, mainWindow) => {
-        const trayMenuTemplate = [
+        const trayMenuTemplate = [{
-            {
+            label: mainWindow.isVisible() ? lang.hideWindow : lang.showWindow, click: () => {
-                label: mainWindow.isVisible() ? lang.hideWindow : lang.showWindow,
+                showHideWindow(tray, lang, mainWindow);
-                click: () => {
-                    showHideWindow(tray, lang, mainWindow);
-                },
             },
-            {
+        }, {
-                label: lang.officialWebsite,
+            label: lang.officialWebsite, click: () => {
-                click: () => {
+                shell.openExternal("https://b3log.org/siyuan/");
-                    shell.openExternal("https://b3log.org/siyuan/");
-                },
             },
-            {
+        }, {
-                label: lang.openSource,
+            label: lang.openSource, click: () => {
-                click: () => {
+                shell.openExternal("https://github.com/siyuan-note/siyuan");
-                    shell.openExternal("https://github.com/siyuan-note/siyuan");
-                },
             },
-            {
+        }, {
-                label: lang.resetWindow,
+            label: lang.resetWindow, type: "checkbox", click: v => {
-                type: "checkbox",
+                resetWindowStateOnRestart = v.checked;
-                click: v => {
+                mainWindow.webContents.send("siyuan-save-close", true);
-                    resetWindowStateOnRestart = v.checked;
-                    mainWindow.webContents.send("siyuan-save-close", true);
-                },
             },
-            {
+        }, {
-                label: lang.quit,
+            label: lang.quit, click: () => {
-                click: () => {
+                mainWindow.webContents.send("siyuan-save-close", true);
-                    mainWindow.webContents.send("siyuan-save-close", true);
-                },
             },
-        ];
+        },];
 
         if ("win32" === process.platform) {
             // Windows 端支持窗口置顶 https://github.com/siyuan-note/siyuan/issues/6860
             trayMenuTemplate.splice(1, 0, {
-                label: mainWindow.isAlwaysOnTop() ? lang.cancelWindowTop : lang.setWindowTop,
+                label: mainWindow.isAlwaysOnTop() ? lang.cancelWindowTop : lang.setWindowTop, click: () => {
-                click: () => {
                     if (!mainWindow.isAlwaysOnTop()) {
                         mainWindow.setAlwaysOnTop(true);
                     } else {
@@ -814,8 +742,7 @@ app.whenReady().then(() => {
                 return true;
             }
         });
-        await fetch(getServer(data.port) + "/api/system/uiproc?pid=" + process.pid,
+        await fetch(getServer(data.port) + "/api/system/uiproc?pid=" + process.pid, {method: "POST"});
-            {method: "POST"});
     });
     ipcMain.on("siyuan-hotkey", (event, data) => {
         globalShortcut.unregisterAll();
@@ -866,10 +793,7 @@ app.whenReady().then(() => {
             icon: path.join(appDir, "stage", "icon-large.png"),
             transparent: "linux" !== process.platform,
             webPreferences: {
-                nodeIntegration: true,
+                nodeIntegration: true, webviewTag: true, webSecurity: false, contextIsolation: false,
-                webviewTag: true,
-                webSecurity: false,
-                contextIsolation: false,
             },
         });
         require("@electron/remote/main").enable(firstOpenWindow.webContents);
@@ -880,17 +804,15 @@ app.whenReady().then(() => {
 
         // 改进桌面端初始化时使用的外观语言 https://github.com/siyuan-note/siyuan/issues/6803
         let languages = app.getPreferredSystemLanguages();
-        let language = languages && 0 < languages.length && "zh-Hans-CN" ===
+        let language = languages && 0 < languages.length && "zh-Hans-CN" === languages[0] ? "zh_CN" : "en_US";
-        languages[0] ? "zh_CN" : "en_US";
+        firstOpenWindow.loadFile(initHTMLPath, {
-        firstOpenWindow.loadFile(
+            query: {
-            initHTMLPath, {
+                lang: language,
-                query: {
+                home: app.getPath("home"),
-                    lang: language,
+                v: appVer,
-                    home: app.getPath("home"),
+                icon: path.join(appDir, "stage", "icon-large.png"),
-                    v: appVer,
+            },
-                    icon: path.join(appDir, "stage", "icon-large.png"),
+        });
-                },
-            });
         firstOpenWindow.show();
         // 初始化启动
         ipcMain.on("siyuan-first-init", (event, data) => {
@@ -1052,8 +974,7 @@ powerMonitor.on("resume", async () => {
     workspaces.forEach(item => {
         const currentURL = new URL(item.browserWindow.getURL());
         const server = getServer(currentURL.port);
-        writeLog(
+        writeLog("sync after system resume [" + server + "/api/sync/performSync" + "]");
-            "sync after system resume [" + server + "/api/sync/performSync" + "]");
         fetch(server + "/api/sync/performSync", {method: "POST"});
     });
 });