@interop/was-client 0.21.0 → 0.23.0

package/dist/edv/recipients.d.ts

@@ -5,18 +5,18 @@
  * Recipient and key-epoch management for multi-recipient encrypted Collections:
  * initializing the first epoch, adding a reader (escrow -- history included),
  * and removing a reader (the full revoke-and-rotate procedure). Each operation
- * mutates a `CollectionEncryption` marker through the marker-store seam (see
- * `markerStore.ts`) -- the Collection Description's `encryption` member for the
- * `collection` sugar, or any explicit `store`, such as a marker hosted as a
- * plain JSON Resource -- and writes it back with a compare-and-swap
- * (`If-Match`), retrying on a concurrent change so two racing recipient edits
- * cannot clobber one another.
+ * mutates a `CollectionEncryption` descriptor through the descriptor-store seam
+ * (see `descriptorStore.ts`) -- the Collection Description's `encryption`
+ * member for the `collection` sugar, or any explicit `store`, such as a
+ * descriptor hosted as a plain JSON Resource -- and writes it back with a
+ * compare-and-swap (`If-Match`), retrying on a concurrent change so two racing
+ * recipient edits cannot clobber one another.
  *
  * The two axes stay separate and are both required to actually remove a reader:
  *
  * - **pull** -- the reader's server-side access. For a Collection this is the
  *   zcap the server checks at request time: revoking it stops the server
- *   serving that reader ciphertext. Immediate and total. A marker whose pull
+ *   serving that reader ciphertext. Immediate and total. A descriptor whose pull
  *   axis lives elsewhere (e.g. a DID document naming the readers) supplies a
  *   `pull` action instead of the default zcap revocation.
  * - **read** -- possession of an epoch key. Rotating the epoch means resources
@@ -33,7 +33,7 @@
 import type { IKeyAgreementKey } from '@interop/data-integrity-core';
 import type { Collection } from '../Collection.js';
 import type { Space } from '../Space.js';
-import type { MarkerStore } from './markerStore.js';
+import type { EncryptionDescriptorStore } from './descriptorStore.js';
 import type { CollectionEncryption, IDelegatedZcap } from '../types.js';
 import type { RecipientPublicKey } from './epochCrypto.js';
 export type { RecipientPublicKey } from './epochCrypto.js';
@@ -45,31 +45,41 @@ export interface OwnerKey {
     keyAgreementKey: IKeyAgreementKey;
 }
 /**
- * Initializes the first key epoch on a marker that has no epochs yet: mints a
- * fresh epoch key, wraps it to each initial recipient, and writes
- * `epochs: [epoch]` / `currentEpoch` back with a compare-and-swap. After this,
- * resources written by any recipient are encrypted under the epoch, and readers
- * unwrap it with their own key-agreement key.
+ * Initializes the first key epoch on a descriptor that has no epochs yet: mints
+ * a fresh epoch key, wraps it to each initial recipient, and writes `epochs:
+ * [epoch]` / `currentEpoch` back with a compare-and-swap. After this, resources
+ * written by any recipient are encrypted under the epoch, and readers unwrap it
+ * with their own key-agreement key.
  *
  * On the `collection` host the collection must already be declared encrypted
- * (its marker exists; this fills in the first epochs). On a store whose marker
- * host starts absent (e.g. `resourceMarkerStore`, whose roster resource does
- * not exist before the first init), the marker itself is created from scratch
- * with a create-if-absent guard (`If-None-Match: *`), so two racing first
- * inits cannot clobber one another.
+ * (its descriptor exists; this fills in the first epochs). On a store whose
+ * descriptor host starts absent (e.g. `resourceDescriptorStore`, whose roster
+ * resource does not exist before the first init), the descriptor itself is
+ * created from scratch with a create-if-absent guard (`If-None-Match: *`), so
+ * two racing first inits cannot clobber one another.
  *
  * @param options {object}
  * @param [options.collection] {Collection}   the (already encrypted) collection
- *   whose Description hosts the marker; exactly one of `collection` / `store`
- * @param [options.store] {MarkerStore}   an explicit marker store
+ *   whose Description hosts the descriptor; exactly one of `collection` /
+ *   `store`
+ * @param [options.store] {EncryptionDescriptorStore}   an explicit descriptor store
  * @param options.recipients {RecipientPublicKey[]}   the initial readers' public
  *   key-agreement keys (each `id` is the reader's `kid`)
- * @returns {Promise<CollectionEncryption>}   the new marker
+ * @param [options.epoch] {{ epochId: string, secret: Uint8Array }}   a
+ *   pre-minted first epoch to install instead of minting one -- for a caller
+ *   whose epoch key already exists (e.g. a per-user key being enrolled into
+ *   its wrap-set roster). The `epochId` must be the key's did:key and `secret`
+ *   its raw 32-byte private key, exactly what {@link mintEpoch} returns.
+ * @returns {Promise<CollectionEncryption>}   the new descriptor
  */
-export declare function initRecipients({ collection, store, recipients }: {
+export declare function initRecipients({ collection, store, recipients, epoch: premintedEpoch }: {
     collection?: Collection;
-    store?: MarkerStore;
+    store?: EncryptionDescriptorStore;
     recipients: RecipientPublicKey[];
+    epoch?: {
+        epochId: string;
+        secret: Uint8Array;
+    };
 }): Promise<CollectionEncryption>;
 /**
  * Adds a reader to a multi-recipient encrypted Collection. Escrow semantics: the
@@ -83,16 +93,16 @@ export declare function initRecipients({ collection, store, recipients }: {
  *
  * @param options {object}
  * @param [options.collection] {Collection}   the collection whose Description
- *   hosts the marker; exactly one of `collection` / `store`
- * @param [options.store] {MarkerStore}   an explicit marker store
+ *   hosts the descriptor; exactly one of `collection` / `store`
+ * @param [options.store] {EncryptionDescriptorStore}   an explicit descriptor store
  * @param options.recipient {RecipientPublicKey}   the new reader's public KAK
  * @param options.owner {OwnerKey}   the caller's own key-agreement key, to
  *   unwrap each epoch key for re-wrapping to the new reader
- * @returns {Promise<CollectionEncryption>}   the new marker
+ * @returns {Promise<CollectionEncryption>}   the new descriptor
  */
 export declare function addRecipient({ collection, store, recipient, owner }: {
     collection?: Collection;
-    store?: MarkerStore;
+    store?: EncryptionDescriptorStore;
     recipient: RecipientPublicKey;
     owner: OwnerKey;
 }): Promise<CollectionEncryption>;
@@ -128,8 +138,8 @@ export declare function addRecipient({ collection, store, recipient, owner }: {
  *
  * @param options {object}
  * @param [options.collection] {Collection}   the collection whose Description
- *   hosts the marker; exactly one of `collection` / `store`
- * @param [options.store] {MarkerStore}   an explicit marker store
+ *   hosts the descriptor; exactly one of `collection` / `store`
+ * @param [options.store] {EncryptionDescriptorStore}   an explicit descriptor store
  * @param [options.space] {Space}   the collection's Space, for the default
  *   pull axis (zcap revocation); required together with `revoke` unless a
  *   custom `pull` is supplied
@@ -149,11 +159,11 @@ export declare function addRecipient({ collection, store, recipient, owner }: {
  *   self-describing `did:key`. May resolve `null` to signal drop-this-kid:
  *   the rotation then excludes that entry from the fresh epoch instead of
  *   throwing (subject to the no-recipients-remaining guard).
- * @returns {Promise<CollectionEncryption>}   the new marker
+ * @returns {Promise<CollectionEncryption>}   the new descriptor
  */
 export declare function removeRecipient({ collection, store, space, recipientId, revoke, pull, resolveRecipientKey }: {
     collection?: Collection;
-    store?: MarkerStore;
+    store?: EncryptionDescriptorStore;
     space?: Space;
     recipientId: string;
     revoke?: IDelegatedZcap | IDelegatedZcap[];

package/dist/edv/recipients.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"recipients.d.ts","sourceRoot":"","sources":["../../src/edv/recipients.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAA;AACpE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAGxC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,KAAK,EACV,oBAAoB,EAEpB,cAAc,EACf,MAAM,aAAa,CAAA;AAQpB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AAE1D,YAAY,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AAE1D;;;GAGG;AACH,MAAM,WAAW,QAAQ;IACvB,eAAe,EAAE,gBAAgB,CAAA;CAClC;AAQD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAsB,cAAc,CAAC,EACnC,UAAU,EACV,KAAK,EACL,UAAU,EACX,EAAE;IACD,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,KAAK,CAAC,EAAE,WAAW,CAAA;IACnB,UAAU,EAAE,kBAAkB,EAAE,CAAA;CACjC,GAAG,OAAO,CAAC,oBAAoB,CAAC,CA6ChC;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAsB,YAAY,CAAC,EACjC,UAAU,EACV,KAAK,EACL,SAAS,EACT,KAAK,EACN,EAAE;IACD,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,KAAK,CAAC,EAAE,WAAW,CAAA;IACnB,SAAS,EAAE,kBAAkB,CAAA;IAC7B,KAAK,EAAE,QAAQ,CAAA;CAChB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAuDhC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsDG;AACH,wBAAsB,eAAe,CAAC,EACpC,UAAU,EACV,KAAK,EACL,KAAK,EACL,WAAW,EACX,MAAM,EACN,IAAI,EACJ,mBAAgD,EACjD,EAAE;IACD,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,KAAK,CAAC,EAAE,WAAW,CAAA;IACnB,KAAK,CAAC,EAAE,KAAK,CAAA;IACb,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,CAAC,EAAE,cAAc,GAAG,cAAc,EAAE,CAAA;IAC1C,IAAI,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1B,mBAAmB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAAA;CAC1E,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAgGhC"}
+{"version":3,"file":"recipients.d.ts","sourceRoot":"","sources":["../../src/edv/recipients.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAA;AACpE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAGxC,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAA;AACrE,OAAO,KAAK,EACV,oBAAoB,EAEpB,cAAc,EACf,MAAM,aAAa,CAAA;AAQpB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AAE1D,YAAY,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AAE1D;;;GAGG;AACH,MAAM,WAAW,QAAQ;IACvB,eAAe,EAAE,gBAAgB,CAAA;CAClC;AAQD;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAsB,cAAc,CAAC,EACnC,UAAU,EACV,KAAK,EACL,UAAU,EACV,KAAK,EAAE,cAAc,EACtB,EAAE;IACD,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,KAAK,CAAC,EAAE,yBAAyB,CAAA;IACjC,UAAU,EAAE,kBAAkB,EAAE,CAAA;IAChC,KAAK,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,UAAU,CAAA;KAAE,CAAA;CAChD,GAAG,OAAO,CAAC,oBAAoB,CAAC,CA8ChC;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAsB,YAAY,CAAC,EACjC,UAAU,EACV,KAAK,EACL,SAAS,EACT,KAAK,EACN,EAAE;IACD,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,KAAK,CAAC,EAAE,yBAAyB,CAAA;IACjC,SAAS,EAAE,kBAAkB,CAAA;IAC7B,KAAK,EAAE,QAAQ,CAAA;CAChB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAuDhC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsDG;AACH,wBAAsB,eAAe,CAAC,EACpC,UAAU,EACV,KAAK,EACL,KAAK,EACL,WAAW,EACX,MAAM,EACN,IAAI,EACJ,mBAAgD,EACjD,EAAE;IACD,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,KAAK,CAAC,EAAE,yBAAyB,CAAA;IACjC,KAAK,CAAC,EAAE,KAAK,CAAA;IACb,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,CAAC,EAAE,cAAc,GAAG,cAAc,EAAE,CAAA;IAC1C,IAAI,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1B,mBAAmB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAAA;CAC1E,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAgGhC"}

package/dist/edv/recipients.js

@@ -1,5 +1,5 @@
 import { PreconditionFailedError, ValidationError } from '../errors.js';
-import { collectionMarkerStore } from './markerStore.js';
+import { collectionDescriptorStore } from './descriptorStore.js';
 import { didKeyResolver, mintEpoch, unwrapEpochSecret, wrapEpochSecret } from './epochCrypto.js';
 import { computeEpochsMac } from './epochMac.js';
 /**
@@ -8,59 +8,66 @@ import { computeEpochsMac } from './epochMac.js';
  */
 const MAX_CAS_ATTEMPTS = 3;
 /**
- * Initializes the first key epoch on a marker that has no epochs yet: mints a
- * fresh epoch key, wraps it to each initial recipient, and writes
- * `epochs: [epoch]` / `currentEpoch` back with a compare-and-swap. After this,
- * resources written by any recipient are encrypted under the epoch, and readers
- * unwrap it with their own key-agreement key.
+ * Initializes the first key epoch on a descriptor that has no epochs yet: mints
+ * a fresh epoch key, wraps it to each initial recipient, and writes `epochs:
+ * [epoch]` / `currentEpoch` back with a compare-and-swap. After this, resources
+ * written by any recipient are encrypted under the epoch, and readers unwrap it
+ * with their own key-agreement key.
  *
  * On the `collection` host the collection must already be declared encrypted
- * (its marker exists; this fills in the first epochs). On a store whose marker
- * host starts absent (e.g. `resourceMarkerStore`, whose roster resource does
- * not exist before the first init), the marker itself is created from scratch
- * with a create-if-absent guard (`If-None-Match: *`), so two racing first
- * inits cannot clobber one another.
+ * (its descriptor exists; this fills in the first epochs). On a store whose
+ * descriptor host starts absent (e.g. `resourceDescriptorStore`, whose roster
+ * resource does not exist before the first init), the descriptor itself is
+ * created from scratch with a create-if-absent guard (`If-None-Match: *`), so
+ * two racing first inits cannot clobber one another.
  *
  * @param options {object}
  * @param [options.collection] {Collection}   the (already encrypted) collection
- *   whose Description hosts the marker; exactly one of `collection` / `store`
- * @param [options.store] {MarkerStore}   an explicit marker store
+ *   whose Description hosts the descriptor; exactly one of `collection` /
+ *   `store`
+ * @param [options.store] {EncryptionDescriptorStore}   an explicit descriptor store
  * @param options.recipients {RecipientPublicKey[]}   the initial readers' public
  *   key-agreement keys (each `id` is the reader's `kid`)
- * @returns {Promise<CollectionEncryption>}   the new marker
+ * @param [options.epoch] {{ epochId: string, secret: Uint8Array }}   a
+ *   pre-minted first epoch to install instead of minting one -- for a caller
+ *   whose epoch key already exists (e.g. a per-user key being enrolled into
+ *   its wrap-set roster). The `epochId` must be the key's did:key and `secret`
+ *   its raw 32-byte private key, exactly what {@link mintEpoch} returns.
+ * @returns {Promise<CollectionEncryption>}   the new descriptor
  */
-export async function initRecipients({ collection, store, recipients }) {
+export async function initRecipients({ collection, store, recipients, epoch: premintedEpoch }) {
     if (recipients.length === 0) {
         throw new ValidationError('initRecipients needs at least one recipient to wrap the epoch key to.');
     }
-    const { epochId, secret } = await mintEpoch();
+    const { epochId, secret } = premintedEpoch ?? (await mintEpoch());
     const epoch = {
         id: epochId,
         recipients: await Promise.all(recipients.map(recipient => wrapEpochSecret({ epochSecret: secret, recipient })))
     };
-    return casUpdateMarker({
-        store: markerStoreFor({ collection, store }),
-        // A store whose marker starts absent initializes from a bare `edv` marker
-        // (the create-if-absent branch); a Collection Description's marker always
-        // exists, so its adapter never reaches the seed.
+    return casUpdateDescriptor({
+        store: descriptorStoreFor({ collection, store }),
+        // A store whose descriptor starts absent initializes from a bare `edv`
+        // descriptor (the create-if-absent branch); a Collection Description's
+        // descriptor always exists, so its adapter never reaches the seed.
         seed: { scheme: 'edv' },
-        mutate: async (marker) => {
-            if (marker.epochs && marker.epochs.length > 0) {
+        mutate: async (descriptor) => {
+            if (descriptor.epochs && descriptor.epochs.length > 0) {
                 throw new ValidationError('This collection already has key epochs; use addRecipient to add a ' +
                     'reader instead of initRecipients.');
             }
-            // Declaring the first epochs, so stamp scheme version 1 when the marker
-            // does not already carry one, and authenticate the epoch configuration
-            // with a MAC keyed from this first epoch's secret (computed over the exact
-            // marker being written, since a CAS retry re-reads the marker).
+            // Declaring the first epochs, so stamp scheme version 1 when the
+            // descriptor does not already carry one, and authenticate the epoch
+            // configuration with a MAC keyed from this first epoch's secret (computed
+            // over the exact descriptor being written, since a CAS retry re-reads the
+            // descriptor).
             const next = {
-                ...marker,
-                version: marker.version ?? 1,
+                ...descriptor,
+                version: descriptor.version ?? 1,
                 epochs: [epoch],
                 currentEpoch: epochId
             };
             const epochsMac = await computeEpochsMac({
-                marker: next,
+                descriptor: next,
                 epochSecret: secret
             });
             return { ...next, epochsMac };
@@ -79,18 +86,18 @@ export async function initRecipients({ collection, store, recipients }) {
  *
  * @param options {object}
  * @param [options.collection] {Collection}   the collection whose Description
- *   hosts the marker; exactly one of `collection` / `store`
- * @param [options.store] {MarkerStore}   an explicit marker store
+ *   hosts the descriptor; exactly one of `collection` / `store`
+ * @param [options.store] {EncryptionDescriptorStore}   an explicit descriptor store
  * @param options.recipient {RecipientPublicKey}   the new reader's public KAK
  * @param options.owner {OwnerKey}   the caller's own key-agreement key, to
  *   unwrap each epoch key for re-wrapping to the new reader
- * @returns {Promise<CollectionEncryption>}   the new marker
+ * @returns {Promise<CollectionEncryption>}   the new descriptor
  */
 export async function addRecipient({ collection, store, recipient, owner }) {
-    return casUpdateMarker({
-        store: markerStoreFor({ collection, store }),
-        mutate: async (marker) => {
-            const epochs = marker.epochs;
+    return casUpdateDescriptor({
+        store: descriptorStoreFor({ collection, store }),
+        mutate: async (descriptor) => {
+            const epochs = descriptor.epochs;
             if (!epochs || epochs.length === 0) {
                 throw new ValidationError('Cannot addRecipient: this collection has no key epochs. Call ' +
                     'initRecipients first.');
@@ -126,7 +133,7 @@ export async function addRecipient({ collection, store, recipient, owner }) {
                     recipients: [...epoch.recipients, wrapped]
                 };
             }));
-            return { ...marker, epochs: nextEpochs };
+            return { ...descriptor, epochs: nextEpochs };
         }
     });
 }
@@ -162,8 +169,8 @@ export async function addRecipient({ collection, store, recipient, owner }) {
  *
  * @param options {object}
  * @param [options.collection] {Collection}   the collection whose Description
- *   hosts the marker; exactly one of `collection` / `store`
- * @param [options.store] {MarkerStore}   an explicit marker store
+ *   hosts the descriptor; exactly one of `collection` / `store`
+ * @param [options.store] {EncryptionDescriptorStore}   an explicit descriptor store
  * @param [options.space] {Space}   the collection's Space, for the default
  *   pull axis (zcap revocation); required together with `revoke` unless a
  *   custom `pull` is supplied
@@ -183,12 +190,12 @@ export async function addRecipient({ collection, store, recipient, owner }) {
  *   self-describing `did:key`. May resolve `null` to signal drop-this-kid:
  *   the rotation then excludes that entry from the fresh epoch instead of
  *   throwing (subject to the no-recipients-remaining guard).
- * @returns {Promise<CollectionEncryption>}   the new marker
+ * @returns {Promise<CollectionEncryption>}   the new descriptor
  */
 export async function removeRecipient({ collection, store, space, recipientId, revoke, pull, resolveRecipientKey = defaultResolveRecipientKey }) {
-    const markerStore = markerStoreFor({ collection, store });
+    const descriptorStore = descriptorStoreFor({ collection, store });
     // Resolve the pull axis up front, before any rotation, so a malformed call
-    // fails before the marker is mutated.
+    // fails before the descriptor is mutated.
     const pullAxis = resolvePullAxis({ space, revoke, pull });
     // 1. Read axis: mint a fresh epoch, wrap it to every remaining recipient,
     // append it, and repoint `currentEpoch` (compare-and-swap, retried on race).
@@ -196,10 +203,10 @@ export async function removeRecipient({ collection, store, space, recipientId, r
     // if the CAS keeps losing the race and throws, the reader is neither pulled
     // nor rotated, so `removeRecipient` is safely retryable to convergence.
     const { epochId, secret } = await mintEpoch();
-    const rotatedMarker = await casUpdateMarker({
-        store: markerStore,
-        mutate: async (marker) => {
-            const epochs = marker.epochs;
+    const rotatedDescriptor = await casUpdateDescriptor({
+        store: descriptorStore,
+        mutate: async (descriptor) => {
+            const epochs = descriptor.epochs;
             if (!epochs || epochs.length === 0) {
                 throw new ValidationError('Cannot removeRecipient: this collection has no key epochs.');
             }
@@ -209,7 +216,7 @@ export async function removeRecipient({ collection, store, space, recipientId, r
             // still present in that older epoch, so unioning would silently re-escrow
             // it into the fresh epoch and hand it back read access. Older epochs exist
             // only so existing readers can decrypt history.
-            const currentEpoch = epochs.find(epoch => epoch.id === marker.currentEpoch) ??
+            const currentEpoch = epochs.find(epoch => epoch.id === descriptor.currentEpoch) ??
                 epochs[epochs.length - 1];
             // Already excluded from the current epoch? A prior attempt's rotation
             // landed (its revoke step then failed transiently and the caller
@@ -250,15 +257,15 @@ export async function removeRecipient({ collection, store, space, recipientId, r
                 recipients: newRecipients
             };
             // Re-authenticate the epoch configuration under the NEW epoch's secret
-            // (the rotating caller just minted it), computed over the exact marker
-            // being written so a CAS retry re-MACs the re-read marker state.
+            // (the rotating caller just minted it), computed over the exact descriptor
+            // being written so a CAS retry re-MACs the re-read descriptor state.
             const next = {
-                ...marker,
+                ...descriptor,
                 epochs: [...epochs, newEpoch],
                 currentEpoch: epochId
             };
             const epochsMac = await computeEpochsMac({
-                marker: next,
+                descriptor: next,
                 epochSecret: secret
             });
             return { ...next, epochsMac };
@@ -267,7 +274,7 @@ export async function removeRecipient({ collection, store, space, recipientId, r
     // 2. Pull axis: withdraw the reader's server-side access AFTER the rotation
     // is durable -- the default zcap revocation, or the caller-supplied `pull`.
     await pullAxis();
-    return rotatedMarker;
+    return rotatedDescriptor;
 }
 /**
  * Resolves the pull axis of {@link removeRecipient} -- exactly one of the
@@ -327,65 +334,65 @@ async function defaultResolveRecipientKey(kid) {
     return { id: resolved.id, publicKeyMultibase: resolved.publicKeyMultibase };
 }
 /**
- * Resolves the marker store a recipient operation targets: the explicit
+ * Resolves the descriptor store a recipient operation targets: the explicit
  * `store`, or the Collection Description adapter over the `collection` sugar.
  * Exactly one of the two must be supplied.
  *
  * @param options {object}
  * @param [options.collection] {Collection}
- * @param [options.store] {MarkerStore}
- * @returns {MarkerStore}
+ * @param [options.store] {EncryptionDescriptorStore}
+ * @returns {EncryptionDescriptorStore}
  */
-function markerStoreFor({ collection, store }) {
+function descriptorStoreFor({ collection, store }) {
     if (collection !== undefined && store !== undefined) {
         throw new ValidationError('Pass either `collection` (the Collection Description hosts the ' +
-            'marker) or `store` (an explicit marker store), not both.');
+            'descriptor) or `store` (an explicit descriptor store), not both.');
     }
     if (store !== undefined) {
         return store;
     }
     if (collection !== undefined) {
-        return collectionMarkerStore({ collection });
+        return collectionDescriptorStore({ collection });
     }
-    throw new ValidationError('A recipient operation needs its marker host: pass `collection` or ' +
+    throw new ValidationError('A recipient operation needs its descriptor host: pass `collection` or ' +
         '`store`.');
 }
 /**
- * Reads the store's marker, applies `mutate`, and writes the result back with
- * a compare-and-swap (`If-Match`). Retries on a stale (`412`) validator,
- * re-reading the fresh marker each time, up to {@link MAX_CAS_ATTEMPTS};
+ * Reads the store's descriptor, applies `mutate`, and writes the result back
+ * with a compare-and-swap (`If-Match`). Retries on a stale (`412`) validator,
+ * re-reading the fresh descriptor each time, up to {@link MAX_CAS_ATTEMPTS};
  * surfaces {@link PreconditionFailedError} if it keeps losing the race. A
- * `mutate` that resolves `null` signals "no change needed" (the marker already
- * reflects the desired state, e.g. an idempotent retry): nothing is written
- * and the current marker is returned as-is.
+ * `mutate` that resolves `null` signals "no change needed" (the descriptor
+ * already reflects the desired state, e.g. an idempotent retry): nothing is
+ * written and the current descriptor is returned as-is.
  *
- * When the store reports no marker yet (`read()` resolves `null`, e.g. the
+ * When the store reports no descriptor yet (`read()` resolves `null`, e.g. the
  * resource adapter before the first `initRecipients`), the optional `seed` is
  * mutated instead and the result written with the store's create-if-absent
  * guard (`If-None-Match: *`). Only `initRecipients` passes a seed; without
- * one an absent marker is refused. Losing the create race (a concurrent
- * writer created the first marker) re-enters the loop and re-reads, like a
+ * one an absent descriptor is refused. Losing the create race (a concurrent
+ * writer created the first descriptor) re-enters the loop and re-reads, like a
  * stale CAS.
  *
  * @param options {object}
- * @param options.store {MarkerStore}
- * @param options.mutate {function}   marker to the next marker (may be async),
+ * @param options.store {EncryptionDescriptorStore}
+ * @param options.mutate {function}   descriptor to the next descriptor (may be async),
  *   or `null` to skip the write
- * @param [options.seed] {CollectionEncryption}   the marker to mutate when the
+ * @param [options.seed] {CollectionEncryption}   the descriptor to mutate when the
  *   store holds none yet
- * @returns {Promise<CollectionEncryption>}   the written (or current) marker
+ * @returns {Promise<CollectionEncryption>}   the written (or current) descriptor
  */
-async function casUpdateMarker({ store, mutate, seed }) {
+async function casUpdateDescriptor({ store, mutate, seed }) {
     let lastError;
     for (let attempt = 0; attempt < MAX_CAS_ATTEMPTS; attempt++) {
         const current = await store.read();
         if (current === null) {
             if (seed === undefined) {
-                throw new ValidationError('Cannot manage recipients: this marker store holds no encryption ' +
-                    'marker yet. Call initRecipients first.');
+                throw new ValidationError('Cannot manage recipients: this descriptor store holds no encryption ' +
+                    'descriptor yet. Call initRecipients first.');
             }
             if (store.create === undefined) {
-                throw new ValidationError('Cannot initialize recipients: this marker store holds no marker ' +
+                throw new ValidationError('Cannot initialize recipients: this descriptor store holds no descriptor ' +
                     'and does not support creating one.');
             }
             const created = await mutate(seed);
@@ -398,17 +405,18 @@ async function casUpdateMarker({ store, mutate, seed }) {
             }
             catch (err) {
                 if (err instanceof PreconditionFailedError) {
-                    // A concurrent writer created the first marker: re-read and re-apply.
+                    // A concurrent writer created the first descriptor: re-read and
+                    // re-apply.
                     lastError = err;
                     continue;
                 }
                 throw err;
             }
         }
-        const next = await mutate(current.marker);
+        const next = await mutate(current.descriptor);
         if (next === null) {
-            // The marker already reflects the desired state: nothing to write.
-            return current.marker;
+            // The descriptor already reflects the desired state: nothing to write.
+            return current.descriptor;
         }
         try {
             await store.replace(next, { ifMatch: current.etag });
@@ -424,7 +432,7 @@ async function casUpdateMarker({ store, mutate, seed }) {
         }
     }
     throw new PreconditionFailedError(`Recipient change lost the compare-and-swap race after ${MAX_CAS_ATTEMPTS} ` +
-        'attempts (another writer kept updating the stored marker). ' +
+        'attempts (another writer kept updating the stored descriptor). ' +
         'Retry the operation.', { cause: lastError });
 }
 //# sourceMappingURL=recipients.js.map

package/dist/edv/recipients.js.map

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

package/dist/errors.d.ts

@@ -92,7 +92,7 @@ export declare class QuotaExceededError extends WasError {
 }
 /**
  * A client-side, fail-closed encryption error: a collection is declared
- * encrypted (by a per-handle override or its `encryption` marker) but this
+ * encrypted (by a per-handle override or its `encryption` descriptor) but this
  * client cannot build the codec -- no `encryption` provider is configured, or
  * the keystore holds no keys for the collection (or does not handle its
  * scheme). Raised before any request, so it carries no HTTP status; recover by
@@ -105,7 +105,7 @@ export declare class EncryptionError extends WasError {
 /**
  * A fail-closed key-epoch error: a reader could not unwrap any epoch key it
  * needs to decrypt a resource on a multi-recipient encrypted Collection -- none
- * of the marker's `recipients` entries yielded a key for this reader's
+ * of the descriptor's `recipients` entries yielded a key for this reader's
  * key-agreement key (it was never a recipient, or has been removed and the
  * epoch rotated). A subtype of {@link EncryptionError}, so existing
  * `catch (EncryptionError)` fail-closed handling still catches it.

package/dist/errors.js

@@ -119,7 +119,7 @@ export class QuotaExceededError extends WasError {
 }
 /**
  * A client-side, fail-closed encryption error: a collection is declared
- * encrypted (by a per-handle override or its `encryption` marker) but this
+ * encrypted (by a per-handle override or its `encryption` descriptor) but this
  * client cannot build the codec -- no `encryption` provider is configured, or
  * the keystore holds no keys for the collection (or does not handle its
  * scheme). Raised before any request, so it carries no HTTP status; recover by
@@ -135,7 +135,7 @@ export class EncryptionError extends WasError {
 /**
  * A fail-closed key-epoch error: a reader could not unwrap any epoch key it
  * needs to decrypt a resource on a multi-recipient encrypted Collection -- none
- * of the marker's `recipients` entries yielded a key for this reader's
+ * of the descriptor's `recipients` entries yielded a key for this reader's
  * key-agreement key (it was never a recipient, or has been removed and the
  * epoch rotated). A subtype of {@link EncryptionError}, so existing
  * `catch (EncryptionError)` fail-closed handling still catches it.

package/dist/internal/codec.d.ts

@@ -4,9 +4,9 @@ import type { EncryptionOverride, IZcap } from '../types.js';
 /**
  * A per-handle codec cache. Memoizes the in-flight resolution so concurrent
  * callers share one round-trip, but drops it on rejection so a transient
- * failure (e.g. a 500/network error during marker discovery) does not
+ * failure (e.g. a 500/network error during descriptor discovery) does not
  * permanently poison the handle, and exposes `reset()` for when a handle's
- * encryption state changes (e.g. `Collection.configure()` adds the marker).
+ * encryption state changes (e.g. `Collection.configure()` adds the descriptor).
  */
 export declare class CodecHolder {
     #private;
@@ -57,20 +57,20 @@ export declare function collectionCodecHolder(context: ClientContext, options: {
  */
 export declare const identityCodec: ResourceCodec;
 /**
- * Resolves the codec for a collection by deciding policy (override > marker >
- * plaintext) and then, when encrypted, building the encrypting codec from the
+ * Resolves the codec for a collection by deciding policy (override > descriptor
+ * > plaintext) and then, when encrypted, building the encrypting codec from the
  * keystore. Fails closed: a collection declared encrypted (by override or
- * marker) for which no codec can be built throws {@link EncryptionError} rather
- * than falling back to {@link identityCodec}.
+ * descriptor) for which no codec can be built throws {@link EncryptionError}
+ * rather than falling back to {@link identityCodec}.
  *
  * @param context {ClientContext}
  * @param options {object}
  * @param options.spaceId {string}
  * @param options.collectionId {string}
  * @param [options.override] {EncryptionOverride}   per-handle override; wins
- *   over the marker and skips the marker read
+ *   over the descriptor and skips the descriptor read
  * @param [options.capability] {IZcap}   the handle's bound capability, used for
- *   the marker-discovery describe (which happens only when there is no
+ *   the descriptor-discovery describe (which happens only when there is no
  *   override and the client has a keystore)
  * @returns {Promise<ResourceCodec>}
  */

package/dist/internal/codec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codec.d.ts","sourceRoot":"","sources":["../../src/internal/codec.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAgB,aAAa,EAAE,MAAM,aAAa,CAAA;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAIjD,OAAO,KAAK,EAEV,kBAAkB,EAClB,KAAK,EAIN,MAAM,aAAa,CAAA;AAEpB;;;;;;GAMG;AACH,qBAAa,WAAW;;IAItB;;;OAGG;gBACS,OAAO,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC;IAIjD;;;;OAIG;IACH,GAAG,IAAI,OAAO,CAAC,aAAa,CAAC;IAiB7B;;;;OAIG;IACH,KAAK,IAAI,IAAI;CAGd;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,aAAa,EACtB,OAAO,EAAE;IACP,OAAO,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,kBAAkB,CAAA;IAC7B,UAAU,CAAC,EAAE,KAAK,CAAA;CACnB,GACA,WAAW,CAEb;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,aAAa,EAAE,aAoC3B,CAAA;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,YAAY,CAChC,OAAO,EAAE,aAAa,EACtB,EACE,OAAO,EACP,YAAY,EACZ,QAAQ,EACR,UAAU,EACX,EAAE;IACD,OAAO,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,kBAAkB,CAAA;IAC7B,UAAU,CAAC,EAAE,KAAK,CAAA;CACnB,GACA,OAAO,CAAC,aAAa,CAAC,CA2DxB"}
+{"version":3,"file":"codec.d.ts","sourceRoot":"","sources":["../../src/internal/codec.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EAAgB,aAAa,EAAE,MAAM,aAAa,CAAA;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAIjD,OAAO,KAAK,EAEV,kBAAkB,EAClB,KAAK,EAIN,MAAM,aAAa,CAAA;AAEpB;;;;;;GAMG;AACH,qBAAa,WAAW;;IAItB;;;OAGG;gBACS,OAAO,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC;IAIjD;;;;OAIG;IACH,GAAG,IAAI,OAAO,CAAC,aAAa,CAAC;IAiB7B;;;;OAIG;IACH,KAAK,IAAI,IAAI;CAGd;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,aAAa,EACtB,OAAO,EAAE;IACP,OAAO,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,kBAAkB,CAAA;IAC7B,UAAU,CAAC,EAAE,KAAK,CAAA;CACnB,GACA,WAAW,CAEb;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,aAAa,EAAE,aAoC3B,CAAA;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,YAAY,CAChC,OAAO,EAAE,aAAa,EACtB,EACE,OAAO,EACP,YAAY,EACZ,QAAQ,EACR,UAAU,EACX,EAAE;IACD,OAAO,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,kBAAkB,CAAA;IAC7B,UAAU,CAAC,EAAE,KAAK,CAAA;CACnB,GACA,OAAO,CAAC,aAAa,CAAC,CA2DxB"}