Skip to content

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

:bug: Preserve independent workspace startup windows https://github.com/siyuan-note/siyuan/issues/20821

Danielbf34a3fab6d8
diff --git a/app/electron/bootWindow.test.js b/app/electron/bootWindow.test.js
index 4f4f901fdf..08e17c344f 100644
--- a/app/electron/bootWindow.test.js
+++ b/app/electron/bootWindow.test.js
@@ -3,6 +3,7 @@ const {readFileSync} = require("node:fs");
const path = require("node:path");
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 helpers = source.slice(source.indexOf("const getAvailablePort ="), source.indexOf("const initKernel ="));
@@ -20,6 +21,7 @@ const setup = (overrides = {}) => {
const context = vm.createContext({
Date, Promise, process: {platform: "win32"}, setImmediate: callback => callback(),
isDevEnv: false, workspaces: ["workspace"], kernelPort: 6806,
+ localKernelStartups: new Map(),
openAsHidden: false, bootWindow: window,
remoteKernelArgError: false, remoteKernelTarget: false, firstOpen: false, lastWorkspaceMissing: false,
readAppCrashInfo: () => undefined, getArg: () => "",
@@ -85,3 +87,157 @@ test("hidden startup stays minimized and destroyed windows are not shown", async
await vm.runInContext("preparedBoot.ready", destroyed.context);
assert.deepEqual(destroyed.events, ["create"]);
});
+
+test("concurrent port allocation resolves each request with its own reserved port", async () => {
+ const close = [];
+ let nextPort = 7420;
+ const {context} = setup({gNet: {createServer: () => {
+ const port = ++nextPort;
+ return {on() {}, listen: (_port, callback) => callback(), address: () => ({port}),
+ close: callback => close.push(callback)};
+ }}});
+ const first = vm.runInContext("getAvailablePort()", context);
+ const second = vm.runInContext("getAvailablePort()", context);
+ close[1]();
+ close[0]();
+ assert.deepEqual(await Promise.all([first, second]), [7421, 7422]);
+});
+
+test("each boot window can show after another workspace creates its boot window", () => {
+ const first = setup();
+ const unrelated = {isDestroyed: () => false, show: () => assert.fail("unrelated window")};
+ vm.runInContext("showLocalBootWindow(bootWindow, 6806, 'en')", first.context);
+ first.context.bootWindow = unrelated;
+ first.window["ready-to-show"]();
+ assert.deepEqual(first.events.slice(-2), ["show", ["opacity", 1]]);
+});
+
+test("appearance recovery reloads only the affected boot window with its original connection", () => {
+ class Window extends EventEmitter {
+ isDestroyed() { return !!this.destroyed; }
+ destroy() { this.destroyed = true; this.emit("closed"); }
+ loadFile(file, options) { this.loaded = {file, query: options.query}; return Promise.resolve(); }
+ }
+ const context = vm.createContext({
+ BrowserWindow: Window, bootWindows: new Set(), bootWindow: undefined, bootIndexPath: "",
+ appDir: "app", appVer: "3.8.6", isDevEnv: false, path, kernelPort: 9999,
+ screen: {getPrimaryDisplay: () => ({size: {width: 1000}, workAreaSize: {height: 800}})},
+ remoteKernelTarget: undefined, writeLog() {}, getArg: () => "en",
+ });
+ vm.runInContext(source.slice(source.indexOf("const loadBootWindow ="), source.indexOf("const getAvailablePort =")), context);
+ vm.runInContext("const a = createBootWindow(); loadBootWindow(false, a, 6806, 'en');" +
+ "const b = createBootWindow(); loadBootWindow(false, b, 6807, 'ja'); a.emit('unresponsive');", context);
+ const [a, b] = Array.from(context.bootWindows);
+ assert.equal(a.loaded.query.port, 6806);
+ assert.equal(a.loaded.query.lang, "en");
+ assert.equal(a.loaded.query.appearance, "0");
+ assert.equal(b.loaded.query.port, 6807);
+ assert.equal(b.loaded.query.lang, "ja");
+ assert.equal(b.loaded.query.appearance, undefined);
+ a.destroy();
+ assert.deepEqual(Array.from(context.bootWindows), [b]);
+});
+
+const mainWindowSetup = () => {
+ const timers = new Map();
+ const ipcMain = new EventEmitter();
+ let windowId = 0;
+ class Window extends EventEmitter {
+ constructor() {
+ super();
+ this.webContents = Object.assign(new EventEmitter(), {id: ++windowId,
+ session: {webRequest: {onBeforeSendHeaders() {}, onHeadersReceived() {}}}});
+ }
+ isDestroyed() { return !!this.destroyed; }
+ destroy() { this.destroyed = true; this.emit("closed"); }
+ show() { this.shown = true; }
+ setPosition() {}
+ unmaximize() {}
+ }
+ const context = vm.createContext({
+ app: {isReady: () => true}, getKernelTarget: port => ({port, mode: "local", ownsKernel: true}),
+ localKernelStartups: new Map(), workspaces: [], bootWindow: undefined,
+ getWorkspaceStartupKey: workspace => workspace,
+ fs: {readFileSync: () => "{}"}, windowStatePath: "state.json", path, appDir: "app", appVer: "3.8.6",
+ screen: {getPrimaryDisplay: () => ({size: {width: 1000}, workAreaSize: {height: 800}})},
+ BrowserWindow: Window, remote: {enable() {}}, bindSpellcheckContextMenu() {}, bindTopBarContextMenu() {},
+ rememberWindowKernelTarget() {}, windowNavigate() {}, writeLog() {}, process: {platform: "win32"},
+ net: {fetch: () => new Promise(() => {})}, getServer: port => "https://127.0.0.1:" + port,
+ setStartupApplicationMenu() {}, isOpenAsHidden: () => false, ipcMain,
+ setTimeout: callback => { const key = {}; timers.set(key, callback); return key; },
+ clearTimeout: key => timers.delete(key),
+ });
+ vm.runInContext(source.slice(source.indexOf("const initMainWindow ="), source.indexOf("const showWindow =")), context);
+ return {context, ipcMain, timers, Window};
+};
+
+test("main windows close their own boot windows in either frontend readiness order", () => {
+ for (const first of [0, 1]) {
+ const {context, ipcMain, timers, Window} = mainWindowSetup();
+ const boots = [new Window(), new Window()];
+ boots.forEach((window, index) => {
+ context.localKernelStartups.set("workspace-" + index, {window, workspace: "workspace-" + index, port: 6806 + index});
+ vm.runInContext(`initMainWindow(${6806 + index})`, context);
+ });
+ assert.equal(context.localKernelStartups.size, 0);
+ assert.deepEqual(Array.from(context.workspaces, item => item.workspaceDir), ["workspace-0", "workspace-1"]);
+ ipcMain.emit("siyuan-ready-to-show", {sender: {}});
+ assert.equal(boots.some(window => window.destroyed), false);
+ ipcMain.emit("siyuan-ready-to-show", {sender: context.workspaces[first].browserWindow.webContents});
+ assert.equal(boots[first].destroyed, true);
+ assert.equal(boots[1 - first].destroyed, undefined);
+ assert.equal(context.workspaces[first].browserWindow.shown, true);
+ assert.equal(context.workspaces[1 - first].browserWindow.shown, undefined);
+ assert.equal(ipcMain.listenerCount("siyuan-ready-to-show"), 1);
+ ipcMain.emit("siyuan-ready-to-show", {sender: context.workspaces[1 - first].browserWindow.webContents});
+ assert.equal(boots.every(window => window.destroyed), true);
+ assert.equal(ipcMain.listenerCount("siyuan-ready-to-show"), 0);
+ assert.equal(timers.size, 0);
+ }
+});
+
+test("main window timeout and closure clean up their own boot windows and readiness listeners", () => {
+ const {context, ipcMain, timers, Window} = mainWindowSetup();
+ const boots = [new Window(), new Window()];
+ boots.forEach((window, index) => {
+ context.localKernelStartups.set("workspace-" + index, {window, workspace: "workspace-" + index, port: 6806 + index});
+ vm.runInContext(`initMainWindow(${6806 + index})`, context);
+ });
+ const [key, timeout] = timers.entries().next().value;
+ timers.delete(key);
+ timeout();
+ assert.equal(boots[0].destroyed, true);
+ assert.equal(boots[1].destroyed, undefined);
+ assert.equal(context.workspaces[0].browserWindow.shown, true);
+ context.workspaces[1].browserWindow.destroy();
+ assert.equal(boots[1].destroyed, true);
+ assert.equal(ipcMain.listenerCount("siyuan-ready-to-show"), 0);
+ assert.equal(timers.size, 0);
+});
+
+test("system shutdown includes every booting workspace and closes only successful exits", async () => {
+ for (const failedPort of [undefined, 6807]) {
+ const {context, Window} = mainWindowSetup();
+ const boots = [new Window(), new Window()];
+ boots.forEach((window, index) => { window.kernelPort = 6806 + index; });
+ let appExits = 0;
+ Object.assign(context, {
+ bootWindows: new Set(boots), remoteKernelTarget: undefined,
+ systemShutdownState: 0, systemShutdownNone: 0, systemShutdownEnding: 1, systemShutdownForced: 2,
+ gracefulSystemShutdownPromise: undefined, keepAppOpenDuringSystemShutdown: false,
+ requestGracefulKernelExit: async port => port !== failedPort,
+ exitApp() {}, showWindow: window => window.show(), app: {exit: () => appExits++},
+ });
+ vm.runInContext(source.slice(source.indexOf("const getSystemShutdownPorts ="),
+ source.indexOf("const requestGracefulKernelExit =")), context);
+ vm.runInContext(source.slice(source.indexOf("const resetSystemShutdown ="),
+ source.indexOf("const beginForcedSystemShutdown =")), context);
+ assert.deepEqual(Array.from(vm.runInContext("getSystemShutdownPorts()", context)), [6806, 6807]);
+ vm.runInContext("beginGracefulSystemShutdown()", context);
+ await context.gracefulSystemShutdownPromise;
+ assert.equal(boots[0].destroyed, true);
+ assert.equal(!!boots[1].destroyed, failedPort === undefined);
+ assert.equal(!!boots[1].shown, failedPort !== undefined);
+ assert.equal(appExits, failedPort === undefined ? 1 : 0);
+ }
+});
diff --git a/app/electron/kernelBoot.test.js b/app/electron/kernelBoot.test.js
index 683f3b026b..94df755e10 100644
--- a/app/electron/kernelBoot.test.js
+++ b/app/electron/kernelBoot.test.js
@@ -7,7 +7,7 @@ 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 ="));
+const startup = source.slice(source.indexOf("const getWorkspaceStartupKey ="), source.indexOf("const fetchWithTimeout ="));
const certificateChange = () => new Error("net::ERR_CERT_DATABASE_CHANGED");
const setup = (progress, options = {}) => {
@@ -18,16 +18,18 @@ const setup = (progress, options = {}) => {
let timerId = 0;
let requests = 0;
let versionRequests = 0;
- let closeKernel;
+ const closeKernels = new Map();
let spawns = 0;
- const window = {
+ const makeWindow = () => ({
destroyed: false,
isDestroyed() { return this.destroyed; },
destroy() { this.destroyed = true; events.push("destroy"); },
loadFile: async (file, options) => { events.push(["load-file", file, options]); },
webContents: {executeJavaScript: async script => { events.push(["boot-script", script]); }},
- };
- const fixture = {events, waits, window, closeKernel: code => closeKernel(code, null),
+ });
+ const window = makeWindow();
+ const windows = [];
+ const fixture = {events, waits, window, windows, closeKernel: (code, port = 6806) => closeKernels.get(String(port))(code, null),
spawns: () => spawns,
requests: () => requests, versionRequests: () => versionRequests,
timerCount: () => timers.size, timerDelays: () => Array.from(timers.values()).map(timer => timer.ms),
@@ -67,10 +69,18 @@ const setup = (progress, options = {}) => {
fs: {existsSync: () => true},
appDir: "app", confDir: "conf", lastWorkspacePath: "workspace", appVer: "3.8.6",
bootWindow: window, kernelPort: 6806, isDevEnv: false, workspaces: [],
+ localKernelStartups: new Map(), showWindow: () => events.push("show-existing"),
bootIndexPath: "app/electron/boot.html",
loadBootWindow: () => events.push("resume-boot"),
kernelProcesses: new Map(), expectedKernelExitPorts: new Set(),
- createBootWindow: () => events.push("create-boot"), showLocalBootWindow: () => events.push("show-boot"),
+ createBootWindow: () => {
+ events.push("create-boot");
+ const current = windows.length ? makeWindow() : window;
+ windows.push(current);
+ context.bootWindow = current;
+ return current;
+ },
+ showLocalBootWindow: (window, port, lang) => { events.push("show-boot"); events.push(["show-boot", window, port, lang]); },
showAppleSiliconWarning: async () => true,
waitForPreviousWorkspaceExit: options.previousExit || (async () => true),
requestWorkspaceExitRecovery: async (workspace, marker, signal, _fetch, _readFile, force) => {
@@ -81,7 +91,7 @@ const setup = (progress, options = {}) => {
events.push(["recovery-dialog", message]);
return {response: options.recoveryResponse ?? 1};
}},
- getAvailablePort: async () => 6806, getServer: port => "https://127.0.0.1:" + port,
+ getAvailablePort: options.allocatePort || (async () => 6806), getServer: port => "https://127.0.0.1:" + port,
writeLog: message => events.push(message),
requestKernelExit: port => events.push(["exit-kernel", port]),
showErrorWindow: (...args) => { events.push(["error-window", args[1]]); return 1; },
@@ -90,7 +100,7 @@ const setup = (progress, options = {}) => {
events.push(["spawn-args", Array.from(args)]);
return {pid: 123 + spawns++, on: (event, callback) => {
assert.equal(event, "close");
- closeKernel = callback;
+ closeKernels.set(String(args[args.indexOf("--port") + 1]), callback);
}};
}, execFile: (file, args, options, callback) => {
events.push(["exec-file", file, args.join(" "), options.timeout]);
@@ -104,15 +114,15 @@ const setup = (progress, options = {}) => {
net: {fetch: async (url, requestOptions = {}) => {
if (url.endsWith("/version")) {
versionRequests++;
- const value = options.version ? await options.version(versionRequests, fixture) : null;
+ const value = options.version ? await options.version(versionRequests, fixture, new URL(url).port) : null;
if (value?.hang) return await hangUntilAbort(requestOptions.signal);
if (value instanceof Error) throw value;
return {json: async () => value?.bodyHang ? await hangUntilAbort(requestOptions.signal) :
value || {code: 0, data: "3.8.6"}};
}
- assert.equal(url, "https://127.0.0.1:6806/api/system/bootProgress");
+ assert.equal(new URL(url).pathname, "/api/system/bootProgress");
requests++;
- const result = await progress(requests, fixture);
+ const result = await progress(requests, fixture, new URL(url).port);
if (result?.hang) return await hangUntilAbort(requestOptions.signal);
if (result instanceof Error) throw result;
return {json: async () => result?.bodyHang ? await hangUntilAbort(requestOptions.signal) :
@@ -121,12 +131,170 @@ const setup = (progress, options = {}) => {
});
fixture.context = context;
vm.runInContext(startup, context);
- fixture.run = () => vm.runInContext("initKernel('', '', '', false)", context);
+ fixture.run = (workspace = "", port = "", lang = "") => vm.runInContext(
+ `initKernel(${JSON.stringify(workspace)}, ${JSON.stringify(port)}, ${JSON.stringify(lang)}, false)`, context);
return fixture;
};
const exits = fixture => fixture.events.filter(event => Array.isArray(event) && event[0] === "exit-kernel");
+test("repeated requests reuse startup before port allocation and during kernel boot", async () => {
+ let allocate;
+ let version;
+ const state = setup(() => 100, {
+ allocatePort: () => new Promise(resolve => { allocate = resolve; }),
+ version: () => new Promise(resolve => { version = resolve; }),
+ });
+ const run = state.run();
+ assert.equal(await state.run(path.resolve("WORKSPACE", "child", "..") + path.sep), false);
+ assert.equal(state.windows.length, 1);
+ assert.equal(state.spawns(), 0);
+ await state.settleMicrotasks();
+ allocate(6806);
+ await state.settleMicrotasks();
+ assert.equal(await state.run("workspace"), false);
+ assert.equal(state.spawns(), 1);
+ assert.equal(state.windows.length, 1);
+ assert.equal(state.events.filter(event => event === "show-existing").length, 2);
+ version();
+ assert.equal(await run, 6806);
+ assert.equal(await state.run("workspace"), false);
+ assert.equal(state.windows.length, 1);
+});
+
+test("a main window awaiting frontend initialization also prevents duplicate startup", async () => {
+ const state = setup(() => 100);
+ state.context.workspaces.push({workspaceDir: path.resolve("workspace"), browserWindow: state.window});
+ assert.equal(await state.run("WORKSPACE"), false);
+ assert.equal(state.windows.length, 0);
+ assert.equal(state.spawns(), 0);
+ assert.deepEqual(state.events, ["show-existing"]);
+});
+
+test("different workspaces retain their own windows, ports and languages in either completion order", async () => {
+ for (const first of ["6806", "6807"]) {
+ const versions = new Map();
+ const allocations = [];
+ const state = setup(() => 100, {
+ allocatePort: () => new Promise(resolve => allocations.push(resolve)),
+ version: (_request, _fixture, port) => new Promise(resolve => versions.set(port, resolve)),
+ });
+ const a = state.run("workspace-a", "", "en");
+ const b = state.run("workspace-b", "", "ja");
+ await state.settleMicrotasks();
+ allocations[1](6807);
+ allocations[0](6806);
+ await state.settleMicrotasks();
+ assert.equal(state.spawns(), 2);
+ assert.equal(state.windows.length, 2);
+ assert.equal(state.context.kernelProcesses.size, 2);
+ const shown = state.events.filter(event => Array.isArray(event) && event[0] === "show-boot");
+ assert.ok(shown.some(event => event[1] === state.windows[0] && event[2] === 6806 && event[3] === "en"));
+ assert.ok(shown.some(event => event[1] === state.windows[1] && event[2] === 6807 && event[3] === "ja"));
+ versions.get(first)();
+ await state.settleMicrotasks();
+ assert.equal(await (first === "6806" ? a : b), Number(first));
+ assert.equal(state.windows.some(window => window.destroyed), false);
+ versions.get(first === "6806" ? "6807" : "6806")();
+ assert.deepEqual(await Promise.all([a, b]), [6806, 6807]);
+ assert.equal(exits(state).length, 0);
+ }
+});
+
+test("a failing startup destroys only its own window and exits only its own kernel", async () => {
+ let port = 6805;
+ let finishOther;
+ const state = setup((_request, _state, port) => port === "6806" ? new Error("failed progress") : 100, {
+ allocatePort: async () => ++port,
+ version: (_request, _state, port) => port === "6807" ? new Promise(resolve => { finishOther = resolve; }) : null,
+ });
+ const a = state.run("workspace-a");
+ const b = state.run("workspace-b");
+ assert.equal(await a, false);
+ assert.deepEqual(exits(state), [["exit-kernel", 6806]]);
+ assert.equal(state.windows[0].destroyed, true);
+ assert.equal(state.windows[1].destroyed, false);
+ finishOther();
+ assert.equal(await b, 6807);
+});
+
+test("quitting cancels every startup and requests each owned kernel to exit once", async () => {
+ let port = 6805;
+ const versions = [];
+ const state = setup(() => 100, {
+ allocatePort: async () => ++port,
+ version: () => new Promise(resolve => versions.push(resolve)),
+ });
+ const runs = [state.run("workspace-a"), state.run("workspace-b")];
+ await state.settleMicrotasks();
+ state.context.app.emit("before-quit");
+ assert.deepEqual(exits(state), [["exit-kernel", 6806], ["exit-kernel", 6807]]);
+ assert.equal(state.windows.every(window => window.destroyed), true);
+ versions.forEach(resolve => resolve());
+ assert.deepEqual(await Promise.all(runs), [false, false]);
+ assert.equal(exits(state).length, 2);
+ assert.equal(state.context.localKernelStartups.size, 0);
+});
+
+test("canceling while allocating a port never spawns a kernel", async () => {
+ let allocate;
+ const state = setup(() => 100, {allocatePort: () => new Promise(resolve => { allocate = resolve; })});
+ const run = state.run();
+ await state.settleMicrotasks();
+ state.context.app.emit("before-quit");
+ allocate(6806);
+ assert.equal(await run, false);
+ assert.equal(state.spawns(), 0);
+ assert.equal(exits(state).length, 0);
+ assert.equal(state.window.destroyed, true);
+});
+
+test("second-instance reuses the default workspace startup and independently opens a different workspace", async () => {
+ let port = 6805;
+ const versions = new Map();
+ const mainPorts = [];
+ const state = setup(() => 100, {
+ allocatePort: async () => ++port,
+ version: (_request, _fixture, port) => new Promise(resolve => versions.set(port, resolve)),
+ });
+ Object.assign(state.context, {
+ updateInstallPromise: undefined, remoteKernelArgError: undefined, remoteKernelTarget: undefined,
+ getArgFrom: (argv, key) => argv.find(arg => arg.startsWith(key + "="))?.slice(key.length + 1),
+ initMainWindow: port => mainPorts.push(port),
+ });
+ vm.runInContext(source.slice(source.indexOf('app.on("second-instance"'), source.indexOf('app.on("activate"')), state.context);
+ const run = state.run();
+ state.context.app.emit("second-instance", {}, ["siyuan", "--workspace=workspace"]);
+ state.context.app.emit("second-instance", {}, ["siyuan"]);
+ assert.equal(state.windows.length, 1);
+ state.context.app.emit("second-instance", {}, ["siyuan", "--workspace=workspace-b"]);
+ await state.settleMicrotasks();
+ assert.equal(state.spawns(), 2);
+ versions.get("6807")();
+ await state.settleMicrotasks();
+ assert.deepEqual(mainPorts, [6807]);
+ assert.equal(state.window.destroyed, false);
+ versions.get("6806")();
+ assert.equal(await run, 6806);
+ assert.equal(exits(state).length, 0);
+});
+
+test("concurrent development startup keeps the external kernel and spawns only the additional workspace", async () => {
+ const versions = new Map();
+ const state = setup(() => 100, {
+ allocatePort: async () => 6807,
+ version: (_request, _fixture, port) => new Promise(resolve => versions.set(port, resolve)),
+ });
+ state.context.isDevEnv = true;
+ const runs = [state.run("workspace-a"), state.run("workspace-b")];
+ await state.settleMicrotasks();
+ assert.equal(state.spawns(), 1);
+ const args = state.events.find(event => Array.isArray(event) && event[0] === "spawn-args")[1];
+ assert.equal(args[args.indexOf("--workspace") + 1], "workspace-b");
+ versions.forEach(resolve => resolve());
+ assert.deepEqual(await Promise.all(runs), [6806, 6807]);
+});
+
test("workspace lock retries retain one window and port until startup succeeds", async () => {
let previousExitChecks = 0;
const state = setup(() => 100, {
@@ -164,8 +332,8 @@ test("lock retries have a fixed deadline and report one terminal error", async (
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"]) {
+test("closing, canceling or quitting during lock retry prevents another spawn", async () => {
+ for (const action of ["close", "cancel", "quit"]) {
const state = setup(() => 100, {
version: (_request, fixture) => {
fixture.closeKernel(24);
@@ -173,7 +341,10 @@ test("closing, replacing or quitting during lock retry prevents another spawn",
},
onSleep: (_ms, fixture) => {
if (action === "close") fixture.window.destroyed = true;
- if (action === "replace") fixture.context.bootWindow = {isDestroyed: () => false};
+ if (action === "cancel") {
+ fixture.context.bootWindow = {isDestroyed: () => false, destroy: () => assert.fail("unrelated window")};
+ fixture.context.localKernelStartups.values().next().value.canceled = true;
+ }
if (action === "quit") {
fixture.context.app.on("before-quit", event => event.preventDefault());
const event = {preventDefault() { this.prevented = true; }};
@@ -186,7 +357,7 @@ test("closing, replacing or quitting during lock retry prevents another spawn",
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);
+ assert.equal(state.window.destroyed, true);
}
});
@@ -257,7 +428,7 @@ test("retry remains bound to its original workspace when the last workspace chan
});
test("canceling retry marker recovery or declining its sync failure does not respawn", async () => {
- for (const action of ["replace", "sync-failure"]) {
+ for (const action of ["cancel", "sync-failure"]) {
let checks = 0;
let state;
state = setup(() => 100, {
@@ -266,6 +437,7 @@ test("canceling retry marker recovery or declining its sync failure does not res
await options.onWaiting();
if (action === "sync-failure") return options.onRecoveryFailed(true);
state.context.bootWindow = {isDestroyed: () => false};
+ state.context.localKernelStartups.values().next().value.canceled = true;
return true;
},
version: (_request, fixture) => {
@@ -276,7 +448,7 @@ test("canceling retry marker recovery or declining its sync failure does not res
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");
+ assert.equal(state.window.destroyed, true);
}
});
@@ -429,19 +601,21 @@ test("non-transient connection, certificate and response errors retain failure h
}
});
-test("closing or replacing the boot window stops retrying without destroying another window", async () => {
- for (const replace of [false, true]) {
+test("closing or canceling startup exits its kernel without destroying another window", async () => {
+ for (const cancel of [false, true]) {
const fixture = setup(certificateChange, {onSleep: (ms, state) => {
- if (replace) {
+ if (cancel) {
state.context.bootWindow = {isDestroyed: () => false, destroy: () => assert.fail("unrelated window")};
+ state.context.localKernelStartups.values().next().value.canceled = true;
} else {
state.window.destroyed = true;
}
}});
assert.equal(await fixture.run(), false);
assert.equal(fixture.requests(), 1);
- assert.equal(exits(fixture).length, 0);
- assert.equal(fixture.events.includes("destroy"), false);
+ assert.equal(exits(fixture).length, 1);
+ assert.equal(fixture.window.destroyed, true);
+ assert.equal(fixture.context.localKernelStartups.size, 0);
}
});
@@ -459,7 +633,7 @@ test("a late successful response cannot complete a canceled startup", async () =
});
assert.equal(await fixture.run(), false);
assert.deepEqual(fixture.waits, []);
- assert.equal(exits(fixture).length, 0);
+ assert.equal(exits(fixture).length, 1);
});
test("kernel exit while finishing the startup animation does not open the main window", async () => {
@@ -556,14 +730,15 @@ test("startup recovers when a stalled version or progress request succeeds on re
});
test("cancellation during a stalled version request stops retries without touching another window", async () => {
- for (const cancel of ["close", "replace", "exit"]) {
+ for (const cancel of ["close", "cancel", "exit"]) {
const fixture = setup(() => 100, {version: () => ({bodyHang: true})});
const run = fixture.run();
await fixture.settleMicrotasks();
if (cancel === "close") {
fixture.window.destroyed = true;
- } else if (cancel === "replace") {
+ } else if (cancel === "cancel") {
fixture.context.bootWindow = {isDestroyed: () => false, destroy: () => assert.fail("unrelated window")};
+ fixture.context.localKernelStartups.values().next().value.canceled = true;
} else {
fixture.closeKernel(0);
}
@@ -571,8 +746,8 @@ test("cancellation during a stalled version request stops retries without touchi
await fixture.settleMicrotasks();
assert.equal(await run, false);
assert.equal(fixture.versionRequests(), 1);
- assert.equal(exits(fixture).length, 0);
- assert.equal(fixture.events.includes("destroy"), false);
+ assert.equal(exits(fixture).length, cancel === "exit" ? 0 : 1);
+ assert.equal(fixture.window.destroyed, true);
assert.equal(fixture.timerCount(), 0);
}
});
@@ -580,6 +755,7 @@ test("cancellation during a stalled version request stops retries without touchi
test("closing the boot window between version retries stops before another request", async () => {
const fixture = setup(() => 100, {version: certificateChange, onSleep: (ms, state) => {
state.context.bootWindow = {isDestroyed: () => false, destroy: () => assert.fail("unrelated window")};
+ state.window.destroyed = true;
}});
assert.equal(await fixture.run(), false);
assert.equal(fixture.versionRequests(), 1);
diff --git a/app/electron/main.js b/app/electron/main.js
index 69358bb77f..1e4247f56d 100644
--- a/app/electron/main.js
+++ b/app/electron/main.js
@@ -159,9 +159,10 @@ const expectedRendererExitIds = new Set();
const expectedKernelExitPorts = new Set();
const handledCrashWebContents = new Set();
const kernelProcesses = new Map();
+const localKernelStartups = new Map();
+const bootWindows = new Set();
let bootWindow;
let bootIndexPath;
-let bootAppearanceFallback = false;
let latestActiveWindow;
let firstOpen = false;
let workspaces = []; // workspaceDir, id, port, webContentsId, browserWindow, tray, hideShortcut
@@ -1974,8 +1975,10 @@ const getSystemShutdownPorts = () => {
ports.add(workspaceItem.port);
}
});
- if (!remoteKernelTarget && bootWindow && !bootWindow.isDestroyed() && kernelPort) {
- ports.add(kernelPort);
+ if (!remoteKernelTarget) {
+ bootWindows.forEach(window => {
+ if (!window.isDestroyed() && window.kernelPort) ports.add(window.kernelPort);
+ });
}
return Array.from(ports);
};
@@ -2023,9 +2026,9 @@ const resetSystemShutdown = (ports) => {
showWindow(workspace.browserWindow);
}
});
- if (bootWindow && !bootWindow.isDestroyed() && ports.includes(kernelPort)) {
- showWindow(bootWindow);
- }
+ bootWindows.forEach(window => {
+ if (ports.includes(window.kernelPort)) showWindow(window);
+ });
};
const beginGracefulSystemShutdown = () => {
@@ -2050,9 +2053,9 @@ const beginGracefulSystemShutdown = () => {
const succeededPorts = results.filter((item) => item.success).map((item) => item.port);
const failedPorts = results.filter((item) => !item.success).map((item) => item.port);
succeededPorts.forEach((port) => exitApp(port));
- if (bootWindow && !bootWindow.isDestroyed() && succeededPorts.includes(kernelPort)) {
- bootWindow.destroy();
- }
+ bootWindows.forEach(window => {
+ if (!window.isDestroyed() && succeededPorts.includes(window.kernelPort)) window.destroy();
+ });
const remainingPorts = getSystemShutdownPorts();
const incompletePorts = Array.from(new Set(failedPorts.concat(remainingPorts)));
@@ -2145,6 +2148,9 @@ const initMainWindow = (kernel = kernelPort, remoteAuthenticated = true) => {
}
const kernelTarget = getKernelTarget(kernel);
const currentKernelPort = kernelTarget.port;
+ const startup = kernelTarget.mode === "remote" ? undefined : Array.from(localKernelStartups.values())
+ .find(item => item.port?.toString() === currentKernelPort.toString());
+ const currentBootWindow = startup ? startup.window : (kernelTarget.mode === "remote" ? bootWindow : undefined);
// 恢复主窗体状态
let oldWindowState = {};
@@ -2352,8 +2358,8 @@ const initMainWindow = (kernel = kernelPort, remoteAuthenticated = true) => {
if (kernelTarget.mode === "remote") {
if (getWindowPathname(currentWindow) === "/check-auth") {
currentWindow.show();
- if (bootWindow && !bootWindow.isDestroyed()) {
- bootWindow.destroy();
+ if (currentBootWindow && !currentBootWindow.isDestroyed()) {
+ currentBootWindow.destroy();
}
}
return;
@@ -2394,19 +2400,28 @@ const initMainWindow = (kernel = kernelPort, remoteAuthenticated = true) => {
port: currentKernelPort,
ownsKernel: kernelTarget.ownsKernel,
kernelTarget,
+ workspaceDir: startup?.workspace,
});
+ if (startup) localKernelStartups.delete(getWorkspaceStartupKey(startup.workspace));
+ bindMainWindowReady(currentWindow, currentBootWindow, windowState);
+};
+
+const bindMainWindowReady = (currentWindow, currentBootWindow, windowState) => {
// loadURL 后设置超时兜底:前端 app bundle 加载或初始化异常导致 siyuan-ready-to-show 迟迟不发时,
// 强制销毁 boot 窗口并显示主窗口,避免永久卡在启动页
const readyToShowTimeout = setTimeout(() => {
- if (bootWindow && !bootWindow.isDestroyed()) {
+ ipcMain.removeListener("siyuan-ready-to-show", readyToShow);
+ if (currentBootWindow && !currentBootWindow.isDestroyed()) {
if (!currentWindow.isDestroyed()) {
writeLog("siyuan-ready-to-show timeout, force showing main window");
currentWindow.show();
}
- bootWindow.destroy();
+ currentBootWindow.destroy();
}
}, 60000);
- ipcMain.once("siyuan-ready-to-show", () => {
+ const readyToShow = (event) => {
+ if (event.sender !== currentWindow.webContents) return;
+ ipcMain.removeListener("siyuan-ready-to-show", readyToShow);
clearTimeout(readyToShowTimeout); // 正常收到信号则取消超时兜底
if (isOpenAsHidden()) {
if (windowState.isMaximized) {
@@ -2427,9 +2442,15 @@ const initMainWindow = (kernel = kernelPort, remoteAuthenticated = true) => {
currentWindow.webContents.openDevTools(); // 保证开发者工具窗口在前
}
}
- if (bootWindow && !bootWindow.isDestroyed()) {
- bootWindow.destroy();
+ if (currentBootWindow && !currentBootWindow.isDestroyed()) {
+ currentBootWindow.destroy();
}
+ };
+ ipcMain.on("siyuan-ready-to-show", readyToShow);
+ currentWindow.once("closed", () => {
+ clearTimeout(readyToShowTimeout);
+ ipcMain.removeListener("siyuan-ready-to-show", readyToShow);
+ if (currentBootWindow && !currentBootWindow.isDestroyed()) currentBootWindow.destroy();
});
};
@@ -2508,25 +2529,27 @@ const showAppleSiliconWarning = async (lang) => {
return false;
};
-const loadBootWindow = (disableAppearance = false) => {
- if (!bootWindow || bootWindow.isDestroyed() || !bootIndexPath) {
+const loadBootWindow = (disableAppearance = false, currentBootWindow = bootWindow, port = kernelPort, lang = getArg("--lang")) => {
+ if (!currentBootWindow || currentBootWindow.isDestroyed() || !bootIndexPath) {
return;
}
if (disableAppearance) {
- bootAppearanceFallback = true;
+ currentBootWindow.appearanceFallback = true;
}
- const query = {v: appVer, port: kernelPort, lang: getArg("--lang") || resolveAppLanguage(app.getPreferredSystemLanguages())};
- if (bootWindow.previousExitWaiting) {
- query.previousExitWaiting = bootWindow.previousExitWaiting;
+ const query = {v: appVer, port, lang: lang || resolveAppLanguage(app.getPreferredSystemLanguages())};
+ currentBootWindow.kernelPort = port;
+ currentBootWindow.lang = lang;
+ if (currentBootWindow.previousExitWaiting) {
+ query.previousExitWaiting = currentBootWindow.previousExitWaiting;
}
if (remoteKernelTarget) {
query.remote = remoteKernelTarget.origin;
query.appearance = "0";
}
- if (bootAppearanceFallback) {
+ if (currentBootWindow.appearanceFallback) {
query.appearance = "0";
}
- bootWindow.loadFile(bootIndexPath, {query}).catch((error) => {
+ currentBootWindow.loadFile(bootIndexPath, {query}).catch((error) => {
writeLog("load boot window failed: " + error);
});
};
@@ -2546,21 +2569,24 @@ const createBootWindow = () => {
webSecurity: false,
},
});
- bootAppearanceFallback = false;
+ const currentBootWindow = bootWindow;
+ bootWindows.add(currentBootWindow);
+ currentBootWindow.once("closed", () => bootWindows.delete(currentBootWindow));
bootIndexPath = path.join(appDir, "app", "electron", "boot.html");
if (isDevEnv) {
bootIndexPath = path.join(appDir, "electron", "boot.html");
}
- bootWindow.on("unresponsive", () => {
- if (!bootAppearanceFallback) {
+ currentBootWindow.on("unresponsive", () => {
+ if (!currentBootWindow.appearanceFallback) {
writeLog("boot window is unresponsive, reload without custom appearance");
- loadBootWindow(true);
+ loadBootWindow(true, currentBootWindow, currentBootWindow.kernelPort, currentBootWindow.lang);
}
});
+ return currentBootWindow;
};
-const getAvailablePort = (port) => {
- if (isDevEnv && workspaces.length === 0) {
+const getAvailablePort = (port, useDevKernel = isDevEnv && workspaces.length === 0) => {
+ if (useDevKernel) {
return Promise.resolve(kernelPort);
}
if (port) {
@@ -2572,29 +2598,29 @@ const getAvailablePort = (port) => {
server.on("error", error => {
writeLog(error);
kernelPort = "";
- resolve(kernelPort);
+ resolve("");
});
server.listen(0, () => {
- kernelPort = server.address().port;
- server.close(() => resolve(kernelPort));
+ const availablePort = server.address().port;
+ kernelPort = availablePort;
+ server.close(() => resolve(availablePort));
});
});
};
-const showLocalBootWindow = () => {
+const showLocalBootWindow = (currentBootWindow = bootWindow, port = kernelPort, lang) => {
const bootWindowCreatedAt = Date.now();
if (!openAsHidden) {
- const currentBootWindow = bootWindow;
if ("win32" === process.platform) {
currentBootWindow.setOpacity(0);
}
currentBootWindow.once("ready-to-show", () => {
- if (bootWindow === currentBootWindow && !currentBootWindow.isDestroyed()) {
+ if (!currentBootWindow.isDestroyed()) {
currentBootWindow.show();
writeLog("boot window ready to show [" + (Date.now() - bootWindowCreatedAt) + "ms since load]");
if ("win32" === process.platform) {
setImmediate(() => {
- if (bootWindow === currentBootWindow && !currentBootWindow.isDestroyed()) {
+ if (!currentBootWindow.isDestroyed()) {
currentBootWindow.setOpacity(1);
}
});
@@ -2602,33 +2628,61 @@ const showLocalBootWindow = () => {
}
});
}
- loadBootWindow();
+ loadBootWindow(false, currentBootWindow, port, lang);
if (openAsHidden) {
- bootWindow.minimize();
+ currentBootWindow.minimize();
}
};
+const getWorkspaceStartupKey = workspace => {
+ const resolved = path.resolve(workspace);
+ return process.platform === "win32" ? resolved.toLowerCase() : resolved;
+};
+
const initKernel = async (workspace, port, lang, safeMode, preparedBoot) => {
- // 每次尝试保留独立的退出状态,避免上一轮未完成的请求干扰新内核。
- const startup = {};
+ workspace = [workspace, process.env.SIYUAN_WORKSPACE_PATH, lastWorkspacePath]
+ .find(item => typeof item === "string" && item);
+ const key = getWorkspaceStartupKey(workspace);
+ const existing = localKernelStartups.get(key);
+ const opened = workspaces.find(item => item.workspaceDir && getWorkspaceStartupKey(item.workspaceDir) === key &&
+ item.browserWindow && !item.browserWindow.isDestroyed());
+ if (existing || opened) {
+ showWindow(existing ? existing.window : opened.browserWindow);
+ return false;
+ }
+ // 必须在首次异步等待前登记并创建窗口,避免重复启动以及无窗口时应用退出。
+ const startup = {
+ workspace,
+ window: preparedBoot ? preparedBoot.window : createBootWindow(),
+ ownsKernel: !isDevEnv || workspaces.length > 0 || localKernelStartups.size > 0,
+ devPort: kernelPort,
+ };
+ localKernelStartups.set(key, startup);
const cancelStartup = () => {
startup.canceled = true;
+ if (startup.kernelRunning && !startup.exitRequested) {
+ startup.exitRequested = true;
+ expectedKernelExitPorts.add(startup.port.toString());
+ requestKernelExit(startup.port, {setCurrentWorkspace: false});
+ }
// 其他工作空间可能阻止应用退出,主动关闭本次启动页,避免留下无法继续的等待窗口。
- if (startup.window && bootWindow === startup.window && !startup.window.isDestroyed()) {
+ if (!startup.window.isDestroyed()) {
startup.window.destroy();
}
};
app.on("before-quit", cancelStartup);
let retryDeadline;
+ let started = false;
try {
for (;;) {
- const result = await initKernelAttempt(startup.window ? startup.workspace : workspace,
+ const result = await initKernelAttempt(workspace,
port, lang, safeMode, preparedBoot, startup);
if (result !== "workspace-locked") {
+ started = !!result;
return result;
}
const currentBootWindow = startup.window;
- const canceled = () => startup.canceled || currentBootWindow.isDestroyed() || bootWindow !== currentBootWindow;
+ const canceled = () => startup.canceled || currentBootWindow.isDestroyed();
if (canceled()) return false;
// 只限制锁冲突的自动重试;已进入正常退出的同步恢复仍使用原有等待期限。
retryDeadline ??= Date.now() + 90000;
@@ -2656,6 +2710,10 @@ const initKernel = async (workspace, port, lang, safeMode, preparedBoot) => {
}
} finally {
app.removeListener("before-quit", cancelStartup);
+ if (!started) {
+ cancelStartup();
+ localKernelStartups.delete(key);
+ }
}
};
@@ -2668,16 +2726,12 @@ const showWorkspaceLocked = () => {
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 currentWorkspace = startup.workspace;
+ const currentBootWindow = startup.window;
+ const canceled = () => startup.canceled || currentBootWindow.isDestroyed();
const workspaceLogPath = currentWorkspace ? path.resolve(currentWorkspace, "temp", "siyuan.log") : "";
const kernelLogPath = path.join(confDir, "kernel.log");
- // 必须在首次异步等待前创建窗口,避免工作空间选择窗口关闭后因无窗口触发应用退出。
- if (!startup.window && !preparedBoot) {
- createBootWindow();
- }
- if (!startup.window && !await showAppleSiliconWarning(lang)) {
- bootWindow.destroy();
+ if (!startup.port && !await showAppleSiliconWarning(lang)) {
app.quit();
resolve(false);
return;
@@ -2686,40 +2740,26 @@ const initKernelAttempt = (workspace, port, lang, safeMode, preparedBoot, startu
const kernelPath = path.join(appDir, "kernel", kernelName);
if (!fs.existsSync(kernelPath)) {
showErrorWindow("内核程序丢失", "Kernel program is missing", `<div>内核程序丢失,请重新安装思源,并将思源内核程序加入杀毒软件信任列表。</div><div>The kernel program is not found, please reinstall SiYuan and add SiYuan Kernel prgram into the trust list of your antivirus software.</div><div><i>${kernelPath}</i></div>`);
- bootWindow.destroy();
resolve(false);
return;
}
- 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);
- }
- writeLog("got kernel port [" + kernelPort + "]");
- if (!kernelPort) {
- bootWindow.destroy();
+ const firstAttempt = !startup.port;
+ const currentKernelPort = startup.port || (preparedBoot ? await preparedBoot.ready :
+ startup.ownsKernel ? await getAvailablePort(port, false) : startup.devPort);
+ startup.port = currentKernelPort;
+ writeLog("got kernel port [" + currentKernelPort + "]");
+ if (!currentKernelPort || canceled()) {
resolve(false);
return;
}
- if (!startup.window && !preparedBoot) {
- showLocalBootWindow();
+ if (firstAttempt && !preparedBoot) {
+ showLocalBootWindow(currentBootWindow, currentKernelPort, lang);
}
- const currentKernelPort = kernelPort;
- const currentBootWindow = bootWindow;
- startup.window = currentBootWindow;
- startup.port = currentKernelPort;
- startup.workspace = currentWorkspace;
let kernelExited = false;
let kernelStarted = false;
- const bootCanceled = () => startup.canceled || kernelExited || currentBootWindow.isDestroyed() || bootWindow !== currentBootWindow;
- if (!isDevEnv || workspaces.length > 0) {
+ const bootCanceled = () => canceled() || kernelExited;
+ if (startup.ownsKernel) {
let waiting = !!currentBootWindow.previousExitWaiting;
const language = lang || resolveAppLanguage(app.getPreferredSystemLanguages());
const languages = loadAppMenuLanguages(language);
@@ -2775,7 +2815,7 @@ const initKernelAttempt = (workspace, port, lang, safeMode, preparedBoot, startu
}
}
const cmds = ["serve", "--port", currentKernelPort, "--wd", appDir, "--attach-ui"];
- if (isDevEnv && workspaces.length === 0) {
+ if (!startup.ownsKernel) {
cmds.push("--mode", "dev");
}
if (workspace && "" !== workspace) {
@@ -2789,7 +2829,7 @@ const initKernelAttempt = (workspace, port, lang, safeMode, preparedBoot, startu
}
let cmd = `ui version [${appVer}], booting kernel [${kernelPath} ${cmds.join(" ")}]`;
writeLog(cmd);
- if (!isDevEnv || workspaces.length > 0) {
+ if (startup.ownsKernel) {
const spawnStartedAt = Date.now();
const kernelProcess = childProcess.spawn(kernelPath, cmds, {
detached: false, // 桌面端内核进程不再以游离模式拉起 https://github.com/siyuan-note/siyuan/issues/6336
@@ -2799,16 +2839,23 @@ const initKernelAttempt = (workspace, port, lang, safeMode, preparedBoot, startu
writeLog("spawned kernel process [" + (Date.now() - spawnStartedAt) + "ms]");
const kernelPortKey = currentKernelPort.toString();
kernelProcesses.set(kernelPortKey, kernelProcess);
+ startup.kernelRunning = true;
+ startup.process = kernelProcess;
writeLog("booted kernel process [pid=" + kernelProcess.pid + ", port=" + currentKernelPort + "]");
kernelProcess.on("close", (code, signal) => {
kernelExited = true;
+ if (startup.process === kernelProcess) startup.kernelRunning = false;
if (kernelProcesses.get(kernelPortKey) === kernelProcess) {
kernelProcesses.delete(kernelPortKey);
}
const expectedExit = expectedKernelExitPorts.delete(kernelPortKey);
writeLog(`kernel [pid=${kernelProcess.pid}, port=${currentKernelPort}] exited with code [${code}], signal [${signal}], expected [${expectedExit}]`);
+ if (startup.canceled) {
+ resolve(false);
+ return;
+ }
if (code === 24 && !expectedExit && !kernelStarted) {
- resolve(startup.canceled || currentBootWindow.isDestroyed() || bootWindow !== currentBootWindow
+ resolve(canceled()
? false : "workspace-locked");
return;
}
@@ -2871,7 +2918,6 @@ const initKernelAttempt = (workspace, port, lang, safeMode, preparedBoot, startu
} else {
showErrorWindow("获取内核服务端口失败", "Failed to Obtain Kernel Service Port", "<div>获取内核服务端口失败,请确保程序拥有网络权限并不受防火墙和杀毒软件阻止。</div><div>Failed to obtain kernel service port. Please ensure SiYuan has network permissions and is not blocked by firewalls or antivirus software.</div>");
}
- requestKernelExit(currentKernelPort);
currentBootWindow.destroy();
resolve(false);
return;
@@ -2889,8 +2935,7 @@ const initKernelAttempt = (workspace, port, lang, safeMode, preparedBoot, startu
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}]`);
- requestKernelExit(currentKernelPort);
- bootWindow.destroy();
+ currentBootWindow.destroy();
resolve(false);
} else {
let progressing = false;
@@ -2915,8 +2960,7 @@ const initKernelAttempt = (workspace, port, lang, safeMode, preparedBoot, startu
"<div>内核启动超时,请查看 <a href=\"#\" data-log-path>工作空间/temp/siyuan.log</a> 获取详细报错信息,或尝试重启思源。</div>" +
"<div>Kernel boot timed out. Please check <a href=\"#\" data-log-path>workspace/temp/siyuan.log</a> for details, or try restarting SiYuan.</div>",
"⚠️", workspaceLogPath);
- requestKernelExit(currentKernelPort);
- bootWindow.destroy();
+ currentBootWindow.destroy();
resolve(false);
progressing = true;
break;
@@ -2951,8 +2995,7 @@ const initKernelAttempt = (workspace, port, lang, safeMode, preparedBoot, startu
if (isLocalKernelRequestTimeout(e)) {
showKernelUnresponsiveWindow(lang);
}
- requestKernelExit(currentKernelPort);
- bootWindow.destroy();
+ currentBootWindow.destroy();
resolve(false);
progressing = true;
}
@@ -3194,9 +3237,10 @@ app.whenReady().then(() => {
createBootWindow();
const currentBootWindow = bootWindow;
preparedBoot = {
+ window: currentBootWindow,
ready: getAvailablePort(getArg("--port")).then((port) => {
- if (port && bootWindow === currentBootWindow && !currentBootWindow.isDestroyed()) {
- showLocalBootWindow();
+ if (port && !currentBootWindow.isDestroyed()) {
+ showLocalBootWindow(currentBootWindow, port, getArg("--lang"));
}
return port;
}),
@@ -3273,10 +3317,12 @@ app.whenReady().then(() => {
return;
}
- if (bootWindow && !bootWindow.isDestroyed() && bootWindow.webContents.id === webContents.id) {
- if (!bootAppearanceFallback) {
+ const crashedBootWindow = Array.from(bootWindows)
+ .find(window => window && !window.isDestroyed() && window.webContents.id === webContents.id);
+ if (crashedBootWindow) {
+ if (!crashedBootWindow.appearanceFallback) {
writeLog("boot renderer exited, reload without custom appearance");
- loadBootWindow(true);
+ loadBootWindow(true, crashedBootWindow, crashedBootWindow.kernelPort, crashedBootWindow.lang);
}
return;
}
@@ -4869,6 +4915,8 @@ app.on("second-instance", (event, argv) => {
if (!siyuanURL && 0 < workspaces.length) {
showWindow(workspaces[0].browserWindow);
+ } else if (!siyuanURL && localKernelStartups.size > 0) {
+ showWindow(localKernelStartups.values().next().value.window);
}
});
diff --git a/app/electron/rendererProcess.test.js b/app/electron/rendererProcess.test.js
index 1e4ab36fcc..fc8136b5d9 100644
--- a/app/electron/rendererProcess.test.js
+++ b/app/electron/rendererProcess.test.js
@@ -97,7 +97,7 @@ if (!process.versions.electron) {
vm.runInNewContext(source.slice(crashStart, crashEnd), {
app, workspaces, writeLog: () => {}, cleanupBlockDragSessions: () => {},
updateInstallPromise: undefined, systemShutdownState: 0, systemShutdownNone: 0,
- expectedRendererExitIds: new Set(), handledCrashWebContents: new Set(), bootWindow: undefined,
+ expectedRendererExitIds: new Set(), handledCrashWebContents: new Set(), bootWindows: new Set(),
safeModeReasons: new Set(["crashed"]),
writeAppCrashMarker: workspace => markers.push(workspace.webContentsId),
requestKernelExit: port => kernelExits.push(port),