@hatk/hatk 0.0.1-alpha.21 → 0.0.1-alpha.23
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/backfill.d.ts.map +1 -1
- package/dist/backfill.js +4 -4
- package/dist/car.js +1 -1
- package/dist/cli.js +111 -54
- package/dist/config.d.ts +1 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +1 -0
- package/dist/database/adapter-factory.d.ts +6 -0
- package/dist/database/adapter-factory.d.ts.map +1 -0
- package/dist/database/adapter-factory.js +20 -0
- package/dist/database/adapters/duckdb-search.d.ts +12 -0
- package/dist/database/adapters/duckdb-search.d.ts.map +1 -0
- package/dist/database/adapters/duckdb-search.js +27 -0
- package/dist/database/adapters/duckdb.d.ts +25 -0
- package/dist/database/adapters/duckdb.d.ts.map +1 -0
- package/dist/database/adapters/duckdb.js +161 -0
- package/dist/database/adapters/sqlite-search.d.ts +18 -0
- package/dist/database/adapters/sqlite-search.d.ts.map +1 -0
- package/dist/database/adapters/sqlite-search.js +38 -0
- package/dist/database/adapters/sqlite.d.ts +18 -0
- package/dist/database/adapters/sqlite.d.ts.map +1 -0
- package/dist/database/adapters/sqlite.js +87 -0
- package/dist/database/db.d.ts +149 -0
- package/dist/database/db.d.ts.map +1 -0
- package/dist/database/db.js +1456 -0
- package/dist/database/dialect.d.ts +45 -0
- package/dist/database/dialect.d.ts.map +1 -0
- package/dist/database/dialect.js +72 -0
- package/dist/database/fts.d.ts +24 -0
- package/dist/database/fts.d.ts.map +1 -0
- package/dist/database/fts.js +777 -0
- package/dist/database/index.d.ts +7 -0
- package/dist/database/index.d.ts.map +1 -0
- package/dist/database/index.js +6 -0
- package/dist/database/ports.d.ts +44 -0
- package/dist/database/ports.d.ts.map +1 -0
- package/dist/database/ports.js +1 -0
- package/dist/database/schema.d.ts +60 -0
- package/dist/database/schema.d.ts.map +1 -0
- package/dist/database/schema.js +388 -0
- package/dist/feeds.js +1 -1
- package/dist/hooks.d.ts +15 -0
- package/dist/hooks.d.ts.map +1 -0
- package/dist/hooks.js +65 -0
- package/dist/hydrate.js +1 -1
- package/dist/indexer.d.ts +19 -0
- package/dist/indexer.d.ts.map +1 -1
- package/dist/indexer.js +34 -4
- package/dist/labels.d.ts +20 -0
- package/dist/labels.d.ts.map +1 -1
- package/dist/labels.js +50 -2
- package/dist/logger.d.ts +29 -0
- package/dist/logger.d.ts.map +1 -1
- package/dist/logger.js +29 -0
- package/dist/main.js +37 -32
- package/dist/mst.d.ts +15 -0
- package/dist/mst.d.ts.map +1 -1
- package/dist/mst.js +13 -0
- package/dist/oauth/db.d.ts.map +1 -1
- package/dist/oauth/db.js +41 -15
- package/dist/oauth/server.d.ts.map +1 -1
- package/dist/oauth/server.js +11 -6
- package/dist/opengraph.js +1 -1
- package/dist/schema.d.ts +8 -0
- package/dist/schema.d.ts.map +1 -1
- package/dist/schema.js +29 -0
- package/dist/seed.d.ts +19 -0
- package/dist/seed.d.ts.map +1 -1
- package/dist/seed.js +43 -4
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +12 -6
- package/dist/setup.d.ts +21 -1
- package/dist/setup.d.ts.map +1 -1
- package/dist/setup.js +37 -2
- package/dist/test.d.ts +1 -1
- package/dist/test.d.ts.map +1 -1
- package/dist/test.js +23 -9
- package/dist/views.js +1 -1
- package/dist/vite-plugin.d.ts.map +1 -1
- package/dist/vite-plugin.js +10 -0
- package/dist/xrpc.d.ts +23 -0
- package/dist/xrpc.d.ts.map +1 -1
- package/dist/xrpc.js +37 -2
- package/package.json +3 -1
package/dist/oauth/server.js
CHANGED
|
@@ -5,8 +5,8 @@ import { resolveClient, validateRedirectUri, isLoopbackClient } from "./client.j
|
|
|
5
5
|
import { discoverAuthServer, resolveHandle } from "./discovery.js";
|
|
6
6
|
import { getServerKey, storeServerKey, storeOAuthRequest, getOAuthRequest, deleteOAuthRequest, storeAuthCode, consumeAuthCode, storeSession, checkAndStoreDpopJti, cleanupExpiredOAuth, storeRefreshToken, getRefreshToken, revokeRefreshToken, } from "./db.js";
|
|
7
7
|
import { emit } from "../logger.js";
|
|
8
|
-
import { querySQL } from "../db.js";
|
|
9
|
-
import { fireOnLoginHook } from "
|
|
8
|
+
import { querySQL } from "../database/db.js";
|
|
9
|
+
import { fireOnLoginHook } from "../hooks.js";
|
|
10
10
|
const SERVER_KEY_KID = 'appview-oauth-key';
|
|
11
11
|
async function resolveHandleForDid(did) {
|
|
12
12
|
const rows = (await querySQL('SELECT handle FROM _repos WHERE did = $1', [did]));
|
|
@@ -146,7 +146,12 @@ export async function handlePar(config, body, dpopHeader, requestUrl) {
|
|
|
146
146
|
// Resolve DID from login_hint
|
|
147
147
|
let did = body.login_hint;
|
|
148
148
|
if (did && !did.startsWith('did:')) {
|
|
149
|
-
|
|
149
|
+
try {
|
|
150
|
+
did = await resolveHandle(did, _relayUrl);
|
|
151
|
+
}
|
|
152
|
+
catch {
|
|
153
|
+
throw new Error('Handle not found');
|
|
154
|
+
}
|
|
150
155
|
}
|
|
151
156
|
// Discover user's PDS auth server
|
|
152
157
|
let pdsRequestUri;
|
|
@@ -256,7 +261,7 @@ export function buildAuthorizeRedirect(config, request) {
|
|
|
256
261
|
// --- OAuth Callback (PDS redirects here) ---
|
|
257
262
|
export async function handleCallback(config, code, state, iss) {
|
|
258
263
|
// Find the matching OAuth request by pds_state (unique per PAR)
|
|
259
|
-
const { querySQL } = await import("../db.js");
|
|
264
|
+
const { querySQL } = await import("../database/db.js");
|
|
260
265
|
let request = null;
|
|
261
266
|
if (state) {
|
|
262
267
|
const rows = await querySQL(`SELECT * FROM _oauth_requests WHERE pds_state = $1 AND expires_at > $2`, [
|
|
@@ -343,8 +348,8 @@ export async function handleCallback(config, code, state, iss) {
|
|
|
343
348
|
await storeAuthCode(clientCode, request.request_uri);
|
|
344
349
|
// Update the request with the DID (in case it wasn't set during PAR)
|
|
345
350
|
if (!request.did && did) {
|
|
346
|
-
const { runSQL } = await import("../db.js");
|
|
347
|
-
await runSQL('UPDATE _oauth_requests SET did = $1 WHERE request_uri = $2', did, request.request_uri);
|
|
351
|
+
const { runSQL } = await import("../database/db.js");
|
|
352
|
+
await runSQL('UPDATE _oauth_requests SET did = $1 WHERE request_uri = $2', [did, request.request_uri]);
|
|
348
353
|
}
|
|
349
354
|
// Build redirect back to client
|
|
350
355
|
const params = new URLSearchParams({ code: clientCode, iss: config.issuer });
|
package/dist/opengraph.js
CHANGED
|
@@ -11,7 +11,7 @@ import { readFileSync, readdirSync } from 'node:fs';
|
|
|
11
11
|
import { log } from "./logger.js";
|
|
12
12
|
import satori from 'satori';
|
|
13
13
|
import { Resvg } from '@resvg/resvg-js';
|
|
14
|
-
import { querySQL, runSQL, packCursor, unpackCursor, isTakendownDid, filterTakendownDids, searchRecords, findUriByFields, lookupByFieldBatch, countByFieldBatch, queryLabelsForUris, } from "./db.js";
|
|
14
|
+
import { querySQL, runSQL, packCursor, unpackCursor, isTakendownDid, filterTakendownDids, searchRecords, findUriByFields, lookupByFieldBatch, countByFieldBatch, queryLabelsForUris, } from "./database/db.js";
|
|
15
15
|
import { resolveRecords } from "./hydrate.js";
|
|
16
16
|
import { blobUrl } from "./xrpc.js";
|
|
17
17
|
const handlers = [];
|
package/dist/schema.d.ts
CHANGED
|
@@ -48,4 +48,12 @@ export declare function getAllLexicons(): Array<{
|
|
|
48
48
|
export declare function getLexiconArray(): any[];
|
|
49
49
|
export declare function generateTableSchema(nsid: string, lexicon: any, lexicons?: Map<string, any>): TableSchema;
|
|
50
50
|
export declare function generateCreateTableSQL(schema: TableSchema): string;
|
|
51
|
+
/**
|
|
52
|
+
* Build table schemas and DDL from lexicons and collections.
|
|
53
|
+
* Shared by main.ts (server boot) and cli.ts (hatk schema command).
|
|
54
|
+
*/
|
|
55
|
+
export declare function buildSchemas(lexicons: Map<string, any>, collections: string[]): {
|
|
56
|
+
schemas: TableSchema[];
|
|
57
|
+
ddlStatements: string[];
|
|
58
|
+
};
|
|
51
59
|
//# sourceMappingURL=schema.d.ts.map
|
package/dist/schema.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,OAAO,CAAA;CACf;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,EAAE,MAAM,CAAA;IAClB,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,SAAS,EAAE,CAAA;IACpB,OAAO,EAAE,OAAO,CAAA;IAChB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,iBAAiB,EAAE,CAAA;CAC9B;AAED,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,MAAM,CAAA;IAClB,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,SAAS,EAAE,CAAA;IACpB,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,QAAQ,EAAE,gBAAgB,EAAE,CAAA;IAC5B,MAAM,EAAE,gBAAgB,EAAE,CAAA;CAC3B;AAED,MAAM,WAAW,gBAAgB;IAC/B,gBAAgB,EAAE,MAAM,CAAA;IACxB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,SAAS,EAAE,CAAA;CACrB;AAGD,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE/C;AA8CD,wBAAgB,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CASlE;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,EAAE,CASxE;AAID,wBAAgB,aAAa,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAI9D;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,GAAG,SAAS,CAExD;AAED,wBAAgB,cAAc,IAAI,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,GAAG,CAAA;CAAE,CAAC,CAEtE;AAED,iFAAiF;AACjF,wBAAgB,eAAe,IAAI,GAAG,EAAE,CAEvC;AAuHD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,WAAW,CA0GxG;AAGD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,CAoElE"}
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,OAAO,CAAA;CACf;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,EAAE,MAAM,CAAA;IAClB,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,SAAS,EAAE,CAAA;IACpB,OAAO,EAAE,OAAO,CAAA;IAChB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,iBAAiB,EAAE,CAAA;CAC9B;AAED,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,MAAM,CAAA;IAClB,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,SAAS,EAAE,CAAA;IACpB,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,QAAQ,EAAE,gBAAgB,EAAE,CAAA;IAC5B,MAAM,EAAE,gBAAgB,EAAE,CAAA;CAC3B;AAED,MAAM,WAAW,gBAAgB;IAC/B,gBAAgB,EAAE,MAAM,CAAA;IACxB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,SAAS,EAAE,CAAA;CACrB;AAGD,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE/C;AA8CD,wBAAgB,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CASlE;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,EAAE,CASxE;AAID,wBAAgB,aAAa,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAI9D;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,GAAG,SAAS,CAExD;AAED,wBAAgB,cAAc,IAAI,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,GAAG,CAAA;CAAE,CAAC,CAEtE;AAED,iFAAiF;AACjF,wBAAgB,eAAe,IAAI,GAAG,EAAE,CAEvC;AAuHD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,WAAW,CA0GxG;AAGD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,CAoElE;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,EAC1B,WAAW,EAAE,MAAM,EAAE,GACpB;IAAE,OAAO,EAAE,WAAW,EAAE,CAAC;IAAC,aAAa,EAAE,MAAM,EAAE,CAAA;CAAE,CA2BrD"}
|
package/dist/schema.js
CHANGED
|
@@ -356,3 +356,32 @@ export function generateCreateTableSQL(schema) {
|
|
|
356
356
|
}
|
|
357
357
|
return [createTable, ...indexes, ...childDDL].join('\n');
|
|
358
358
|
}
|
|
359
|
+
/**
|
|
360
|
+
* Build table schemas and DDL from lexicons and collections.
|
|
361
|
+
* Shared by main.ts (server boot) and cli.ts (hatk schema command).
|
|
362
|
+
*/
|
|
363
|
+
export function buildSchemas(lexicons, collections) {
|
|
364
|
+
const schemas = [];
|
|
365
|
+
const ddlStatements = [];
|
|
366
|
+
for (const nsid of collections) {
|
|
367
|
+
const lexicon = lexicons.get(nsid);
|
|
368
|
+
if (!lexicon) {
|
|
369
|
+
const genericDDL = `CREATE TABLE IF NOT EXISTS "${nsid}" (
|
|
370
|
+
uri TEXT PRIMARY KEY,
|
|
371
|
+
cid TEXT,
|
|
372
|
+
did TEXT NOT NULL,
|
|
373
|
+
indexed_at TIMESTAMP NOT NULL,
|
|
374
|
+
data JSON
|
|
375
|
+
);
|
|
376
|
+
CREATE INDEX IF NOT EXISTS idx_${nsid.replace(/\./g, '_')}_indexed ON "${nsid}"(indexed_at DESC);
|
|
377
|
+
CREATE INDEX IF NOT EXISTS idx_${nsid.replace(/\./g, '_')}_author ON "${nsid}"(did);`;
|
|
378
|
+
schemas.push({ collection: nsid, tableName: `"${nsid}"`, columns: [], refColumns: [], children: [], unions: [] });
|
|
379
|
+
ddlStatements.push(genericDDL);
|
|
380
|
+
continue;
|
|
381
|
+
}
|
|
382
|
+
const schema = generateTableSchema(nsid, lexicon, lexicons);
|
|
383
|
+
schemas.push(schema);
|
|
384
|
+
ddlStatements.push(generateCreateTableSQL(schema));
|
|
385
|
+
}
|
|
386
|
+
return { schemas, ddlStatements };
|
|
387
|
+
}
|
package/dist/seed.d.ts
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
|
+
/** Authenticated PDS session — returned by {@link seed.createAccount}. */
|
|
1
2
|
export type Session = {
|
|
2
3
|
did: string;
|
|
3
4
|
accessJwt: string;
|
|
4
5
|
handle: string;
|
|
5
6
|
};
|
|
7
|
+
/** AT Protocol blob reference, as returned by `com.atproto.repo.uploadBlob`. */
|
|
6
8
|
export type BlobRef = {
|
|
7
9
|
$type: 'blob';
|
|
8
10
|
ref: {
|
|
@@ -11,11 +13,23 @@ export type BlobRef = {
|
|
|
11
13
|
mimeType: string;
|
|
12
14
|
size: number;
|
|
13
15
|
};
|
|
16
|
+
/** Options for the seed helper. All fields fall back to env vars or sensible defaults. */
|
|
14
17
|
export type SeedOpts = {
|
|
15
18
|
pds?: string;
|
|
16
19
|
password?: string;
|
|
17
20
|
lexicons?: string;
|
|
18
21
|
};
|
|
22
|
+
/**
|
|
23
|
+
* Create a seed helper for populating a local PDS with test data.
|
|
24
|
+
*
|
|
25
|
+
* Returns `createAccount`, `createRecord`, and `uploadBlob` functions bound to
|
|
26
|
+
* the target PDS. Records are validated against the project's lexicons before
|
|
27
|
+
* being written. Generic parameter `R` maps collection NSIDs to their record types
|
|
28
|
+
* for type-safe seeding.
|
|
29
|
+
*
|
|
30
|
+
* @typeParam R - Map of collection NSID → record type (defaults to untyped)
|
|
31
|
+
* @param opts - PDS URL, password, and lexicon directory overrides
|
|
32
|
+
*/
|
|
19
33
|
export declare function seed<R extends Record<string, unknown> = Record<string, unknown>>(opts?: SeedOpts): {
|
|
20
34
|
createAccount: (handle: string) => Promise<Session>;
|
|
21
35
|
createRecord: <K extends keyof R & string>(session: Session, collection: K, record: R[K] extends Record<string, unknown> ? R[K] : Record<string, unknown>, opts: {
|
|
@@ -23,6 +37,11 @@ export declare function seed<R extends Record<string, unknown> = Record<string,
|
|
|
23
37
|
}) => Promise<{
|
|
24
38
|
uri: string;
|
|
25
39
|
cid: string;
|
|
40
|
+
commit: {
|
|
41
|
+
cid: string;
|
|
42
|
+
rev: string;
|
|
43
|
+
};
|
|
44
|
+
validationStatus: string;
|
|
26
45
|
}>;
|
|
27
46
|
uploadBlob: (session: Session, filePath: string) => Promise<BlobRef>;
|
|
28
47
|
};
|
package/dist/seed.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"seed.d.ts","sourceRoot":"","sources":["../src/seed.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"seed.d.ts","sourceRoot":"","sources":["../src/seed.ts"],"names":[],"mappings":"AA8BA,0EAA0E;AAC1E,MAAM,MAAM,OAAO,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAA;AAExE,gFAAgF;AAChF,MAAM,MAAM,OAAO,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAA;AAE/F,0FAA0F;AAC1F,MAAM,MAAM,QAAQ,GAAG;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAE7E;;;;;;;;;;GAUG;AACH,wBAAgB,IAAI,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,EAAE,QAAQ;4BAO1D,MAAM,KAAG,OAAO,CAAC,OAAO,CAAC;mBA6BlC,CAAC,SAAS,MAAM,CAAC,GAAG,MAAM,WAC3C,OAAO,cACJ,CAAC,UACL,CAAC,CAAC,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,QACvE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,KACrB,OAAO,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,GAAG,EAAE,MAAM,CAAA;SAAE,CAAC;QAAC,gBAAgB,EAAE,MAAM,CAAA;KAAE,CAAC;0BAkCrE,OAAO,YAAY,MAAM,KAAG,OAAO,CAAC,OAAO,CAAC;EA4BhF"}
|
package/dist/seed.js
CHANGED
|
@@ -1,12 +1,49 @@
|
|
|
1
|
-
|
|
1
|
+
/**
|
|
2
|
+
* Test data seeding helpers for populating a local PDS.
|
|
3
|
+
*
|
|
4
|
+
* Place a seed script at `seeds/seed.ts`. It runs during `hatk dev` to create
|
|
5
|
+
* accounts and records against your local PDS. Records are validated against
|
|
6
|
+
* your project's lexicons before being written.
|
|
7
|
+
*
|
|
8
|
+
* @example
|
|
9
|
+
* ```ts
|
|
10
|
+
* // seeds/seed.ts
|
|
11
|
+
* import { seed } from '../hatk.generated.ts'
|
|
12
|
+
*
|
|
13
|
+
* const { createAccount, createRecord } = seed()
|
|
14
|
+
*
|
|
15
|
+
* const alice = await createAccount('alice.test')
|
|
16
|
+
* const bob = await createAccount('bob.test')
|
|
17
|
+
*
|
|
18
|
+
* await createRecord(
|
|
19
|
+
* alice,
|
|
20
|
+
* 'xyz.statusphere.status',
|
|
21
|
+
* { status: '👍', createdAt: new Date().toISOString() },
|
|
22
|
+
* { rkey: 'status1' },
|
|
23
|
+
* )
|
|
24
|
+
* ```
|
|
25
|
+
*/
|
|
26
|
+
import { loadLexicons } from "./database/schema.js";
|
|
2
27
|
import { validateRecord } from '@bigmoves/lexicon';
|
|
3
28
|
import { resolve } from 'node:path';
|
|
4
29
|
import { readFileSync } from 'node:fs';
|
|
30
|
+
/**
|
|
31
|
+
* Create a seed helper for populating a local PDS with test data.
|
|
32
|
+
*
|
|
33
|
+
* Returns `createAccount`, `createRecord`, and `uploadBlob` functions bound to
|
|
34
|
+
* the target PDS. Records are validated against the project's lexicons before
|
|
35
|
+
* being written. Generic parameter `R` maps collection NSIDs to their record types
|
|
36
|
+
* for type-safe seeding.
|
|
37
|
+
*
|
|
38
|
+
* @typeParam R - Map of collection NSID → record type (defaults to untyped)
|
|
39
|
+
* @param opts - PDS URL, password, and lexicon directory overrides
|
|
40
|
+
*/
|
|
5
41
|
export function seed(opts) {
|
|
6
42
|
const pdsUrl = opts?.pds || process.env.PDS_URL || 'http://localhost:2583';
|
|
7
43
|
const password = opts?.password || process.env.SEED_PASSWORD || 'password';
|
|
8
44
|
const lexiconsDir = resolve(opts?.lexicons || 'lexicons');
|
|
9
45
|
const lexiconArray = [...loadLexicons(lexiconsDir).values()];
|
|
46
|
+
/** Create a PDS account (or reuse an existing one) and return an authenticated session. */
|
|
10
47
|
async function createAccount(handle) {
|
|
11
48
|
const res = await fetch(`${pdsUrl}/xrpc/com.atproto.server.createAccount`, {
|
|
12
49
|
method: 'POST',
|
|
@@ -34,6 +71,7 @@ export function seed(opts) {
|
|
|
34
71
|
const session = (await sessionRes.json());
|
|
35
72
|
return { ...session, handle };
|
|
36
73
|
}
|
|
74
|
+
/** Validate a record against its lexicon and write it to the PDS via `putRecord`. */
|
|
37
75
|
async function createRecord(session, collection, record, opts) {
|
|
38
76
|
const error = validateRecord(lexiconArray, collection, record);
|
|
39
77
|
if (error) {
|
|
@@ -53,10 +91,11 @@ export function seed(opts) {
|
|
|
53
91
|
if (!res.ok) {
|
|
54
92
|
throw new Error(`[seed] [${session.handle}] failed to create ${collection}: ${await res.text()}`);
|
|
55
93
|
}
|
|
56
|
-
const
|
|
57
|
-
console.log(`[seed] [${session.handle}] ${collection} → ${uri}`);
|
|
58
|
-
return
|
|
94
|
+
const result = (await res.json());
|
|
95
|
+
console.log(`[seed] [${session.handle}] ${collection} → ${result.uri}`);
|
|
96
|
+
return result;
|
|
59
97
|
}
|
|
98
|
+
/** Upload a file to the PDS as a blob. MIME type is inferred from the file extension. */
|
|
60
99
|
async function uploadBlob(session, filePath) {
|
|
61
100
|
const data = readFileSync(resolve(filePath));
|
|
62
101
|
const ext = filePath.split('.').pop()?.toLowerCase() || '';
|
package/dist/server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,MAAM,EAAE,KAAK,eAAe,EAAE,MAAM,WAAW,CAAA;AAmD3E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AA2B9C,wBAAgB,WAAW,CACzB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EAAE,EACrB,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,KAAK,EAAE,WAAW,GAAG,IAAI,EACzB,MAAM,GAAE,MAAM,EAAO,EACrB,aAAa,CAAC,EAAE,CAAC,GAAG,EAAE,eAAe,KAAK;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,EAChE,QAAQ,CAAC,EAAE,MAAM,IAAI,GACpB,MAAM,
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,MAAM,EAAE,KAAK,eAAe,EAAE,MAAM,WAAW,CAAA;AAmD3E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AA2B9C,wBAAgB,WAAW,CACzB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EAAE,EACrB,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,KAAK,EAAE,WAAW,GAAG,IAAI,EACzB,MAAM,GAAE,MAAM,EAAO,EACrB,aAAa,CAAC,EAAE,CAAC,GAAG,EAAE,eAAe,KAAK;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,EAChE,QAAQ,CAAC,EAAE,MAAM,IAAI,GACpB,MAAM,CAg9BR"}
|
package/dist/server.js
CHANGED
|
@@ -3,10 +3,10 @@ import { gzipSync } from 'node:zlib';
|
|
|
3
3
|
import { existsSync } from 'node:fs';
|
|
4
4
|
import { readFile } from 'node:fs/promises';
|
|
5
5
|
import { join, extname } from 'node:path';
|
|
6
|
-
import { queryRecords, getRecordByUri, searchRecords, getSchema, reshapeRow, setRepoStatus, getRepoStatus, getRepoRetryInfo, querySQL, insertRecord, deleteRecord, queryLabelsForUris, insertLabels, searchAccounts, listReposPaginated, getCollectionCounts, normalizeValue, getSchemaDump, getPreferences, putPreference, } from "./db.js";
|
|
6
|
+
import { queryRecords, getRecordByUri, searchRecords, getSchema, reshapeRow, setRepoStatus, getRepoStatus, getRepoRetryInfo, querySQL, insertRecord, deleteRecord, queryLabelsForUris, insertLabels, searchAccounts, listReposPaginated, getCollectionCounts, normalizeValue, getSchemaDump, getPreferences, putPreference, } from "./database/db.js";
|
|
7
7
|
import { executeFeed, listFeeds } from "./feeds.js";
|
|
8
8
|
import { executeXrpc, InvalidRequestError } from "./xrpc.js";
|
|
9
|
-
import { getLexiconArray } from "./schema.js";
|
|
9
|
+
import { getLexiconArray } from "./database/schema.js";
|
|
10
10
|
import { validateRecord } from '@bigmoves/lexicon';
|
|
11
11
|
import { resolveRecords } from "./hydrate.js";
|
|
12
12
|
import { handleOpengraphRequest, buildOgMeta } from "./opengraph.js";
|
|
@@ -192,7 +192,7 @@ export function startServer(port, collections, publicDir, oauth, admins = [], re
|
|
|
192
192
|
columns: schema?.columns.map((col) => ({
|
|
193
193
|
name: col.name,
|
|
194
194
|
originalName: col.originalName,
|
|
195
|
-
type: col.
|
|
195
|
+
type: col.sqlType,
|
|
196
196
|
required: col.notNull,
|
|
197
197
|
})),
|
|
198
198
|
};
|
|
@@ -527,7 +527,7 @@ export function startServer(port, collections, publicDir, oauth, admins = [], re
|
|
|
527
527
|
if (url.pathname === '/admin/schema') {
|
|
528
528
|
if (!requireAdmin(viewer, res))
|
|
529
529
|
return;
|
|
530
|
-
const { getAllLexicons } = await import("./schema.js");
|
|
530
|
+
const { getAllLexicons } = await import("./database/schema.js");
|
|
531
531
|
const ddl = await getSchemaDump();
|
|
532
532
|
jsonResponse(res, { ddl, lexicons: getAllLexicons() });
|
|
533
533
|
return;
|
|
@@ -597,8 +597,14 @@ export function startServer(port, collections, publicDir, oauth, admins = [], re
|
|
|
597
597
|
jsonError(res, 400, 'DPoP header required');
|
|
598
598
|
return;
|
|
599
599
|
}
|
|
600
|
-
|
|
601
|
-
|
|
600
|
+
try {
|
|
601
|
+
const result = await handlePar(oauth, body, dpopHeader, `${requestOrigin}/oauth/par`);
|
|
602
|
+
jsonResponse(res, result);
|
|
603
|
+
}
|
|
604
|
+
catch (err) {
|
|
605
|
+
const message = err instanceof Error ? err.message : 'Unknown error';
|
|
606
|
+
jsonError(res, 400, message);
|
|
607
|
+
}
|
|
602
608
|
return;
|
|
603
609
|
}
|
|
604
610
|
// OAuth Authorize
|
package/dist/setup.d.ts
CHANGED
|
@@ -1,8 +1,28 @@
|
|
|
1
|
+
import type { BulkInserter } from './database/ports.ts';
|
|
2
|
+
/** Context passed to each setup script's handler function. */
|
|
1
3
|
export interface SetupContext {
|
|
2
4
|
db: {
|
|
3
5
|
query: (sql: string, params?: any[]) => Promise<any[]>;
|
|
4
|
-
run: (sql: string,
|
|
6
|
+
run: (sql: string, params?: any[]) => Promise<void>;
|
|
7
|
+
runBatch: (operations: Array<{
|
|
8
|
+
sql: string;
|
|
9
|
+
params: any[];
|
|
10
|
+
}>) => Promise<void>;
|
|
11
|
+
createBulkInserter: (table: string, columns: string[], options?: {
|
|
12
|
+
onConflict?: 'ignore' | 'replace';
|
|
13
|
+
batchSize?: number;
|
|
14
|
+
}) => Promise<BulkInserter>;
|
|
5
15
|
};
|
|
6
16
|
}
|
|
17
|
+
/**
|
|
18
|
+
* Run all setup scripts in the given directory on server boot.
|
|
19
|
+
*
|
|
20
|
+
* Each script should export a default handler function (or `{ handler }`) that
|
|
21
|
+
* receives a {@link SetupContext} with database access. Scripts run in sorted
|
|
22
|
+
* filename order — prefix with numbers (e.g. `01-create-tables.ts`) to control
|
|
23
|
+
* execution order. Files starting with `_` are ignored.
|
|
24
|
+
*
|
|
25
|
+
* @param setupDir - Absolute path to the `setup/` directory
|
|
26
|
+
*/
|
|
7
27
|
export declare function initSetup(setupDir: string): Promise<void>;
|
|
8
28
|
//# sourceMappingURL=setup.d.ts.map
|
package/dist/setup.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../src/setup.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../src/setup.ts"],"names":[],"mappings":"AA4BA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAEvD,8DAA8D;AAC9D,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE;QACF,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;QACtD,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;QACnD,QAAQ,EAAE,CAAC,UAAU,EAAE,KAAK,CAAC;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,GAAG,EAAE,CAAA;SAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;QAC9E,kBAAkB,EAAE,CAClB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,CAAC,EAAE;YAAE,UAAU,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC;YAAC,SAAS,CAAC,EAAE,MAAM,CAAA;SAAE,KAChE,OAAO,CAAC,YAAY,CAAC,CAAA;KAC3B,CAAA;CACF;AAkBD;;;;;;;;;GASG;AACH,wBAAsB,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAqB/D"}
|
package/dist/setup.js
CHANGED
|
@@ -6,10 +6,35 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
|
|
|
6
6
|
}
|
|
7
7
|
return path;
|
|
8
8
|
};
|
|
9
|
+
/**
|
|
10
|
+
* Setup scripts that run once on server boot for initializing custom tables,
|
|
11
|
+
* views, or other database state.
|
|
12
|
+
*
|
|
13
|
+
* Place scripts in the `setup/` directory. Each module default-exports a handler
|
|
14
|
+
* function (or `{ handler }`) that receives a {@link SetupContext} with database
|
|
15
|
+
* access. Scripts run in sorted filename order — prefix with numbers to control
|
|
16
|
+
* execution order. Files starting with `_` are ignored.
|
|
17
|
+
*
|
|
18
|
+
* @example
|
|
19
|
+
* ```ts
|
|
20
|
+
* // setup/01-leaderboard.ts
|
|
21
|
+
* import type { SetupContext } from '@hatk/hatk/setup'
|
|
22
|
+
*
|
|
23
|
+
* export default async function (ctx: SetupContext) {
|
|
24
|
+
* await ctx.db.run(`
|
|
25
|
+
* CREATE TABLE IF NOT EXISTS leaderboard (
|
|
26
|
+
* did TEXT PRIMARY KEY,
|
|
27
|
+
* score INTEGER DEFAULT 0
|
|
28
|
+
* )
|
|
29
|
+
* `)
|
|
30
|
+
* }
|
|
31
|
+
* ```
|
|
32
|
+
*/
|
|
9
33
|
import { resolve, relative } from 'node:path';
|
|
10
34
|
import { readdirSync, statSync } from 'node:fs';
|
|
11
35
|
import { log } from "./logger.js";
|
|
12
|
-
import { querySQL, runSQL } from "./db.js";
|
|
36
|
+
import { querySQL, runSQL, runBatch, createBulkInserterSQL } from "./database/db.js";
|
|
37
|
+
/** Recursively collect .ts/.js files in a directory, skipping files prefixed with `_`. */
|
|
13
38
|
function walkDir(dir) {
|
|
14
39
|
const results = [];
|
|
15
40
|
try {
|
|
@@ -26,6 +51,16 @@ function walkDir(dir) {
|
|
|
26
51
|
catch { }
|
|
27
52
|
return results.sort();
|
|
28
53
|
}
|
|
54
|
+
/**
|
|
55
|
+
* Run all setup scripts in the given directory on server boot.
|
|
56
|
+
*
|
|
57
|
+
* Each script should export a default handler function (or `{ handler }`) that
|
|
58
|
+
* receives a {@link SetupContext} with database access. Scripts run in sorted
|
|
59
|
+
* filename order — prefix with numbers (e.g. `01-create-tables.ts`) to control
|
|
60
|
+
* execution order. Files starting with `_` are ignored.
|
|
61
|
+
*
|
|
62
|
+
* @param setupDir - Absolute path to the `setup/` directory
|
|
63
|
+
*/
|
|
29
64
|
export async function initSetup(setupDir) {
|
|
30
65
|
const files = walkDir(setupDir);
|
|
31
66
|
if (files.length === 0)
|
|
@@ -39,7 +74,7 @@ export async function initSetup(setupDir) {
|
|
|
39
74
|
continue;
|
|
40
75
|
}
|
|
41
76
|
const ctx = {
|
|
42
|
-
db: { query: querySQL, run: runSQL },
|
|
77
|
+
db: { query: querySQL, run: runSQL, runBatch, createBulkInserter: createBulkInserterSQL },
|
|
43
78
|
};
|
|
44
79
|
log(`[setup] running: ${name}`);
|
|
45
80
|
await handler(ctx);
|
package/dist/test.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ import type { FeedContext } from './feeds.ts';
|
|
|
4
4
|
export interface TestContext {
|
|
5
5
|
db: {
|
|
6
6
|
query: (sql: string, params?: any[]) => Promise<any[]>;
|
|
7
|
-
run: (sql: string,
|
|
7
|
+
run: (sql: string, params?: any[]) => Promise<void>;
|
|
8
8
|
};
|
|
9
9
|
loadFixtures: (dir?: string) => Promise<void>;
|
|
10
10
|
loadFeed: (name: string) => {
|
package/dist/test.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.d.ts","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":"AAIA,OAAO,EAAc,KAAK,UAAU,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"test.d.ts","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":"AAIA,OAAO,EAAc,KAAK,UAAU,EAAE,MAAM,aAAa,CAAA;AAmBzD,OAAO,EAAE,IAAI,IAAI,iBAAiB,EAAE,KAAK,QAAQ,EAAE,MAAM,WAAW,CAAA;AACpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAE7C,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE;QACF,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;QACtD,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;KACpD,CAAA;IACD,YAAY,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAC7C,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK;QAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,WAAW,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;KAAE,CAAA;IAC5E,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK;QAAE,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;KAAE,CAAA;IACnE,WAAW,EAAE,CAAC,IAAI,CAAC,EAAE;QACnB,KAAK,CAAC,EAAE,MAAM,CAAA;QACd,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,MAAM,CAAC,EAAE;YAAE,GAAG,EAAE,MAAM,CAAA;SAAE,GAAG,IAAI,CAAA;QAC/B,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAChC,KAAK,WAAW,CAAA;IACjB,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1B,gBAAgB,CAAC,OAAO,EAAE,UAAU,CAAA;IACpC,gBAAgB,CAAC,YAAY,EAAE,MAAM,EAAE,CAAA;CACxC;AAED,MAAM,WAAW,UAAW,SAAQ,WAAW;IAC7C,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;IAC9D,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;IAC7E,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE,QAAQ,KAAK,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAA;IAC/D,aAAa,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CAClE;AAYD;;;;;;;;GAQG;AACH,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,WAAW,CAAC,CAiL9D;AA8BD,wBAAsB,eAAe,IAAI,OAAO,CAAC,UAAU,CAAC,CAgD3D"}
|
package/dist/test.js
CHANGED
|
@@ -2,16 +2,18 @@ import { resolve, dirname } from 'node:path';
|
|
|
2
2
|
import { readdirSync, readFileSync } from 'node:fs';
|
|
3
3
|
import YAML from 'yaml';
|
|
4
4
|
import { loadConfig } from "./config.js";
|
|
5
|
-
import { loadLexicons, storeLexicons, discoverCollections, generateTableSchema, generateCreateTableSQL, } from "./schema.js";
|
|
6
|
-
import { initDatabase, querySQL, runSQL, insertRecord, closeDatabase } from "./db.js";
|
|
5
|
+
import { loadLexicons, storeLexicons, discoverCollections, generateTableSchema, generateCreateTableSQL, } from "./database/schema.js";
|
|
6
|
+
import { initDatabase, querySQL, runSQL, insertRecord, closeDatabase } from "./database/db.js";
|
|
7
|
+
import { createAdapter } from "./database/adapter-factory.js";
|
|
8
|
+
import { setSearchPort } from "./database/fts.js";
|
|
7
9
|
import { initFeeds, executeFeed, listFeeds, createPaginate } from "./feeds.js";
|
|
8
10
|
import { initXrpc, executeXrpc, listXrpc, configureRelay } from "./xrpc.js";
|
|
9
11
|
import { initOpengraph } from "./opengraph.js";
|
|
10
12
|
import { initLabels } from "./labels.js";
|
|
11
13
|
import { discoverViews } from "./views.js";
|
|
12
|
-
import { loadOnLoginHook } from "./
|
|
14
|
+
import { loadOnLoginHook } from "./hooks.js";
|
|
13
15
|
import { validateLexicons } from '@bigmoves/lexicon';
|
|
14
|
-
import { packCursor, unpackCursor, isTakendownDid, filterTakendownDids } from "./db.js";
|
|
16
|
+
import { packCursor, unpackCursor, isTakendownDid, filterTakendownDids } from "./database/db.js";
|
|
15
17
|
import { seed as createSeedHelpers } from "./seed.js";
|
|
16
18
|
/**
|
|
17
19
|
* Find the project's hatk.config.ts by walking up from cwd.
|
|
@@ -58,8 +60,10 @@ export async function createTestContext() {
|
|
|
58
60
|
schemas.push(schema);
|
|
59
61
|
ddlStatements.push(generateCreateTableSQL(schema));
|
|
60
62
|
}
|
|
61
|
-
// In-memory
|
|
62
|
-
await
|
|
63
|
+
// In-memory database
|
|
64
|
+
const { adapter, searchPort } = await createAdapter('duckdb');
|
|
65
|
+
setSearchPort(searchPort);
|
|
66
|
+
await initDatabase(adapter, ':memory:', schemas, ddlStatements);
|
|
63
67
|
// Discover views + hooks
|
|
64
68
|
discoverViews();
|
|
65
69
|
try {
|
|
@@ -94,7 +98,12 @@ export async function createTestContext() {
|
|
|
94
98
|
if (Array.isArray(records)) {
|
|
95
99
|
for (const rec of records) {
|
|
96
100
|
const row = interpolateHelpers(rec);
|
|
97
|
-
await runSQL(`INSERT OR IGNORE INTO _repos (did, status, handle, backfilled_at) VALUES ($1, $2, $3, $4)`,
|
|
101
|
+
await runSQL(`INSERT OR IGNORE INTO _repos (did, status, handle, backfilled_at) VALUES ($1, $2, $3, $4)`, [
|
|
102
|
+
row.did,
|
|
103
|
+
row.status || 'active',
|
|
104
|
+
row.handle || row.did.split(':').pop() + '.test',
|
|
105
|
+
new Date().toISOString(),
|
|
106
|
+
]);
|
|
98
107
|
}
|
|
99
108
|
}
|
|
100
109
|
}
|
|
@@ -119,7 +128,7 @@ export async function createTestContext() {
|
|
|
119
128
|
const row = interpolateHelpers(rec);
|
|
120
129
|
const vals = keys.map((k) => row[k]);
|
|
121
130
|
const placeholders = keys.map((_, i) => `$${i + 1}`).join(', ');
|
|
122
|
-
await runSQL(`INSERT INTO "${tableName}" (${keys.map((k) => `"${k}"`).join(', ')}) VALUES (${placeholders})`,
|
|
131
|
+
await runSQL(`INSERT INTO "${tableName}" (${keys.map((k) => `"${k}"`).join(', ')}) VALUES (${placeholders})`, vals);
|
|
123
132
|
}
|
|
124
133
|
continue;
|
|
125
134
|
}
|
|
@@ -133,7 +142,12 @@ export async function createTestContext() {
|
|
|
133
142
|
// Auto-register DID in _repos if not already present
|
|
134
143
|
if (!seenDids.has(did)) {
|
|
135
144
|
seenDids.add(did);
|
|
136
|
-
await runSQL(`INSERT OR IGNORE INTO _repos (did, status, handle, backfilled_at) VALUES ($1, $2, $3, $4)`,
|
|
145
|
+
await runSQL(`INSERT OR IGNORE INTO _repos (did, status, handle, backfilled_at) VALUES ($1, $2, $3, $4)`, [
|
|
146
|
+
did,
|
|
147
|
+
'active',
|
|
148
|
+
did.split(':').pop() + '.test',
|
|
149
|
+
new Date().toISOString(),
|
|
150
|
+
]);
|
|
137
151
|
}
|
|
138
152
|
await insertRecord(tableName, uri, cid, did, fields);
|
|
139
153
|
}
|
package/dist/views.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
// 1. Inline views: defined in the record lexicon with ref: "#main" (e.g., playView)
|
|
4
4
|
// 2. Defs views: defined in a defs lexicon, associated by naming convention (e.g., profileView)
|
|
5
5
|
import { log } from "./logger.js";
|
|
6
|
-
import { getAllLexicons, getLexicon } from "./schema.js";
|
|
6
|
+
import { getAllLexicons, getLexicon } from "./database/schema.js";
|
|
7
7
|
// --- Registry ---
|
|
8
8
|
/** All views keyed by full NSID (e.g., "fm.teal.alpha.feed.play#playView") */
|
|
9
9
|
const views = new Map();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vite-plugin.d.ts","sourceRoot":"","sources":["../src/vite-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAKlC,wBAAgB,IAAI,CAAC,IAAI,CAAC,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"vite-plugin.d.ts","sourceRoot":"","sources":["../src/vite-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAKlC,wBAAgB,IAAI,CAAC,IAAI,CAAC,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAiGrD"}
|
package/dist/vite-plugin.js
CHANGED
|
@@ -16,6 +16,9 @@ export function hatk(opts) {
|
|
|
16
16
|
server: {
|
|
17
17
|
host: '127.0.0.1',
|
|
18
18
|
port: devPort,
|
|
19
|
+
watch: {
|
|
20
|
+
ignored: ['**/db/**', '**/data/**'],
|
|
21
|
+
},
|
|
19
22
|
proxy: {
|
|
20
23
|
'/xrpc': rule,
|
|
21
24
|
'/oauth/par': rule,
|
|
@@ -74,6 +77,13 @@ export function hatk(opts) {
|
|
|
74
77
|
DEV_MODE: '1',
|
|
75
78
|
},
|
|
76
79
|
});
|
|
80
|
+
// Suppress ECONNREFUSED proxy errors while backend is booting
|
|
81
|
+
const origError = server.config.logger.error;
|
|
82
|
+
server.config.logger.error = (msg, opts) => {
|
|
83
|
+
if (typeof msg === 'string' && msg.includes('ECONNREFUSED'))
|
|
84
|
+
return;
|
|
85
|
+
origError(msg, opts);
|
|
86
|
+
};
|
|
77
87
|
server.httpServer?.on('close', () => {
|
|
78
88
|
serverProcess?.kill();
|
|
79
89
|
serverProcess = null;
|
package/dist/xrpc.d.ts
CHANGED
|
@@ -1,14 +1,25 @@
|
|
|
1
1
|
import type { Row, FlatRow } from './lex-types.ts';
|
|
2
2
|
export type { Row, FlatRow };
|
|
3
|
+
/** Thrown from XRPC handlers to return a 400 response with an error message. */
|
|
3
4
|
export declare class InvalidRequestError extends Error {
|
|
4
5
|
status: number;
|
|
5
6
|
errorName?: string;
|
|
6
7
|
constructor(message: string, errorName?: string);
|
|
7
8
|
}
|
|
9
|
+
/** Thrown from XRPC handlers to return a 404 response. */
|
|
8
10
|
export declare class NotFoundError extends InvalidRequestError {
|
|
9
11
|
status: number;
|
|
10
12
|
constructor(message?: string);
|
|
11
13
|
}
|
|
14
|
+
/**
|
|
15
|
+
* Context passed to every XRPC handler. Provides database access, pagination
|
|
16
|
+
* helpers, viewer auth, record resolution, full-text search, label queries,
|
|
17
|
+
* and blob URL generation.
|
|
18
|
+
*
|
|
19
|
+
* @typeParam P - Query parameter types (derived from lexicon)
|
|
20
|
+
* @typeParam Records - Map of collection NSID → record type (from generated types)
|
|
21
|
+
* @typeParam I - Input body type for procedure calls
|
|
22
|
+
*/
|
|
12
23
|
export interface XrpcContext<P = Record<string, string>, Records extends Record<string, any> = Record<string, any>, I = unknown> {
|
|
13
24
|
db: {
|
|
14
25
|
query: (sql: string, params?: any[]) => Promise<any[]>;
|
|
@@ -43,11 +54,23 @@ export interface XrpcContext<P = Record<string, string>, Records extends Record<
|
|
|
43
54
|
labels: (uris: string[]) => Promise<Map<string, any[]>>;
|
|
44
55
|
blobUrl: (did: string, ref: unknown, preset?: 'avatar' | 'banner' | 'feed_thumbnail' | 'feed_fullsize') => string | undefined;
|
|
45
56
|
}
|
|
57
|
+
/** Set the relay URL used for blob URL generation. Called once during boot. */
|
|
46
58
|
export declare function configureRelay(relay: string): void;
|
|
59
|
+
/**
|
|
60
|
+
* Generate a CDN URL for a blob ref. Uses the PDS directly in local dev,
|
|
61
|
+
* or the Bluesky CDN (`cdn.bsky.app`) in production.
|
|
62
|
+
*/
|
|
47
63
|
export declare function blobUrl(did: string, ref: unknown, preset?: 'avatar' | 'banner' | 'feed_thumbnail' | 'feed_fullsize'): string | undefined;
|
|
64
|
+
/**
|
|
65
|
+
* Discover and load XRPC handler modules from the `xrpc/` directory.
|
|
66
|
+
* Directory nesting maps to NSID segments. Parameters are validated and
|
|
67
|
+
* coerced against the matching lexicon definition.
|
|
68
|
+
*/
|
|
48
69
|
export declare function initXrpc(xrpcDir: string): Promise<void>;
|
|
70
|
+
/** Execute a registered XRPC handler by name. Returns null if no handler matches. */
|
|
49
71
|
export declare function executeXrpc(name: string, params: Record<string, string>, cursor: string | undefined, limit: number, viewer?: {
|
|
50
72
|
did: string;
|
|
51
73
|
} | null, input?: unknown): Promise<any | null>;
|
|
74
|
+
/** Return all registered XRPC method names. */
|
|
52
75
|
export declare function listXrpc(): string[];
|
|
53
76
|
//# sourceMappingURL=xrpc.d.ts.map
|
package/dist/xrpc.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xrpc.d.ts","sourceRoot":"","sources":["../src/xrpc.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"xrpc.d.ts","sourceRoot":"","sources":["../src/xrpc.ts"],"names":[],"mappings":"AAsCA,OAAO,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AAElD,YAAY,EAAE,GAAG,EAAE,OAAO,EAAE,CAAA;AAE5B,gFAAgF;AAChF,qBAAa,mBAAoB,SAAQ,KAAK;IAC5C,MAAM,SAAM;IACZ,SAAS,CAAC,EAAE,MAAM,CAAA;gBACN,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;CAIhD;AACD,0DAA0D;AAC1D,qBAAa,aAAc,SAAQ,mBAAmB;IACpD,MAAM,SAAM;gBACA,OAAO,SAAc;CAGlC;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,WAAW,CAC1B,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC1B,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACzD,CAAC,GAAG,OAAO;IAEX,EAAE,EAAE;QACF,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;QACtD,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;KACtD,CAAA;IACD,MAAM,EAAE,CAAC,CAAA;IACT,KAAK,EAAE,CAAC,CAAA;IACR,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAA;IAC9B,UAAU,EAAE,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,MAAM,CAAA;IAC7D,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAA;IACzE,WAAW,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;IAC9C,mBAAmB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;IAC7D,MAAM,EAAE,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,OAAO,EACvC,UAAU,EAAE,CAAC,EACb,CAAC,EAAE,MAAM,EACT,IAAI,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,KACxD,OAAO,CAAC;QAAE,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IAC7D,OAAO,EAAE,CAAC,CAAC,GAAG,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;IAC3D,MAAM,EAAE,CAAC,CAAC,GAAG,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACtG,KAAK,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;IAC5F,MAAM,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;IACjF,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAA;IACvD,OAAO,EAAE,CACP,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,OAAO,EACZ,MAAM,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,gBAAgB,GAAG,eAAe,KAC9D,MAAM,GAAG,SAAS,CAAA;CACxB;AAgBD,+EAA+E;AAC/E,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,QAE3C;AAED;;;GAGG;AACH,wBAAgB,OAAO,CACrB,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,OAAO,EACZ,MAAM,GAAE,QAAQ,GAAG,QAAQ,GAAG,gBAAgB,GAAG,eAA0B,GAC1E,MAAM,GAAG,SAAS,CAQpB;AAoBD;;;;GAIG;AACH,wBAAsB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAsE7D;AAED,qFAAqF;AACrF,wBAAsB,WAAW,CAC/B,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9B,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,KAAK,EAAE,MAAM,EACb,MAAM,CAAC,EAAE;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,EAC/B,KAAK,CAAC,EAAE,OAAO,GACd,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,CAIrB;AAED,+CAA+C;AAC/C,wBAAgB,QAAQ,IAAI,MAAM,EAAE,CAEnC"}
|