Skip to content

Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.

[codex] Structure Electron protocol teardown failures (#3310)

Julius Marminge9d5ca2cb7cee
diff --git a/apps/desktop/src/electron/ElectronProtocol.test.ts b/apps/desktop/src/electron/ElectronProtocol.test.ts
index 619b7e871..56fe009fe 100644
--- a/apps/desktop/src/electron/ElectronProtocol.test.ts
+++ b/apps/desktop/src/electron/ElectronProtocol.test.ts
@@ -1,4 +1,5 @@
import { assert, describe, it } from "@effect/vitest";
+import * as Cause from "effect/Cause";
import * as Effect from "effect/Effect";
import { beforeEach, vi } from "vite-plus/test";
@@ -98,6 +99,60 @@ describe("ElectronProtocol", () => {
}).pipe(Effect.provide(ElectronProtocol.layer)),
);
+ it.effect("preserves protocol registration failures", () =>
+ Effect.gen(function* () {
+ const cause = new Error("protocol registration failed");
+ handleMock.mockImplementationOnce(() => {
+ throw cause;
+ });
+
+ const protocol = yield* ElectronProtocol.ElectronProtocol;
+ const error = yield* Effect.scoped(
+ protocol.registerDesktopProtocol({
+ scheme: "t3code-dev",
+ targetOrigin: new URL("http://127.0.0.1:3773/"),
+ backendOrigin: new URL("http://127.0.0.1:3774/"),
+ clerkFrontendApiHostname: undefined,
+ }),
+ ).pipe(Effect.flip);
+
+ assert.instanceOf(error, ElectronProtocol.ElectronProtocolRegistrationError);
+ assert.equal(error.scheme, "t3code-dev");
+ assert.strictEqual(error.cause, cause);
+ assert.equal(error.message, 'Failed to register Electron protocol scheme "t3code-dev".');
+ }).pipe(Effect.provide(ElectronProtocol.layer)),
+ );
+
+ it.effect("preserves protocol unregistration failures", () =>
+ Effect.gen(function* () {
+ const cause = new Error("protocol unregistration failed");
+ unhandleMock.mockImplementationOnce(() => {
+ throw cause;
+ });
+
+ const protocol = yield* ElectronProtocol.ElectronProtocol;
+ const exit = yield* Effect.exit(
+ Effect.scoped(
+ protocol.registerDesktopProtocol({
+ scheme: "t3code",
+ targetOrigin: new URL("http://127.0.0.1:3773/"),
+ backendOrigin: new URL("http://127.0.0.1:3773/"),
+ clerkFrontendApiHostname: undefined,
+ }),
+ ),
+ );
+
+ assert.equal(exit._tag, "Failure");
+ if (exit._tag === "Failure") {
+ const error = Cause.squash(exit.cause);
+ assert.instanceOf(error, ElectronProtocol.ElectronProtocolUnregistrationError);
+ assert.equal(error.scheme, "t3code");
+ assert.strictEqual(error.cause, cause);
+ assert.equal(error.message, 'Failed to unregister Electron protocol scheme "t3code".');
+ }
+ }).pipe(Effect.provide(ElectronProtocol.layer)),
+ );
+
it("keeps executable sources host-restricted while allowing runtime network resources", () => {
const policy = ElectronProtocol.makeDesktopContentSecurityPolicy({
scheme: "t3code",
diff --git a/apps/desktop/src/electron/ElectronProtocol.ts b/apps/desktop/src/electron/ElectronProtocol.ts
index 4c80c2c49..757c26178 100644
--- a/apps/desktop/src/electron/ElectronProtocol.ts
+++ b/apps/desktop/src/electron/ElectronProtocol.ts
@@ -31,7 +31,19 @@ export class ElectronProtocolRegistrationError extends Schema.TaggedErrorClass<E
},
) {
override get message(): string {
- return `Failed to register ${this.scheme}: protocol.`;
+ return `Failed to register Electron protocol scheme "${this.scheme}".`;
+ }
+}
+
+export class ElectronProtocolUnregistrationError extends Schema.TaggedErrorClass<ElectronProtocolUnregistrationError>()(
+ "ElectronProtocolUnregistrationError",
+ {
+ scheme: Schema.String,
+ cause: Schema.Defect(),
+ },
+) {
+ override get message(): string {
+ return `Failed to unregister Electron protocol scheme "${this.scheme}".`;
}
}
@@ -133,9 +145,14 @@ export const make = Effect.gen(function* () {
catch: (cause) => new ElectronProtocolRegistrationError({ scheme: input.scheme, cause }),
}).pipe(Effect.andThen(Ref.set(registered, true))),
() =>
- Effect.sync(() => {
- Electron.protocol.unhandle(input.scheme);
- }).pipe(Effect.andThen(Ref.set(registered, false))),
+ Effect.try({
+ try: () => Electron.protocol.unhandle(input.scheme),
+ catch: (cause) =>
+ new ElectronProtocolUnregistrationError({
+ scheme: input.scheme,
+ cause,
+ }),
+ }).pipe(Effect.andThen(Ref.set(registered, false)), Effect.orDie),
);
},
);