Skip to content

Commit cf3acd9

Browse files
fix(server): preserve typed requirements as the RPC group grows (pingdotgg#23813)
Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent ff31a2a commit cf3acd9

1 file changed

Lines changed: 28 additions & 3 deletions

File tree

‎apps/server/src/ws.ts‎

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { OrchestrationDispatchCommandError } from "@t3tools/contracts";
2+
import * as Context from "effect/Context";
23
import * as Crypto from "effect/Crypto";
34
import * as Orchestrator from "./orchestration-v2/Orchestrator.ts";
45

@@ -103,7 +104,7 @@ import {
103104
HttpServerRespondable,
104105
HttpServerResponse,
105106
} from "effect/http";
106-
import { RpcSerialization, RpcServer } from "effect/rpc";
107+
import { RpcGroup, RpcSerialization, RpcServer } from "effect/rpc";
107108

108109
import * as CheckpointDiffQuery from "./checkpointing/CheckpointDiffQuery.ts";
109110
import * as ServerConfig from "./config.ts";
@@ -547,6 +548,24 @@ const PROVIDER_STATUS_DEBOUNCE_MS = 200;
547548

548549
// Middleware added later wraps middleware added earlier, so instrumentation wraps authorization.
549550
const ServerWsRpcGroup = WsRpcGroup.middleware(RpcInstrumentation);
551+
552+
// RpcGroup.toLayer derives each handler's requirements by scanning every RPC in
553+
// the group, so its type cost grows with handlers × RPCs. Near 200 methods that
554+
// crosses TypeScript's instantiation limit and the layer's requirements degrade to
555+
// `any`, so the handlers are registered as two disjoint, smaller groups.
556+
type ServerWsRpc = RpcGroup.Rpcs<typeof ServerWsRpcGroup>;
557+
const SPLIT_WS_RPC_PREFIXES = ["server", "pullRequests", "provider", "orchestration"] as const;
558+
type SplitWsRpc = Extract<
559+
ServerWsRpc,
560+
{ readonly _tag: `${(typeof SPLIT_WS_RPC_PREFIXES)[number]}.${string}` }
561+
>;
562+
const isSplitWsRpc = (rpc: ServerWsRpc): rpc is SplitWsRpc =>
563+
SPLIT_WS_RPC_PREFIXES.some((prefix) => rpc._tag.startsWith(`${prefix}.`));
564+
const isOtherWsRpc = (rpc: ServerWsRpc): rpc is Exclude<ServerWsRpc, SplitWsRpc> =>
565+
!isSplitWsRpc(rpc);
566+
const serverWsRpcs = Array.from(ServerWsRpcGroup.requests.values());
567+
const SplitWsRpcGroup = RpcGroup.make(...serverWsRpcs.filter(isSplitWsRpc));
568+
const OtherWsRpcGroup = RpcGroup.make(...serverWsRpcs.filter(isOtherWsRpc));
550569
// Replaying each intervening event costs a shell refetch; past this gap a
551570
// single O(active-threads) snapshot is cheaper and bounded.
552571
const SHELL_RESUME_MAX_GAP = 1_000;
@@ -1208,7 +1227,7 @@ export const layerWsRpc = (
12081227
previewAutomationBroker: PreviewAutomationBroker.PreviewAutomationBroker["Service"],
12091228
serverBrowser: ServerBrowser.ServerBrowser["Service"],
12101229
) =>
1211-
ServerWsRpcGroup.toLayer(
1230+
Layer.effectContext(
12121231
Effect.gen(function* () {
12131232
const currentSessionId = currentSession.sessionId;
12141233
const sql = yield* SqlClient.SqlClient;
@@ -3144,7 +3163,13 @@ export const layerWsRpc = (
31443163
),
31453164
),
31463165
});
3147-
return handlers;
3166+
const splitHandlers: Pick<typeof handlers, SplitWsRpc["_tag"]> = handlers;
3167+
const otherHandlers: Pick<typeof handlers, Exclude<ServerWsRpc, SplitWsRpc>["_tag"]> =
3168+
handlers;
3169+
return Context.merge(
3170+
yield* SplitWsRpcGroup.toHandlers(splitHandlers),
3171+
yield* OtherWsRpcGroup.toHandlers(otherHandlers),
3172+
);
31483173
}),
31493174
);
31503175

0 commit comments

Comments
 (0)