@kubun/plugin-p2p 0.8.0 → 0.8.2

package/lib/sync/merkle-tree.d.ts

@@ -1,8 +1,10 @@
-import type { MutationLogEntry } from '@kubun/db';
+import type { MutationLogEntry } from '@kubun/store-graph';
 export type MerkleTree = {
     root: string;
     buckets: Record<string, string>;
 };
+/** Maximum number of mutation JWTs to send in a single channel message. */
+export declare const SYNC_BATCH_SIZE = 1000;
 export declare function getTimeBuckets(hlc: string): {
     year: string;
     month: string;

package/lib/sync/merkle-tree.js

@@ -1 +1 @@
-import{blake3 as t}from"@noble/hashes/blake3.js";let e=[4,7,10,16],o=new TextEncoder;export function getTimeBuckets(t){return{year:t.slice(0,4),month:t.slice(0,7),day:t.slice(0,10),minute:t.slice(0,16)}}function r(e){return Array.from(t(o.encode(e))).map(t=>t.toString(16).padStart(2,"0")).join("")}export function buildMerkleTree(t){if(0===t.length)return{root:"",buckets:{}};let e=new Map;for(let o of t){let{minute:t}=getTimeBuckets(o.hlc),r=e.get(t);null==r&&(r=[],e.set(t,r)),r.push(o)}let o={};for(let[t,n]of e){let e=[...n].sort((t,e)=>t.mutation_hash<e.mutation_hash?-1:+(t.mutation_hash>e.mutation_hash)).map(t=>t.mutation_hash).join("\n");o[t]=r(e)}for(let t of[10,7,4]){let e=10===t?16:7===t?10:7,n=new Map;for(let r of Object.keys(o)){if(r.length!==e)continue;let o=r.slice(0,t),s=n.get(o);null==s&&(s=[],n.set(o,s)),s.push(r)}for(let[t,e]of n){let n=e.sort().map(t=>`${t}\0${o[t]}`).join("\n");o[t]=r(n)}}let n=r(Object.keys(o).filter(t=>4===t.length).sort().map(t=>`${t}\0${o[t]}`).join("\n"));return o.root=n,{root:n,buckets:o}}export function findDivergentBuckets(t,o){if(t.root===o.root)return[];if(""===t.root)return Object.keys(o.buckets).filter(t=>16===t.length).sort();if(""===o.root)return Object.keys(t.buckets).filter(t=>16===t.length).sort();let r=[],n=new Set([...Object.keys(t.buckets),...Object.keys(o.buckets)]);return!function s(l,i){let u=e[i];for(let c of[...n].filter(t=>t.length===u&&(""===l||t.startsWith(l))).sort())t.buckets[c]!==o.buckets[c]&&(i===e.length-1?r.push(c):s(c,i+1))}("",0),r.sort()}
+import{blake3 as t}from"@noble/hashes/blake3.js";export const SYNC_BATCH_SIZE=1e3;let e=[4,7,10,16],o=new TextEncoder;export function getTimeBuckets(t){return{year:t.slice(0,4),month:t.slice(0,7),day:t.slice(0,10),minute:t.slice(0,16)}}function r(e){return Array.from(t(o.encode(e))).map(t=>t.toString(16).padStart(2,"0")).join("")}export function buildMerkleTree(t){if(0===t.length)return{root:"",buckets:{}};let e=new Map;for(let o of t){let{minute:t}=getTimeBuckets(o.hlc),r=e.get(t);null==r&&(r=[],e.set(t,r)),r.push(o)}let o={};for(let[t,n]of e){let e=[...n].sort((t,e)=>t.mutation_hash<e.mutation_hash?-1:+(t.mutation_hash>e.mutation_hash)).map(t=>t.mutation_hash).join("\n");o[t]=r(e)}for(let t of[10,7,4]){let e=10===t?16:7===t?10:7,n=new Map;for(let r of Object.keys(o)){if(r.length!==e)continue;let o=r.slice(0,t),s=n.get(o);null==s&&(s=[],n.set(o,s)),s.push(r)}for(let[t,e]of n){let n=e.sort().map(t=>`${t}\0${o[t]}`).join("\n");o[t]=r(n)}}let n=r(Object.keys(o).filter(t=>4===t.length).sort().map(t=>`${t}\0${o[t]}`).join("\n"));return o.root=n,{root:n,buckets:o}}export function findDivergentBuckets(t,o){if(t.root===o.root)return[];if(""===t.root)return Object.keys(o.buckets).filter(t=>16===t.length).sort();if(""===o.root)return Object.keys(t.buckets).filter(t=>16===t.length).sort();let r=[],n=new Set([...Object.keys(t.buckets),...Object.keys(o.buckets)]);return!function s(l,i){let u=e[i];for(let c of[...n].filter(t=>t.length===u&&(""===l||t.startsWith(l))).sort())t.buckets[c]!==o.buckets[c]&&(i===e.length-1?r.push(c):s(c,i+1))}("",0),r.sort()}

package/lib/sync/peer-registry.d.ts

@@ -1,5 +1,6 @@
 import type { Runtime } from '@enkaku/runtime';
-import type { KubunDB } from '@kubun/db';
+import type { StoreProvider } from '@kubun/db';
+import type { SyncDirection } from '../protocol.js';
 export type PeerConfig = {
     peerDID: string;
     endpoint: string;
@@ -9,6 +10,7 @@ export type PeerConfig = {
     };
     priority: string;
     trustLevel: 'trusted' | 'restricted';
+    allowedDirection?: SyncDirection;
 };
 export type PeerConfigWithID = PeerConfig & {
     id: string;
@@ -16,16 +18,33 @@ export type PeerConfigWithID = PeerConfig & {
     updatedAt: number;
 };
 export type PeerRegistryParams = {
-    db: KubunDB;
     runtime: Runtime;
 };
 export declare class PeerRegistry {
     #private;
     constructor(params: PeerRegistryParams);
-    addPeer(config: PeerConfig): Promise<void>;
-    getPeer(peerDID: string): Promise<PeerConfigWithID | undefined>;
-    listPeers(): Promise<Array<PeerConfigWithID>>;
-    updatePeer(peerDID: string, updates: Partial<PeerConfig>): Promise<void>;
-    removePeer(peerDID: string): Promise<void>;
-    isPeerAllowed(peerDID: string): Promise<boolean>;
+    addPeer(params: {
+        config: PeerConfig;
+        stores: StoreProvider;
+    }): Promise<void>;
+    getPeer(params: {
+        peerDID: string;
+        stores: StoreProvider;
+    }): Promise<PeerConfigWithID | undefined>;
+    listPeers(params: {
+        stores: StoreProvider;
+    }): Promise<Array<PeerConfigWithID>>;
+    updatePeer(params: {
+        peerDID: string;
+        updates: Partial<PeerConfig>;
+        stores: StoreProvider;
+    }): Promise<void>;
+    removePeer(params: {
+        peerDID: string;
+        stores: StoreProvider;
+    }): Promise<void>;
+    isPeerAllowed(params: {
+        peerDID: string;
+        stores: StoreProvider;
+    }): Promise<boolean>;
 }

package/lib/sync/peer-registry.js

@@ -1 +1 @@
-function e(e){var t;return{id:e.id,peerDID:e.peer_did,endpoint:e.endpoint,mode:e.mode,allowedUsers:"string"==typeof(t=e.allowed_users)?JSON.parse(t):t,priority:e.priority,trustLevel:e.trust_level,createdAt:e.created_at,updatedAt:e.updated_at}}export class PeerRegistry{#e;#t;constructor(e){this.#e=e.db,this.#t=e.runtime}async addPeer(e){let t=await this.#e.getDB();await t.insertInto("kubun_sync_peers").values({id:this.#t.getRandomID(),peer_did:e.peerDID,endpoint:e.endpoint,mode:e.mode,allowed_users:JSON.stringify(e.allowedUsers),priority:e.priority,trust_level:e.trustLevel,config:JSON.stringify({}),created_at:Date.now(),updated_at:Date.now()}).onConflict(t=>t.column("peer_did").doUpdateSet({endpoint:e.endpoint,mode:e.mode,allowed_users:JSON.stringify(e.allowedUsers),priority:e.priority,trust_level:e.trustLevel,updated_at:Date.now()})).execute()}async getPeer(t){let r=await this.#e.getDB(),i=await r.selectFrom("kubun_sync_peers").selectAll().where("peer_did","=",t).executeTakeFirst();if(i)return e(i)}async listPeers(){let t=await this.#e.getDB();return(await t.selectFrom("kubun_sync_peers").selectAll().execute()).map(t=>e(t))}async updatePeer(e,t){let r=await this.getPeer(e);if(!r)throw Error(`Peer ${e} not found`);let i={...r,...t},s=await this.#e.getDB();await s.updateTable("kubun_sync_peers").set({endpoint:i.endpoint,mode:i.mode,allowed_users:JSON.stringify(i.allowedUsers),priority:i.priority,trust_level:i.trustLevel,config:JSON.stringify({}),updated_at:Date.now()}).where("peer_did","=",e).execute()}async removePeer(e){let t=await this.#e.getDB();await t.deleteFrom("kubun_sync_peers").where("peer_did","=",e).execute()}async isPeerAllowed(e){return void 0!==await this.getPeer(e)}}
+import{getP2PStore as e}from"@kubun/store-p2p";function t(e){var t,r;let i="string"==typeof(t=e.config)?JSON.parse(t):t??{};return{id:e.id,peerDID:e.peer_did,endpoint:e.endpoint,mode:e.mode,allowedUsers:"string"==typeof(r=e.allowed_users)?JSON.parse(r):r,priority:e.priority,trustLevel:e.trust_level,allowedDirection:i.allowedDirection,createdAt:e.created_at,updatedAt:e.updated_at}}export class PeerRegistry{#e;constructor(e){this.#e=e.runtime}async addPeer(t){let r=await e(t.stores);await r.addSyncPeer({id:this.#e.getRandomID(),peer_did:t.config.peerDID,endpoint:t.config.endpoint,mode:t.config.mode,allowed_users:t.config.allowedUsers,priority:t.config.priority,trust_level:t.config.trustLevel,config:{allowedDirection:t.config.allowedDirection},created_at:Date.now(),updated_at:Date.now()})}async getPeer(r){let i=await e(r.stores),o=await i.getSyncPeer(r.peerDID);if(o)return t(o)}async listPeers(r){let i=await e(r.stores);return(await i.listSyncPeers()).map(e=>t(e))}async updatePeer(t){let r=await this.getPeer({peerDID:t.peerDID,stores:t.stores});if(!r)throw Error(`Peer ${t.peerDID} not found`);let i={...r,...t.updates},o=await e(t.stores);await o.updateSyncPeer(t.peerDID,{endpoint:i.endpoint,mode:i.mode,allowed_users:i.allowedUsers,priority:i.priority,trust_level:i.trustLevel,config:{allowedDirection:i.allowedDirection}})}async removePeer(t){let r=await e(t.stores);await r.removeSyncPeer(t.peerDID)}async isPeerAllowed(e){return void 0!==await this.getPeer({peerDID:e.peerDID,stores:e.stores})}}

package/lib/sync/sync-client.d.ts

@@ -3,7 +3,7 @@ import type { ClientTransportOf } from '@enkaku/protocol';
 import type { Runtime } from '@enkaku/runtime';
 import type { SigningIdentity } from '@enkaku/token';
 import type { Logger } from '@kubun/logger';
-import type { SyncProtocol } from '../protocol.js';
+import type { SyncDirection, SyncProtocol } from '../protocol.js';
 /**
  * Provider for sync-specific transport to a peer's sync server.
  * The p2p plugin exposes this via `createSyncTransport()`.
@@ -21,14 +21,6 @@ export type SyncScope = {
     modelID: string;
     ownerDID: string;
 };
-export type MerkleSyncMessage = {
-    type: 'mutations';
-    mutationJWTs: Array<string>;
-} | {
-    type: 'complete';
-    divergentBuckets?: number;
-    totalMutations?: number;
-};
 /**
  * Client for connecting to peer servers for sync operations.
  * Supports both direct (in-process) and HTTP transports.
@@ -48,21 +40,31 @@ export declare class SyncClient {
     /**
      * Negotiate sync scopes with peer.
      */
-    negotiate(client: Client<SyncProtocol>, scopes: Array<SyncScope>, delegationTokens?: Array<string>, knownModelIDs?: Array<string>): Promise<{
+    negotiate(client: Client<SyncProtocol>, scopes: Array<SyncScope>, delegationTokens?: Array<string>, knownModelIDs?: Array<string>, direction?: SyncDirection): Promise<{
         acceptedScopes: Array<SyncScope>;
         excludedDocumentIDs: Array<string>;
         missingClusters?: Record<string, unknown>;
+        direction?: SyncDirection;
     }>;
     /**
-     * Perform Merkle tree-based sync with peer.
-     * Sends local tree, receives divergent mutation JWTs.
+     * Perform Merkle tree-based sync with peer using bidirectional channel.
+     * Sends local tree and divergent mutations, receives remote mutations.
      */
     merkleSync(client: Client<SyncProtocol>, params: {
         scopes: Array<SyncScope>;
         excludedDocumentIDs: Array<string>;
-        tree: Record<string, string>;
+        localTree: {
+            root: string;
+            buckets: Record<string, string>;
+        };
+        direction: SyncDirection;
+        localEntries: Array<{
+            hlc: string;
+            mutation_jwt: string;
+        }>;
     }): Promise<{
         mutationJWTs: Array<string>;
         divergentBuckets: number;
+        mutationsSent: number;
     }>;
 }

package/lib/sync/sync-client.js

@@ -1 +1 @@
-import{Client as e}from"@enkaku/client";import{ClientTransport as t}from"@enkaku/http-client-transport";import{createArraySink as r}from"@enkaku/stream";export class SyncClient{#e;#t;#r;#n;constructor(e){this.#e=e.runtime,this.#t=e.identity,this.#r=e.logger,this.#n=e.serverResolver}async connect(e,t){if(e.startsWith("direct://"))return this.#s(e);if(e.startsWith("http://")||e.startsWith("https://"))return this.#i(e,t);throw Error(`Unsupported endpoint scheme: ${e}`)}#i(r,n){let s=new t({url:r,fetch:this.#e.fetch});return new e({runtime:this.#e,identity:this.#t,logger:this.#r.getChild("sync-client"),serverID:n,transport:s})}#s(t){let r=t.replace("direct://","");if(!this.#n)throw Error("Server resolver not configured for direct transport");let n=this.#n(r);if(!n)throw Error(`Server not found: ${r}`);let s=n.createSyncTransport();return new e({runtime:this.#e,identity:this.#t,logger:this.#r.getChild("sync-client"),serverID:r,transport:s})}async negotiate(e,t,r=[],n){this.#r.debug("Negotiate: sending {scopeCount} scopes",{scopeCount:t.length});let s=await e.request("sync/negotiate",{param:{scopes:t,delegationTokens:r,knownModelIDs:n}});return this.#r.debug("Negotiate: accepted {acceptedCount} scopes, excluded {excludedCount} docs",{acceptedCount:s.acceptedScopes.length,excludedCount:s.excludedDocumentIDs.length}),s}async merkleSync(e,t){this.#r.debug("MerkleSync: creating stream with {buckets} local buckets",{buckets:Object.keys(t.tree).length});let[n,s]=r(),i=e.createStream("sync/merkle-sync",{param:{scopes:t.scopes,excludedDocumentIDs:t.excludedDocumentIDs,tree:t.tree}}),o=i.readable.pipeTo(n);this.#r.debug("MerkleSync: awaiting stream completion"),await Promise.all([i,o]),this.#r.debug("MerkleSync: stream completed, collecting messages");let c=await s,l=[],a=0;for(let e of c)"mutations"===e.type?l.push(...e.mutationJWTs):"complete"===e.type&&(a=e.divergentBuckets??0);return{mutationJWTs:l,divergentBuckets:a}}}
+import{Client as e}from"@enkaku/client";import{ClientTransport as t}from"@enkaku/http-client-transport";import{findDivergentBuckets as r,getTimeBuckets as n,SYNC_BATCH_SIZE as i}from"./merkle-tree.js";export class SyncClient{#e;#t;#r;#n;constructor(e){this.#e=e.runtime,this.#t=e.identity,this.#r=e.logger,this.#n=e.serverResolver}async connect(e,t){if(e.startsWith("direct://"))return this.#i(e);if(e.startsWith("http://")||e.startsWith("https://"))return this.#s(e,t);throw Error(`Unsupported endpoint scheme: ${e}`)}#s(r,n){let i=new t({url:r,fetch:this.#e.fetch});return new e({runtime:this.#e,identity:this.#t,logger:this.#r.getChild("sync-client"),serverID:n,transport:i})}#i(t){let r=t.replace("direct://","");if(!this.#n)throw Error("Server resolver not configured for direct transport");let n=this.#n(r);if(!n)throw Error(`Server not found: ${r}`);let i=n.createSyncTransport();return new e({runtime:this.#e,identity:this.#t,logger:this.#r.getChild("sync-client"),serverID:r,transport:i})}async negotiate(e,t,r=[],n,i){this.#r.debug("Negotiate: sending {scopeCount} scopes",{scopeCount:t.length});let s=await e.request("sync/negotiate",{param:{scopes:t,delegationTokens:r,knownModelIDs:n,direction:i}});return this.#r.debug("Negotiate: accepted {acceptedCount} scopes, excluded {excludedCount} docs",{acceptedCount:s.acceptedScopes.length,excludedCount:s.excludedDocumentIDs.length}),s}async merkleSync(e,t){let{scopes:s,excludedDocumentIDs:o,localTree:c,direction:l,localEntries:a}=t;this.#r.debug("MerkleSync: creating channel with {buckets} local buckets",{buckets:Object.keys(c.buckets).length});let u=e.createChannel("sync/merkle-sync",{param:{scopes:s,excludedDocumentIDs:o,tree:c.buckets,direction:l}}),h=u.readable.getReader(),d=await h.read();if(d.done)throw Error("MerkleSync: channel closed before receiving remote tree");let g=d.value;if("tree"!==g.type)throw Error(`MerkleSync: expected 'tree' message, got '${g.type}'`);let p=r(c,{root:g.tree?.root??"",buckets:g.tree??{}}),m=p.length;this.#r.debug("MerkleSync: found {count} divergent buckets",{count:m});let y=0,f=async()=>{if("push"===l||"both"===l){let e=new Set(p),t=a.filter(t=>{let{minute:r}=n(t.hlc);return e.has(r)});for(let e=0;e<t.length;e+=i){let r=t.slice(e,e+i);await u.send({type:"mutations",mutationJWTs:r.map(e=>e.mutation_jwt)}),y+=r.length}}await u.send({type:"complete"})},k=async()=>{let e=[];for(;;){let{done:t,value:r}=await h.read();if(t)break;if("mutations"===r.type&&null!=r.mutationJWTs)e.push(...r.mutationJWTs);else if("complete"===r.type)break}return h.releaseLock(),e},[,v]=await Promise.all([f(),k()]),w=await u;if(null!=w&&!w.success)throw Error("MerkleSync: responder reported failure");return this.#r.debug("MerkleSync: completed with {received} received, {sent} sent",{received:v.length,sent:y}),{mutationJWTs:v,divergentBuckets:m,mutationsSent:y}}}

package/lib/sync/sync-manager.d.ts

@@ -1,8 +1,9 @@
 import type { Runtime } from '@enkaku/runtime';
 import { type Identity, type SigningIdentity } from '@enkaku/token';
-import type { KubunDB } from '@kubun/db';
+import type { StoreProvider } from '@kubun/db';
 import type { Logger } from '@kubun/logger';
-import { type PeerConfig, type PeerConfigWithID } from './peer-registry.js';
+import type { SyncDirection } from '../protocol.js';
+import { type PeerConfig, type PeerConfigWithID, PeerRegistry } from './peer-registry.js';
 import { type SyncScope, type SyncTransportProvider } from './sync-client.js';
 export type SyncSessionInfo = {
     peerID: string;
@@ -23,19 +24,24 @@ export type SyncEvent = {
     reason?: string;
 };
 export type SyncManagerParams = {
-    db: KubunDB;
     deployClusters?: (clusters: Record<string, unknown>) => Promise<void>;
     runtime: Runtime;
     identity: Identity;
     logger: Logger;
     serverResolver?: (serverID: string) => SyncTransportProvider | undefined;
 };
-export type MerkleSyncOptions = {
+export type MerkleSyncParams = {
+    peerDID: string;
+    scopes: Array<SyncScope>;
+    stores: StoreProvider;
+    delegationTokens?: Array<string>;
     knownModelIDs?: Array<string>;
+    direction?: SyncDirection;
 };
 export declare class SyncManager {
     #private;
     constructor(params: SyncManagerParams);
+    get peerRegistry(): PeerRegistry;
     /**
      * Configure the signing identity used for sync operations.
      */
@@ -44,18 +50,37 @@ export declare class SyncManager {
      * Configure the server resolver for direct transport connections.
      */
     setServerResolver(resolver: (serverID: string) => SyncTransportProvider | undefined): void;
-    addPeer(config: PeerConfig): Promise<void>;
-    removePeer(peerDID: string): Promise<void>;
-    updatePeerConfig(peerDID: string, updates: Partial<PeerConfig>): Promise<void>;
-    listPeers(): Promise<Array<PeerConfigWithID>>;
-    getPeer(peerDID: string): Promise<PeerConfigWithID | undefined>;
-    merkleSyncWithPeer(peerDID: string, scopes: Array<SyncScope>, delegationTokens?: Array<string>, options?: MerkleSyncOptions): Promise<{
+    addPeer(params: {
+        config: PeerConfig;
+        stores: StoreProvider;
+    }): Promise<void>;
+    removePeer(params: {
+        peerDID: string;
+        stores: StoreProvider;
+    }): Promise<void>;
+    updatePeerConfig(params: {
+        peerDID: string;
+        updates: Partial<PeerConfig>;
+        stores: StoreProvider;
+    }): Promise<void>;
+    listPeers(params: {
+        stores: StoreProvider;
+    }): Promise<Array<PeerConfigWithID>>;
+    getPeer(params: {
+        peerDID: string;
+        stores: StoreProvider;
+    }): Promise<PeerConfigWithID | undefined>;
+    merkleSyncWithPeer(params: MerkleSyncParams): Promise<{
         sessionID: string;
         divergentBuckets: number;
         messagesReceived: number;
+        messagesSent: number;
         missingClusters?: Record<string, unknown>;
     }>;
-    getStatus(peerDID?: string): SyncStatus;
+    getStatus(params: {
+        peerDID?: string;
+        stores: StoreProvider;
+    }): SyncStatus;
     onSyncEvent(callback: (event: SyncEvent) => void): () => void;
     dispose(): Promise<void>;
 }

package/lib/sync/sync-manager.js

@@ -1 +1 @@
-import{EventEmitter as e}from"@enkaku/event";import{isSigningIdentity as t}from"@enkaku/token";import{applySyncMutations as s}from"./merkle-apply.js";import{buildMerkleTree as r}from"./merkle-tree.js";import{PeerRegistry as i}from"./peer-registry.js";import{SyncClient as n}from"./sync-client.js";export class SyncManager{#e;#t;#s;#r;#i;#n=new e;#o=new Map;#l=new Map;#a;#c;constructor(e){this.#e=e.db,this.#t=e.deployClusters,this.#s=e.runtime,this.#a=e.identity,this.#r=e.logger,this.#i=new i({db:e.db,runtime:e.runtime}),this.#c=e.serverResolver}setIdentity(e){this.#a=e}setServerResolver(e){this.#c=e}async addPeer(e){await this.#i.addPeer(e),this.#r.info("Peer added",{peerDID:e.peerDID})}async removePeer(e){await this.#i.removePeer(e),this.#r.info("Peer removed",{peerDID:e})}async updatePeerConfig(e,t){await this.#i.updatePeer(e,t),this.#r.info("Peer updated",{peerDID:e})}async listPeers(){return this.#i.listPeers()}async getPeer(e){return this.#i.getPeer(e)}async merkleSyncWithPeer(e,i,o=[],l){let a;this.#r.info("Starting Merkle sync with peer",{peerDID:e,scopes:i});let c=await this.#i.getPeer(e);if(!c)throw Error(`Peer ${e} not found`);let g=`merkle-sync-${e}-${Date.now()}`,m={peerID:e,startTime:Date.now(),documentsAttempted:0,documentsCompleted:0};this.#o.set(g,m),this.#g({type:"started",peerID:e,timestamp:Date.now()});try{let p=this.#a;if(!t(p))throw Error("Signing identity required for Merkle sync");let d=new n({runtime:this.#s,identity:p,logger:this.#r,serverResolver:this.#c});a=await d.connect(c.endpoint,e),this.#r.info("Negotiating sync scopes",{scopes:i});let{acceptedScopes:y,excludedDocumentIDs:h,missingClusters:u}=await d.negotiate(a,i,o,l?.knownModelIDs);if(0===y.length)return this.#r.info("No scopes accepted by peer"),this.#l.set(e,Date.now()),this.#g({type:"completed",peerID:e,timestamp:Date.now()}),this.#o.delete(g),{sessionID:g,divergentBuckets:0,messagesReceived:0,missingClusters:u};null!=u&&Object.keys(u).length>0&&(null!=this.#t?(this.#r.info("Deploying missing clusters from peer",{clusterCount:Object.keys(u).length}),await this.#t(u)):this.#r.warn("Missing clusters received but no deployClusters callback configured",{clusterCount:Object.keys(u).length})),this.#r.info("Building local Merkle tree",{acceptedScopes:y});let v=await this.#e.getDocumentIDsForScope(y,h),f=await this.#e.getMutationLogForDocuments(v),w=r(f);this.#r.info("Requesting Merkle sync from peer",{localTreeBuckets:Object.keys(w.buckets).length});let k=await d.merkleSync(a,{scopes:y,excludedDocumentIDs:h,tree:w.buckets});return k.mutationJWTs.length>0&&(this.#r.info("Applying sync mutations",{mutations:k.mutationJWTs.length}),m.documentsCompleted=(await s({db:this.#e,mutationJWTs:k.mutationJWTs})).applied),this.#l.set(e,Date.now()),this.#g({type:"completed",peerID:e,timestamp:Date.now()}),this.#r.info("Merkle sync completed",{divergentBuckets:k.divergentBuckets,mutationsReceived:k.mutationJWTs.length}),{sessionID:g,divergentBuckets:k.divergentBuckets,messagesReceived:k.mutationJWTs.length,missingClusters:u}}catch(t){throw this.#r.error("Merkle sync failed",{peerDID:e,error:t}),this.#g({type:"error",peerID:e,timestamp:Date.now(),error:t instanceof Error?t.message:String(t)}),t}finally{if(null!=a)try{a.abort("SyncComplete"),await a.dispose()}catch{}this.#o.delete(g)}}getStatus(e){let t=Array.from(this.#o.values()).filter(t=>!e||t.peerID===e).map(e=>({peerID:e.peerID,startTime:e.startTime,documentsAttempted:e.documentsAttempted,documentsCompleted:e.documentsCompleted})),s={};for(let[t,r]of this.#l.entries())e&&t!==e||(s[t]=r);return{activeSessions:t,lastSyncByPeer:s}}onSyncEvent(e){return this.#n.on("sync",e)}#g(e){this.#n.emit("sync",e).catch(e=>{this.#r.error("Error in sync event listener",{error:e})})}async dispose(){this.#o.clear(),this.#l.clear()}}
+import{EventEmitter as e}from"@enkaku/event";import{isSigningIdentity as t}from"@enkaku/token";import{getGraphStore as r}from"@kubun/store-graph";import{applySyncMutations as s}from"./merkle-apply.js";import{buildMerkleTree as i}from"./merkle-tree.js";import{PeerRegistry as n}from"./peer-registry.js";import{SyncClient as o}from"./sync-client.js";export class SyncManager{#e;#t;#r;#s;#i=new e;#n=new Map;#o=new Map;#l;#a;constructor(e){this.#e=e.deployClusters,this.#t=e.runtime,this.#l=e.identity,this.#r=e.logger,this.#s=new n({runtime:e.runtime}),this.#a=e.serverResolver}get peerRegistry(){return this.#s}setIdentity(e){this.#l=e}setServerResolver(e){this.#a=e}async addPeer(e){await this.#s.addPeer(e),this.#r.info("Peer added",{peerDID:e.config.peerDID})}async removePeer(e){await this.#s.removePeer(e),this.#r.info("Peer removed",{peerDID:e.peerDID})}async updatePeerConfig(e){await this.#s.updatePeer(e),this.#r.info("Peer updated",{peerDID:e.peerDID})}async listPeers(e){return this.#s.listPeers(e)}async getPeer(e){return this.#s.getPeer(e)}async merkleSyncWithPeer(e){let n,{peerDID:l,scopes:a,delegationTokens:c=[],knownModelIDs:g,direction:m}=e;this.#r.info("Starting Merkle sync with peer",{peerDID:l,scopes:a});let p=await this.#s.getPeer({peerDID:l,stores:e.stores});if(!p)throw Error(`Peer ${l} not found`);let y=`merkle-sync-${l}-${Date.now()}`,u={peerID:l,startTime:Date.now(),documentsAttempted:0,documentsCompleted:0};this.#n.set(y,u),this.#c({type:"started",peerID:l,timestamp:Date.now()});try{let d=this.#l;if(!t(d))throw Error("Signing identity required for Merkle sync");let h=new o({runtime:this.#t,identity:d,logger:this.#r,serverResolver:this.#a});n=await h.connect(p.endpoint,l);let v=m??"pull";this.#r.info("Negotiating sync scopes",{scopes:a,direction:v});let{acceptedScopes:f,excludedDocumentIDs:D,missingClusters:w,direction:k}=await h.negotiate(n,a,c,g,v);if(0===f.length)return this.#r.info("No scopes accepted by peer"),this.#o.set(l,Date.now()),this.#c({type:"completed",peerID:l,timestamp:Date.now()}),this.#n.delete(y),{sessionID:y,divergentBuckets:0,messagesReceived:0,messagesSent:0,missingClusters:w};null!=w&&Object.keys(w).length>0&&(null!=this.#e?(this.#r.info("Deploying missing clusters from peer",{clusterCount:Object.keys(w).length}),await this.#e(w)):this.#r.warn("Missing clusters received but no deployClusters callback configured",{clusterCount:Object.keys(w).length})),this.#r.info("Building local Merkle tree",{acceptedScopes:f});let S=await r(e.stores),P=await S.getDocumentIDsForScope(f,D),R=await S.getMutationLogForDocuments(P),I=i(R),C=k??v;this.#r.info("Requesting Merkle sync from peer",{localTreeBuckets:Object.keys(I.buckets).length,direction:C});let B=await h.merkleSync(n,{scopes:f,excludedDocumentIDs:D,localTree:I,direction:C,localEntries:R});return B.mutationJWTs.length>0&&(this.#r.info("Applying sync mutations",{mutations:B.mutationJWTs.length}),u.documentsCompleted=(await s({db:e.stores,mutationJWTs:B.mutationJWTs})).applied),this.#o.set(l,Date.now()),this.#c({type:"completed",peerID:l,timestamp:Date.now()}),this.#r.info("Merkle sync completed",{divergentBuckets:B.divergentBuckets,mutationsReceived:B.mutationJWTs.length}),{sessionID:y,divergentBuckets:B.divergentBuckets,messagesReceived:B.mutationJWTs.length,messagesSent:B.mutationsSent,missingClusters:w}}catch(e){throw this.#r.error("Merkle sync failed",{peerDID:l,error:e}),this.#c({type:"error",peerID:l,timestamp:Date.now(),error:e instanceof Error?e.message:String(e)}),e}finally{if(null!=n)try{n.abort("SyncComplete"),await n.dispose()}catch{}this.#n.delete(y)}}getStatus(e){let{peerDID:t}=e,r=Array.from(this.#n.values()).filter(e=>!t||e.peerID===t).map(e=>({peerID:e.peerID,startTime:e.startTime,documentsAttempted:e.documentsAttempted,documentsCompleted:e.documentsCompleted})),s={};for(let[e,r]of this.#o.entries())t&&e!==t||(s[e]=r);return{activeSessions:r,lastSyncByPeer:s}}onSyncEvent(e){return this.#i.on("sync",e)}#c(e){this.#i.emit("sync",e).catch(e=>{this.#r.error("Error in sync event listener",{error:e})})}async dispose(){this.#n.clear(),this.#o.clear()}}

package/lib/types.d.ts

@@ -1,24 +1,24 @@
 import type { ClientTransportOf } from '@enkaku/protocol';
-import type { SyncProtocol } from './protocol.js';
+import type { SyncDirection, SyncProtocol } from './protocol.js';
 import type { PeerConfig, PeerConfigWithID } from './sync/peer-registry.js';
 import type { SyncScope } from './sync/sync-client.js';
 import type { SyncEvent, SyncStatus } from './sync/sync-manager.js';
-export type SpaceData = {
+export type GroupData = {
     id: string;
     name: string;
     description: string;
     createdBy: string;
     createdAt: string;
 };
-export type SpaceMemberData = {
-    spaceID: string;
+export type GroupMemberData = {
+    groupID: string;
     memberDID: string;
     role: string;
     createdAt: string;
 };
 export type CircleData = {
     id: string;
-    spaceID: string;
+    groupID: string;
     name: string;
     description: string;
     createdAt: string;
@@ -37,19 +37,19 @@ export type CatalogData = {
     filterCriteria: string;
     createdAt: string;
 };
-export type InviteToSpaceData = {
+export type InviteToGroupData = {
     invitePayload: string;
-    spaceID: string;
-    spaceName: string;
+    groupID: string;
+    groupName: string;
 };
-export type JoinSpaceData = {
-    space: SpaceData | null;
+export type JoinGroupData = {
+    group: GroupData | null;
 };
-export type LeaveSpaceData = {
-    spaceID: string;
+export type LeaveGroupData = {
+    groupID: string;
 };
-export type RemoveSpaceMemberData = {
-    spaceID: string;
+export type RemoveGroupMemberData = {
+    groupID: string;
 };
 export type DeleteCatalogData = {
     deletedID: string;
@@ -61,8 +61,8 @@ export type RemoveCircleMemberData = {
     circleID: string;
     memberDID: string;
 };
-export type UpdateSpaceInput = {
-    spaceID: string;
+export type UpdateGroupInput = {
+    groupID: string;
     name?: string;
     description?: string;
 };
@@ -72,42 +72,42 @@ export type UpdateCircleInput = {
     description?: string;
     catalogIDs?: Array<string>;
 };
-export type SpaceRequestContext = {
-    spaceCreateSpace: (input: {
+export type GroupRequestContext = {
+    p2pCreateGroup: (input: {
         name: string;
         description?: string;
-    }) => Promise<SpaceData>;
-    spaceGetSpaces: () => Promise<Array<SpaceData>>;
-    spaceGetSpace: (id: string) => Promise<SpaceData | null>;
-    spaceAddSpaceMember: (spaceID: string, memberDID: string, role: string) => Promise<SpaceMemberData>;
-    spaceGetSpaceMembers: (spaceID: string) => Promise<Array<SpaceMemberData>>;
-    spaceCreateCircle: (params: {
-        spaceID: string;
+    }) => Promise<GroupData>;
+    p2pGetGroups: () => Promise<Array<GroupData>>;
+    p2pGetGroup: (id: string) => Promise<GroupData | null>;
+    p2pAddGroupMember: (groupID: string, memberDID: string, role: string) => Promise<GroupMemberData>;
+    p2pGetGroupMembers: (groupID: string) => Promise<Array<GroupMemberData>>;
+    p2pCreateCircle: (params: {
+        groupID: string;
         name: string;
         description?: string;
     }) => Promise<CircleData>;
-    spaceGetCircles: (spaceID: string) => Promise<Array<CircleData>>;
-    spaceAddCircleMember: (circleID: string, memberDID: string, role: string) => Promise<CircleMemberData>;
-    spaceCreateCatalog: (params: {
+    p2pGetCircles: (groupID: string) => Promise<Array<CircleData>>;
+    p2pAddCircleMember: (circleID: string, memberDID: string, role: string) => Promise<CircleMemberData>;
+    p2pCreateCatalog: (params: {
         name: string;
         description?: string;
         filterCriteria: string;
     }) => Promise<CatalogData>;
-    spaceGetCatalogs: (ownerDID?: string) => Promise<Array<CatalogData>>;
-    spaceInviteToSpace: (spaceID: string, joinRequest: string) => Promise<InviteToSpaceData>;
-    spaceJoinSpace: (invitePayload: string, joinRequestPayload: string) => Promise<JoinSpaceData>;
-    spaceLeaveSpace: (spaceID: string) => Promise<LeaveSpaceData>;
-    spaceRemoveSpaceMember: (spaceID: string, memberDID: string) => Promise<RemoveSpaceMemberData>;
-    spaceUpdateSpace: (input: UpdateSpaceInput) => Promise<SpaceData>;
-    spaceUpdateCircle: (input: UpdateCircleInput) => Promise<CircleData>;
-    spaceUpdateCatalog: (params: {
+    p2pGetCatalogs: (ownerDID?: string) => Promise<Array<CatalogData>>;
+    p2pInviteToGroup: (groupID: string, joinRequest: string) => Promise<InviteToGroupData>;
+    p2pJoinGroup: (invitePayload: string, joinRequestPayload: string) => Promise<JoinGroupData>;
+    p2pLeaveGroup: (groupID: string) => Promise<LeaveGroupData>;
+    p2pRemoveGroupMember: (groupID: string, memberDID: string) => Promise<RemoveGroupMemberData>;
+    p2pUpdateGroup: (input: UpdateGroupInput) => Promise<GroupData>;
+    p2pUpdateCircle: (input: UpdateCircleInput) => Promise<CircleData>;
+    p2pUpdateCatalog: (params: {
         catalogID: string;
         name?: string;
         filterCriteria?: string;
     }) => Promise<CatalogData>;
-    spaceDeleteCatalog: (catalogID: string) => Promise<DeleteCatalogData>;
-    spaceDeleteCircle: (circleID: string) => Promise<DeleteCircleData>;
-    spaceRemoveCircleMember: (circleID: string, memberDID: string) => Promise<RemoveCircleMemberData>;
+    p2pDeleteCatalog: (catalogID: string) => Promise<DeleteCatalogData>;
+    p2pDeleteCircle: (circleID: string) => Promise<DeleteCircleData>;
+    p2pRemoveCircleMember: (circleID: string, memberDID: string) => Promise<RemoveCircleMemberData>;
 };
 export type SyncRequestContext = {
     syncAddPeer: (config: PeerConfig) => Promise<void>;
@@ -120,13 +120,14 @@ export type P2PJoinRequestContext = {
         joinRequest: string;
     }>;
     p2pCompleteJoin: (invitePayload: string) => Promise<{
-        space: SpaceData | null;
+        group: GroupData | null;
     }>;
 };
 export type SyncSessionResult = {
     sessionID: string;
     divergentBuckets: number;
     messagesReceived: number;
+    messagesSent: number;
     missingClusters?: Record<string, unknown>;
 };
 export type SyncPluginAPI = {
@@ -140,6 +141,7 @@ export type SyncPluginAPI = {
         scopes: Array<SyncScope>;
         delegationTokens?: Array<string>;
         knownModelIDs?: Array<string>;
+        direction?: SyncDirection;
     }): Promise<SyncSessionResult>;
     getStatus(peerDID?: string): SyncStatus;
     onSyncEvent(callback: (event: SyncEvent) => void): () => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubun/plugin-p2p",
-  "version": "0.8.0",
+  "version": "0.8.2",
   "license": "see LICENSE.md",
   "type": "module",
   "main": "lib/index.js",
@@ -14,42 +14,46 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@enkaku/async": "^0.14.0",
+    "@enkaku/async": "^0.14.1",
     "@enkaku/capability": "^0.14.0",
-    "@enkaku/client": "^0.14.3",
+    "@enkaku/client": "^0.14.4",
     "@enkaku/codec": "^0.14.0",
     "@enkaku/event": "^0.14.1",
     "@enkaku/generator": "^0.14.0",
     "@enkaku/group": "^0.14.6",
     "@enkaku/http-client-transport": "^0.14.3",
     "@enkaku/http-server-transport": "^0.14.2",
+    "@enkaku/hub-protocol": "^0.14.0",
     "@enkaku/protocol": "^0.14.0",
     "@enkaku/runtime": "^0.14.0",
     "@enkaku/schema": "^0.14.0",
-    "@enkaku/server": "^0.14.3",
+    "@enkaku/server": "^0.14.4",
     "@enkaku/stream": "^0.14.1",
     "@enkaku/token": "0.14.1",
-    "@enkaku/transport": "0.14.0",
+    "@enkaku/transport": "0.14.1",
     "@noble/hashes": "^2.2.0",
     "graphql": "^16.13.2",
     "kysely": "^0.28.16",
     "@kubun/client": "^0.8.0",
-    "@kubun/graphql": "^0.8.0",
+    "@kubun/store-p2p": "^0.8.0",
+    "@kubun/graphql": "^0.8.1",
+    "@kubun/engine": "^0.8.2",
+    "@kubun/id": "^0.8.0",
     "@kubun/hlc": "^0.8.0",
-    "@kubun/db-adapter": "^0.8.0",
-    "@kubun/db": "^0.8.0",
-    "@kubun/engine": "^0.8.0",
+    "@kubun/mutation": "^0.8.1",
+    "@kubun/db": "^0.8.1",
+    "@kubun/store-graph": "^0.8.1",
+    "@kubun/protocol": "^0.8.1",
     "@kubun/logger": "^0.8.0",
-    "@kubun/id": "^0.8.0",
-    "@kubun/mutation": "^0.8.0",
-    "@kubun/protocol": "^0.8.0"
+    "@kubun/db-adapter": "^0.8.1"
   },
   "devDependencies": {
+    "@enkaku/hub-server": "^0.14.1",
     "get-port": "^7.2.0",
-    "@kubun/db-better-sqlite": "^0.8.0",
-    "@kubun/plugin-connector": "^0.8.0",
-    "@kubun/plugin-http": "^0.8.0",
-    "@kubun/plugin-rpc": "^0.8.0",
+    "@kubun/db-better-sqlite": "^0.8.1",
+    "@kubun/plugin-connector": "^0.8.1",
+    "@kubun/plugin-rpc": "^0.8.1",
+    "@kubun/plugin-http": "^0.8.1",
     "@kubun/test-utils": "^0.8.0"
   },
   "scripts": {

package/lib/context/space.d.ts

@@ -1,4 +0,0 @@
-import type { ExecutionContext } from '@kubun/engine';
-import type { SpaceRequestContext } from '../types.js';
-import type { ContextDeps } from './types.js';
-export declare function createSpaceContext(ctx: ExecutionContext, deps: ContextDeps): SpaceRequestContext;

package/lib/context/space.js

@@ -1 +0,0 @@
-import{HLC as e}from"@kubun/hlc";import{restoreGroupHandle as t}from"../spaces/group-handle.js";import{decodeFullJoinRequest as a,decodeInvitePayload as r,decodeJoinRequest as i,encodeInvitePayload as c}from"../spaces/invite-payload.js";import{createSpaceFromJoin as l}from"../spaces/join-utils.js";import{checkPeerAccess as s,normalizeCredential as d,toISO as n}from"./types.js";export function createSpaceContext(p,o){return{spaceCreateSpace:async e=>await p.transaction(async t=>{let a=t.db,r=await o.spaceManager.createSpace({identity:o.identity,name:e.name,description:e.description},a);await t.db.updateTable("kubun_spaces").set({created_by:p.viewerDID}).where("id","=",r.spaceID).execute();let i=await t.db.selectFrom("kubun_spaces").selectAll().where("id","=",r.spaceID).executeTakeFirst();if(null==i)throw Error("Failed to create space");t.emit("space:created",{spaceID:r.spaceID});let c={id:i.id,name:i.name,description:i.description,createdBy:i.created_by,createdAt:n(i.created_at)};return await o.emitter.emit("spaceJoined",c),c}),spaceGetSpaces:async()=>{let e=await o.getDB();return(await e.selectFrom("kubun_spaces").selectAll().execute()).map(e=>({id:e.id,name:e.name,description:e.description,createdBy:e.created_by,createdAt:n(e.created_at)}))},spaceGetSpace:async e=>{let t=await o.getDB(),a=await t.selectFrom("kubun_spaces").selectAll().where("id","=",e).executeTakeFirst();return null==a?null:{id:a.id,name:a.name,description:a.description,createdBy:a.created_by,createdAt:n(a.created_at)}},spaceAddSpaceMember:async(e,t,a)=>{let r=await o.getDB();await r.insertInto("kubun_space_members").values({space_id:e,member_did:t,role:a}).onConflict(e=>e.columns(["space_id","member_did"]).doUpdateSet(e=>({role:e.ref("excluded.role"),updated_at:o.adapter.encodeTimestamp(new Date)}))).execute();let i=await r.selectFrom("kubun_space_members").selectAll().where("space_id","=",e).where("member_did","=",t).executeTakeFirst();if(null==i)throw Error("Failed to add space member");let c={spaceID:i.space_id,memberDID:i.member_did,role:i.role,createdAt:n(i.created_at)};return await o.emitter.emit("spaceMemberJoined",{...c,spaceID:c.spaceID}),c},spaceGetSpaceMembers:async e=>{let t=await o.getDB();return(await t.selectFrom("kubun_space_members").selectAll().where("space_id","=",e).execute()).map(e=>({spaceID:e.space_id,memberDID:e.member_did,role:e.role,createdAt:n(e.created_at)}))},spaceCreateCircle:async e=>{let t=await o.spaceManager.createCircle({spaceID:e.spaceID,name:e.name,description:e.description}),a=await o.getDB(),r=await a.selectFrom("kubun_circles").selectAll().where("id","=",t.circleID).executeTakeFirst();if(null==r)throw Error("Failed to create circle");let i={id:r.id,spaceID:r.space_id,name:r.name,description:r.description,createdAt:n(r.created_at)};return await o.emitter.emit("circleCreated",{...i,spaceID:i.spaceID}),i},spaceGetCircles:async e=>{let t=await o.getDB();return(await t.selectFrom("kubun_circles").selectAll().where("space_id","=",e).execute()).map(e=>({id:e.id,spaceID:e.space_id,name:e.name,description:e.description,createdAt:n(e.created_at)}))},spaceAddCircleMember:async(t,a,r)=>{let i=await o.getDB(),c=e.serialize(o.hlc.now());await i.insertInto("kubun_circle_members").values({circle_id:t,member_did:a,role:r,hlc:c}).onConflict(e=>e.columns(["circle_id","member_did"]).doUpdateSet(e=>({role:e.ref("excluded.role"),hlc:e.ref("excluded.hlc")}))).execute();let l=await i.selectFrom("kubun_circle_members").selectAll().where("circle_id","=",t).where("member_did","=",a).executeTakeFirst();if(null==l)throw Error("Failed to add circle member");let s={circleID:l.circle_id,memberDID:l.member_did,role:l.role,createdAt:n(l.created_at)};return await o.emitter.emit("circleMemberAdded",{...s,circleID:s.circleID}),s},spaceCreateCatalog:async t=>{let a=await o.getDB(),r=o.runtime.getRandomID(),i=e.serialize(o.hlc.now());await a.insertInto("kubun_catalogs").values({id:r,owner_did:p.viewerDID,name:t.name,description:t.description??"",filter_criteria:o.adapter.encodeJSON("string"==typeof t.filterCriteria?JSON.parse(t.filterCriteria):t.filterCriteria),hlc:i}).execute();let c=await a.selectFrom("kubun_catalogs").selectAll().where("id","=",r).executeTakeFirst();if(null==c)throw Error("Failed to create catalog");return{id:c.id,ownerDID:c.owner_did,name:c.name,description:c.description,filterCriteria:"string"==typeof c.filter_criteria?c.filter_criteria:JSON.stringify(c.filter_criteria),createdAt:n(c.created_at)}},spaceGetCatalogs:async e=>{let t=(await o.getDB()).selectFrom("kubun_catalogs").selectAll();return null!=e&&(t=t.where("owner_did","=",e)),(await t.execute()).map(e=>({id:e.id,ownerDID:e.owner_did,name:e.name,description:e.description,filterCriteria:"string"==typeof e.filter_criteria?e.filter_criteria:JSON.stringify(e.filter_criteria),createdAt:n(e.created_at)}))},spaceInviteToSpace:async(e,a)=>{s(p.viewerDID,o.identity.id,o.autoAcceptPeers);let r=await o.getDB(),l=o.identity,n=await r.selectFrom("kubun_space_mls_state").selectAll().where("space_id","=",e).where("device_id","=",l.id).executeTakeFirst();if(null==n)throw Error(`No MLS state for space ${e}`);let m=await t({mlsState:n.mls_state,credential:d(n.credential),epoch:n.epoch,rootCapability:n.root_capability}),u=i(a),w=await o.spaceManager.inviteToSpace({spaceID:e,identity:l,groupHandle:m,recipientDID:u.did,recipientKeyPackage:u.publicPackage,permission:"member"},r),_=await r.selectFrom("kubun_spaces").select(["name","hub_urls"]).where("id","=",e).executeTakeFirst(),D="string"==typeof _?.hub_urls?JSON.parse(_.hub_urls):_?.hub_urls??[],b=c({spaceID:e,spaceName:_?.name??"",hubURLs:D,invite:w.invite,welcomeMessage:w.welcomeMessage,ratchetTree:w.updatedGroupHandle.state.ratchetTree});return await o.emitter.emit("spaceMemberJoined",{spaceID:e,memberDID:u.did,role:"member",createdAt:new Date().toISOString()}),{invitePayload:b,spaceID:e,spaceName:_?.name??""}},spaceJoinSpace:async(e,t)=>{let i=await o.getDB(),c=o.identity,s=r(e),d=a(t),n={publicPackage:d.publicPackage,privatePackage:d.privatePackage,ownerDID:d.did};return await o.spaceManager.joinSpace({identity:c,spaceID:s.spaceID,invite:s.invite,keyPackageBundle:n,welcomeMessage:s.welcomeMessage,ratchetTree:s.ratchetTree},i),await l({db:i,adapter:o.adapter,hlc:o.hlc,emitter:o.emitter,identity:c,invite:s})},spaceLeaveSpace:async e=>{let t=await o.getDB(),a=await t.selectFrom("kubun_spaces").selectAll().where("id","=",e).executeTakeFirst(),r=o.identity;return await o.spaceManager.leaveSpace({spaceID:e,identity:r}),null!=a&&await o.emitter.emit("spaceLeft",{id:a.id,name:a.name,description:a.description,createdBy:a.created_by,createdAt:n(a.created_at),spaceID:e}),{spaceID:e}},spaceRemoveSpaceMember:async(e,a)=>{let r=await o.getDB(),i=o.identity,c=await r.selectFrom("kubun_space_mls_state").selectAll().where("space_id","=",e).where("device_id","=",i.id).executeTakeFirst();if(null==c)throw Error(`No MLS state for space ${e}`);let l=await t({mlsState:c.mls_state,credential:d(c.credential),epoch:c.epoch,rootCapability:c.root_capability});return await o.spaceManager.removeSpaceMember({spaceID:e,groupHandle:l,memberDID:a},r),await o.emitter.emit("spaceMemberLeft",{spaceID:e,memberDID:a,role:"",createdAt:new Date().toISOString()}),{spaceID:e}},spaceUpdateSpace:async e=>{await o.spaceManager.updateSpace({spaceID:e.spaceID,update:{name:e.name,description:e.description}});let t=await o.getDB(),a=await t.selectFrom("kubun_spaces").selectAll().where("id","=",e.spaceID).executeTakeFirst();if(null==a)throw Error(`Space ${e.spaceID} not found`);let r={id:a.id,name:a.name,description:a.description,createdBy:a.created_by,createdAt:n(a.created_at)};return await o.emitter.emit("spaceDataChanged",{...r,spaceID:e.spaceID}),r},spaceUpdateCircle:async e=>{await o.spaceManager.updateCircle({circleID:e.circleID,update:{name:e.name,description:e.description,catalogIDs:e.catalogIDs}});let t=await o.getDB(),a=await t.selectFrom("kubun_circles").selectAll().where("id","=",e.circleID).executeTakeFirst();if(null==a)throw Error(`Circle ${e.circleID} not found`);let r={id:a.id,spaceID:a.space_id,name:a.name,description:a.description,createdAt:n(a.created_at)};return null!=e.catalogIDs?await o.emitter.emit("circleCatalogsChanged",{...r,circleID:e.circleID}):await o.emitter.emit("circleDataChanged",{...r,circleID:e.circleID}),r},spaceUpdateCatalog:async t=>{let a=await o.getDB(),r={hlc:e.serialize(o.hlc.now())};null!=t.name&&(r.name=t.name),null!=t.filterCriteria&&(r.filter_criteria=o.adapter.encodeJSON("string"==typeof t.filterCriteria?JSON.parse(t.filterCriteria):t.filterCriteria)),r.updated_at=o.adapter.encodeTimestamp(new Date),await a.updateTable("kubun_catalogs").set(r).where("id","=",t.catalogID).execute();let i=await a.selectFrom("kubun_catalogs").selectAll().where("id","=",t.catalogID).executeTakeFirst();if(null==i)throw Error(`Catalog ${t.catalogID} not found`);return{id:i.id,ownerDID:i.owner_did,name:i.name,description:i.description,filterCriteria:"string"==typeof i.filter_criteria?i.filter_criteria:JSON.stringify(i.filter_criteria),createdAt:n(i.created_at)}},spaceDeleteCatalog:async e=>{let t=await o.getDB();return await t.deleteFrom("kubun_catalogs").where("id","=",e).execute(),{deletedID:e}},spaceDeleteCircle:async e=>{let t=await o.getDB(),a=await t.selectFrom("kubun_circles").selectAll().where("id","=",e).executeTakeFirst();return await o.spaceManager.deleteCircle({circleID:e}),null!=a&&await o.emitter.emit("circleDeleted",{id:a.id,spaceID:a.space_id,name:a.name,description:a.description,createdAt:n(a.created_at)}),{deletedID:e}},spaceRemoveCircleMember:async(e,t)=>(await o.spaceManager.removeCircleMember({circleID:e,memberDID:t}),await o.emitter.emit("circleMemberRemoved",{circleID:e,memberDID:t,role:"",createdAt:new Date().toISOString()}),{circleID:e,memberDID:t})}}

package/lib/migrations.d.ts

@@ -1,8 +0,0 @@
-import type { Adapter } from '@kubun/db-adapter';
-import type { PluginMigrationContext } from '@kubun/engine';
-import type { Migration } from 'kysely';
-export type MigrationContext = {
-    types: Adapter['types'];
-    functions: Adapter['functions'];
-};
-export declare function createP2PMigrations(ctx: MigrationContext | PluginMigrationContext): Record<string, Migration>;

package/lib/migrations.js

@@ -1 +0,0 @@
-export function createP2PMigrations(e){let t=e.types,a=e.functions;return{"001_create_p2p_tables":{async up(e){await e.schema.createTable("kubun_spaces").ifNotExists().addColumn("id",t.text,e=>e.notNull().primaryKey()).addColumn("name",t.text,e=>e.notNull()).addColumn("description",t.text,e=>e.notNull().defaultTo("")).addColumn("created_by",t.text,e=>e.notNull()).addColumn("hub_urls",t.json,e=>e.defaultTo("[]").notNull()).addColumn("hlc",t.text,e=>e.notNull()).addColumn("created_at",t.timestamp,e=>e.defaultTo(a.now).notNull()).addColumn("updated_at",t.timestamp).execute(),await e.schema.createTable("kubun_space_members").ifNotExists().addColumn("space_id",t.text,e=>e.notNull()).addColumn("member_did",t.text,e=>e.notNull()).addColumn("role",t.text,e=>e.notNull().defaultTo("member")).addColumn("created_at",t.timestamp,e=>e.defaultTo(a.now).notNull()).addColumn("updated_at",t.timestamp).addPrimaryKeyConstraint("pk_space_members",["space_id","member_did"]).execute(),await e.schema.createIndex("idx_space_members_did").ifNotExists().on("kubun_space_members").column("member_did").execute(),await e.schema.createTable("kubun_circles").ifNotExists().addColumn("id",t.text,e=>e.notNull().primaryKey()).addColumn("space_id",t.text,e=>e.notNull()).addColumn("name",t.text,e=>e.notNull()).addColumn("description",t.text,e=>e.notNull().defaultTo("")).addColumn("catalog_ids",t.json,e=>e.notNull().defaultTo("[]")).addColumn("hlc",t.text,e=>e.notNull()).addColumn("created_at",t.timestamp,e=>e.defaultTo(a.now).notNull()).addColumn("updated_at",t.timestamp).execute(),await e.schema.createIndex("idx_circles_space").ifNotExists().on("kubun_circles").column("space_id").execute(),await e.schema.createTable("kubun_circle_members").ifNotExists().addColumn("circle_id",t.text,e=>e.notNull()).addColumn("member_did",t.text,e=>e.notNull()).addColumn("role",t.text,e=>e.notNull().defaultTo("member")).addColumn("hlc",t.text,e=>e.notNull()).addColumn("created_at",t.timestamp,e=>e.defaultTo(a.now).notNull()).addColumn("updated_at",t.timestamp).addPrimaryKeyConstraint("pk_circle_members",["circle_id","member_did"]).execute(),await e.schema.createIndex("idx_circle_members_did").ifNotExists().on("kubun_circle_members").column("member_did").execute(),await e.schema.createTable("kubun_catalogs").ifNotExists().addColumn("id",t.text,e=>e.notNull().primaryKey()).addColumn("owner_did",t.text,e=>e.notNull()).addColumn("name",t.text,e=>e.notNull()).addColumn("description",t.text,e=>e.notNull().defaultTo("")).addColumn("filter_criteria",t.json,e=>e.notNull()).addColumn("hlc",t.text,e=>e.notNull()).addColumn("created_at",t.timestamp,e=>e.defaultTo(a.now).notNull()).addColumn("updated_at",t.timestamp).execute(),await e.schema.createIndex("idx_catalogs_owner").ifNotExists().on("kubun_catalogs").column("owner_did").execute(),await e.schema.createTable("kubun_space_mls_state").ifNotExists().addColumn("space_id",t.text,e=>e.notNull()).addColumn("device_id",t.text,e=>e.notNull()).addColumn("mls_state",t.binary,e=>e.notNull()).addColumn("credential",t.text,e=>e.notNull()).addColumn("epoch","integer",e=>e.notNull()).addColumn("root_capability",t.text,e=>e.notNull().defaultTo("")).addColumn("updated_at",t.timestamp,e=>e.defaultTo(a.now).notNull()).addPrimaryKeyConstraint("pk_space_mls_state",["space_id","device_id"]).execute(),await e.schema.createTable("kubun_sync_peers").ifNotExists().addColumn("id",t.text,e=>e.notNull().primaryKey()).addColumn("peer_did",t.text,e=>e.notNull().unique()).addColumn("endpoint",t.text,e=>e.notNull()).addColumn("mode",t.text,e=>e.notNull()).addColumn("allowed_users",t.json,e=>e.notNull()).addColumn("priority",t.text,e=>e.notNull().defaultTo("0")).addColumn("trust_level",t.text,e=>e.notNull()).addColumn("config",t.json,e=>e.notNull()).addColumn("created_at",t.timestamp,e=>e.defaultTo(a.now).notNull()).addColumn("updated_at",t.timestamp,e=>e.defaultTo(a.now).notNull()).execute(),await e.schema.createTable("kubun_sync_checkpoints").ifNotExists().addColumn("id",t.text,e=>e.notNull().primaryKey()).addColumn("peer_did",t.text,e=>e.notNull()).addColumn("scope",t.text,e=>e.notNull()).addColumn("checkpoint_hlc",t.text,e=>e.notNull()).addColumn("updated_at",t.timestamp,e=>e.defaultTo(a.now).notNull()).execute()},async down(e){await e.schema.dropTable("kubun_sync_checkpoints").ifExists().execute(),await e.schema.dropTable("kubun_sync_peers").ifExists().execute(),await e.schema.dropTable("kubun_space_mls_state").ifExists().execute(),await e.schema.dropTable("kubun_catalogs").ifExists().execute(),await e.schema.dropTable("kubun_circle_members").ifExists().execute(),await e.schema.dropTable("kubun_circles").ifExists().execute(),await e.schema.dropTable("kubun_space_members").ifExists().execute(),await e.schema.dropTable("kubun_spaces").ifExists().execute()}}}}

package/lib/spaces/broadcast-codec.d.ts

@@ -1,3 +0,0 @@
-import type { SpaceBroadcastMessage } from './broadcast.js';
-export declare function serializeBroadcast(message: SpaceBroadcastMessage): Uint8Array;
-export declare function deserializeBroadcast(bytes: Uint8Array): SpaceBroadcastMessage;

package/lib/spaces/broadcast-service.d.ts

@@ -1,59 +0,0 @@
-import { EventEmitter } from '@enkaku/event';
-import type { Database } from '@kubun/db';
-import type { AbstractAdapter, AdapterTypes } from '@kubun/db-adapter';
-import type { Kysely } from 'kysely';
-import { type SpaceBroadcastMessage } from './broadcast.js';
-import { type SerializedGroupState } from './mls-state.js';
-export type BroadcastEvent = {
-    spaceID: string;
-    message: SpaceBroadcastMessage;
-    applied: boolean;
-};
-export type BroadcastServiceEvents = {
-    broadcast: BroadcastEvent;
-};
-export type SendBroadcastParams = {
-    spaceID: string;
-    message: SpaceBroadcastMessage;
-    groupState: SerializedGroupState;
-};
-export type SendBroadcastResult = {
-    encrypted: Uint8Array;
-    updatedGroupState: SerializedGroupState;
-};
-export type ReceiveBroadcastParams = {
-    spaceID: string;
-    encrypted: Uint8Array;
-    groupState: SerializedGroupState;
-};
-export type ReceiveBroadcastResult = {
-    message: SpaceBroadcastMessage;
-    applied: boolean;
-    updatedGroupState: SerializedGroupState;
-};
-/**
- * BroadcastService handles MLS encrypt/decrypt for space broadcasts
- * and applies received messages to the local DB.
- *
- * It does NOT manage hub transport directly -- callers are responsible
- * for sending encrypted bytes via hub and delivering received bytes
- * from hub. This keeps the service testable without hub infrastructure.
- */
-export type BroadcastServiceParams<T extends AdapterTypes = AdapterTypes> = {
-    kysely: Kysely<Database>;
-    adapter: AbstractAdapter<T>;
-};
-export declare class BroadcastService extends EventEmitter<BroadcastServiceEvents> {
-    #private;
-    constructor(params: BroadcastServiceParams);
-    /**
-     * Prepare a broadcast for sending: serialize + MLS encrypt.
-     * Returns encrypted bytes to send via hub and updated MLS state to persist.
-     */
-    prepareSend(params: SendBroadcastParams): Promise<SendBroadcastResult>;
-    /**
-     * Process a received broadcast: MLS decrypt + deserialize + apply to DB.
-     * Returns the decoded message, whether it was applied, and updated MLS state.
-     */
-    processReceived(params: ReceiveBroadcastParams): Promise<ReceiveBroadcastResult>;
-}