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] Refactor primary HTTP Effect service (#3205)

Julius Marminge3b56dc17a555
diff --git a/apps/web/src/environments/primary/httpClient.ts b/apps/web/src/environments/primary/httpClient.ts
index d5cb22433..a7860ec61 100644
--- a/apps/web/src/environments/primary/httpClient.ts
+++ b/apps/web/src/environments/primary/httpClient.ts
@@ -5,16 +5,13 @@ import * as Layer from "effect/Layer";
import { resolvePrimaryEnvironmentHttpUrl } from "./target";
-export type PrimaryEnvironmentHttpClientShape = Effect.Success<
- ReturnType<typeof makeEnvironmentHttpApiClient>
->;
-
export class PrimaryEnvironmentHttpClient extends Context.Service<
PrimaryEnvironmentHttpClient,
- PrimaryEnvironmentHttpClientShape
+ Effect.Success<ReturnType<typeof makeEnvironmentHttpApiClient>>
>()("@t3tools/web/environments/primary/httpClient/PrimaryEnvironmentHttpClient") {}
-export const primaryEnvironmentHttpClientLive = Layer.effect(
- PrimaryEnvironmentHttpClient,
- Effect.suspend(() => makeEnvironmentHttpApiClient(resolvePrimaryEnvironmentHttpUrl("/"))),
+const make = Effect.suspend(() =>
+ makeEnvironmentHttpApiClient(resolvePrimaryEnvironmentHttpUrl("/")),
);
+
+export const layer = Layer.effect(PrimaryEnvironmentHttpClient, make);
diff --git a/apps/web/src/lib/runtime.ts b/apps/web/src/lib/runtime.ts
index cf4ffb084..e4bea61f1 100644
--- a/apps/web/src/lib/runtime.ts
+++ b/apps/web/src/lib/runtime.ts
@@ -5,10 +5,7 @@ import * as Socket from "effect/unstable/socket/Socket";
import { remoteHttpClientLayer } from "@t3tools/client-runtime/rpc";
import { makeRelayClientTracingLayer } from "@t3tools/shared/relayTracing";
-import {
- PrimaryEnvironmentHttpClient,
- primaryEnvironmentHttpClientLive,
-} from "../environments/primary/httpClient";
+import * as PrimaryEnvironmentHttpClient from "../environments/primary/httpClient";
import { primaryEnvironmentHttpLayer } from "../environments/primary/httpLayer";
import { browserCryptoLayer } from "../cloud/dpop";
@@ -30,11 +27,11 @@ const relayTracingLayer = makeRelayClientTracingLayer(resolveRelayTracingConfig(
export const remoteHttpRuntime = ManagedRuntime.make(httpClientLayer);
const primaryHttpRuntime = ManagedRuntime.make(
- primaryEnvironmentHttpClientLive.pipe(Layer.provide(primaryEnvironmentHttpLayer)),
+ PrimaryEnvironmentHttpClient.layer.pipe(Layer.provide(primaryEnvironmentHttpLayer)),
);
export type PrimaryHttpEffectRunner = <A, E>(
- effect: Effect.Effect<A, E, PrimaryEnvironmentHttpClient>,
+ effect: Effect.Effect<A, E, PrimaryEnvironmentHttpClient.PrimaryEnvironmentHttpClient>,
) => Promise<A>;
const livePrimaryHttpRunner: PrimaryHttpEffectRunner = (effect) =>
@@ -42,8 +39,9 @@ const livePrimaryHttpRunner: PrimaryHttpEffectRunner = (effect) =>
let primaryHttpRunner = livePrimaryHttpRunner;
-export const runPrimaryHttp = <A, E>(effect: Effect.Effect<A, E, PrimaryEnvironmentHttpClient>) =>
- primaryHttpRunner(effect);
+export const runPrimaryHttp = <A, E>(
+ effect: Effect.Effect<A, E, PrimaryEnvironmentHttpClient.PrimaryEnvironmentHttpClient>,
+) => primaryHttpRunner(effect);
export function __setPrimaryHttpRunnerForTests(runner?: PrimaryHttpEffectRunner): void {
primaryHttpRunner = runner ?? livePrimaryHttpRunner;