mirror of
https://github.com/garrytan/gbrain.git
synced 2026-07-30 03:12:32 +00:00
* fix(sources): recover corrupted config shapes (#3401) Use one canonical normalizer for nested string and array-shaped source configs across federation reads, config writes, archive/restore, and doctor remediation.\n\nFixes #3401\nFixes #3402\nFixes #3403 Signed-off-by: arisgysel-design <arisgysel-design@users.noreply.github.com> * fix(sources): bind restoreSource federated patch via ::text::jsonb (#2339 class) restoreSource bound a JS JSON string to a bare $1::jsonb placeholder; postgres.js double-encodes that into a jsonb string scalar, so on the Postgres engine the coerced object || string-scalar concat evaluates as array-concat and restore RE-CORRUPTS the exact config shape this PR repairs. PGLite masks the bug (its driver parses the bind natively). Fix: bind through $1::text::jsonb per the repo JSONB rule. Adds the DATABASE_URL-gated Postgres regression (test/e2e/restore-source-config-jsonb-postgres.test.ts): seeds a corrupted string-scalar config, runs archive -> restore, asserts jsonb_typeof(config) = 'object' with the federated flag applied and pre-existing keys preserved. Verified red on the bare ::jsonb bind (config became a jsonb array) and green on the fix against a real pgvector Postgres; skips cleanly without DATABASE_URL. Co-authored-by: arisgysel-design <arisgysel-design@users.noreply.github.com> Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Signed-off-by: arisgysel-design <arisgysel-design@users.noreply.github.com> Co-authored-by: arisgysel-design <arisgysel-design@users.noreply.github.com> Co-authored-by: Garry Tan <garrytan@gmail.com> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
199 lines
7.3 KiB
TypeScript
199 lines
7.3 KiB
TypeScript
/**
|
|
* Tests for src/core/sources-load.ts (v0.40 D7).
|
|
*
|
|
* Validates the shared loader: ordering, filtering, config parsing, and
|
|
* defensive fallback when legacy brains lack the `archived` column.
|
|
*/
|
|
import { describe, test, expect, beforeAll, afterAll, beforeEach } from 'bun:test';
|
|
import { PGLiteEngine } from '../src/core/pglite-engine.ts';
|
|
import { resetPgliteState } from './helpers/reset-pglite.ts';
|
|
import {
|
|
loadAllSources,
|
|
fetchSource,
|
|
parseSourceConfig,
|
|
normalizeSourceConfig,
|
|
isSourceFederated,
|
|
} from '../src/core/sources-load.ts';
|
|
|
|
let engine: PGLiteEngine;
|
|
|
|
beforeAll(async () => {
|
|
engine = new PGLiteEngine();
|
|
await engine.connect({});
|
|
await engine.initSchema();
|
|
}, 30000);
|
|
|
|
afterAll(async () => {
|
|
await engine.disconnect();
|
|
});
|
|
|
|
beforeEach(async () => {
|
|
await resetPgliteState(engine);
|
|
});
|
|
|
|
async function insertSource(id: string, opts: { federated?: boolean; archived?: boolean; config?: Record<string, unknown> } = {}): Promise<void> {
|
|
const config = { ...opts.config, federated: opts.federated ?? false };
|
|
await engine.executeRaw(
|
|
`INSERT INTO sources (id, name, config, archived)
|
|
VALUES ($1, $1, $2::jsonb, $3)
|
|
ON CONFLICT (id) DO UPDATE SET config = EXCLUDED.config, archived = EXCLUDED.archived`,
|
|
[id, JSON.stringify(config), opts.archived ?? false],
|
|
);
|
|
}
|
|
|
|
describe('loadAllSources', () => {
|
|
test('returns default source first, then alphabetical', async () => {
|
|
await insertSource('zebra');
|
|
await insertSource('alpha');
|
|
const rows = await loadAllSources(engine);
|
|
expect(rows.map((r) => r.id)).toEqual(['default', 'alpha', 'zebra']);
|
|
});
|
|
|
|
test('excludes archived rows by default', async () => {
|
|
await insertSource('keep');
|
|
await insertSource('archived-one', { archived: true });
|
|
const rows = await loadAllSources(engine);
|
|
expect(rows.map((r) => r.id).sort()).toEqual(['default', 'keep']);
|
|
});
|
|
|
|
test('includeArchived: true returns archived rows', async () => {
|
|
await insertSource('keep');
|
|
await insertSource('archived-one', { archived: true });
|
|
const rows = await loadAllSources(engine, { includeArchived: true });
|
|
expect(rows.map((r) => r.id).sort()).toEqual(['archived-one', 'default', 'keep']);
|
|
});
|
|
|
|
test('federatedOnly: filters to config.federated=true', async () => {
|
|
await insertSource('iso', { federated: false });
|
|
await insertSource('fed-a', { federated: true });
|
|
await insertSource('fed-b', { federated: true });
|
|
const rows = await loadAllSources(engine, { federatedOnly: true });
|
|
// default source seeded by resetPgliteState has federated: true
|
|
expect(rows.map((r) => r.id).sort()).toEqual(['default', 'fed-a', 'fed-b']);
|
|
});
|
|
|
|
test('rows have the full SourceRow projection (no surprise drift)', async () => {
|
|
await insertSource('shapecheck', { federated: true, config: { tracked_branch: 'main' } });
|
|
const rows = await loadAllSources(engine);
|
|
const target = rows.find((r) => r.id === 'shapecheck');
|
|
expect(target).toBeDefined();
|
|
expect(target).toMatchObject({
|
|
id: 'shapecheck',
|
|
name: 'shapecheck',
|
|
local_path: null,
|
|
last_commit: null,
|
|
last_sync_at: null,
|
|
});
|
|
expect(target!.config).toBeDefined();
|
|
expect(target!.created_at).toBeDefined();
|
|
});
|
|
});
|
|
|
|
describe('fetchSource', () => {
|
|
test('returns row for known id', async () => {
|
|
await insertSource('mybrain', { federated: true });
|
|
const row = await fetchSource(engine, 'mybrain');
|
|
expect(row?.id).toBe('mybrain');
|
|
expect(isSourceFederated(row!.config)).toBe(true);
|
|
});
|
|
|
|
test('returns null for unknown id', async () => {
|
|
const row = await fetchSource(engine, 'does-not-exist');
|
|
expect(row).toBeNull();
|
|
});
|
|
});
|
|
|
|
describe('parseSourceConfig', () => {
|
|
test('passes through plain object', () => {
|
|
expect(parseSourceConfig({ federated: true })).toEqual({ federated: true });
|
|
});
|
|
|
|
test('parses JSON string', () => {
|
|
expect(parseSourceConfig('{"federated":true}')).toEqual({ federated: true });
|
|
});
|
|
|
|
test('returns empty object on null / undefined / non-object', () => {
|
|
expect(parseSourceConfig(null)).toEqual({});
|
|
expect(parseSourceConfig(undefined)).toEqual({});
|
|
expect(parseSourceConfig(42)).toEqual({});
|
|
});
|
|
|
|
test('returns empty object on malformed JSON string', () => {
|
|
expect(parseSourceConfig('{')).toEqual({});
|
|
});
|
|
|
|
test('#2829: unwraps an accidental multi-layer nested string (self-heal read path)', () => {
|
|
const wrapped = JSON.stringify(JSON.stringify({ federated: true }));
|
|
expect(parseSourceConfig(wrapped)).toEqual({ federated: true });
|
|
});
|
|
|
|
test('recovers ordered object fragments from a historical JSONB array', () => {
|
|
expect(parseSourceConfig([
|
|
'{"remote_url":"https://example.invalid/repo"}',
|
|
{ federated: true },
|
|
{ tracked_branch: 'main' },
|
|
])).toEqual({
|
|
remote_url: 'https://example.invalid/repo',
|
|
federated: true,
|
|
tracked_branch: 'main',
|
|
});
|
|
});
|
|
});
|
|
|
|
describe('normalizeSourceConfig (#2829)', () => {
|
|
test('passes a plain object through unchanged', () => {
|
|
expect(normalizeSourceConfig({ federated: true, webhook_secret: 'x' })).toEqual({
|
|
federated: true,
|
|
webhook_secret: 'x',
|
|
});
|
|
});
|
|
|
|
test('unwraps a single JSON-string layer', () => {
|
|
expect(normalizeSourceConfig('{"federated":true}')).toEqual({ federated: true });
|
|
});
|
|
|
|
test('unwraps a 5-layer nested JSON string back to the object', () => {
|
|
let v: unknown = { federated: true, tracked_branch: 'main' };
|
|
for (let i = 0; i < 5; i++) v = JSON.stringify(v); // 5 stringify passes = 5 layers
|
|
expect(normalizeSourceConfig(v)).toEqual({ federated: true, tracked_branch: 'main' });
|
|
});
|
|
|
|
test('non-object garbage resolves to {}', () => {
|
|
expect(normalizeSourceConfig('not json')).toEqual({});
|
|
expect(normalizeSourceConfig('42')).toEqual({}); // parses to a number
|
|
expect(normalizeSourceConfig('"just a string"')).toEqual({});
|
|
expect(normalizeSourceConfig(null)).toEqual({});
|
|
expect(normalizeSourceConfig(undefined)).toEqual({});
|
|
expect(normalizeSourceConfig(['a', 'b'])).toEqual({}); // array is not a plain object
|
|
expect(normalizeSourceConfig(JSON.stringify(['a']))).toEqual({});
|
|
});
|
|
|
|
test('normalizes a historical config-fragment array without dropping valid keys', () => {
|
|
expect(normalizeSourceConfig([
|
|
JSON.stringify(JSON.stringify({ remote_url: 'https://example.invalid/repo' })),
|
|
{ federated: false },
|
|
])).toEqual({
|
|
remote_url: 'https://example.invalid/repo',
|
|
federated: false,
|
|
});
|
|
});
|
|
|
|
test('respects the unwrap bound instead of spinning forever', () => {
|
|
let v: unknown = { federated: true };
|
|
for (let i = 0; i < 12; i++) v = JSON.stringify(v); // 12 layers, past the bound of 10
|
|
expect(normalizeSourceConfig(v)).toEqual({}); // gives up to {} once the bound is hit
|
|
});
|
|
});
|
|
|
|
describe('isSourceFederated', () => {
|
|
test('strict-true requirement', () => {
|
|
expect(isSourceFederated({ federated: true })).toBe(true);
|
|
expect(isSourceFederated({ federated: false })).toBe(false);
|
|
expect(isSourceFederated({ federated: 'true' })).toBe(false); // strict boolean
|
|
expect(isSourceFederated({ federated: 1 })).toBe(false);
|
|
expect(isSourceFederated({})).toBe(false);
|
|
expect(isSourceFederated(null)).toBe(false);
|
|
expect(isSourceFederated(['{"remote_url":"x"}', { federated: true }])).toBe(true);
|
|
});
|
|
});
|