Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions apps/desktop/src/window/DesktopWindow.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1339,6 +1339,47 @@ describe("DesktopWindow", () => {
}),
);

it.effect(
"recovers killed renderers without reloading indefinitely or reviving closed windows",
() =>
Effect.gen(function* () {
const fakeWindow = makeFakeBrowserWindow();
const createCount = yield* Ref.make(0);
const mainWindow = yield* Ref.make<Option.Option<Electron.BrowserWindow>>(Option.none());
const layer = layerTest({ window: fakeWindow.window, createCount, mainWindow });
yield* Effect.gen(function* () {
const desktopWindow = yield* DesktopWindow.DesktopWindow;
yield* desktopWindow.createMain;
const onGone = fakeWindow.webContentsListeners.get("render-process-gone");
const onLoaded = fakeWindow.webContentsListeners.get("did-finish-load");
if (!onGone || !onLoaded)
return yield* Effect.die("renderer lifecycle listeners missing");

onGone({}, { reason: "clean-exit", exitCode: 0 });
yield* TestClock.adjust(500);
assert.equal(fakeWindow.loadURL.mock.calls.length, 1);

for (let attempt = 0; attempt < 4; attempt += 1) {
onGone({}, { reason: "killed", exitCode: 9 });
yield* TestClock.adjust(500);
onLoaded();
}
assert.equal(fakeWindow.loadURL.mock.calls.length, 4);

yield* TestClock.adjust(60_000);
onGone({}, { reason: "killed", exitCode: 9 });
yield* TestClock.adjust(500);
assert.equal(fakeWindow.loadURL.mock.calls.length, 5);
assert.equal(yield* Ref.get(createCount), 1);

onGone({}, { reason: "killed", exitCode: 9 });
fakeWindow.isDestroyed.mockReturnValue(true);
yield* TestClock.adjust(500);
assert.equal(fakeWindow.loadURL.mock.calls.length, 5);
}).pipe(Effect.provide(layer));
}),
);

it.effect("recovers when the development renderer is temporarily unreachable", () =>
Effect.gen(function* () {
const fakeWindow = makeFakeBrowserWindow();
Expand Down
2 changes: 2 additions & 0 deletions apps/desktop/src/window/DesktopWindow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -756,9 +756,11 @@ export const make = Effect.gen(function* () {
const recoverable =
details.reason === "crashed" ||
details.reason === "oom" ||
details.reason === "killed" ||
details.reason === "abnormal-exit";
// Recovery attempts are bounded so a renderer that dies immediately on
// boot cannot reload-loop forever.

runFork(
Effect.gen(function* () {
const now = yield* Clock.currentTimeMillis;
Expand Down
Loading