Changeset b300682 in Klonkt

Timestamp:

06/16/2026 12:38:38 AM (3 months ago)

Author:

roboburr <roboburr@…>

Branches:

main

Children:

25d4041

Parents:

af5407f

Message:

Circles v1 — foundation: migration + signed own publication

Steps 1+2 of the Circles federation (3rd tenancy mode alongside solo/hub):

• DB: circle_links / remote_actors / remote_posts (idempotent in initializeDatabase)
• SettingsService: tenancy now accepts 'circle'
• CircleFederation.js: per-instance Ed25519 keypair (app_settings) + actor/outbox builders + sign/verify (SPKI-DER pubkey, signature over raw body)
• routes/federation.js: GET /.klonkt/actor.json + signed /.klonkt/outbox.json, mounted in server.js before resolveSite
• docs/cirkels-v1-spec.md: full v1 spec

Still to do: CircleService.sync (pull+verify), Admin UI, /cirkel feed, hardening.
Ed25519 sign/verify round-trip verified in isolation; syntax clean.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@…>

Files:

• docs/cirkels-v1-spec.md (added)
• src/config/database.js (modified) (1 diff)
• src/routes/federation.js (added)
• src/server.js (modified) (2 diffs)
• src/services/CircleFederation.js (added)
• src/services/SettingsService.js (modified) (1 diff)

src/config/database.js

@@ -106 +106 @@
   `);
   db.prepare("INSERT OR IGNORE INTO app_settings (key, value) VALUES ('tenancy', 'solo')").run();
+
+  // ── Cirkels (federatie) ─────────────────────────────────────
+  // Decentrale, asymmetrische verbindingen tussen solo-instances.
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS circle_links (
+      id TEXT PRIMARY KEY,
+      local_site_id TEXT NOT NULL,
+      remote_url TEXT NOT NULL,
+      remote_actor_id TEXT,
+      label TEXT,
+      status TEXT DEFAULT 'active',
+      added_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+      last_synced DATETIME,
+      last_error TEXT,
+      UNIQUE(local_site_id, remote_url),
+      FOREIGN KEY (local_site_id) REFERENCES sites(id)
+    );
+    CREATE TABLE IF NOT EXISTS remote_actors (
+      id TEXT PRIMARY KEY,
+      url TEXT UNIQUE NOT NULL,
+      name TEXT,
+      summary TEXT,
+      avatar TEXT,
+      public_key TEXT NOT NULL,
+      fetched_at DATETIME DEFAULT CURRENT_TIMESTAMP
+    );
+    CREATE TABLE IF NOT EXISTS remote_posts (
+      id TEXT PRIMARY KEY,
+      actor_id TEXT NOT NULL,
+      published DATETIME,
+      title TEXT,
+      summary TEXT,
+      url TEXT,
+      media_json TEXT,
+      raw_json TEXT,
+      fetched_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+      FOREIGN KEY (actor_id) REFERENCES remote_actors(id)
+    );
+  `);
 }
 

src/server.js

@@ -43 +43 @@
 import artistsRoutes from './routes/artists.js';
 import postsRoutes from './routes/posts.js';
+import federationRoutes from './routes/federation.js';
 
 if (!process.env.SESSION_SECRET) {
@@ -166 +167 @@
 app.locals.prutter = prutter;
 
+// Cirkels-federatie: publieke, site-agnostische endpoints (/.klonkt/*).
+// Vóór resolveSite/theme — ze hebben geen site-context nodig.
+app.use(federationRoutes);
+
 app.use(resolveSite);
 app.use(loadAudioTracks);

src/services/SettingsService.js

@@ -35 +35 @@
 
 export function getTenancy() {
-  return getSetting('tenancy', 'solo') === 'hub' ? 'hub' : 'solo';
+  const v = getSetting('tenancy', 'solo');
+  return v === 'hub' ? 'hub' : v === 'circle' ? 'circle' : 'solo';
 }
 
 export function setTenancy(mode) {
-  setSetting('tenancy', mode === 'hub' ? 'hub' : 'solo');
+  const m = (mode === 'hub' || mode === 'circle') ? mode : 'solo';
+  setSetting('tenancy', m);
 }