Skip to content

Commit 40f9885

Browse files
Validate persistence repository rows with Effect Schema decoders
Co-authored-by: Julius Marminge <[email protected]>
1 parent 72c33f7 commit 40f9885

5 files changed

Lines changed: 95 additions & 19 deletions

File tree

‎apps/server/src/persistence/repos/documentsRepo.ts‎

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
import * as Effect from "effect/Effect";
2+
import * as Schema from "effect/Schema";
23
import * as SqlClient from "effect/unstable/sql/SqlClient";
4+
import {
5+
DataJsonRowSchema,
6+
DocumentRowSchema,
7+
TotalCountRowSchema,
8+
} from "../schema";
39

410
export interface DocumentRow {
511
id: string;
@@ -34,6 +40,10 @@ function toSafeInteger(value: unknown, fallback = 0): number {
3440
return fallback;
3541
}
3642

43+
const decodeDocumentRows = Schema.decodeUnknownSync(Schema.Array(DocumentRowSchema));
44+
const decodeDataJsonRows = Schema.decodeUnknownSync(Schema.Array(DataJsonRowSchema));
45+
const decodeTotalCountRows = Schema.decodeUnknownSync(Schema.Array(TotalCountRowSchema));
46+
3747
export const getDocumentRowById = (
3848
id: string,
3949
): Effect.Effect<DocumentRow | null, unknown, SqlClient.SqlClient> =>
@@ -45,7 +55,8 @@ export const getDocumentRowById = (
4555
[id],
4656
)
4757
.unprepared) as DocumentRow[];
48-
return rows[0] ?? null;
58+
const parsedRows = decodeDocumentRows(rows);
59+
return parsedRows[0] ?? null;
4960
});
5061

5162
export const upsertDocument = (input: {
@@ -118,7 +129,7 @@ export const listProjectPayloads = (): Effect.Effect<string[], unknown, SqlClien
118129
"SELECT data_json FROM documents WHERE kind = 'project' ORDER BY updated_at DESC, created_at DESC;",
119130
)
120131
.unprepared) as DataJsonRow[];
121-
return rows.map((row) => row.data_json);
132+
return decodeDataJsonRows(rows).map((row) => row.data_json);
122133
});
123134

124135
export const listThreadPayloads = (): Effect.Effect<string[], unknown, SqlClient.SqlClient> =>
@@ -129,7 +140,7 @@ export const listThreadPayloads = (): Effect.Effect<string[], unknown, SqlClient
129140
"SELECT data_json FROM documents WHERE kind = 'thread' ORDER BY updated_at DESC, created_at DESC;",
130141
)
131142
.unprepared) as DataJsonRow[];
132-
return rows.map((row) => row.data_json);
143+
return decodeDataJsonRows(rows).map((row) => row.data_json);
133144
});
134145

135146
export const listThreadPayloadsByProject = (
@@ -142,7 +153,7 @@ export const listThreadPayloadsByProject = (
142153
projectId,
143154
])
144155
.unprepared) as DataJsonRow[];
145-
return rows.map((row) => row.data_json);
156+
return decodeDataJsonRows(rows).map((row) => row.data_json);
146157
});
147158

148159
export const findThreadPayloadByRuntimeThreadId = (
@@ -156,7 +167,8 @@ export const findThreadPayloadByRuntimeThreadId = (
156167
[runtimeThreadId],
157168
)
158169
.unprepared) as DataJsonRow[];
159-
return rows[0]?.data_json ?? null;
170+
const parsedRows = decodeDataJsonRows(rows);
171+
return parsedRows[0]?.data_json ?? null;
160172
});
161173

162174
export const deleteDocumentsByProjectId = (
@@ -195,7 +207,7 @@ export const listMessagePayloadsForThread = (
195207
[threadId],
196208
)
197209
.unprepared) as Array<{ data_json: string }>;
198-
return rows.map((row) => row.data_json);
210+
return decodeDataJsonRows(rows).map((row) => row.data_json);
199211
});
200212

201213
export const listPaginatedMessagePayloadsForThread = (input: {
@@ -211,7 +223,7 @@ export const listPaginatedMessagePayloadsForThread = (input: {
211223
[input.threadId, input.limit, input.offset],
212224
)
213225
.unprepared) as PaginatedMessagePayloadsRow[];
214-
return rows.map((row) => row.data_json);
226+
return decodeDataJsonRows(rows).map((row) => row.data_json);
215227
});
216228

217229
export const countMessagesForThread = (
@@ -224,7 +236,8 @@ export const countMessagesForThread = (
224236
threadId,
225237
])
226238
.unprepared) as TotalCountRow[];
227-
return toSafeInteger(rows[0]?.total, 0);
239+
const parsedRows = decodeTotalCountRows(rows);
240+
return toSafeInteger(parsedRows[0]?.total, 0);
228241
});
229242

230243
export const listMessagePayloadsForThreadDesc = (
@@ -241,7 +254,7 @@ export const listMessagePayloadsForThreadDesc = (
241254
[threadId],
242255
)
243256
.unprepared) as Array<{ data_json: string }>;
244-
return rows.map((row) => row.data_json);
257+
return decodeDataJsonRows(rows).map((row) => row.data_json);
245258
});
246259

247260
export const listTurnSummaryPayloadsForThread = (
@@ -255,5 +268,5 @@ export const listTurnSummaryPayloadsForThread = (
255268
[threadId],
256269
)
257270
.unprepared) as Array<{ data_json: string }>;
258-
return rows.map((row) => row.data_json);
271+
return decodeDataJsonRows(rows).map((row) => row.data_json);
259272
});

‎apps/server/src/persistence/repos/metadataRepo.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import * as Effect from "effect/Effect";
2+
import * as Schema from "effect/Schema";
23
import * as SqlClient from "effect/unstable/sql/SqlClient";
4+
import { MetadataRowSchema } from "../schema";
35

46
function tryParseJson(value: string): unknown {
57
try {
@@ -9,6 +11,8 @@ function tryParseJson(value: string): unknown {
911
}
1012
}
1113

14+
const decodeMetadataRows = Schema.decodeUnknownSync(Schema.Array(MetadataRowSchema));
15+
1216
export const readMetadataValue = (
1317
key: string,
1418
): Effect.Effect<unknown | null, unknown, SqlClient.SqlClient> =>
@@ -17,7 +21,7 @@ export const readMetadataValue = (
1721
const rows = (yield* sql
1822
.unsafe<{ value_json: string }>("SELECT value_json FROM metadata WHERE key = ? LIMIT 1;", [key])
1923
.unprepared) as Array<{ value_json: string }>;
20-
const row = rows[0];
24+
const row = decodeMetadataRows(rows)[0];
2125
if (!row) {
2226
return null;
2327
}

‎apps/server/src/persistence/repos/providerEventsRepo.ts‎

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
import * as Effect from "effect/Effect";
2+
import * as Schema from "effect/Schema";
23
import * as SqlClient from "effect/unstable/sql/SqlClient";
4+
import {
5+
CompletedProviderItemRowSchema,
6+
ProviderEventInsertStatsSchema,
7+
} from "../schema";
38

49
function toSafeInteger(value: unknown, fallback = 0): number {
510
if (typeof value === "number" && Number.isFinite(value)) {
@@ -11,6 +16,11 @@ function toSafeInteger(value: unknown, fallback = 0): number {
1116
return fallback;
1217
}
1318

19+
const decodeProviderEventInsertStats = Schema.decodeUnknownSync(ProviderEventInsertStatsSchema);
20+
const decodeCompletedProviderItemRows = Schema.decodeUnknownSync(
21+
Schema.Array(CompletedProviderItemRowSchema),
22+
);
23+
1424
export interface CompletedProviderItemRow {
1525
item_id: string | null;
1626
payload_json: string | null;
@@ -70,7 +80,8 @@ export const insertProviderEvent = (input: {
7080
],
7181
)
7282
.raw) as { changes?: number | bigint };
73-
return toSafeInteger(rawResult.changes, 0);
83+
const stats = decodeProviderEventInsertStats(rawResult);
84+
return toSafeInteger(stats.changes, 0);
7485
});
7586

7687
export const listCompletedItemEventsBySessionTurn = (input: {
@@ -79,7 +90,7 @@ export const listCompletedItemEventsBySessionTurn = (input: {
7990
}): Effect.Effect<CompletedProviderItemRow[], unknown, SqlClient.SqlClient> =>
8091
Effect.gen(function*() {
8192
const sql = yield* SqlClient.SqlClient;
82-
return (yield* sql
93+
const rows = (yield* sql
8394
.unsafe<CompletedProviderItemRow>(
8495
`SELECT item_id, payload_json
8596
FROM provider_events
@@ -88,6 +99,10 @@ export const listCompletedItemEventsBySessionTurn = (input: {
8899
[input.sessionId, input.turnId],
89100
)
90101
.unprepared) as CompletedProviderItemRow[];
102+
return decodeCompletedProviderItemRows(rows).map((row) => ({
103+
item_id: row.item_id,
104+
payload_json: row.payload_json,
105+
}));
91106
});
92107

93108
export const listCompletedItemEventsByThreadTurn = (input: {
@@ -96,7 +111,7 @@ export const listCompletedItemEventsByThreadTurn = (input: {
96111
}): Effect.Effect<CompletedProviderItemRow[], unknown, SqlClient.SqlClient> =>
97112
Effect.gen(function*() {
98113
const sql = yield* SqlClient.SqlClient;
99-
return (yield* sql
114+
const rows = (yield* sql
100115
.unsafe<CompletedProviderItemRow>(
101116
`SELECT item_id, payload_json
102117
FROM provider_events
@@ -105,14 +120,18 @@ export const listCompletedItemEventsByThreadTurn = (input: {
105120
[input.runtimeThreadId, input.turnId],
106121
)
107122
.unprepared) as CompletedProviderItemRow[];
123+
return decodeCompletedProviderItemRows(rows).map((row) => ({
124+
item_id: row.item_id,
125+
payload_json: row.payload_json,
126+
}));
108127
});
109128

110129
export const listCompletedItemEventsByTurn = (
111130
turnId: string,
112131
): Effect.Effect<CompletedProviderItemRow[], unknown, SqlClient.SqlClient> =>
113132
Effect.gen(function*() {
114133
const sql = yield* SqlClient.SqlClient;
115-
return (yield* sql
134+
const rows = (yield* sql
116135
.unsafe<CompletedProviderItemRow>(
117136
`SELECT item_id, payload_json
118137
FROM provider_events
@@ -121,4 +140,8 @@ export const listCompletedItemEventsByTurn = (
121140
[turnId],
122141
)
123142
.unprepared) as CompletedProviderItemRow[];
143+
return decodeCompletedProviderItemRows(rows).map((row) => ({
144+
item_id: row.item_id,
145+
payload_json: row.payload_json,
146+
}));
124147
});

‎apps/server/src/persistence/repos/stateEventsRepo.ts‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
import * as Effect from "effect/Effect";
2+
import * as Schema from "effect/Schema";
23
import * as SqlClient from "effect/unstable/sql/SqlClient";
34
import { stateEventSchema, type StateEvent } from "@t3tools/contracts";
5+
import {
6+
StateEventRowSchema,
7+
StateSeqRowSchema,
8+
StateEventInsertStatsSchema,
9+
} from "../schema";
410

511
interface StateEventRow {
612
seq: number;
@@ -28,6 +34,10 @@ function tryParseJson(value: string): unknown {
2834
}
2935
}
3036

37+
const decodeStateEventRows = Schema.decodeUnknownSync(Schema.Array(StateEventRowSchema));
38+
const decodeStateSeqRows = Schema.decodeUnknownSync(Schema.Array(StateSeqRowSchema));
39+
const decodeStateEventInsertStats = Schema.decodeUnknownSync(StateEventInsertStatsSchema);
40+
3141
export const appendStateEvent = (input: {
3242
eventType: string;
3343
entityId: string;
@@ -45,9 +55,10 @@ export const appendStateEvent = (input: {
4555
changes?: number | bigint;
4656
lastInsertRowid?: number | bigint;
4757
};
58+
const stats = decodeStateEventInsertStats(result);
4859

4960
return stateEventSchema.parse({
50-
seq: toSafeInteger(result.lastInsertRowid, 0),
61+
seq: toSafeInteger(stats.lastInsertRowid, 0),
5162
eventType: input.eventType,
5263
entityId: input.entityId,
5364
payload: input.payload,
@@ -63,7 +74,8 @@ export const readLastStateSeq: Effect.Effect<number, unknown, SqlClient.SqlClien
6374
"SELECT COALESCE(MAX(seq), 0) AS seq FROM state_events;",
6475
)
6576
.unprepared) as Array<{ seq?: number | bigint }>;
66-
return toSafeInteger(rows[0]?.seq, 0);
77+
const parsedRows = decodeStateSeqRows(rows);
78+
return toSafeInteger(parsedRows[0]?.seq, 0);
6779
},
6880
);
6981

@@ -78,7 +90,7 @@ export const listStateEventsAfterSeq = (
7890
[afterSeq],
7991
)
8092
.unprepared) as StateEventRow[];
81-
return rows.map((row) =>
93+
return decodeStateEventRows(rows).map((row) =>
8294
stateEventSchema.parse({
8395
seq: row.seq,
8496
eventType: row.event_type,

‎apps/server/src/persistence/schema.ts‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,24 @@ export const DocumentRowSchema = Schema.Struct({
1111
data_json: Schema.String,
1212
});
1313

14+
export const DataJsonRowSchema = Schema.Struct({
15+
data_json: Schema.String,
16+
});
17+
18+
const NumberOrBigIntSchema = Schema.Union([Schema.Number, Schema.BigInt]);
19+
1420
export const ProviderEventInsertStatsSchema = Schema.Struct({
15-
changes: Schema.NullOr(Schema.Number),
21+
changes: Schema.optional(Schema.NullOr(NumberOrBigIntSchema)),
22+
});
23+
24+
export const CompletedProviderItemRowSchema = Schema.Struct({
25+
item_id: Schema.NullOr(Schema.String),
26+
payload_json: Schema.NullOr(Schema.String),
27+
});
28+
29+
export const StateEventInsertStatsSchema = Schema.Struct({
30+
changes: Schema.optional(Schema.NullOr(NumberOrBigIntSchema)),
31+
lastInsertRowid: Schema.optional(Schema.NullOr(NumberOrBigIntSchema)),
1632
});
1733

1834
export const StateEventRowSchema = Schema.Struct({
@@ -23,6 +39,14 @@ export const StateEventRowSchema = Schema.Struct({
2339
created_at: Schema.String,
2440
});
2541

42+
export const StateSeqRowSchema = Schema.Struct({
43+
seq: Schema.optional(Schema.NullOr(NumberOrBigIntSchema)),
44+
});
45+
46+
export const TotalCountRowSchema = Schema.Struct({
47+
total: Schema.optional(Schema.NullOr(NumberOrBigIntSchema)),
48+
});
49+
2650
export const MetadataRowSchema = Schema.Struct({
2751
value_json: Schema.String,
2852
});

0 commit comments

Comments
 (0)