Skip to content

An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作

:bug: Retry workspace startup during lock contention https://github.com/siyuan-note/siyuan/issues/20519

Daniela8a162ca09cc
diff --git a/app/appearance/langs/ar.json b/app/appearance/langs/ar.json
index 681ba9d6dd..8cb3028b2a 100644
--- a/app/appearance/langs/ar.json
+++ b/app/appearance/langs/ar.json
@@ -1,4 +1,5 @@
{
+ "workspaceLockWaiting": "مساحة العمل قيد الاستخدام. في انتظار إعادة المحاولة...",
"clearOCRText": "مسح نص OCR",
"clearOCRTextDone": "تم مسح نص OCR",
"compactMode": "الوضع المضغوط",
diff --git a/app/appearance/langs/de.json b/app/appearance/langs/de.json
index 61a684aba5..b28657971c 100644
--- a/app/appearance/langs/de.json
+++ b/app/appearance/langs/de.json
@@ -1,4 +1,5 @@
{
+ "workspaceLockWaiting": "Der Arbeitsbereich wird verwendet. Warten auf erneuten Versuch...",
"clearOCRText": "OCR-Text löschen",
"clearOCRTextDone": "OCR-Text gelöscht",
"compactMode": "Kompaktmodus",
diff --git a/app/appearance/langs/en.json b/app/appearance/langs/en.json
index b9c70cc94c..ab628e5487 100644
--- a/app/appearance/langs/en.json
+++ b/app/appearance/langs/en.json
@@ -1,4 +1,5 @@
{
+ "workspaceLockWaiting": "Workspace is in use. Waiting to retry...",
"clearOCRText": "Clear OCR text",
"clearOCRTextDone": "OCR text cleared",
"compactMode": "Compact mode",
diff --git a/app/appearance/langs/es.json b/app/appearance/langs/es.json
index 7ca662b7b9..76094b2e1a 100644
--- a/app/appearance/langs/es.json
+++ b/app/appearance/langs/es.json
@@ -1,4 +1,5 @@
{
+ "workspaceLockWaiting": "El espacio de trabajo está en uso. Esperando para reintentar...",
"clearOCRText": "Borrar texto OCR",
"clearOCRTextDone": "Texto OCR borrado",
"compactMode": "Modo compacto",
diff --git a/app/appearance/langs/fr.json b/app/appearance/langs/fr.json
index 8c6ce903a4..3690b7c4d6 100644
--- a/app/appearance/langs/fr.json
+++ b/app/appearance/langs/fr.json
@@ -1,4 +1,5 @@
{
+ "workspaceLockWaiting": "L’espace de travail est en cours d’utilisation. En attente d’une nouvelle tentative...",
"clearOCRText": "Effacer le texte OCR",
"clearOCRTextDone": "Texte OCR effacé",
"compactMode": "Mode compact",
diff --git a/app/appearance/langs/he.json b/app/appearance/langs/he.json
index 7752bd580a..feee69830a 100644
--- a/app/appearance/langs/he.json
+++ b/app/appearance/langs/he.json
@@ -1,4 +1,5 @@
{
+ "workspaceLockWaiting": "מקום העבודה נמצא בשימוש. ממתין לניסיון חוזר...",
"clearOCRText": "נקה טקסט OCR",
"clearOCRTextDone": "טקסט OCR נוקה",
"compactMode": "מצב קומפקטי",
diff --git a/app/appearance/langs/hi.json b/app/appearance/langs/hi.json
index 5b19c4a43f..68b319a204 100644
--- a/app/appearance/langs/hi.json
+++ b/app/appearance/langs/hi.json
@@ -1,4 +1,5 @@
{
+ "workspaceLockWaiting": "कार्यक्षेत्र उपयोग में है। पुनः प्रयास करने की प्रतीक्षा में...",
"clearOCRText": "OCR पाठ साफ़ करें",
"clearOCRTextDone": "OCR पाठ साफ़ कर दिया गया",
"compactMode": "संक्षिप्त मोड",
diff --git a/app/appearance/langs/id.json b/app/appearance/langs/id.json
index d6d2bd368b..b5ecf71e33 100644
--- a/app/appearance/langs/id.json
+++ b/app/appearance/langs/id.json
@@ -1,4 +1,5 @@
{
+ "workspaceLockWaiting": "Ruang kerja sedang digunakan. Menunggu untuk mencoba lagi...",
"clearOCRText": "Hapus teks OCR",
"clearOCRTextDone": "Teks OCR dihapus",
"compactMode": "Mode ringkas",
diff --git a/app/appearance/langs/it.json b/app/appearance/langs/it.json
index 3707931462..bb14d550dd 100644
--- a/app/appearance/langs/it.json
+++ b/app/appearance/langs/it.json
@@ -1,4 +1,5 @@
{
+ "workspaceLockWaiting": "L'area di lavoro è in uso. In attesa di riprovare...",
"clearOCRText": "Cancella testo OCR",
"clearOCRTextDone": "Testo OCR cancellato",
"compactMode": "Modalità compatta",
diff --git a/app/appearance/langs/ja.json b/app/appearance/langs/ja.json
index 2f8bb18947..0af7881718 100644
--- a/app/appearance/langs/ja.json
+++ b/app/appearance/langs/ja.json
@@ -1,4 +1,5 @@
{
+ "workspaceLockWaiting": "ワークスペースは使用中です。再試行を待機しています...",
"clearOCRText": "OCR テキストを消去",
"clearOCRTextDone": "OCR テキストを消去しました",
"compactMode": "コンパクトモード",
diff --git a/app/appearance/langs/ko.json b/app/appearance/langs/ko.json
index f9acf3d808..d3922cb093 100644
--- a/app/appearance/langs/ko.json
+++ b/app/appearance/langs/ko.json
@@ -1,4 +1,5 @@
{
+ "workspaceLockWaiting": "작업 공간이 사용 중입니다. 재시도 대기 중...",
"clearOCRText": "OCR 텍스트 지우기",
"clearOCRTextDone": "OCR 텍스트를 지웠습니다",
"compactMode": "간결한 모드",
diff --git a/app/appearance/langs/nl.json b/app/appearance/langs/nl.json
index c9a2d1bab2..8cbd97439d 100644
--- a/app/appearance/langs/nl.json
+++ b/app/appearance/langs/nl.json
@@ -1,4 +1,5 @@
{
+ "workspaceLockWaiting": "De werkruimte is in gebruik. Wachten op een nieuwe poging...",
"clearOCRText": "OCR-tekst wissen",
"clearOCRTextDone": "OCR-tekst gewist",
"compactMode": "Compacte modus",
diff --git a/app/appearance/langs/pl.json b/app/appearance/langs/pl.json
index d4605b2007..39b274f35e 100644
--- a/app/appearance/langs/pl.json
+++ b/app/appearance/langs/pl.json
@@ -1,4 +1,5 @@
{
+ "workspaceLockWaiting": "Obszar roboczy jest używany. Oczekiwanie na ponowną próbę...",
"clearOCRText": "Wyczyść tekst OCR",
"clearOCRTextDone": "Tekst OCR został wyczyszczony",
"compactMode": "Tryb kompaktowy",
diff --git a/app/appearance/langs/pt-BR.json b/app/appearance/langs/pt-BR.json
index 4b7415cad4..3b57c8c4bb 100644
--- a/app/appearance/langs/pt-BR.json
+++ b/app/appearance/langs/pt-BR.json
@@ -1,4 +1,5 @@
{
+ "workspaceLockWaiting": "O espaço de trabalho está em uso. Aguardando para tentar novamente...",
"clearOCRText": "Limpar texto OCR",
"clearOCRTextDone": "Texto OCR limpo",
"compactMode": "Modo compacto",
diff --git a/app/appearance/langs/ru.json b/app/appearance/langs/ru.json
index 09b79de346..fc805792a3 100644
--- a/app/appearance/langs/ru.json
+++ b/app/appearance/langs/ru.json
@@ -1,4 +1,5 @@
{
+ "workspaceLockWaiting": "Рабочее пространство используется. Ожидание повторной попытки...",
"clearOCRText": "Очистить текст OCR",
"clearOCRTextDone": "Текст OCR очищен",
"compactMode": "Компактный режим",
diff --git a/app/appearance/langs/sk.json b/app/appearance/langs/sk.json
index 00912122c2..e0ef124dff 100644
--- a/app/appearance/langs/sk.json
+++ b/app/appearance/langs/sk.json
@@ -1,4 +1,5 @@
{
+ "workspaceLockWaiting": "Pracovný priestor sa používa. Čaká sa na opätovný pokus...",
"clearOCRText": "Vymazať text OCR",
"clearOCRTextDone": "Text OCR bol vymazaný",
"compactMode": "Kompaktný režim",
diff --git a/app/appearance/langs/sr.json b/app/appearance/langs/sr.json
index dfaf67de83..2aa9277660 100644
--- a/app/appearance/langs/sr.json
+++ b/app/appearance/langs/sr.json
@@ -1,4 +1,5 @@
{
+ "workspaceLockWaiting": "Radni prostor je u upotrebi. Čekanje na ponovni pokušaj...",
"clearOCRText": "Очисти OCR текст",
"clearOCRTextDone": "OCR текст је очишћен",
"compactMode": "Компактни режим",
diff --git a/app/appearance/langs/th.json b/app/appearance/langs/th.json
index f3042c3071..8c9f94650c 100644
--- a/app/appearance/langs/th.json
+++ b/app/appearance/langs/th.json
@@ -1,4 +1,5 @@
{
+ "workspaceLockWaiting": "พื้นที่ทำงานกำลังถูกใช้งาน กำลังรอเพื่อลองอีกครั้ง...",
"clearOCRText": "ล้างข้อความ OCR",
"clearOCRTextDone": "ล้างข้อความ OCR แล้ว",
"compactMode": "โหมดกะทัดรัด",
diff --git a/app/appearance/langs/tr.json b/app/appearance/langs/tr.json
index 46ddb1f5f2..63c2ae5350 100644
--- a/app/appearance/langs/tr.json
+++ b/app/appearance/langs/tr.json
@@ -1,4 +1,5 @@
{
+ "workspaceLockWaiting": "Çalışma alanı kullanımda. Yeniden denemek için bekleniyor...",
"clearOCRText": "OCR metnini temizle",
"clearOCRTextDone": "OCR metni temizlendi",
"compactMode": "Kompakt mod",
diff --git a/app/appearance/langs/uk.json b/app/appearance/langs/uk.json
index a620ece6cc..c14cec7076 100644
--- a/app/appearance/langs/uk.json
+++ b/app/appearance/langs/uk.json
@@ -1,4 +1,5 @@
{
+ "workspaceLockWaiting": "Робочий простір використовується. Очікування повторної спроби...",
"clearOCRText": "Очистити текст OCR",
"clearOCRTextDone": "Текст OCR очищено",
"compactMode": "Компактний режим",
diff --git a/app/appearance/langs/zh-CN.json b/app/appearance/langs/zh-CN.json
index faaa72f1fb..f17b80c2ca 100644
--- a/app/appearance/langs/zh-CN.json
+++ b/app/appearance/langs/zh-CN.json
@@ -1,4 +1,5 @@
{
+ "workspaceLockWaiting": "工作空间正在被使用,等待重试...",
"clearOCRText": "清空 OCR 文本",
"clearOCRTextDone": "已清空 OCR 文本",
"compactMode": "紧凑模式",
diff --git a/app/appearance/langs/zh-TW.json b/app/appearance/langs/zh-TW.json
index d5da0e0b85..ad38f3ea24 100644
--- a/app/appearance/langs/zh-TW.json
+++ b/app/appearance/langs/zh-TW.json
@@ -1,4 +1,5 @@
{
+ "workspaceLockWaiting": "工作空間正在被使用,等待重試...",
"clearOCRText": "清空 OCR 文字",
"clearOCRTextDone": "已清空 OCR 文字",
"compactMode": "緊湊模式",
diff --git a/app/electron/kernelBoot.test.js b/app/electron/kernelBoot.test.js
index a96152dad1..e29d54cfef 100644
--- a/app/electron/kernelBoot.test.js
+++ b/app/electron/kernelBoot.test.js
@@ -4,6 +4,7 @@ const path = require("node:path");
const {pathToFileURL} = require("node:url");
const {test} = require("node:test");
const vm = require("node:vm");
+const {EventEmitter} = require("node:events");
const source = readFileSync(path.join(__dirname, "main.js"), "utf8");
const startup = source.slice(source.indexOf("const initKernel ="), source.indexOf("const fetchWithTimeout ="));
@@ -18,6 +19,7 @@ const setup = (progress, options = {}) => {
let requests = 0;
let versionRequests = 0;
let closeKernel;
+ let spawns = 0;
const window = {
destroyed: false,
isDestroyed() { return this.destroyed; },
@@ -26,6 +28,7 @@ const setup = (progress, options = {}) => {
webContents: {executeJavaScript: async script => { events.push(["boot-script", script]); }},
};
const fixture = {events, waits, window, closeKernel: code => closeKernel(code, null),
+ spawns: () => spawns,
requests: () => requests, versionRequests: () => versionRequests,
timerCount: () => timers.size, timerDelays: () => Array.from(timers.values()).map(timer => timer.ms),
settleMicrotasks: () => new Promise(resolve => setImmediate(resolve)),
@@ -46,7 +49,7 @@ const setup = (progress, options = {}) => {
path,
pathToFileURL,
process: {platform: options.platform || "win32", env: {}},
- app: {getPreferredSystemLanguages: () => ["en"]},
+ app: Object.assign(new EventEmitter(), {getPreferredSystemLanguages: () => ["en"]}),
resolveAppLanguage: languages => languages[0],
loadAppMenuLanguages: language => JSON.parse(readFileSync(path.join(__dirname, "../appearance/langs", language + ".json"), "utf8")),
escapeHTML: value => String(value).replace(/[&<>"']/g, character => ({
@@ -67,7 +70,8 @@ const setup = (progress, options = {}) => {
bootIndexPath: "app/electron/boot.html",
loadBootWindow: () => events.push("resume-boot"),
kernelProcesses: new Map(), expectedKernelExitPorts: new Set(),
- createBootWindow: () => {}, showLocalBootWindow: () => {}, showAppleSiliconWarning: async () => true,
+ createBootWindow: () => events.push("create-boot"), showLocalBootWindow: () => events.push("show-boot"),
+ showAppleSiliconWarning: async () => true,
waitForPreviousWorkspaceExit: options.previousExit || (async () => true),
requestWorkspaceExitRecovery: async (workspace, marker, signal) => {
events.push(["recover-exit", workspace, marker.pid, signal]);
@@ -82,10 +86,13 @@ const setup = (progress, options = {}) => {
requestKernelExit: port => events.push(["exit-kernel", port]),
showErrorWindow: (...args) => { events.push(["error-window", args[1]]); return 1; },
exitApp: () => events.push("exit-app"),
- childProcess: {spawn: () => ({pid: 123, on: (event, callback) => {
- assert.equal(event, "close");
- closeKernel = callback;
- }}), execFile: (file, args, options, callback) => {
+ childProcess: {spawn: (_file, args) => {
+ events.push(["spawn-args", Array.from(args)]);
+ return {pid: 123 + spawns++, on: (event, callback) => {
+ assert.equal(event, "close");
+ closeKernel = callback;
+ }};
+ }, execFile: (file, args, options, callback) => {
events.push(["exec-file", file, args.join(" "), options.timeout]);
callback(null, "");
}},
@@ -120,6 +127,180 @@ const setup = (progress, options = {}) => {
const exits = fixture => fixture.events.filter(event => Array.isArray(event) && event[0] === "exit-kernel");
+test("workspace lock retries retain one window and port until startup succeeds", async () => {
+ let previousExitChecks = 0;
+ const state = setup(() => 100, {
+ platform: "linux",
+ previousExit: async () => { previousExitChecks++; return true; },
+ version: (request, fixture) => {
+ if (request <= 3) {
+ fixture.closeKernel(24);
+ return new Error("net::ERR_CONNECTION_REFUSED");
+ }
+ },
+ });
+ assert.equal(await state.run(), 6806);
+ assert.equal(state.spawns(), 4);
+ assert.equal(previousExitChecks, 4);
+ assert.equal(state.events.filter(event => event === "create-boot").length, 1);
+ assert.equal(state.events.filter(event => event === "show-boot").length, 1);
+ assert.equal(state.events.some(event => Array.isArray(event) && event[0] === "error-window"), false);
+ assert.equal(state.context.kernelProcesses.size, 1);
+ assert.equal(state.window.previousExitWaiting, "");
+ assert.equal(exits(state).length, 0);
+ assert.equal(state.context.app.listenerCount("before-quit"), 0);
+});
+
+test("lock retries have a fixed deadline and report one terminal error", async () => {
+ const state = setup(() => 100, {version: (_request, fixture) => {
+ fixture.closeKernel(24);
+ return new Error("net::ERR_CONNECTION_REFUSED");
+ }});
+ assert.equal(await state.run(), false);
+ assert.equal(state.spawns(), 90);
+ assert.equal(state.events.filter(event => Array.isArray(event) && event[0] === "error-window").length, 1);
+ assert.equal(state.events.filter(event => event === "exit-app").length, 1);
+ assert.equal(state.context.kernelProcesses.size, 0);
+ assert.equal(exits(state).length, 0);
+});
+
+test("closing, replacing or quitting during lock retry prevents another spawn", async () => {
+ for (const action of ["close", "replace", "quit"]) {
+ const state = setup(() => 100, {
+ version: (_request, fixture) => {
+ fixture.closeKernel(24);
+ return new Error("net::ERR_CONNECTION_REFUSED");
+ },
+ onSleep: (_ms, fixture) => {
+ if (action === "close") fixture.window.destroyed = true;
+ if (action === "replace") fixture.context.bootWindow = {isDestroyed: () => false};
+ if (action === "quit") {
+ fixture.context.app.on("before-quit", event => event.preventDefault());
+ const event = {preventDefault() { this.prevented = true; }};
+ fixture.context.app.emit("before-quit", event);
+ assert.equal(event.prevented, true);
+ }
+ },
+ });
+ assert.equal(await state.run(), false);
+ assert.equal(state.spawns(), 1);
+ assert.equal(exits(state).length, 0);
+ assert.equal(state.events.some(event => Array.isArray(event) && event[0] === "error-window"), false);
+ if (action === "quit") assert.equal(state.window.destroyed, true);
+ }
+});
+
+test("a marker appearing on retry retains long graceful exit recovery", async () => {
+ let checks = 0;
+ let state;
+ state = setup(() => 100, {
+ previousExit: async (_workspace, options) => {
+ if (++checks === 2) {
+ assert.equal(state.spawns(), 1);
+ await options.onWaiting();
+ state.advance(120000);
+ }
+ return true;
+ },
+ version: (request, fixture) => {
+ if (request === 1) {
+ fixture.closeKernel(24);
+ return new Error("net::ERR_CONNECTION_REFUSED");
+ }
+ },
+ });
+ assert.equal(await state.run(), 6806);
+ assert.equal(state.spawns(), 2);
+ assert.equal(exits(state).length, 0);
+});
+
+test("late responses from a locked attempt cannot settle its replacement", async () => {
+ for (const reject of [false, true]) {
+ let finishOld;
+ let finishNew;
+ const state = setup(() => 100, {version: request => new Promise((resolve, rejectRequest) => {
+ if (request === 1) finishOld = () => reject ? rejectRequest(new Error("late failure")) : resolve();
+ else finishNew = resolve;
+ })});
+ let settled = false;
+ const run = state.run().then(result => { settled = true; return result; });
+ await state.settleMicrotasks();
+ state.closeKernel(24);
+ await state.settleMicrotasks();
+ assert.equal(state.spawns(), 2);
+ finishOld();
+ await state.settleMicrotasks();
+ assert.equal(settled, false);
+ assert.equal(state.window.destroyed, false);
+ finishNew();
+ assert.equal(await run, 6806);
+ assert.equal(exits(state).length, 0);
+ }
+});
+
+test("retry remains bound to its original workspace when the last workspace changes", async () => {
+ const checked = [];
+ const state = setup(() => 100, {
+ previousExit: async workspace => { checked.push(workspace); return true; },
+ version: (request, fixture) => {
+ if (request === 1) {
+ fixture.closeKernel(24);
+ return new Error("net::ERR_CONNECTION_REFUSED");
+ }
+ },
+ onSleep: (_ms, fixture) => { fixture.context.lastWorkspacePath = "other-workspace"; },
+ });
+ assert.equal(await state.run(), 6806);
+ assert.deepEqual(checked, ["workspace", "workspace"]);
+ const args = state.events.filter(event => Array.isArray(event) && event[0] === "spawn-args")[1][1];
+ assert.equal(args[args.indexOf("--workspace") + 1], "workspace");
+});
+
+test("canceling retry marker recovery or declining its sync failure does not respawn", async () => {
+ for (const action of ["replace", "sync-failure"]) {
+ let checks = 0;
+ let state;
+ state = setup(() => 100, {
+ previousExit: async (_workspace, options) => {
+ if (++checks === 1) return true;
+ await options.onWaiting();
+ if (action === "sync-failure") return options.onRecoveryFailed(true);
+ state.context.bootWindow = {isDestroyed: () => false};
+ return true;
+ },
+ version: (_request, fixture) => {
+ fixture.closeKernel(24);
+ return new Error("net::ERR_CONNECTION_REFUSED");
+ },
+ });
+ assert.equal(await state.run(), false);
+ assert.equal(state.spawns(), 1);
+ assert.equal(exits(state).length, 0);
+ assert.equal(state.window.destroyed, action === "sync-failure");
+ }
+});
+
+test("expected exits and other error codes do not retry kernel spawning", async () => {
+ for (const code of [0, 20, 21, 25, 26, 24]) {
+ const state = setup(() => 100, {version: (_request, fixture) => {
+ if (code === 24) fixture.context.expectedKernelExitPorts.add("6806");
+ fixture.closeKernel(code);
+ return new Error("net::ERR_CONNECTION_REFUSED");
+ }});
+ assert.equal(await state.run(), false);
+ assert.equal(state.spawns(), 1);
+ }
+});
+
+test("code 24 after startup success retains runtime failure handling", async () => {
+ const state = setup(() => 100);
+ assert.equal(await state.run(), 6806);
+ state.closeKernel(24);
+ await state.settleMicrotasks();
+ assert.equal(state.spawns(), 1);
+ assert.equal(state.events.filter(event => Array.isArray(event) && event[0] === "error-window").length, 1);
+});
+
test("startup shows previous-exit waiting and spawns only after it completes", async () => {
let finish;
const pending = new Promise(resolve => { finish = resolve; });
diff --git a/app/electron/main.js b/app/electron/main.js
index 81775060f9..8786c659b0 100644
--- a/app/electron/main.js
+++ b/app/electron/main.js
@@ -2601,17 +2601,75 @@ const showLocalBootWindow = () => {
}
};
-const initKernel = (workspace, port, lang, safeMode, preparedBoot) => {
+const initKernel = async (workspace, port, lang, safeMode, preparedBoot) => {
+ // 每次尝试保留独立的退出状态,避免上一轮未完成的请求干扰新内核。
+ const startup = {};
+ const cancelStartup = () => {
+ startup.canceled = true;
+ // 其他工作空间可能阻止应用退出,主动关闭本次启动页,避免留下无法继续的等待窗口。
+ if (startup.window && bootWindow === startup.window && !startup.window.isDestroyed()) {
+ startup.window.destroy();
+ }
+ };
+ app.on("before-quit", cancelStartup);
+ let retryDeadline;
+ try {
+ for (;;) {
+ const result = await initKernelAttempt(startup.window ? startup.workspace : workspace,
+ port, lang, safeMode, preparedBoot, startup);
+ if (result !== "workspace-locked") {
+ return result;
+ }
+ const currentBootWindow = startup.window;
+ const canceled = () => startup.canceled || currentBootWindow.isDestroyed() || bootWindow !== currentBootWindow;
+ if (canceled()) return false;
+ // 只限制锁冲突的自动重试;已进入正常退出的同步恢复仍使用原有等待期限。
+ retryDeadline ??= Date.now() + 90000;
+ const failLocked = () => {
+ exitApp(startup.port, showWorkspaceLocked());
+ if (!currentBootWindow.isDestroyed()) currentBootWindow.destroy();
+ return false;
+ };
+ if (Date.now() >= retryDeadline) return failLocked();
+ try {
+ const languages = loadAppMenuLanguages(lang || resolveAppLanguage(app.getPreferredSystemLanguages()));
+ currentBootWindow.previousExitWaiting = languages.workspaceLockWaiting;
+ await currentBootWindow.webContents.executeJavaScript(
+ `window.setPreviousExitWaiting(${JSON.stringify(languages.workspaceLockWaiting)})`);
+ writeLog("workspace is locked, waiting to retry kernel startup");
+ for (let elapsed = 0; elapsed < 1000 && !canceled(); elapsed += 100) {
+ await sleep(100);
+ }
+ if (canceled()) return false;
+ if (Date.now() >= retryDeadline) return failLocked();
+ } catch (error) {
+ writeLog("wait to retry kernel startup failed: " + error);
+ return canceled() ? false : failLocked();
+ }
+ }
+ } finally {
+ app.removeListener("before-quit", cancelStartup);
+ }
+};
+
+const showWorkspaceLocked = () => {
+ if (workspaces && 0 < workspaces.length) {
+ showWindow(workspaces[0].browserWindow);
+ }
+ return showErrorWindow("工作空间已被锁定", "The workspace is locked", "<div>该工作空间正在被使用,请尝试在任务管理器中结束 SiYuan-Kernel 进程或者重启操作系统后再启动思源。</div><div>The workspace is being used, please try to end the SiYuan-Kernel process in the task manager or restart the operating system and then start SiYuan.</div>");
+};
+
+const initKernelAttempt = (workspace, port, lang, safeMode, preparedBoot, startup) => {
return new Promise(async (resolve) => {
const currentWorkspace = [workspace, process.env.SIYUAN_WORKSPACE_PATH, lastWorkspacePath]
.find(item => typeof item === "string" && item);
const workspaceLogPath = currentWorkspace ? path.resolve(currentWorkspace, "temp", "siyuan.log") : "";
const kernelLogPath = path.join(confDir, "kernel.log");
// 必须在首次异步等待前创建窗口,避免工作空间选择窗口关闭后因无窗口触发应用退出。
- if (!preparedBoot) {
+ if (!startup.window && !preparedBoot) {
createBootWindow();
}
- if (!await showAppleSiliconWarning(lang)) {
+ if (!startup.window && !await showAppleSiliconWarning(lang)) {
bootWindow.destroy();
app.quit();
resolve(false);
@@ -2626,7 +2684,13 @@ const initKernel = (workspace, port, lang, safeMode, preparedBoot) => {
return;
}
- if (preparedBoot) {
+ if (startup.window) {
+ if (startup.canceled || startup.window.isDestroyed() || bootWindow !== startup.window) {
+ resolve(false);
+ return;
+ }
+ kernelPort = startup.port;
+ } else if (preparedBoot) {
kernelPort = await preparedBoot.ready;
} else {
await getAvailablePort(port);
@@ -2637,15 +2701,19 @@ const initKernel = (workspace, port, lang, safeMode, preparedBoot) => {
resolve(false);
return;
}
- if (!preparedBoot) {
+ if (!startup.window && !preparedBoot) {
showLocalBootWindow();
}
const currentKernelPort = kernelPort;
const currentBootWindow = bootWindow;
+ startup.window = currentBootWindow;
+ startup.port = currentKernelPort;
+ startup.workspace = currentWorkspace;
let kernelExited = false;
- const bootCanceled = () => kernelExited || currentBootWindow.isDestroyed() || bootWindow !== currentBootWindow;
+ let kernelStarted = false;
+ const bootCanceled = () => startup.canceled || kernelExited || currentBootWindow.isDestroyed() || bootWindow !== currentBootWindow;
if (!isDevEnv || workspaces.length > 0) {
- let waiting = false;
+ let waiting = !!currentBootWindow.previousExitWaiting;
const language = lang || resolveAppLanguage(app.getPreferredSystemLanguages());
const languages = loadAppMenuLanguages(language);
try {
@@ -2729,6 +2797,11 @@ const initKernel = (workspace, port, lang, safeMode, preparedBoot) => {
}
const expectedExit = expectedKernelExitPorts.delete(kernelPortKey);
writeLog(`kernel [pid=${kernelProcess.pid}, port=${currentKernelPort}] exited with code [${code}], signal [${signal}], expected [${expectedExit}]`);
+ if (code === 24 && !expectedExit && !kernelStarted) {
+ resolve(startup.canceled || currentBootWindow.isDestroyed() || bootWindow !== currentBootWindow
+ ? false : "workspace-locked");
+ return;
+ }
if (0 !== code && !expectedExit) {
let errorWindowId;
switch (code) {
@@ -2739,11 +2812,7 @@ const initKernel = (workspace, port, lang, safeMode, preparedBoot) => {
errorWindowId = showErrorWindow("监听端口 " + currentKernelPort + " 失败", "Failed to listen to port " + currentKernelPort, "<div>监听 " + currentKernelPort + " 端口失败,请确保程序拥有网络权限并不受防火墙和杀毒软件阻止。</div><div>Failed to listen to port " + currentKernelPort + ", please make sure the program has network permissions and is not blocked by firewalls and antivirus software.</div>");
break;
case 24: // 工作空间已被锁定,尝试切换到第一个打开的工作空间
- if (workspaces && 0 < workspaces.length) {
- showWindow(workspaces[0].browserWindow);
- }
-
- errorWindowId = showErrorWindow("工作空间已被锁定", "The workspace is locked", "<div>该工作空间正在被使用,请尝试在任务管理器中结束 SiYuan-Kernel 进程或者重启操作系统后再启动思源。</div><div>The workspace is being used, please try to end the SiYuan-Kernel process in the task manager or restart the operating system and then start SiYuan.</div>");
+ errorWindowId = showWorkspaceLocked();
break;
case 25:
errorWindowId = showErrorWindow("初始化工作空间失败", "Failed to create workspace directory", "<div>工作空间文件夹权限不足,请查看 <a href=\"#\" data-log-path>~/.config/siyuan/kernel.log</a> 获取详细报错信息</div><div>Insufficient permissions for the workspace folder. Please check <a href=\"#\" data-log-path>~/.config/siyuan/kernel.log</a> for detailed error information.</div>", "⚠️", kernelLogPath);
@@ -2806,6 +2875,7 @@ const initKernel = (workspace, port, lang, safeMode, preparedBoot) => {
return;
}
if (0 === apiData.code) {
+ kernelStarted = true;
writeLog("got kernel version [" + apiData.data + "]");
if (!isDevEnv && apiData.data !== appVer) {
writeLog(`kernel [${apiData.data}] is running, shutdown it now and then start kernel [${appVer}]`);