@weaveprotocol/core 0.1.1 → 0.2.0

package/dist/network/multi-signaling.js

@@ -16,13 +16,18 @@
  *
  * Peers are announced once per room however many relays mention them, because a
  * duplicate announcement would have both sides opening a second connection.
+ *
+ * A room can name relays of its own: a space says where its members meet
+ * (`sys.relays`), so two people whose apps use different relays still find
+ * each other there. Those are joined for that room only, and dropped once no
+ * room names them.
  */
 import { createEmitter } from '../utils/events.js';
 import { createSignalingClient } from './signaling.js';
 /**
  * Creates a signaling client spanning several relays.
  *
- * @param urls The relays to use. One is fine; none is a programming error.
+ * @param urls The relays to use for every room. One is fine; none is a programming error.
  * @param did This peer's identifier
  * @returns A client with the same contract as a single-relay one
  */
@@ -30,7 +35,14 @@ export function createMultiSignalingClient(urls, did) {
     if (urls.length === 0) {
         throw new Error('At least one relay is needed to introduce peers.');
     }
-    const clients = urls.map((url) => createSignalingClient(url, did));
+    const defaults = new Set(urls);
+    const byUrl = new Map();
+    const clientList = () => [...byUrl.values()];
+    /** Which rooms each relay of a room's own was joined for */
+    const roomsOn = new Map();
+    /** Each room's own relays */
+    const extraOf = new Map();
+    let connecting = false;
     const { on, off, emit } = createEmitter();
     /** Which relays a peer has been seen on, so replies go back the same way. */
     const routes = new Map();
@@ -38,7 +50,7 @@ export function createMultiSignalingClient(urls, did) {
     const presence = new Map();
     /** TURN servers each relay offered, and when their passwords stop working */
     const turn = new Map();
-    const connectedCount = () => clients.filter((client) => client.isConnected()).length;
+    const connectedCount = () => clientList().filter((client) => client.isConnected()).length;
     /** Remembers that a peer is reachable through this relay. */
     const remember = (peer, client) => {
         (routes.get(peer) ?? routes.set(peer, new Set()).get(peer)).add(client);
@@ -48,9 +60,46 @@ export function createMultiSignalingClient(urls, did) {
         const known = [...(routes.get(peer) ?? [])].filter((client) => client.isConnected());
         // Nothing known yet — an answer to an offer that arrived before this client
         // saw the peer join. Shout on every relay rather than dropping it.
-        return known.length > 0 ? known : clients.filter((client) => client.isConnected());
+        return known.length > 0 ? known : clientList().filter((client) => client.isConnected());
+    };
+    /** A relay's client, made and wired the first time it is needed */
+    const clientFor = (url) => {
+        const held = byUrl.get(url);
+        if (held)
+            return held;
+        const client = createSignalingClient(url, did);
+        byUrl.set(url, client);
+        wire(client);
+        // One of a room's own, added while running: connected now, like the rest.
+        if (connecting)
+            void client.connect().catch(() => { });
+        return client;
+    };
+    /** Lets go of a room's own relay once no room names it */
+    const release = (url, room) => {
+        const client = byUrl.get(url);
+        if (!client)
+            return;
+        client.leave(room);
+        const rooms = roomsOn.get(url);
+        rooms?.delete(room);
+        if (defaults.has(url) || (rooms && rooms.size > 0))
+            return;
+        roomsOn.delete(url);
+        byUrl.delete(url);
+        turn.delete(client);
+        for (const seenBy of routes.values())
+            seenBy.delete(client);
+        for (const [where, seenBy] of presence) {
+            if (!seenBy.delete(client) || seenBy.size > 0)
+                continue;
+            presence.delete(where);
+            const space = where.indexOf(' ');
+            emit('peer-left', where.slice(space + 1), where.slice(0, space));
+        }
+        client.disconnect();
     };
-    for (const client of clients) {
+    function wire(client) {
         client.on('peer-joined', (peer, room) => {
             remember(peer, client);
             if (peer === did)
@@ -91,32 +140,55 @@ export function createMultiSignalingClient(urls, did) {
         // worth surfacing on its own. Total failure shows up through `connect`.
         client.on('error', () => { });
     }
+    for (const url of defaults)
+        clientFor(url);
     /**
      * Connects to every relay, succeeding if any of them answers.
      * @returns Once at least one relay is usable
      */
     const connect = async () => {
-        const results = await Promise.allSettled(clients.map((client) => client.connect()));
+        connecting = true;
+        const all = [...byUrl.keys()];
+        const results = await Promise.allSettled(clientList().map((client) => client.connect()));
         if (results.some((result) => result.status === 'fulfilled'))
             return;
-        throw new Error(`None of the ${clients.length} configured relays could be reached: ${urls.join(', ')}`);
+        throw new Error(`None of the ${all.length} relays could be reached: ${all.join(', ')}`);
     };
     return Object.freeze({
         connect,
         disconnect: () => {
-            for (const client of clients)
+            connecting = false;
+            for (const client of clientList())
                 client.disconnect();
+            // A room's own relays are made again when a room names them.
+            for (const url of [...byUrl.keys()])
+                if (!defaults.has(url))
+                    byUrl.delete(url);
+            roomsOn.clear();
+            extraOf.clear();
             routes.clear();
             presence.clear();
             turn.clear();
         },
-        join: (room) => {
-            for (const client of clients)
-                client.join(room);
+        join: (room, relays = []) => {
+            const own = new Set(relays.filter((url) => !defaults.has(url)));
+            for (const url of extraOf.get(room) ?? [])
+                if (!own.has(url))
+                    release(url, room);
+            extraOf.set(room, own);
+            for (const url of defaults)
+                clientFor(url).join(room);
+            for (const url of own) {
+                (roomsOn.get(url) ?? roomsOn.set(url, new Set()).get(url)).add(room);
+                clientFor(url).join(room);
+            }
         },
         leave: (room) => {
-            for (const client of clients)
-                client.leave(room);
+            for (const url of defaults)
+                byUrl.get(url)?.leave(room);
+            for (const url of extraOf.get(room) ?? [])
+                release(url, room);
+            extraOf.delete(room);
             for (const where of presence.keys())
                 if (where.startsWith(`${room} `))
                     presence.delete(where);
@@ -126,7 +198,7 @@ export function createMultiSignalingClient(urls, did) {
                 client.signal(kind, target, payload);
         },
         requestIce: () => {
-            for (const client of clients)
+            for (const client of clientList())
                 if (client.isConnected())
                     client.requestIce();
         },

package/dist/network/multi-signaling.js.map

@@ -1 +1 @@
-{"version":3,"file":"multi-signaling.js","sourceRoot":"","sources":["../../src/network/multi-signaling.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"multi-signaling.js","sourceRoot":"","sources":["../../src/network/multi-signaling.ts"],"names":[],"mappings":"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"}

package/dist/network/peer-auth.d.ts

@@ -24,6 +24,16 @@
  * it, and a host that cannot read the space checks readers exactly as a
  * member's own node does.
  *
+ * **A private space's key changes** when someone is removed (`sys.key`), and
+ * with it the read key. A reader proves the one the space names now. One
+ * that was offline when it changed still holds only an older one: it proves
+ * that, and sends its note — the delegation from its account — sealed with
+ * the older space key, so only those who could read the space then can open
+ * it. A peer holding that key opens the note and lets it in if its account is
+ * still a member. Someone removed holds the older key too, but is no member.
+ * A peer without any key of the space's (a host) takes the current read key
+ * only.
+ *
  * The node signs with **its own key**, the one its DID names. That proves the
  * welcome comes from the node that sent the challenge; which node to trust is
  * the client's choice of URL. Naming the node in the client's signature keeps
@@ -34,7 +44,39 @@ import type { CryptoProvider } from '../types.js';
 export interface HelloProof {
     readonly sig: string;
     readonly read?: string;
+    /** The read key that signed `read`, when it is not the one the space names now */
+    readonly readKey?: string;
+    /** Its note, sealed with the space key behind `readKey` — for a reader that may be behind */
+    readonly member?: string;
+}
+/**
+ * Who may read a private space, as one side of a connection knows it — asked
+ * at every handshake, since the space's key can change while it is open.
+ */
+export interface ReadAccess {
+    /** The read key this side proves with, or null when it holds none */
+    key(): Promise<{
+        readonly did: string;
+        readonly privateKey: CryptoKey;
+    } | null>;
+    /** The read key every reader must prove, as the space names it now */
+    current(): string;
+    /**
+     * This side's note, sealed with the space key behind the read key it
+     * proves with — sent along when that may not be the current one.
+     */
+    membership?(): Promise<string | null>;
+    /** Whether a peer proving an older read key, with this sealed note, is still a member */
+    admits?(peerDid: string, readKey: string, membership: unknown): Promise<boolean>;
 }
+/** What a caller may pass for a space's read access: the full thing, or a fixed key pair and the public half it must match */
+export type ReadAccessInput = ReadAccess | {
+    readonly key: {
+        readonly privateKey: CryptoKey;
+        readonly did?: string;
+    } | null;
+    readonly publicDid: string;
+};
 /** The connecting side: proves who it is and that it may read, and checks the node's welcome. */
 export interface ClientAuth {
     hello(clientDid: string, nodeDid: string, nodeNonce: string): Promise<HelloProof>;
@@ -51,30 +93,27 @@ export declare function peerNonce(): string;
  * The client side.
  * @param spaceId The space — bound into every signature, so a proof for one space is useless in another
  * @param session This side's DID and the key it names
- * @param readKey In a private space, the space's read key (`deriveReadKey`); null in a public one
+ * @param read In a private space, how this side proves it may read — or just the read key (`deriveReadKey`); null in a public one
  */
 export declare function createClientAuth(spaceId: string, session: {
     readonly did: string;
     readonly key: CryptoKey;
-}, readKey: {
+}, read: ReadAccess | {
     readonly privateKey: CryptoKey;
 } | null, provider: CryptoProvider): ClientAuth;
 /**
- * The node side. Holds no secret of the space's.
- * @param readKey In a private space, its public read key, from the space itself; null in a public one
+ * The node side. Needs no secret of the space's.
+ * @param read In a private space, who may read it — or just its public read key; null in a public one
  * @param nodeKey The private key of the DID the node introduces itself as
  */
-export declare function createServerAuth(spaceId: string, readKey: string | null, nodeKey: CryptoKey, provider: CryptoProvider): ServerAuth;
+export declare function createServerAuth(spaceId: string, read: ReadAccess | string | null, nodeKey: CryptoKey, provider: CryptoProvider): ServerAuth;
 /** The fingerprints of one connection's two ends, as this side sees them */
 export interface ChannelBinding {
     readonly local: string;
     readonly remote: string;
 }
-/** What one side sends to prove itself */
-export interface MeshProof {
-    readonly sig: string;
-    readonly read?: string;
-}
+/** What one side sends to prove itself — as a client's hello */
+export type MeshProof = HelloProof;
 /** Proving who you are to a peer — and, in a private space, that you may read it. */
 export interface MeshAuth {
     prove(peerDid: string, peerNonce: string, binding: ChannelBinding | null): Promise<MeshProof>;
@@ -89,10 +128,5 @@ export interface MeshAuth {
 export declare function createMeshAuth(spaceId: string, session: {
     readonly did: string;
     readonly key: CryptoKey;
-}, read: {
-    readonly key: {
-        readonly privateKey: CryptoKey;
-    } | null;
-    readonly publicDid: string;
-} | null, provider: CryptoProvider): MeshAuth;
+}, read: ReadAccessInput | null, provider: CryptoProvider): MeshAuth;
 //# sourceMappingURL=peer-auth.d.ts.map

package/dist/network/peer-auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"peer-auth.d.ts","sourceRoot":"","sources":["../../src/network/peer-auth.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAIlD,oGAAoG;AACpG,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,iGAAiG;AACjG,MAAM,WAAW,UAAU;IACzB,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IAClF,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACpF;AAED,sEAAsE;AACtE,MAAM,WAAW,UAAU;IACzB,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACpG,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAChE;AAED,yCAAyC;AACzC,wBAAgB,SAAS,IAAI,MAAM,CAElC;AAiBD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAA;CAAE,EAC1D,OAAO,EAAE;IAAE,QAAQ,CAAC,UAAU,EAAE,SAAS,CAAA;CAAE,GAAG,IAAI,EAClD,QAAQ,EAAE,cAAc,GACvB,UAAU,CAWZ;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,cAAc,GAAG,UAAU,CAYlI;AA0BD,4EAA4E;AAC5E,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAED,0CAA0C;AAC1C,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,qFAAqF;AACrF,MAAM,WAAW,QAAQ;IACvB,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IAC9F,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,IAAI,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC5G;AAKD;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAA;CAAE,EAC1D,IAAI,EAAE;IAAE,QAAQ,CAAC,GAAG,EAAE;QAAE,QAAQ,CAAC,UAAU,EAAE,SAAS,CAAA;KAAE,GAAG,IAAI,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,EACpG,QAAQ,EAAE,cAAc,GACvB,QAAQ,CAkBV"}
+{"version":3,"file":"peer-auth.d.ts","sourceRoot":"","sources":["../../src/network/peer-auth.ts"],"names":[],"mappings":"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"}

package/dist/network/peer-auth.js

@@ -1,5 +1,34 @@
 import { base64UrlDecode, base64UrlEncode, utf8Encode } from '../utils/encoding.js';
 import { didToPublicKey } from '../identity/did.js';
+function readAccessOf(read) {
+    if (!read)
+        return null;
+    if ('current' in read)
+        return read;
+    const { key, publicDid } = read;
+    return { key: async () => (key ? { did: key.did ?? publicDid, privateKey: key.privateKey } : null), current: () => publicDid };
+}
+/** Signs `label` as a reader: with the read key, saying which one when it is not the current one, and the sealed note then */
+async function proveRead(access, label, provider) {
+    const key = await access.key();
+    if (!key)
+        return null;
+    const read = base64UrlEncode(await provider.sign(key.privateKey, label));
+    if (key.did === access.current())
+        return { read };
+    const member = (await access.membership?.()) ?? null;
+    return { read, readKey: key.did, ...(member ? { member } : {}) };
+}
+/** Whether a proof shows a reader: the current read key, or an older one with a note from someone still a member */
+async function checkRead(access, peerDid, label, proof, provider) {
+    const current = access.current();
+    const claimed = typeof proof.readKey === 'string' ? proof.readKey : current;
+    if (!claimed.startsWith('did:key:') || !(await verifyBy(provider, claimed, proof.read, label)))
+        return false;
+    if (claimed === current)
+        return true;
+    return access.admits ? access.admits(peerDid, claimed, proof.member) : false;
+}
 /** A fresh random nonce, as a string. */
 export function peerNonce() {
     return base64UrlEncode(globalThis.crypto.getRandomValues(new Uint8Array(16)));
@@ -21,14 +50,19 @@ async function verifyBy(provider, did, sig, data) {
  * The client side.
  * @param spaceId The space — bound into every signature, so a proof for one space is useless in another
  * @param session This side's DID and the key it names
- * @param readKey In a private space, the space's read key (`deriveReadKey`); null in a public one
+ * @param read In a private space, how this side proves it may read — or just the read key (`deriveReadKey`); null in a public one
  */
-export function createClientAuth(spaceId, session, readKey, provider) {
+export function createClientAuth(spaceId, session, read, provider) {
+    // A bare key pair proves itself as whatever the node names now.
+    const access = !read ? null : 'current' in read ? read : { key: async () => ({ did: '', privateKey: read.privateKey }), current: () => '' };
     return Object.freeze({
         async hello(clientDid, nodeDid, nodeNonce) {
             const label = helloLabel(spaceId, clientDid, nodeDid, nodeNonce);
             const sig = base64UrlEncode(await provider.sign(session.key, label));
-            return readKey ? { sig, read: base64UrlEncode(await provider.sign(readKey.privateKey, label)) } : { sig };
+            if (!access)
+                return { sig };
+            const proof = await proveRead(access, label, provider);
+            return proof ? { sig, ...proof } : { sig };
         },
         checkWelcome(nodeDid, clientNonce, sig) {
             return verifyBy(provider, nodeDid, sig, welcomeLabel(spaceId, nodeDid, clientNonce));
@@ -36,18 +70,19 @@ export function createClientAuth(spaceId, session, readKey, provider) {
     });
 }
 /**
- * The node side. Holds no secret of the space's.
- * @param readKey In a private space, its public read key, from the space itself; null in a public one
+ * The node side. Needs no secret of the space's.
+ * @param read In a private space, who may read it — or just its public read key; null in a public one
  * @param nodeKey The private key of the DID the node introduces itself as
  */
-export function createServerAuth(spaceId, readKey, nodeKey, provider) {
+export function createServerAuth(spaceId, read, nodeKey, provider) {
+    const access = read === null ? null : typeof read === 'string' ? { key: async () => null, current: () => read } : read;
     return Object.freeze({
         async checkHello(clientDid, nodeDid, nodeNonce, proof) {
-            const { sig, read } = (proof ?? {});
+            const given = (proof ?? {});
             const label = helloLabel(spaceId, clientDid, nodeDid, nodeNonce);
-            if (!clientDid.startsWith('did:key:') || !(await verifyBy(provider, clientDid, sig, label)))
+            if (!clientDid.startsWith('did:key:') || !(await verifyBy(provider, clientDid, given.sig, label)))
                 return false;
-            return readKey ? verifyBy(provider, readKey, read, label) : true;
+            return access ? checkRead(access, clientDid, label, given, provider) : true;
         },
         async welcome(nodeDid, clientNonce) {
             return base64UrlEncode(await provider.sign(nodeKey, welcomeLabel(spaceId, nodeDid, clientNonce)));
@@ -62,24 +97,26 @@ const meshLabel = (spaceId, prover, verifier, nonce, proverCert, verifierCert) =
  * @param read In a private space: the read key to prove with, and the public half the space names to check others against
  */
 export function createMeshAuth(spaceId, session, read, provider) {
+    const access = readAccessOf(read);
     return Object.freeze({
         async prove(peerDid, peerNonce, binding) {
             const label = meshLabel(spaceId, session.did, peerDid, peerNonce, binding?.local ?? '', binding?.remote ?? '');
             const sig = base64UrlEncode(await provider.sign(session.key, label));
-            if (!read)
+            if (!access)
                 return { sig };
+            const proof = await proveRead(access, label, provider);
             // A node without the space's key cannot prove it may read — and should not be served.
-            if (!read.key)
+            if (!proof)
                 throw new Error('This node cannot read the space, so it cannot join its peers');
-            return { sig, read: base64UrlEncode(await provider.sign(read.key.privateKey, label)) };
+            return { sig, ...proof };
         },
         async check(peerDid, ourNonce, binding, proof) {
-            const { sig, read: readSig } = (proof ?? {});
+            const given = (proof ?? {});
             // What they signed, seen from this end: their certificate is our remote one.
             const label = meshLabel(spaceId, peerDid, session.did, ourNonce, binding?.remote ?? '', binding?.local ?? '');
-            if (!peerDid.startsWith('did:key:') || !(await verifyBy(provider, peerDid, sig, label)))
+            if (!peerDid.startsWith('did:key:') || !(await verifyBy(provider, peerDid, given.sig, label)))
                 return false;
-            return read ? verifyBy(provider, read.publicDid, readSig, label) : true;
+            return access ? checkRead(access, peerDid, label, given, provider) : true;
         },
     });
 }

package/dist/network/peer-auth.js.map

@@ -1 +1 @@
-{"version":3,"file":"peer-auth.js","sourceRoot":"","sources":["../../src/network/peer-auth.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"peer-auth.js","sourceRoot":"","sources":["../../src/network/peer-auth.ts"],"names":[],"mappings":"AA0CA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACpF,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAmCpD,SAAS,YAAY,CAAC,IAA4B;IAChD,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IACvB,IAAI,SAAS,IAAI,IAAI;QAAE,OAAO,IAAI,CAAC;IACnC,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IAChC,OAAO,EAAE,GAAG,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,SAAS,EAAE,UAAU,EAAE,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,SAAS,EAAE,CAAC;AACjI,CAAC;AAED,8HAA8H;AAC9H,KAAK,UAAU,SAAS,CAAC,MAAkB,EAAE,KAAiB,EAAE,QAAwB;IACtF,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,GAAG,EAAE,CAAC;IAC/B,IAAI,CAAC,GAAG;QAAE,OAAO,IAAI,CAAC;IACtB,MAAM,IAAI,GAAG,eAAe,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC;IACzE,IAAI,GAAG,CAAC,GAAG,KAAK,MAAM,CAAC,OAAO,EAAE;QAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAClD,MAAM,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC;IACrD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;AACnE,CAAC;AAED,oHAAoH;AACpH,KAAK,UAAU,SAAS,CAAC,MAAkB,EAAE,OAAe,EAAE,KAAiB,EAAE,KAA0B,EAAE,QAAwB;IACnI,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;IACjC,MAAM,OAAO,GAAG,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;IAC5E,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,MAAM,QAAQ,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IAC7G,IAAI,OAAO,KAAK,OAAO;QAAE,OAAO,IAAI,CAAC;IACrC,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AAC/E,CAAC;AAcD,yCAAyC;AACzC,MAAM,UAAU,SAAS;IACvB,OAAO,eAAe,CAAC,UAAU,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAChF,CAAC;AAED,MAAM,UAAU,GAAG,CAAC,OAAe,EAAE,SAAiB,EAAE,OAAe,EAAE,KAAa,EAAE,EAAE,CACxF,UAAU,CAAC,wBAAwB,OAAO,IAAI,SAAS,IAAI,OAAO,IAAI,KAAK,EAAE,CAAC,CAAC;AACjF,MAAM,YAAY,GAAG,CAAC,OAAe,EAAE,OAAe,EAAE,KAAa,EAAE,EAAE,CACvE,UAAU,CAAC,wBAAwB,OAAO,IAAI,OAAO,IAAI,KAAK,EAAE,CAAC,CAAC;AAEpE,KAAK,UAAU,QAAQ,CAAC,QAAwB,EAAE,GAAW,EAAE,GAAY,EAAE,IAAgB;IAC3F,IAAI,OAAO,GAAG,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC1C,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,eAAe,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,cAAc,CAAC,CAAC;QACrF,OAAO,MAAM,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,eAAe,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;IACtE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,gBAAgB,CAC9B,OAAe,EACf,OAA0D,EAC1D,IAA4D,EAC5D,QAAwB;IAExB,gEAAgE;IAChE,MAAM,MAAM,GAAsB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;IAC/J,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,KAAK,CAAC,KAAK,CAAC,SAAiB,EAAE,OAAe,EAAE,SAAiB;YAC/D,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;YACjE,MAAM,GAAG,GAAG,eAAe,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;YACrE,IAAI,CAAC,MAAM;gBAAE,OAAO,EAAE,GAAG,EAAE,CAAC;YAC5B,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;YACvD,OAAO,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC;QAC7C,CAAC;QACD,YAAY,CAAC,OAAe,EAAE,WAAmB,EAAE,GAAY;YAC7D,OAAO,QAAQ,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,EAAE,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC;QACvF,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAC,OAAe,EAAE,IAAgC,EAAE,OAAkB,EAAE,QAAwB;IAC9H,MAAM,MAAM,GAAsB,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAC1I,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,KAAK,CAAC,UAAU,CAAC,SAAiB,EAAE,OAAe,EAAE,SAAiB,EAAE,KAAc;YACpF,MAAM,KAAK,GAAG,CAAC,KAAK,IAAI,EAAE,CAAwB,CAAC;YACnD,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;YACjE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,MAAM,QAAQ,CAAC,QAAQ,EAAE,SAAS,EAAE,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;gBAAE,OAAO,KAAK,CAAC;YAChH,OAAO,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC9E,CAAC;QACD,KAAK,CAAC,OAAO,CAAC,OAAe,EAAE,WAAmB;YAChD,OAAO,eAAe,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;QACpG,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAyCD,MAAM,SAAS,GAAG,CAAC,OAAe,EAAE,MAAc,EAAE,QAAgB,EAAE,KAAa,EAAE,UAAkB,EAAE,YAAoB,EAAE,EAAE,CAC/H,UAAU,CAAC,iBAAiB,OAAO,IAAI,MAAM,IAAI,QAAQ,IAAI,KAAK,IAAI,UAAU,IAAI,YAAY,EAAE,CAAC,CAAC;AAEtG;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAC5B,OAAe,EACf,OAA0D,EAC1D,IAA4B,EAC5B,QAAwB;IAExB,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IAClC,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,KAAK,CAAC,KAAK,CAAC,OAAe,EAAE,SAAiB,EAAE,OAA8B;YAC5E,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,IAAI,EAAE,EAAE,OAAO,EAAE,MAAM,IAAI,EAAE,CAAC,CAAC;YAC/G,MAAM,GAAG,GAAG,eAAe,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;YACrE,IAAI,CAAC,MAAM;gBAAE,OAAO,EAAE,GAAG,EAAE,CAAC;YAC5B,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;YACvD,sFAAsF;YACtF,IAAI,CAAC,KAAK;gBAAE,MAAM,IAAI,KAAK,CAAC,8DAA8D,CAAC,CAAC;YAC5F,OAAO,EAAE,GAAG,EAAE,GAAG,KAAK,EAAE,CAAC;QAC3B,CAAC;QACD,KAAK,CAAC,KAAK,CAAC,OAAe,EAAE,QAAgB,EAAE,OAA8B,EAAE,KAAc;YAC3F,MAAM,KAAK,GAAG,CAAC,KAAK,IAAI,EAAE,CAAwB,CAAC;YACnD,6EAA6E;YAC7E,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,IAAI,EAAE,EAAE,OAAO,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;YAC9G,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,MAAM,QAAQ,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;gBAAE,OAAO,KAAK,CAAC;YAC5G,OAAO,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC5E,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}

package/dist/node/carrier.d.ts

@@ -22,7 +22,12 @@
  * registry are never opened.
  */
 import type { CryptoProvider } from '../types.js';
+import { type SpaceRecord } from '../space/space-manager.js';
+import { type CarriedSubscription } from '../space/notify.js';
+import { type LocalHub } from '../network/local-transport.js';
+import { type SpaceRuntime } from './space-runtime.js';
 import type { StoreFactory } from './stores.js';
+import type { BlobStore } from '../storage/blob-store.js';
 import type { ConnectionState, NodeNetworkConfig } from './types.js';
 export interface CarrierConfig {
     /** Its own key — who it is to peers. Never the account's. */
@@ -63,7 +68,34 @@ export type CarrierEvent =
 /** The account stopped using this carrier: forget everything */
  | {
     readonly type: 'closed';
+}
+/**
+ * A record arrived that one of the account's subscriptions asks about. Only
+ * what the carrier can see: which subscription, which space, which record.
+ */
+ | {
+    readonly type: 'notify';
+    readonly subscription: CarriedSubscriptionView;
+    readonly space: {
+        readonly id: string;
+        readonly name: string;
+    };
+    readonly record: {
+        readonly key: string;
+        readonly collection: string;
+        readonly createdAt: string;
+    };
 };
+/** A subscription as the carrier holds it: the person's label, what it looks at, where a click goes */
+export interface CarriedSubscriptionView {
+    readonly id: string;
+    readonly label: string;
+    readonly collection: string;
+    /** The spaces it looks at, by name; empty for every space */
+    readonly spaces: ReadonlyArray<string>;
+    readonly open?: string;
+    readonly paused: boolean;
+}
 export interface CarrierNode {
     readonly did: string;
     /** The carry space's id */
@@ -74,12 +106,67 @@ export interface CarrierNode {
      * data path in it. Null stops writing there; the carrier's own copy goes on.
      */
     usePod(stores: StoreFactory | null): Promise<void>;
+    /** The account's subscriptions, as this carrier holds them */
+    subscriptions(): Promise<ReadonlyArray<CarriedSubscriptionView>>;
     subscribe(listener: (event: CarrierEvent) => void): () => void;
     close(): Promise<void>;
 }
+interface Carried {
+    readonly record: SpaceRecord;
+    readonly hub: LocalHub;
+    readonly runtime: SpaceRuntime;
+    pod: Promise<SpaceRuntime> | null;
+}
+/** An account's carry space, as a carrying node holds it */
+interface Carry {
+    readonly account: string;
+    /** The spaces its passes named last time they were read */
+    wants: ReadonlySet<string>;
+    /** Its subscriptions, by key, as last read */
+    subscriptions: ReadonlyMap<string, CarriedSubscription>;
+}
+export interface CarryCoreConfig {
+    readonly key: CryptoKeyPair;
+    readonly stores: StoreFactory;
+    readonly network?: NodeNetworkConfig;
+    readonly provider?: CryptoProvider;
+    readonly watchIntervalMs?: number;
+    readonly emit: (event: CarrierEvent) => void;
+    /** An account wrote `carry:closed` into its carry space: it stopped using this node */
+    readonly onClosed: (carrySpace: string) => void;
+    /** A file store every carried space is also kept in — a host's bucket */
+    readonly mirror?: BlobStore;
+    /** A space nobody asks for any more was let go — not one opened again after a key change */
+    readonly onRelease?: (spaceId: string) => Promise<void>;
+}
+/**
+ * What a carrier and a host share: carry spaces — one per account it carries
+ * for — and every space their passes name, each held once however many
+ * accounts ask for it.
+ */
+export declare function createCarryCore(config: CarryCoreConfig): Promise<{
+    did: string;
+    podDid: string;
+    carried: ReadonlyMap<string, Carried>;
+    carries: ReadonlyMap<string, Carry>;
+    /**
+     * Starts carrying for an account: joins its carry space and every space
+     * its passes name.
+     * @returns The carry space's id
+     * @throws When the invite is not a readable invite to a private space
+     */
+    addCarry(account: string, invite: string): Promise<string>;
+    /** Stops carrying for an account: its carry space, and every space nobody else still asks for */
+    removeCarry(carrySpace: string): Promise<void>;
+    setPod(stores: StoreFactory | null): Promise<void>;
+    subscriptions(): Promise<ReadonlyArray<CarriedSubscriptionView>>;
+    spaces(): Promise<ReadonlyArray<CarriedSpace>>;
+    close(): Promise<void>;
+}>;
 /**
  * Starts a carrier.
  * @throws When the carry invite is not a readable invite to a private space
  */
 export declare function createCarrierNode(config: CarrierConfig): Promise<CarrierNode>;
+export {};
 //# sourceMappingURL=carrier.d.ts.map

package/dist/node/carrier.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"carrier.d.ts","sourceRoot":"","sources":["../../src/node/carrier.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AASlD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,KAAK,EAAE,eAAe,EAAa,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAEhF,MAAM,WAAW,aAAa;IAC5B,6DAA6D;IAC7D,QAAQ,CAAC,GAAG,EAAE,aAAa,CAAC;IAC5B,sEAAsE;IACtE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,8CAA8C;IAC9C,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,0CAA0C;IAC1C,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,OAAO,CAAC,EAAE,iBAAiB,CAAC;IACrC,QAAQ,CAAC,QAAQ,CAAC,EAAE,cAAc,CAAC;IACnC,+EAA+E;IAC/E,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;CACnC;AAED,qDAAqD;AACrD,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,UAAU,EAAE,QAAQ,GAAG,SAAS,CAAC;IAC1C,8DAA8D;IAC9D,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,UAAU,EAAE,eAAe,CAAC;IACrC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,mDAAmD;IACnD,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,MAAM,YAAY;AACtB,wCAAwC;AACtC;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAA;CAAE;AAC7B,0DAA0D;GACxD;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE;AACrD,gEAAgE;GAC9D;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC;AAEhC,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,2BAA2B;IAC3B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,MAAM,IAAI,OAAO,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,CAAC;IAC/C;;;OAGG;IACH,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACnD,SAAS,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;IAC/D,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AASD;;;GAGG;AACH,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,WAAW,CAAC,CAkLnF"}
+{"version":3,"file":"carrier.d.ts","sourceRoot":"","sources":["../../src/node/carrier.ts"],"names":[],"mappings":"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"}