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
2 changes: 1 addition & 1 deletion apps/server/src/auth/replayMarkers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import * as Option from "effect/Option";
import * as Path from "effect/Path";
import * as Schedule from "effect/Schedule";

import { CLOUD_REPLAY_MARKER_PREFIXES } from "../cloud/http.ts";
import { CLOUD_REPLAY_MARKER_PREFIXES } from "../cloud/CloudLink.ts";
import * as ServerConfig from "../config.ts";
import { forkParked } from "../serverActivation.ts";
import { DPOP_REPLAY_MARKER_PREFIX } from "./dpop.ts";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,18 @@ import * as Fiber from "effect/Fiber";
import * as Layer from "effect/Layer";
import * as Option from "effect/Option";
import * as FetchHttpClient from "effect/http/FetchHttpClient";
import { HttpClient, HttpServer } from "effect/http";
import * as NetAddress from "effect/net/NetAddress";
import * as NodeServices from "@effect/platform-node/NodeServices";

import * as EnvironmentAuth from "../auth/EnvironmentAuth.ts";
import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
import * as ServerConfig from "../config.ts";
import * as ServerEnvironment from "../environment/ServerEnvironment.ts";
import * as AgentAwarenessRelay from "../relay/AgentAwarenessRelay.ts";
import * as CloudPreferences from "./CloudPreferences.ts";
import * as CliTokenManager from "./CliTokenManager.ts";
import * as CloudLink from "./CloudLink.ts";
import * as ManagedEndpointRuntime from "./ManagedEndpointRuntime.ts";
import {
HOLD_WEBHOOKS_WHILE_OFFLINE_SECRET,
PUBLISH_AGENT_ACTIVITY_SECRET,
Expand All @@ -34,7 +41,7 @@ const withService = <A, E>(
};
},
body: (input: {
readonly preferences: CloudPreferences.CloudPreferences["Service"];
readonly preferences: { readonly update: CloudLink.CloudLink["Service"]["updatePreferences"] };
readonly stored: Map<string, Uint8Array>;
readonly relayCalls: Array<boolean>;
}) => Effect.Effect<A, E, never>,
Expand Down Expand Up @@ -88,12 +95,25 @@ const withService = <A, E>(
getEnvironmentId: Effect.succeed(EnvironmentId.make("environment-1")),
}),
Layer.mock(AgentAwarenessRelay.AgentAwarenessRelay)({ requestCatchUp: () => Effect.void }),
// Saving preferences touches none of the link's other dependencies.
Layer.mock(ManagedEndpointRuntime.CloudManagedEndpointRuntime)({}),
Layer.mock(EnvironmentAuth.EnvironmentAuth)({}),
Layer.mock(CliTokenManager.CloudCliTokenManager)({}),
Layer.mock(HttpServer.HttpServer)({
address: NetAddress.inetAddressFromIpStringUnsafe("127.0.0.1", 3773),
}),
Layer.mock(ServerConfig.ServerConfig)({} as ServerConfig.ServerConfig["Service"]),
Layer.succeed(
HttpClient.HttpClient,
HttpClient.make(() => Effect.die("unused")),
),
NodeServices.layer,
);
return yield* Effect.gen(function* () {
const preferences = yield* CloudPreferences.CloudPreferences;
return yield* body({ preferences, stored, relayCalls });
const link = yield* CloudLink.CloudLink;
return yield* body({ preferences: { update: link.updatePreferences }, stored, relayCalls });
}).pipe(
Effect.provide(CloudPreferences.layer.pipe(Layer.provide(layerDependencies))),
Effect.provide(CloudLink.layer.pipe(Layer.provide(layerDependencies))),
Effect.provideService(FetchHttpClient.Fetch, fetch),
);
});
Expand Down
Loading
Loading