an app to share curated trails
sidetrail.app
fix deploys
author
Dan Abramov
date
(Jun 11, 2026, 12:32 AM +0100)
commit
4e2ee485
4e2ee485ac761d6a5ee70b0fd5ad461d181ff1ea
parent
8d607fc1
8d607fc17d192fc1d8d9b5ac0d3cbcb156adf0ab
+33
-28
+2
-1
ingester/package.json
+2
-1
ingester/package.json
+26
-23
ingester/src/lexicons.ts
+26
-23
ingester/src/lexicons.ts
···
1
-
import { jsonToLex } from "@atproto/lex-json";
2
-
import { main as trail } from "../../lib/lexicons/app/sidetrail/trail.defs";
3
-
import { main as walk } from "../../lib/lexicons/app/sidetrail/walk.defs";
4
-
import { main as completion } from "../../lib/lexicons/app/sidetrail/completion.defs";
1
+
import { readFileSync } from "node:fs";
2
+
import { Lexicons, jsonToLex, type LexiconDoc } from "@atproto/lexicon";
3
+
4
+
// Validate against the lexicon JSON documents directly (the same source the
5
+
// generated lib/lexicons code is built from). PDSes don't reliably enforce
6
+
// third-party lexicons, so validating is the indexer's responsibility.
7
+
const loadDoc = (path: string): LexiconDoc =>
8
+
JSON.parse(readFileSync(new URL(`../../lexicons/${path}`, import.meta.url), "utf8"));
9
+
10
+
const lexicons = new Lexicons([
11
+
loadDoc("app/sidetrail/trail.json"),
12
+
loadDoc("app/sidetrail/walk.json"),
13
+
loadDoc("app/sidetrail/completion.json"),
14
+
loadDoc("com/atproto/repo/strongRef.json"),
15
+
]);
5
16
6
-
// Runtime lexicon schemas for every collection we index. Records that fail
7
-
// validation are rejected: PDSes don't reliably enforce third-party lexicons,
8
-
// so validating is the indexer's responsibility.
9
-
export const RECORD_SCHEMAS = {
10
-
"app.sidetrail.trail": trail,
11
-
"app.sidetrail.walk": walk,
12
-
"app.sidetrail.completion": completion,
13
-
} as const;
17
+
export const INDEXED_COLLECTIONS = [
18
+
"app.sidetrail.trail",
19
+
"app.sidetrail.walk",
20
+
"app.sidetrail.completion",
21
+
] as const;
14
22
15
-
export type IndexedCollection = keyof typeof RECORD_SCHEMAS;
23
+
export type IndexedCollection = (typeof INDEXED_COLLECTIONS)[number];
16
24
17
25
export function validateRecord(
18
26
collection: IndexedCollection,
19
27
record: unknown,
20
28
): { success: true } | { success: false; reason: string } {
21
29
// Records arrive as JSON (jetstream, listRecords, jsonb storage), where CID
22
-
// links are {"$link": ...} objects. Schemas validate lex values, so convert
23
-
// first; a record that can't even be converted (e.g. malformed CID) is invalid.
30
+
// links are {"$link": ...} objects. The validator expects lex values, so
31
+
// convert first; a record that can't be converted (e.g. malformed CID) is invalid.
24
32
let lexValue: unknown;
25
33
try {
26
-
lexValue = jsonToLex(record as Parameters<typeof jsonToLex>[0]);
34
+
lexValue = jsonToLex(record);
27
35
} catch (err) {
28
36
return { success: false, reason: `unparseable as lex: ${(err as Error).message}` };
29
37
}
30
-
const result = RECORD_SCHEMAS[collection].validate(lexValue);
38
+
const result = lexicons.validate(collection, lexValue);
31
39
if (result.success) return { success: true };
32
-
return {
33
-
success: false,
34
-
reason: result.error.issues
35
-
.map((issue) => `${issue.code} at ${issue.path.join(".") || "(root)"}`)
36
-
.join("; "),
37
-
};
40
+
return { success: false, reason: result.error.message };
38
41
}
+1
package-lock.json
+1
package-lock.json
+4
-4
package.json
+4
-4
package.json
···
25
25
"db:studio": "drizzle-kit studio",
26
26
"test": "npx vitest run",
27
27
"test:watch": "npx vitest",
28
-
"deploy:app": "railway link --service sidetrail && railway up",
29
-
"deploy:ingester": "railway link --service ingester && railway up",
30
-
"deploy:realtime": "railway link --service realtime && railway up",
31
-
"deploy:all": "npm run deploy:app & npm run deploy:ingester & npm run deploy:realtime & wait"
28
+
"deploy:app": "railway up --service sidetrail --ci",
29
+
"deploy:ingester": "railway up --service ingester --ci",
30
+
"deploy:realtime": "railway up --service realtime --ci",
31
+
"deploy:all": "npm run deploy:app && npm run deploy:ingester && npm run deploy:realtime"
32
32
},
33
33
"dependencies": {
34
34
"@atproto/api": "^0.17.4",