Skip to content

Commit 1e26291

Browse files
injaneityf-trycua
andcommitted
fix(desktop): ignore cua recovery interruption
Co-authored-by: Francesco Bonacci <[email protected]>
1 parent e8d5b02 commit 1e26291

2 files changed

Lines changed: 33 additions & 5 deletions

File tree

‎apps/desktop/src/app/DesktopApp.ts‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,13 @@ export const restartBackendAfterCuaDriverExit = Effect.fn(
157157
return true;
158158
});
159159

160+
export const reportCuaDriverRecoveryFailure = (cause: Cause.Cause<never>) =>
161+
Cause.hasInterruptsOnly(cause)
162+
? Effect.failCause(cause)
163+
: logStartupError("failed to remove unavailable cua-driver from desktop backend", {
164+
cause,
165+
});
166+
160167
const bootstrap = Effect.gen(function* () {
161168
const pool = yield* DesktopBackendPool.DesktopBackendPool;
162169
const primaryBackend = yield* pool.primary;
@@ -354,11 +361,7 @@ const startup = Effect.gen(function* () {
354361
? logStartupInfo("desktop backend restarted without unavailable cua-driver")
355362
: Effect.void,
356363
),
357-
Effect.catchCause((cause) =>
358-
logStartupError("failed to remove unavailable cua-driver from desktop backend", {
359-
cause,
360-
}),
361-
),
364+
Effect.catchCause(reportCuaDriverRecoveryFailure),
362365
Effect.forkScoped,
363366
);
364367
}

‎apps/desktop/src/app/DesktopAppErrors.test.ts‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
import { assert, describe, it } from "@effect/vitest";
2+
import * as Cause from "effect/Cause";
23
import * as Effect from "effect/Effect";
4+
import * as Exit from "effect/Exit";
5+
import * as Logger from "effect/Logger";
36
import * as Option from "effect/Option";
47

58
import {
69
DesktopBackendPortUnavailableError,
710
DesktopDevelopmentBackendPortRequiredError,
11+
reportCuaDriverRecoveryFailure,
812
restartBackendAfterCuaDriverExit,
913
} from "./DesktopApp.ts";
1014

@@ -59,4 +63,25 @@ describe("DesktopApp errors", () => {
5963
),
6064
);
6165
});
66+
67+
it.effect("does not log clean shutdown interruption as a Cua recovery failure", () => {
68+
const messages: Array<unknown> = [];
69+
const logger = Logger.make(({ message }) => {
70+
messages.push(message);
71+
});
72+
73+
return reportCuaDriverRecoveryFailure(Cause.interrupt()).pipe(
74+
Effect.exit,
75+
Effect.tap((exit) =>
76+
Effect.sync(() => {
77+
assert.isTrue(Exit.isFailure(exit));
78+
if (Exit.isFailure(exit)) {
79+
assert.isTrue(Cause.hasInterruptsOnly(exit.cause));
80+
}
81+
assert.lengthOf(messages, 0);
82+
}),
83+
),
84+
Effect.provide(Logger.layer([logger], { mergeWithExisting: false })),
85+
);
86+
});
6287
});

0 commit comments

Comments
 (0)