Skip to content

Commit 39f6fc4

Browse files
committed
perf(server): hydrate only the requested project page
1 parent 125b619 commit 39f6fc4

2 files changed

Lines changed: 101 additions & 14 deletions

File tree

‎apps/server/src/project/ProjectService.test.ts‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import * as Fiber from "effect/Fiber";
1010
import * as Layer from "effect/Layer";
1111
import * as Metric from "effect/Metric";
1212
import * as Option from "effect/Option";
13+
import * as PubSub from "effect/PubSub";
1314
import * as Ref from "effect/Ref";
1415
import { TestClock } from "effect/testing";
1516
import * as SqlClient from "effect/sql/SqlClient";
@@ -107,6 +108,88 @@ const layerTestFor = (
107108

108109
const layerTest = layerTestFor(layerMetadata);
109110

111+
it.effect("resolves only the requested active project page in creation order", () =>
112+
Effect.gen(function* () {
113+
const inspected = yield* Ref.make<ReadonlySet<string>>(new Set());
114+
const note = (workspaceRoot: string) =>
115+
Ref.update(inspected, (roots) => new Set([...roots, workspaceRoot]));
116+
const metadata = Layer.merge(
117+
Layer.succeed(RepositoryIdentityResolver.RepositoryIdentityResolver, {
118+
resolve: (workspaceRoot) =>
119+
note(workspaceRoot).pipe(
120+
Effect.as({
121+
canonicalKey: `example.test${workspaceRoot}`,
122+
locator: {
123+
source: "git-remote" as const,
124+
remoteName: "origin",
125+
remoteUrl: `https://example.test${workspaceRoot}.git`,
126+
},
127+
rootPath: workspaceRoot,
128+
}),
129+
),
130+
}),
131+
Layer.succeed(ProjectFaviconResolver.ProjectFaviconResolver, {
132+
invalidate: () => Effect.void,
133+
resolvePath: (workspaceRoot) => note(workspaceRoot).pipe(Effect.as(null)),
134+
}),
135+
);
136+
yield* Effect.gen(function* () {
137+
const sql = yield* SqlClient.SqlClient;
138+
const service = yield* ProjectService.ProjectService;
139+
const enrichment = yield* ProjectEnrichmentService.ProjectEnrichmentService;
140+
const changes = yield* enrichment.subscribeChanges;
141+
const rows = Array.from({ length: 6 }, (_, index) => ({
142+
project_id: `page:${index}`,
143+
title: `Project ${index}`,
144+
workspace_root: `/work/page-${index}`,
145+
scripts_json: "[]",
146+
created_at: "2026-10-01T00:00:00.000Z",
147+
updated_at: "2026-10-01T00:00:00.000Z",
148+
deleted_at: index === 1 ? "2026-10-02T00:00:00.000Z" : null,
149+
auto_pull: 0,
150+
}));
151+
yield* sql`INSERT INTO projection_projects ${sql.insert(rows)}`;
152+
const first = yield* service.listPage({ cursor: 0, limit: 2 });
153+
assert.deepEqual(
154+
first.projects.map((project) => project.id),
155+
["page:0", "page:2"],
156+
);
157+
assert.equal(first.nextCursor, 2);
158+
assert.deepEqual(
159+
first.projects.map((project) => project.repositoryIdentity?.canonicalKey),
160+
["example.test/work/page-0", "example.test/work/page-2"],
161+
);
162+
// A sentinel queued after the page lets the enrichment workers finish
163+
// earlier requests before checking which workspaces were inspected.
164+
yield* enrichment.request("/work/page-sentinel");
165+
for (;;) {
166+
if ((yield* PubSub.take(changes)).workspaceRoot === "/work/page-sentinel") break;
167+
}
168+
assert.deepEqual(
169+
new Set(yield* Ref.get(inspected)),
170+
new Set(["/work/page-0", "/work/page-2", "/work/page-sentinel"]),
171+
);
172+
const second = yield* service.listPage({ cursor: first.nextCursor!, limit: 2 });
173+
assert.deepEqual(
174+
second.projects.map((project) => project.id),
175+
["page:3", "page:4"],
176+
);
177+
assert.equal(second.nextCursor, 4);
178+
const last = yield* service.listPage({ cursor: second.nextCursor!, limit: 2 });
179+
assert.deepEqual(
180+
last.projects.map((project) => project.id),
181+
["page:5"],
182+
);
183+
assert.isNull(last.nextCursor);
184+
assert.isFalse((yield* Ref.get(inspected)).has("/work/page-1"));
185+
assert.deepEqual(yield* service.listPage({ cursor: 99, limit: 2 }), {
186+
projects: [],
187+
nextCursor: null,
188+
});
189+
}).pipe(Effect.scoped, Effect.provide(layerTestFor(metadata)));
190+
}),
191+
);
192+
110193
const layerProjectServiceDependencies = Layer.mergeAll(
111194
RuntimeLayer.layerEventSink,
112195
ProjectStore.layer,

‎apps/server/src/project/ProjectService.ts‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -553,14 +553,14 @@ export const make = Effect.gen(function* () {
553553
return yield* Effect.forEach(shells, enrichShell, { concurrency: 16 });
554554
});
555555

556+
const listRows = projects
557+
.list()
558+
.pipe(
559+
Effect.mapError((cause) => new ProjectOperationError({ operation: "list-projects", cause })),
560+
);
561+
556562
const snapshot = Effect.gen(function* () {
557-
const rows = yield* projects
558-
.list()
559-
.pipe(
560-
Effect.mapError(
561-
(cause) => new ProjectOperationError({ operation: "list-projects", cause }),
562-
),
563-
);
563+
const rows = yield* listRows;
564564
const hydrated = yield* Effect.forEach(rows, hydrate, { concurrency: 8 });
565565
return {
566566
projects: hydrated,
@@ -570,15 +570,19 @@ export const make = Effect.gen(function* () {
570570

571571
const listPage: ProjectService["Service"]["listPage"] = Effect.fn("ProjectService.listPage")(
572572
function* ({ cursor, limit }) {
573-
const rows = (yield* snapshot).projects.filter((project) => project.deletedAt === null);
573+
const rows = (yield* listRows).filter((project) => project.deletedAt === null);
574574
const projects = yield* Effect.forEach(
575575
rows.slice(cursor, cursor + limit),
576-
(project) =>
577-
project.repositoryIdentity !== null
578-
? Effect.succeed(project)
579-
: projectEnrichment
580-
.readRepositoryIdentity(project.workspaceRoot)
581-
.pipe(Effect.map((repositoryIdentity) => ({ ...project, repositoryIdentity }))),
576+
(row) =>
577+
hydrate(row).pipe(
578+
Effect.filterOrElse(
579+
(project) => project.repositoryIdentity !== null,
580+
(project) =>
581+
projectEnrichment
582+
.readRepositoryIdentity(project.workspaceRoot)
583+
.pipe(Effect.map((repositoryIdentity) => ({ ...project, repositoryIdentity }))),
584+
),
585+
),
582586
{ concurrency: 8 },
583587
);
584588
return { projects, nextCursor: cursor + limit < rows.length ? cursor + limit : null };

0 commit comments

Comments
 (0)