@weaveprotocol/core 0.1.2 → 0.2.1

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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"}

package/dist/node/carrier.js

@@ -4,16 +4,19 @@ import { createSigner } from '../schema/signer.js';
 import { createSchemaEngine } from '../schema/schema-engine.js';
 import { createSpaceManager, parseSpaceInvite } from '../space/space-manager.js';
 import { carriedRecord, CARRY_CLOSED_KEY, openPass, PASS_COLLECTION } from '../space/pass.js';
+import { matchesSubscription, readCarried, SUBSCRIPTION_COLLECTION } from '../space/notify.js';
 import { createLocalHub } from '../network/local-transport.js';
 import { meshFor, openSpaceRuntime } from './space-runtime.js';
 /**
- * Starts a carrier.
- * @throws When the carry invite is not a readable invite to a private space
+ * 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 async function createCarrierNode(config) {
+export async function createCarryCore(config) {
     const provider = config.provider ?? createP256Provider();
     const signer = createSigner(provider);
     const schemas = createSchemaEngine();
+    const { emit } = config;
     const did = publicKeyToDid(await provider.exportPublicKey(config.key.publicKey), P256_MULTICODEC);
     // It never writes, so it never needs a note; the session only names it on the wire.
     const session = { did, key: config.key.privateKey, proof: () => '' };
@@ -21,31 +24,19 @@ export async function createCarrierNode(config) {
     const podKeys = await provider.generateKeyPair();
     const podDid = publicKeyToDid(await provider.exportPublicKey(podKeys.publicKey), P256_MULTICODEC);
     const podSession = { did: podDid, key: podKeys.privateKey, proof: () => '' };
-    const listeners = new Set();
-    const emit = (event) => {
-        for (const listener of listeners) {
-            try {
-                listener(event);
-            }
-            catch (error) {
-                console.error('Error in carrier listener:', error);
-            }
-        }
-    };
-    // The carry space is joined like any space: it is the one key the carrier holds.
+    // Carry spaces are joined like any space: their keys are the only ones a carrier holds.
     const registryStore = await config.stores('registry');
     const registry = createSpaceManager(registryStore, provider);
-    const carrySpace = parseSpaceInvite(config.carry).space.id;
-    const carryRecord = (await registry.get(carrySpace)) ?? (await registry.join(config.carry));
-    if (carryRecord.space.visibility !== 'private' || !carryRecord.key)
-        throw new Error('That is not an invite to a carry space.');
     let closed = false;
     let podStores = null;
+    const carries = new Map();
     const carried = new Map();
     const mesh = meshFor(config.network, did);
-    const open = (record, stores, as, network, onEvent) => openSpaceRuntime({
-        // The carrier's own spaces meet through relays; its copy in the pod only over the local link.
+    const open = (record, stores, as, network, onEvent, onArrived) => openSpaceRuntime({
+        ...(onArrived ? { onArrived } : {}),
+        // Carried spaces meet through relays; the copy in the pod only over the local link.
         ...(as === session && mesh ? { mesh } : {}),
+        ...(as === session && config.mirror ? { mirrors: [config.mirror] } : {}),
         record,
         stores,
         provider,
@@ -80,9 +71,9 @@ export async function createCarrierNode(config) {
         const runtime = await open(record, config.stores, session, network, (event) => {
             if (event.type === 'records' || event.type === 'status')
                 emit({ type: 'status', space: spaceId });
-            if (event.type === 'records' && spaceId === carrySpace)
+            if (event.type === 'records' && carries.has(spaceId))
                 void refresh();
-        });
+        }, (version) => arrived(record, version));
         if (closed)
             return void (await runtime.close());
         const entry = { record, hub, runtime, pod: null };
@@ -90,6 +81,39 @@ export async function createCarrierNode(config) {
         if (podStores)
             entry.pod = openPod(record, hub, podStores);
     }
+    /** Records already said something about — one can arrive twice, from a peer and from the pod */
+    const noticed = new Set();
+    /** A record arrived in a space: does any subscription of an account carrying it ask about it? */
+    function arrived(record, version) {
+        const spaceId = record.space.id;
+        if (noticed.has(version.id) || carries.has(spaceId))
+            return;
+        for (const entry of carries.values()) {
+            if (!entry.wants.has(spaceId))
+                continue;
+            for (const [id, sub] of entry.subscriptions) {
+                if (!matchesSubscription(sub, spaceId, version, entry.account))
+                    continue;
+                noticed.add(version.id);
+                if (noticed.size > 1000)
+                    noticed.delete(noticed.values().next().value);
+                emit({
+                    type: 'notify',
+                    subscription: view(id, sub),
+                    space: { id: spaceId, name: record.space.name },
+                    record: { key: version.key, collection: version.collection, createdAt: version.createdAt },
+                });
+            }
+        }
+    }
+    const view = (id, sub) => ({
+        id,
+        label: sub.label,
+        collection: sub.collection,
+        spaces: sub.spaces === 'all' ? [] : sub.spaces.map((space) => carried.get(space)?.record.space.name ?? 'a space'),
+        ...(sub.open ? { open: sub.open } : {}),
+        paused: sub.paused,
+    });
     async function drop(spaceId) {
         const entry = carried.get(spaceId);
         if (!entry)
@@ -103,48 +127,119 @@ export async function createCarrierNode(config) {
     function refresh() {
         refreshing = refreshing.then(refreshOnce).catch((error) => {
             if (!closed)
-                console.error('Could not read the carry space:', error);
+                console.error('Could not read a carry space:', error);
         });
         return refreshing;
     }
     async function refreshOnce() {
-        const carryRuntime = carried.get(carrySpace)?.runtime;
-        if (!carryRuntime || closed)
-            return;
-        const records = (await carryRuntime.list({ collection: PASS_COLLECTION })).filter((record) => record.verified && record.root === config.account);
-        if (records.some((record) => record.key === CARRY_CLOSED_KEY)) {
-            emit({ type: 'closed' });
+        if (closed)
             return;
-        }
         const wanted = new Map();
-        for (const record of records) {
-            if (!record.key.startsWith('pass:'))
+        for (const [carrySpace, entry] of carries) {
+            const carryRuntime = carried.get(carrySpace)?.runtime;
+            if (!carryRuntime)
                 continue;
-            const pass = await openPass(record.body, provider);
-            if (pass && pass.space.id !== carrySpace)
-                wanted.set(pass.space.id, carriedRecord(pass));
+            const records = (await carryRuntime.list({ collection: PASS_COLLECTION })).filter((record) => record.verified && record.root === entry.account);
+            if (records.some((record) => record.key === CARRY_CLOSED_KEY)) {
+                entry.wants = new Set();
+                config.onClosed(carrySpace);
+                continue;
+            }
+            const subscriptions = new Map();
+            for (const record of await carryRuntime.list({ collection: SUBSCRIPTION_COLLECTION })) {
+                if (!record.verified || record.root !== entry.account)
+                    continue;
+                const sub = readCarried(record.body);
+                if (sub)
+                    subscriptions.set(record.key, sub);
+            }
+            entry.subscriptions = subscriptions;
+            const wants = new Set();
+            for (const record of records) {
+                if (!record.key.startsWith('pass:'))
+                    continue;
+                const pass = await openPass(record.body, provider);
+                if (!pass || carries.has(pass.space.id))
+                    continue;
+                wants.add(pass.space.id);
+                // Two accounts naming one space: a pass for a later key beats one for the space's first,
+                // since an account whose pass is behind just hasn't caught up yet.
+                const known = wanted.get(pass.space.id);
+                const later = (read) => !!read && read.did !== pass.space.readKey;
+                if (!known || (!later(known.read) && later(pass.read)))
+                    wanted.set(pass.space.id, carriedRecord(pass));
+            }
+            entry.wants = wants;
         }
         let changed = false;
         for (const [spaceId, record] of wanted) {
-            if (carried.has(spaceId))
+            const held = carried.get(spaceId);
+            if (held && held.record.read?.did === record.read?.did)
                 continue;
+            // The space's key changed: carried again, proving the new read key.
+            if (held)
+                await drop(spaceId);
             await carry(record);
             changed = true;
         }
         for (const spaceId of [...carried.keys()]) {
-            if (spaceId === carrySpace || wanted.has(spaceId))
+            if (carries.has(spaceId) || wanted.has(spaceId))
                 continue;
             await drop(spaceId);
+            await config.onRelease?.(spaceId).catch(() => { });
             changed = true;
         }
         if (changed)
             emit({ type: 'spaces' });
     }
-    await carry(carryRecord);
-    await refresh();
-    return Object.freeze({
+    return {
         did,
-        carrySpace,
+        podDid,
+        carried: carried,
+        carries: carries,
+        /**
+         * 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
+         */
+        async addCarry(account, invite) {
+            const carrySpace = parseSpaceInvite(invite).space.id;
+            const record = (await registry.get(carrySpace)) ?? (await registry.join(invite));
+            if (record.space.visibility !== 'private' || !record.key) {
+                await registry.remove(carrySpace);
+                throw new Error('That is not an invite to a carry space.');
+            }
+            if (!carries.has(carrySpace))
+                carries.set(carrySpace, { account, wants: new Set(), subscriptions: new Map() });
+            await carry(record);
+            await refresh();
+            return carrySpace;
+        },
+        /** Stops carrying for an account: its carry space, and every space nobody else still asks for */
+        async removeCarry(carrySpace) {
+            if (!carries.delete(carrySpace))
+                return;
+            await drop(carrySpace);
+            await registry.remove(carrySpace);
+            await config.onRelease?.(carrySpace).catch(() => { });
+            await refresh();
+        },
+        async setPod(stores) {
+            podStores = stores;
+            for (const entry of carried.values()) {
+                const was = entry.pod;
+                entry.pod = null;
+                await (await was?.catch(() => null))?.close();
+                if (stores)
+                    entry.pod = openPod(entry.record, entry.hub, stores);
+            }
+            emit({ type: 'spaces' });
+        },
+        async subscriptions() {
+            await refreshing;
+            return [...carries.values()].flatMap((entry) => [...entry.subscriptions].map(([id, sub]) => view(id, sub)));
+        },
         async spaces() {
             const found = [];
             for (const [spaceId, entry] of carried) {
@@ -153,7 +248,7 @@ export async function createCarrierNode(config) {
                     id: spaceId,
                     name: entry.record.space.name,
                     visibility: entry.record.space.visibility,
-                    carry: spaceId === carrySpace,
+                    carry: carries.has(spaceId),
                     connection: status.connection,
                     peers: status.peers.filter((peer) => peer !== podDid).length,
                     inPod: entry.pod !== null,
@@ -161,17 +256,48 @@ export async function createCarrierNode(config) {
             }
             return found;
         },
-        async usePod(stores) {
-            podStores = stores;
-            for (const entry of carried.values()) {
-                const was = entry.pod;
-                entry.pod = null;
-                await (await was?.catch(() => null))?.close();
-                if (stores)
-                    entry.pod = openPod(entry.record, entry.hub, stores);
-            }
-            emit({ type: 'spaces' });
+        async close() {
+            if (closed)
+                return;
+            closed = true;
+            await refreshing;
+            await Promise.all([...carried.keys()].map((spaceId) => drop(spaceId)));
+            await registryStore.close();
         },
+    };
+}
+/**
+ * Starts a carrier.
+ * @throws When the carry invite is not a readable invite to a private space
+ */
+export async function createCarrierNode(config) {
+    const listeners = new Set();
+    const emit = (event) => {
+        for (const listener of listeners) {
+            try {
+                listener(event);
+            }
+            catch (error) {
+                console.error('Error in carrier listener:', error);
+            }
+        }
+    };
+    const core = await createCarryCore({
+        key: config.key,
+        stores: config.stores,
+        ...(config.network ? { network: config.network } : {}),
+        ...(config.provider ? { provider: config.provider } : {}),
+        ...(config.watchIntervalMs !== undefined ? { watchIntervalMs: config.watchIntervalMs } : {}),
+        emit,
+        onClosed: () => emit({ type: 'closed' }),
+    });
+    const carrySpace = await core.addCarry(config.account, config.carry);
+    return Object.freeze({
+        did: core.did,
+        carrySpace,
+        spaces: core.spaces,
+        usePod: core.setPod,
+        subscriptions: core.subscriptions,
         subscribe(listener) {
             listeners.add(listener);
             return () => {
@@ -179,12 +305,7 @@ export async function createCarrierNode(config) {
             };
         },
         async close() {
-            if (closed)
-                return;
-            closed = true;
-            await refreshing;
-            await Promise.all([...carried.keys()].map((spaceId) => drop(spaceId)));
-            await registryStore.close();
+            await core.close();
             listeners.clear();
         },
     });

package/dist/node/carrier.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"copy.d.ts","sourceRoot":"","sources":["../../src/node/copy.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAKhD,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAC5B,QAAQ,CAAC,EAAE,EAAE,YAAY,CAAC;IAC1B,8EAA8E;IAC9E,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,yEAAyE;IACzE,QAAQ,CAAC,UAAU,CAAC,EAAE,UAAU,CAAC;IACjC,sDAAsD;IACtD,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CAC7D;AAED,MAAM,WAAW,UAAU;IACzB,uDAAuD;IACvD,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,kDAAkD;IAClD,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,oDAAoD;IACpD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAED;;;GAGG;AACH,wBAAsB,eAAe,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,UAAU,CAAC,CA0CpF"}
+{"version":3,"file":"copy.d.ts","sourceRoot":"","sources":["../../src/node/copy.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAKhD,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAC5B,QAAQ,CAAC,EAAE,EAAE,YAAY,CAAC;IAC1B,8EAA8E;IAC9E,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,yEAAyE;IACzE,QAAQ,CAAC,UAAU,CAAC,EAAE,UAAU,CAAC;IACjC,sDAAsD;IACtD,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CAC7D;AAED,MAAM,WAAW,UAAU;IACzB,uDAAuD;IACvD,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,kDAAkD;IAClD,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,oDAAoD;IACpD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAED;;;GAGG;AACH,wBAAsB,eAAe,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,UAAU,CAAC,CA4CpF"}

package/dist/node/copy.js

@@ -1,5 +1,5 @@
 import { createSpaceManager } from '../space/space-manager.js';
-import { deriveAccountRegistry } from '../space/account-registry.js';
+import { deriveAccountRegistry, deriveContactsSpace } from '../space/account-registry.js';
 import { createStorageProvider } from '../storage/storage-provider.js';
 /**
  * Copies every space an account holds, with its key and its records, into
@@ -10,6 +10,8 @@ export async function copyAccountData(params) {
     const toRegistryStore = await params.to('registry', { seal: true });
     const fromRegistry = createSpaceManager(fromRegistryStore);
     const toRegistry = createSpaceManager(toRegistryStore);
+    // The contacts space is copied like any other, but it is not one the person counts as theirs.
+    const contacts = params.accountKey ? (await deriveContactsSpace(params.accountKey, params.did)).space.id : null;
     let spacesAdded = 0;
     const spaceIds = [];
     for (const { space } of await fromRegistry.list()) {
@@ -18,7 +20,8 @@ export async function copyAccountData(params) {
             continue;
         // An invite carries exactly what a registry needs: the space, and its key.
         await toRegistry.join(await fromRegistry.createInvite(space.id, params.did));
-        spacesAdded++;
+        if (space.id !== contacts)
+            spacesAdded++;
     }
     if (params.accountKey)
         spaceIds.push((await deriveAccountRegistry(params.accountKey, params.did)).space.id);
@@ -30,7 +33,7 @@ export async function copyAccountData(params) {
             // Every version the source keeps — current, first, retained — goes
             // through the ordering rule on arrival, so the target ends up with what
             // it would have reached by syncing with the source.
-            const ids = new Set((await source.entries()).map((entry) => entry.value));
+            const ids = new Set(await source.versionIds());
             for (const id of ids) {
                 const held = await target.getExpression(id);
                 const expression = await source.getExpression(id);

package/dist/node/copy.js.map

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