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.

fix(cloud): use Electron fetch for proxying Clerk IPC requests (#2973)

Julius Marminge602148f8fe4b
diff --git a/apps/desktop/src/ipc/methods/cloudAuth.test.ts b/apps/desktop/src/ipc/methods/cloudAuth.test.ts
index c0e4d8b26..c5f1e2b2c 100644
--- a/apps/desktop/src/ipc/methods/cloudAuth.test.ts
+++ b/apps/desktop/src/ipc/methods/cloudAuth.test.ts
@@ -1,29 +1,35 @@
import { assert, describe, it } from "@effect/vitest";
import * as Effect from "effect/Effect";
-import * as Layer from "effect/Layer";
-import { HttpClient, HttpClientRequest, HttpClientResponse } from "effect/unstable/http";
import { afterEach } from "vite-plus/test";
import { fetchCloudAuth, validateClerkFrontendApiUrl } from "./cloudAuth.ts";
const originalClerkPublishableKey = process.env.T3CODE_CLERK_PUBLISHABLE_KEY;
+const originalFetch = globalThis.fetch;
const clerkPublishableKey = (hostname: string): string =>
`pk_test_${Buffer.from(`${hostname}$`).toString("base64")}`;
-function makeHttpClientLayer(
- handler: (
- request: HttpClientRequest.HttpClientRequest,
- ) => Effect.Effect<HttpClientResponse.HttpClientResponse, never>,
-) {
- return Layer.succeed(
- HttpClient.HttpClient,
- HttpClient.make((request) => handler(request)),
- );
-}
+type FetchCall = readonly [input: RequestInfo | URL, init: RequestInit];
+
+const recordedFetch = (...responses: ReadonlyArray<Response>) => {
+ const calls: Array<FetchCall> = [];
+ let responseIndex = 0;
+ const fetchFn = ((input, init) => {
+ calls.push([input, init ?? {}]);
+ const response = responses[responseIndex++];
+ if (!response) {
+ return Promise.reject(new Error("Unexpected fetch call"));
+ }
+ return Promise.resolve(response);
+ }) satisfies typeof fetch;
+
+ return { fetchFn, calls };
+};
describe("Desktop cloud auth IPC", () => {
afterEach(() => {
+ globalThis.fetch = originalFetch;
if (originalClerkPublishableKey === undefined) {
delete process.env.T3CODE_CLERK_PUBLISHABLE_KEY;
} else {
@@ -33,16 +39,8 @@ describe("Desktop cloud auth IPC", () => {
it.effect("preserves Clerk's URL-encoded OAuth form content type", () => {
const body = "strategy=oauth_google&redirect_url=t3code%3A%2F%2Fauth%2Fcallback";
- let forwardedRequest: HttpClientRequest.HttpClientRequest | null = null;
- const layer = makeHttpClientLayer((request) =>
- Effect.sync(() => {
- forwardedRequest = request;
- return HttpClientResponse.fromWeb(
- request,
- Response.json({ response: { object: "sign_in_attempt" } }),
- );
- }),
- );
+ const fetch = recordedFetch(Response.json({ response: { object: "sign_in_attempt" } }));
+ globalThis.fetch = fetch.fetchFn;
return Effect.gen(function* () {
yield* fetchCloudAuth.handler({
@@ -55,32 +53,25 @@ describe("Desktop cloud auth IPC", () => {
body,
});
- assert(forwardedRequest !== null);
+ const forwardedRequest = fetch.calls[0];
+ assert(forwardedRequest !== undefined);
+ const [url, init] = forwardedRequest;
+ assert.equal(String(url), "https://example.clerk.accounts.dev/v1/client/sign_ins");
+ assert.equal(init.method, "POST");
assert.equal(
- forwardedRequest.headers["content-type"],
+ new Headers(init.headers).get("content-type"),
"application/x-www-form-urlencoded;charset=UTF-8",
);
- assert.equal(forwardedRequest.body._tag, "Uint8Array");
- if (forwardedRequest.body._tag === "Uint8Array") {
- assert.equal(new TextDecoder().decode(forwardedRequest.body.body), body);
- }
- }).pipe(Effect.provide(layer));
+ assert.equal(new TextDecoder().decode(init.body as Uint8Array), body);
+ });
});
it.effect(
"allows the custom Clerk Frontend API host encoded by the configured publishable key",
() => {
process.env.T3CODE_CLERK_PUBLISHABLE_KEY = clerkPublishableKey("clerk.t3.codes");
- let forwardedRequest: HttpClientRequest.HttpClientRequest | null = null;
- const layer = makeHttpClientLayer((request) =>
- Effect.sync(() => {
- forwardedRequest = request;
- return HttpClientResponse.fromWeb(
- request,
- Response.json({ response: { object: "client" } }),
- );
- }),
- );
+ const fetch = recordedFetch(Response.json({ response: { object: "client" } }));
+ globalThis.fetch = fetch.fetchFn;
return Effect.gen(function* () {
yield* fetchCloudAuth.handler({
@@ -89,9 +80,10 @@ describe("Desktop cloud auth IPC", () => {
headers: {},
});
- assert(forwardedRequest !== null);
- assert.equal(forwardedRequest.url.toString(), "https://clerk.t3.codes/v1/client");
- }).pipe(Effect.provide(layer));
+ const forwardedRequest = fetch.calls[0];
+ assert(forwardedRequest !== undefined);
+ assert.equal(String(forwardedRequest[0]), "https://clerk.t3.codes/v1/client");
+ });
},
);
diff --git a/apps/desktop/src/ipc/methods/cloudAuth.ts b/apps/desktop/src/ipc/methods/cloudAuth.ts
index 3c9ee264f..a5a7aacff 100644
--- a/apps/desktop/src/ipc/methods/cloudAuth.ts
+++ b/apps/desktop/src/ipc/methods/cloudAuth.ts
@@ -8,9 +8,11 @@ import {
} from "@t3tools/shared/relayAuth";
import * as Data from "effect/Data";
import * as Effect from "effect/Effect";
+import { identity } from "effect/Function";
+import * as Layer from "effect/Layer";
import * as Option from "effect/Option";
import * as Schema from "effect/Schema";
-import { Headers, HttpClient, HttpClientRequest } from "effect/unstable/http";
+import { FetchHttpClient, HttpClient, HttpClientRequest } from "effect/unstable/http";
import * as DesktopCloudAuth from "../../app/DesktopCloudAuth.ts";
import * as DesktopCloudAuthTokenStore from "../../app/DesktopCloudAuthTokenStore.ts";
@@ -52,6 +54,68 @@ export function validateClerkFrontendApiUrl(rawUrl: string): URL {
return url;
}
+function executeCloudAuthFetch(url: URL, input: typeof DesktopCloudAuthFetchInputSchema.Type) {
+ return Effect.gen(function* () {
+ const method = (input.method ?? "GET") as "GET" | "POST";
+ const headers = new Headers(input.headers);
+ const response = yield* HttpClientRequest.make(method)(url).pipe(
+ HttpClientRequest.setHeaders(headers),
+ input.body === undefined
+ ? identity
+ : HttpClientRequest.bodyText(input.body, headers.get("content-type") ?? undefined),
+ HttpClient.execute,
+ Effect.mapError(
+ (cause) =>
+ new DesktopCloudAuthFetchError({
+ reason: "Desktop cloud auth fetch failed to execute.",
+ cause,
+ }),
+ ),
+ );
+
+ const body = yield* response.text.pipe(
+ Effect.mapError(
+ (cause) =>
+ new DesktopCloudAuthFetchError({
+ reason: "Desktop cloud auth fetch response could not be read.",
+ cause,
+ }),
+ ),
+ );
+
+ return {
+ ok: response.status >= 200 && response.status < 300,
+ status: response.status,
+ statusText: "",
+ headers: response.headers,
+ body,
+ };
+ });
+}
+
+const electronNetFetchLayer = Layer.unwrap(
+ Effect.gen(function* () {
+ const electronFetch = yield* Effect.promise(async () => {
+ const electron = (await import("electron")) as {
+ readonly net?: { readonly fetch?: typeof globalThis.fetch };
+ };
+ return typeof electron.net?.fetch === "function"
+ ? electron.net.fetch.bind(electron.net)
+ : null;
+ }).pipe(Effect.catchCause(() => Effect.succeed(null)));
+
+ if (!electronFetch) {
+ yield* Effect.logWarning(
+ "electron.net.fetch is not available, falling back to global fetch. This may cause unexpected errors.",
+ );
+ }
+
+ return FetchHttpClient.layer.pipe(
+ Layer.provide(Layer.succeed(FetchHttpClient.Fetch, electronFetch ?? globalThis.fetch)),
+ );
+ }),
+);
+
export const createCloudAuthRequest = makeIpcMethod({
channel: IpcChannels.CREATE_CLOUD_AUTH_REQUEST_CHANNEL,
payload: Schema.Void,
@@ -108,47 +172,6 @@ export const fetchCloudAuth = makeIpcMethod({
}),
});
- const requestWithoutBody = HttpClientRequest.make((input.method ?? "GET") as "GET" | "POST")(
- url,
- {
- headers: input.headers,
- },
- );
- const request =
- input.body === undefined
- ? requestWithoutBody
- : HttpClientRequest.bodyText(
- requestWithoutBody,
- input.body,
- Option.getOrUndefined(Headers.get(requestWithoutBody.headers, "content-type")),
- );
-
- const response = yield* HttpClient.execute(request).pipe(
- Effect.mapError(
- (cause) =>
- new DesktopCloudAuthFetchError({
- reason: "Desktop cloud auth fetch failed.",
- cause,
- }),
- ),
- );
-
- const body = yield* response.text.pipe(
- Effect.mapError(
- (cause) =>
- new DesktopCloudAuthFetchError({
- reason: "Desktop cloud auth fetch response could not be read.",
- cause,
- }),
- ),
- );
-
- return {
- ok: response.status >= 200 && response.status < 300,
- status: response.status,
- statusText: "",
- headers: response.headers,
- body,
- };
+ return yield* executeCloudAuthFetch(url, input).pipe(Effect.provide(electronNetFetchLayer));
}),
});