History

Remove dead orchestration snapshot RPC

Julius Marminge committed 7 months ago

Commit 4b155db1 parent 3b01bbe10 files · +14 −69Browse files

Unified · Split

10 files
  1. apps/server/src/server.test.ts +8 −13
  2. apps/server/src/ws.ts +0 −11
  3. apps/web/src/components/ChatView.browser.tsx +1 −4
  4. apps/web/src/components/KeybindingsToast.browser.tsx +1 −4
  5. apps/web/src/wsNativeApi.test.ts +0 −1
  6. apps/web/src/wsNativeApi.ts +0 −1
  7. apps/web/src/wsRpcClient.ts +0 −3
  8. packages/contracts/src/ipc.ts +0 −1
  9. packages/contracts/src/orchestration.ts +0 −18
  10. packages/contracts/src/rpc.ts +4 −13
apps/server/src/server.test.ts+8−13
@@ -1145,11 +1145,6 @@ it.layer(NodeServices.layer)("server router seam", (it) => { · 1144 unmodified lines
11451145 });
11461146
11471147 const wsUrl = yield* getWsServerUrl("/ws");
1148− const snapshotResult = yield* Effect.scoped(
1149− withWsRpcClient(wsUrl, (client) => client[ORCHESTRATION_WS_METHODS.getSnapshot]({})),
1150− );
1151− assert.equal(snapshotResult.snapshotSequence, 1);
1152−
11531148 const activeSnapshotResult = yield* Effect.scoped(
11541149 withWsRpcClient(wsUrl, (client) => client[ORCHESTRATION_WS_METHODS.getActiveSnapshot]({})),
11551150 );
@@ -1266,15 +1261,15 @@ it.layer(NodeServices.layer)("server router seam", (it) => { · 110 unmodified lines
12661261 }).pipe(Effect.provide(NodeHttpServer.layerTest)),
12671262 );
12681263
1269− it.effect("routes websocket rpc orchestration.getSnapshot errors", () =>
1264+ it.effect("routes websocket rpc orchestration.getActiveSnapshot errors", () =>
12701265 Effect.gen(function* () {
12711266 yield* buildAppUnderTest({
12721267 layers: {
12731268 projectionSnapshotQuery: {
1274− getSnapshot: () =>
1269+ getActiveSnapshot: () =>
12751270 Effect.fail(
12761271 new PersistenceSqlError({
1277− operation: "ProjectionSnapshotQuery.getSnapshot",
1272+ operation: "ProjectionSnapshotQuery.getActiveSnapshot",
12781273 detail: "projection unavailable",
12791274 }),
12801275 ),
@@ -1284,14 +1279,14 @@ it.layer(NodeServices.layer)("server router seam", (it) => { · 3 unmodified lines
12841279
12851280 const wsUrl = yield* getWsServerUrl("/ws");
12861281 const result = yield* Effect.scoped(
1287− withWsRpcClient(wsUrl, (client) => client[ORCHESTRATION_WS_METHODS.getSnapshot]({})).pipe(
1288− Effect.result,
1289− ),
1282+ withWsRpcClient(wsUrl, (client) =>
1283+ client[ORCHESTRATION_WS_METHODS.getActiveSnapshot]({}),
1284+ ).pipe(Effect.result),
12901285 );
12911286
12921287 assertTrue(result._tag === "Failure");
1293− assertTrue(result.failure._tag === "OrchestrationGetSnapshotError");
1294− assertInclude(result.failure.message, "Failed to load orchestration snapshot");
1288+ assertTrue(result.failure._tag === "OrchestrationGetActiveSnapshotError");
1289+ assertInclude(result.failure.message, "Failed to load active orchestration snapshot");
12951290 }).pipe(Effect.provide(NodeHttpServer.layerTest)),
12961291 );
12971292
apps/server/src/ws.ts+0−11
@@ -7,7 +7,6 @@ import { · 6 unmodified lines
77 OrchestrationGetActiveSnapshotError,
88 OrchestrationGetFullThreadDiffError,
99 OrchestrationListArchivedThreadsError,
10− OrchestrationGetSnapshotError,
1110 OrchestrationGetTurnDiffError,
1211 ORCHESTRATION_WS_METHODS,
1312 ProjectSearchEntriesError,
@@ -74,16 +73,6 @@ const WsRpcLayer = WsRpcGroup.toLayer( · 60 unmodified lines
7473 });
7574
7675 return WsRpcGroup.of({
77− [ORCHESTRATION_WS_METHODS.getSnapshot]: (_input) =>
78− projectionSnapshotQuery.getSnapshot().pipe(
79− Effect.mapError(
80− (cause) =>
81− new OrchestrationGetSnapshotError({
82− message: "Failed to load orchestration snapshot",
83− cause,
84− }),
85− ),
86− ),
8776 [ORCHESTRATION_WS_METHODS.getActiveSnapshot]: (_input) =>
8877 projectionSnapshotQuery.getActiveSnapshot().pipe(
8978 Effect.mapError(
apps/web/src/components/ChatView.browser.tsx+1−4
@@ -622,10 +622,7 @@ function resolveWsRpc(body: NormalizedWsRpcRequestBody): unknown { · 621 unmodified lines
622622 return customResult;
623623 }
624624 const tag = body._tag;
625− if (
626− tag === ORCHESTRATION_WS_METHODS.getSnapshot ||
627− tag === ORCHESTRATION_WS_METHODS.getActiveSnapshot
628− ) {
625+ if (tag === ORCHESTRATION_WS_METHODS.getActiveSnapshot) {
629626 return fixture.snapshot;
630627 }
631628 if (tag === WS_METHODS.serverGetConfig) {
apps/web/src/components/KeybindingsToast.browser.tsx+1−4
@@ -147,10 +147,7 @@ function buildFixture(): TestFixture { · 146 unmodified lines
147147 }
148148
149149 function resolveWsRpc(tag: string): unknown {
150− if (
151− tag === ORCHESTRATION_WS_METHODS.getSnapshot ||
152− tag === ORCHESTRATION_WS_METHODS.getActiveSnapshot
153− ) {
150+ if (tag === ORCHESTRATION_WS_METHODS.getActiveSnapshot) {
154151 return fixture.snapshot;
155152 }
156153 if (tag === WS_METHODS.serverGetConfig) {
apps/web/src/wsNativeApi.test.ts+0−1
@@ -75,7 +75,6 @@ const rpcClientMock = { · 74 unmodified lines
7575 subscribeLifecycle: vi.fn(),
7676 },
7777 orchestration: {
78− getSnapshot: vi.fn(),
7978 getActiveSnapshot: vi.fn(),
8079 listArchivedThreads: vi.fn(),
8180 dispatchCommand: vi.fn(),
apps/web/src/wsNativeApi.ts+0−1
@@ -90,7 +90,6 @@ export function createWsNativeApi(): NativeApi { · 89 unmodified lines
9090 updateSettings: rpcClient.server.updateSettings,
9191 },
9292 orchestration: {
93− getSnapshot: rpcClient.orchestration.getSnapshot,
9493 getActiveSnapshot: rpcClient.orchestration.getActiveSnapshot,
9594 listArchivedThreads: rpcClient.orchestration.listArchivedThreads,
9695 dispatchCommand: rpcClient.orchestration.dispatchCommand,
apps/web/src/wsRpcClient.ts+0−3
@@ -86,7 +86,6 @@ export interface WsRpcClient { · 85 unmodified lines
8686 readonly subscribeLifecycle: RpcStreamMethod<typeof WS_METHODS.subscribeServerLifecycle>;
8787 };
8888 readonly orchestration: {
89− readonly getSnapshot: RpcUnaryNoArgMethod<typeof ORCHESTRATION_WS_METHODS.getSnapshot>;
9089 readonly getActiveSnapshot: RpcUnaryNoArgMethod<
9190 typeof ORCHESTRATION_WS_METHODS.getActiveSnapshot
9291 >;
@@ -191,8 +190,6 @@ export function createWsRpcClient(transport = new WsTransport()): WsRpcClient { · 98 unmodified lines
191190 transport.subscribe((client) => client[WS_METHODS.subscribeServerLifecycle]({}), listener),
192191 },
193192 orchestration: {
194− getSnapshot: () =>
195− transport.request((client) => client[ORCHESTRATION_WS_METHODS.getSnapshot]({})),
196193 getActiveSnapshot: () =>
197194 transport.request((client) => client[ORCHESTRATION_WS_METHODS.getActiveSnapshot]({})),
198195 dispatchCommand: (input) =>
packages/contracts/src/ipc.ts+0−1
@@ -174,7 +174,6 @@ export interface NativeApi { · 173 unmodified lines
174174 updateSettings: (patch: ServerSettingsPatch) => Promise<ServerSettings>;
175175 };
176176 orchestration: {
177− getSnapshot: () => Promise<OrchestrationReadModel>;
178177 getActiveSnapshot: () => Promise<OrchestrationReadModel>;
179178 listArchivedThreads: () => Promise<OrchestrationListArchivedThreadsResult>;
180179 dispatchCommand: (command: ClientOrchestrationCommand) => Promise<{ sequence: number }>;
packages/contracts/src/orchestration.ts+0−18
@@ -16,7 +16,6 @@ import { · 15 unmodified lines
1616 } from "./baseSchemas";
1717
1818 export const ORCHESTRATION_WS_METHODS = {
19− getSnapshot: "orchestration.getSnapshot",
2019 getActiveSnapshot: "orchestration.getActiveSnapshot",
2120 dispatchCommand: "orchestration.dispatchCommand",
2221 getTurnDiff: "orchestration.getTurnDiff",
@@ -982,11 +981,6 @@ export const DispatchResult = Schema.Struct({ · 959 unmodified lines
982981 });
983982 export type DispatchResult = typeof DispatchResult.Type;
984983
985−export const OrchestrationGetSnapshotInput = Schema.Struct({});
986−export type OrchestrationGetSnapshotInput = typeof OrchestrationGetSnapshotInput.Type;
987−const OrchestrationGetSnapshotResult = OrchestrationReadModel;
988−export type OrchestrationGetSnapshotResult = typeof OrchestrationGetSnapshotResult.Type;
989−
990984 export const OrchestrationGetActiveSnapshotInput = Schema.Struct({});
991985 export type OrchestrationGetActiveSnapshotInput = typeof OrchestrationGetActiveSnapshotInput.Type;
992986 const OrchestrationGetActiveSnapshotResult = OrchestrationReadModel;
@@ -1039,10 +1033,6 @@ const OrchestrationReplayEventsResult = Schema.Array(OrchestrationEvent); · 46 unmodified lines
10391033 export type OrchestrationReplayEventsResult = typeof OrchestrationReplayEventsResult.Type;
10401034
10411035 export const OrchestrationRpcSchemas = {
1042− getSnapshot: {
1043− input: OrchestrationGetSnapshotInput,
1044− output: OrchestrationGetSnapshotResult,
1045− },
10461036 getActiveSnapshot: {
10471037 input: OrchestrationGetActiveSnapshotInput,
10481038 output: OrchestrationGetActiveSnapshotResult,
@@ -1069,14 +1059,6 @@ export const OrchestrationRpcSchemas = { · 20 unmodified lines
10691059 },
10701060 } as const;
10711061
1072−export class OrchestrationGetSnapshotError extends Schema.TaggedErrorClass<OrchestrationGetSnapshotError>()(
1073− "OrchestrationGetSnapshotError",
1074− {
1075− message: TrimmedNonEmptyString,
1076− cause: Schema.optional(Schema.Defect),
1077− },
1078−) {}
1079−
10801062 export class OrchestrationGetActiveSnapshotError extends Schema.TaggedErrorClass<OrchestrationGetActiveSnapshotError>()(
10811063 "OrchestrationGetActiveSnapshotError",
10821064 {
packages/contracts/src/rpc.ts+4−13
@@ -35,8 +35,6 @@ import { · 34 unmodified lines
3535 OrchestrationGetActiveSnapshotInput,
3636 OrchestrationGetFullThreadDiffError,
3737 OrchestrationGetFullThreadDiffInput,
38− OrchestrationGetSnapshotError,
39− OrchestrationGetSnapshotInput,
4038 OrchestrationGetTurnDiffError,
4139 OrchestrationGetTurnDiffInput,
4240 OrchestrationListArchivedThreadsError,
@@ -261,12 +259,6 @@ export const WsTerminalCloseRpc = Rpc.make(WS_METHODS.terminalClose, { · 218 unmodified lines
261259 error: TerminalError,
262260 });
263261
264−export const WsOrchestrationGetSnapshotRpc = Rpc.make(ORCHESTRATION_WS_METHODS.getSnapshot, {
265− payload: OrchestrationGetSnapshotInput,
266− success: OrchestrationRpcSchemas.getSnapshot.output,
267− error: OrchestrationGetSnapshotError,
268−});
269−
270262 export const WsOrchestrationGetActiveSnapshotRpc = Rpc.make(
271263 ORCHESTRATION_WS_METHODS.getActiveSnapshot,
272264 {
@@ -369,15 +361,14 @@ export const WsRpcGroup = RpcGroup.make( · 96 unmodified lines
369361 WsTerminalClearRpc,
370362 WsTerminalRestartRpc,
371363 WsTerminalCloseRpc,
372− WsSubscribeOrchestrationDomainEventsRpc,
373− WsSubscribeTerminalEventsRpc,
374− WsSubscribeServerConfigRpc,
375− WsSubscribeServerLifecycleRpc,
376− WsOrchestrationGetSnapshotRpc,
377364 WsOrchestrationGetActiveSnapshotRpc,
378365 WsOrchestrationDispatchCommandRpc,
379366 WsOrchestrationGetTurnDiffRpc,
380367 WsOrchestrationGetFullThreadDiffRpc,
381368 WsOrchestrationListArchivedThreadsRpc,
382369 WsOrchestrationReplayEventsRpc,
370+ WsSubscribeOrchestrationDomainEventsRpc,
371+ WsSubscribeTerminalEventsRpc,
372+ WsSubscribeServerConfigRpc,
373+ WsSubscribeServerLifecycleRpc,
383374 );