@interop/did-cli 0.10.0 → 0.10.1

package/dist/commands/zcap.d.ts

@@ -28,24 +28,6 @@ import { Command } from 'commander';
  * @returns {string}
  */
 export declare function storageIdFor(capabilityId: string): string;
-/**
- * Write the metadata sidecar of a freshly saved zcap: the creation timestamp,
- * plus the handle and description when given. Exported for reuse by
- * `was grant --save`.
- *
- * @param options {object}
- * @param options.storageId {string}
- * @param options.created {string}
- * @param [options.handle] {string}
- * @param [options.description] {string}
- * @returns {Promise<void>}
- */
-export declare function writeCreateMeta({ storageId, created, handle, description }: {
-    storageId: string;
-    created: string;
-    handle?: string;
-    description?: string;
-}): Promise<void>;
 /**
  * Creates a root capability and prints it (with its encoding) to stdout.
  *

package/dist/commands/zcap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zcap.d.ts","sourceRoot":"","sources":["../../src/commands/zcap.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AACH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAiBnC;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAEzD;AAcD;;;;;;;;;;;GAWG;AACH,wBAAsB,eAAe,CAAC,EACpC,SAAS,EACT,OAAO,EACP,MAAM,EACN,WAAW,EACZ,EAAE;IACD,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB,GAAG,OAAO,CAAC,IAAI,CAAC,CAShB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,SAAS,CAAC,OAAO,EAAE;IACvC,UAAU,EAAE,MAAM,CAAA;IAClB,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB,GAAG,OAAO,CAAC,MAAM,CAAC,CA6BlB;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAsB,WAAW,CAAC,OAAO,EAAE;IACzC,SAAS,EAAE,MAAM,CAAA;IACjB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB,GAAG,OAAO,CAAC,MAAM,CAAC,CAuClB;AAED,wBAAgB,eAAe,IAAI,OAAO,CAoXzC"}
+{"version":3,"file":"zcap.d.ts","sourceRoot":"","sources":["../../src/commands/zcap.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AACH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAuBnC;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAEzD;AAcD;;;;;;;;;;;GAWG;AACH,wBAAsB,SAAS,CAAC,OAAO,EAAE;IACvC,UAAU,EAAE,MAAM,CAAA;IAClB,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB,GAAG,OAAO,CAAC,MAAM,CAAC,CAiClB;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAsB,WAAW,CAAC,OAAO,EAAE;IACzC,SAAS,EAAE,MAAM,CAAA;IACjB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB,GAAG,OAAO,CAAC,MAAM,CAAC,CA2ClB;AAED,wBAAgB,eAAe,IAAI,OAAO,CAwRzC"}

package/dist/commands/zcap.js

@@ -22,9 +22,12 @@ import { Command } from 'commander';
 import { createCapability } from '../zcap/create.js';
 import { delegateCapability } from '../zcap/delegate.js';
 import { resolveCapabilityInput } from '../zcap/resolve.js';
-import { listCollection, loadFromCollection, loadMetaFromCollection, removeFromCollection, saveMetaToCollection, saveToCollection, sanitizeStorageId } from '../storage.js';
+import { saveToCollection, sanitizeStorageId } from '../storage.js';
 import { resolveZcapRef } from '../meta.js';
 import { renderTable } from '../table.js';
+import { requireSaveForMetaFlags, resolveRefOrReport, runListCollection, runMetaCollection, runRemoveCollection, writeCreateMeta } from './collection-command.js';
+/** The wallet collection name for stored authorization capabilities. */
+const COLLECTION = 'zcaps';
 /**
  * Derives a filesystem-safe storage id from a capability id (the `urn:...`
  * value). Exported for reuse by `was grant --save`, which stores into the
@@ -47,28 +50,6 @@ export function storageIdFor(capabilityId) {
 function zcapTypeLabel({ zcap }) {
     return zcap.parentCapability ? 'delegated' : 'root';
 }
-/**
- * Write the metadata sidecar of a freshly saved zcap: the creation timestamp,
- * plus the handle and description when given. Exported for reuse by
- * `was grant --save`.
- *
- * @param options {object}
- * @param options.storageId {string}
- * @param options.created {string}
- * @param [options.handle] {string}
- * @param [options.description] {string}
- * @returns {Promise<void>}
- */
-export async function writeCreateMeta({ storageId, created, handle, description }) {
-    const meta = { created };
-    if (handle) {
-        meta.handle = handle;
-    }
-    if (description) {
-        meta.description = description;
-    }
-    await saveMetaToCollection({ collection: 'zcaps', storageId, meta });
-}
 /**
  * Creates a root capability and prints it (with its encoding) to stdout.
  *
@@ -82,6 +63,9 @@ export async function writeCreateMeta({ storageId, created, handle, description
  * @returns {Promise<number>}   The process exit code.
  */
 export async function runCreate(options) {
+    if (!requireSaveForMetaFlags(options)) {
+        return 1;
+    }
     try {
         const result = createCapability({
             controller: options.controller,
@@ -89,8 +73,13 @@ export async function runCreate(options) {
         });
         if (options.save) {
             const storageId = storageIdFor(result.rootCapability.id);
-            const filePath = await saveToCollection('zcaps', storageId, result.rootCapability);
+            const filePath = await saveToCollection({
+                collection: COLLECTION,
+                storageId,
+                data: result.rootCapability
+            });
             await writeCreateMeta({
+                collection: COLLECTION,
                 storageId,
                 created: new Date().toISOString(),
                 handle: options.handle,
@@ -129,6 +118,9 @@ export async function runCreate(options) {
  * @returns {Promise<number>}   The process exit code.
  */
 export async function runDelegate(options) {
+    if (!requireSaveForMetaFlags(options)) {
+        return 1;
+    }
     try {
         const capability = options.capability
             ? await resolveCapabilityInput({ ref: options.capability })
@@ -146,8 +138,13 @@ export async function runDelegate(options) {
         });
         if (options.save) {
             const storageId = storageIdFor(result.delegatedCapability.id);
-            const filePath = await saveToCollection('zcaps', storageId, result.delegatedCapability);
+            const filePath = await saveToCollection({
+                collection: COLLECTION,
+                storageId,
+                data: result.delegatedCapability
+            });
             await writeCreateMeta({
+                collection: COLLECTION,
                 storageId,
                 created: new Date().toISOString(),
                 handle: options.handle,
@@ -174,12 +171,6 @@ export function makeZcapCommand() {
         .option('--handle <handle>', 'short tag for the saved zcap (requires --save)')
         .option('--description <description>', 'longer description of the saved zcap (requires --save)')
         .action(async (options) => {
-        if ((options.handle !== undefined || options.description !== undefined) &&
-            !options.save) {
-            console.error('--handle and --description require --save');
-            process.exit(1);
-            return;
-        }
         const code = await runCreate(options);
         if (code !== 0) {
             process.exit(code);
@@ -202,12 +193,6 @@ export function makeZcapCommand() {
         .option('--handle <handle>', 'short tag for the saved zcap (requires --save)')
         .option('--description <description>', 'longer description of the saved zcap (requires --save)')
         .action(async (options) => {
-        if ((options.handle !== undefined || options.description !== undefined) &&
-            !options.save) {
-            console.error('--handle and --description require --save');
-            process.exit(1);
-            return;
-        }
         const code = await runDelegate(options);
         if (code !== 0) {
             process.exit(code);
@@ -219,55 +204,21 @@ export function makeZcapCommand() {
         .option('--json', 'output the list as a JSON array of objects with metadata')
         .option('--plain', 'output one capability id per line, sorted (no metadata)')
         .action(async (options) => {
-        const storageIds = await listCollection('zcaps');
-        if (options.plain) {
-            const zcapIds = [];
-            for (const storageId of storageIds) {
-                const zcap = await loadFromCollection('zcaps', storageId);
-                if (zcap.id) {
-                    zcapIds.push(zcap.id);
-                }
-            }
-            zcapIds.sort();
-            for (const zcapId of zcapIds) {
-                console.log(zcapId);
-            }
-            return;
-        }
-        const entries = [];
-        for (const storageId of storageIds) {
-            const zcap = await loadFromCollection('zcaps', storageId);
-            if (!zcap.id) {
-                continue;
-            }
-            const meta = await loadMetaFromCollection({
-                collection: 'zcaps',
-                storageId
-            });
-            entries.push({ id: zcap.id, type: zcapTypeLabel({ zcap }), ...meta });
-        }
-        if (options.json) {
-            const output = entries.map(entry => ({
+        await runListCollection({
+            collection: COLLECTION,
+            plain: options.plain,
+            json: options.json,
+            plainId: zcap => zcap.id,
+            toEntry: ({ item, meta }) => item.id
+                ? { id: item.id, type: zcapTypeLabel({ zcap: item }), ...meta }
+                : undefined,
+            toJson: entry => ({
                 id: entry.id,
                 type: entry.type,
                 ...(entry.created && { created: entry.created }),
                 ...(entry.handle && { handle: entry.handle }),
                 ...(entry.description && { description: entry.description })
-            }));
-            console.log(JSON.stringify(output, null, 2));
-            return;
-        }
-        if (entries.length === 0) {
-            return;
-        }
-        const rows = entries.map(entry => [
-            entry.handle ?? '',
-            entry.type,
-            entry.created?.slice(0, 10) ?? '',
-            entry.id,
-            entry.description ?? ''
-        ]);
-        console.log(renderTable({
+            }),
             columns: [
                 { header: 'HANDLE', maxWidth: 16 },
                 { header: 'TYPE' },
@@ -275,8 +226,14 @@ export function makeZcapCommand() {
                 { header: 'ID', maxWidth: 44 },
                 { header: 'DESCRIPTION', maxWidth: 40 }
             ],
-            rows
-        }));
+            toRow: entry => [
+                entry.handle ?? '',
+                entry.type,
+                entry.created?.slice(0, 10) ?? '',
+                entry.id,
+                entry.description ?? ''
+            ]
+        });
     });
     zcap
         .command('show <id>')
@@ -285,17 +242,12 @@ export function makeZcapCommand() {
         .option('--meta', 'show the zcap metadata instead of the capability')
         .option('--json', 'with --meta, output the metadata as JSON')
         .action(async (id, options) => {
-        let resolved;
-        try {
-            resolved = await resolveZcapRef({ ref: id });
-        }
-        catch (err) {
-            console.error(err.message);
-            process.exit(1);
-            return;
-        }
+        const resolved = await resolveRefOrReport({
+            resolve: ref => resolveZcapRef({ ref }),
+            ref: id,
+            noun: 'zcap'
+        });
         if (!resolved) {
-            console.error(`No locally stored zcap found for ${id}`);
             process.exit(1);
             return;
         }
@@ -349,49 +301,17 @@ export function makeZcapCommand() {
         .option('--handle <handle>', 'set the handle (an empty string clears it)')
         .option('--description <description>', 'set the description (an empty string clears it)')
         .action(async (id, options) => {
-        let resolved;
-        try {
-            resolved = await resolveZcapRef({ ref: id });
-        }
-        catch (err) {
-            console.error(err.message);
-            process.exit(1);
-            return;
-        }
-        if (!resolved) {
-            console.error(`No locally stored zcap found for ${id}`);
-            process.exit(1);
-            return;
-        }
-        const hasEdits = options.handle !== undefined || options.description !== undefined;
-        if (!hasEdits) {
-            console.log(JSON.stringify(resolved.meta ?? {}, null, 2));
-            return;
-        }
-        const meta = { ...(resolved.meta ?? {}) };
-        if (options.handle !== undefined) {
-            if (options.handle === '') {
-                delete meta.handle;
-            }
-            else {
-                meta.handle = options.handle;
-            }
-        }
-        if (options.description !== undefined) {
-            if (options.description === '') {
-                delete meta.description;
-            }
-            else {
-                meta.description = options.description;
-            }
-        }
-        const filePath = await saveMetaToCollection({
-            collection: 'zcaps',
-            storageId: resolved.storageId,
-            meta
+        const code = await runMetaCollection({
+            collection: COLLECTION,
+            noun: 'zcap',
+            resolve: ref => resolveZcapRef({ ref }),
+            ref: id,
+            handle: options.handle,
+            description: options.description
         });
-        console.error(`Metadata saved to ${filePath}`);
-        console.log(JSON.stringify(meta, null, 2));
+        if (code !== 0) {
+            process.exit(code);
+        }
     });
     zcap
         .command('remove <id>')
@@ -399,33 +319,21 @@ export function makeZcapCommand() {
         .description('Remove a locally stored zcap and its metadata sidecar (by capability ' +
         'id or handle)')
         .action(async (id) => {
-        let resolved;
-        try {
-            resolved = await resolveZcapRef({ ref: id });
-        }
-        catch (err) {
-            console.error(err.message);
-            process.exit(1);
-            return;
-        }
-        if (!resolved) {
-            console.error(`No locally stored zcap found for ${id}`);
-            process.exit(1);
-            return;
-        }
-        const removed = await removeFromCollection({
-            collection: 'zcaps',
-            storageId: resolved.storageId
+        const code = await runRemoveCollection({
+            collection: COLLECTION,
+            noun: 'zcap',
+            resolve: ref => resolveZcapRef({ ref }),
+            ref: id
         });
-        for (const filePath of removed) {
-            console.error(`Removed ${filePath}`);
+        if (code !== 0) {
+            process.exit(code);
         }
     });
     zcap
         .command('revoke <id>')
         .description('Revoke a zcap by ID')
         .action((zcapId) => {
-        console.log(`Revoking zcap ${zcapId}...`);
+        console.error(`Revoking zcap ${zcapId}...`);
         // TODO: implement
     });
     return zcap;

package/dist/commands/zcap.js.map

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

package/dist/documentLoader.d.ts

@@ -0,0 +1,5 @@
+import { defaultWebvhLogVerifier } from '@interop/did-method-webvh/driver';
+export { defaultWebvhLogVerifier as webvhLogVerifier };
+/** The shared document loader for all CLI commands. */
+export declare const documentLoader: import("@interop/data-integrity-core").IDocumentLoader;
+//# sourceMappingURL=documentLoader.d.ts.map

package/dist/documentLoader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"documentLoader.d.ts","sourceRoot":"","sources":["../src/documentLoader.ts"],"names":[],"mappings":"AAkBA,OAAO,EAEL,uBAAuB,EACxB,MAAM,kCAAkC,CAAA;AAKzC,OAAO,EAAE,uBAAuB,IAAI,gBAAgB,EAAE,CAAA;AAUtD,uDAAuD;AACvD,eAAO,MAAM,cAAc,wDAA0C,CAAA"}

package/dist/documentLoader.js

@@ -0,0 +1,29 @@
+/**
+ * The CLI's single shared JSON-LD document loader, used by every command that
+ * resolves DIDs / dereferences DID URLs or loads JSON-LD contexts (DID
+ * resolution, VC issue/verify, EDV recipient resolution, zcap signing).
+ *
+ * Per project convention, DID/JSON-LD resolution always goes through
+ * `@interop/security-document-loader`, never a hand-rolled loader. The loader's
+ * default resolver only knows did:key and did:web, so the did:webvh driver is
+ * registered onto a copy of the defaults -- keeping the did:webvh dependency out
+ * of the shared loader package itself. A bare DID resolves to its DID document;
+ * a `did#fragment` URL is dereferenced straight to its verification-method node.
+ * Works for did:key (offline), did:web, and did:webvh (both fetched). Built once
+ * and reused.
+ */
+import { createDefaultDidResolver, securityLoader } from '@interop/security-document-loader';
+import { createDidWebvhDriver, defaultWebvhLogVerifier } from '@interop/did-method-webvh/driver';
+// The did:webvh history-log verifier, re-exported under the CLI's existing name
+// for the commands that resolve DIDs directly (e.g. `did show`).
+export { defaultWebvhLogVerifier as webvhLogVerifier };
+// The shared DID resolver underlying `documentLoader`. Kept module-private: its
+// `@interop/did-io` type is not portably nameable across an export boundary.
+const didResolver = createDefaultDidResolver();
+// `CachedResolver.use` types its argument as the full generation-capable
+// `DidMethodDriver`, but only reads `.method` (and later calls `.get`) for
+// resolution; the webvh driver implements just that resolution subset.
+didResolver.use(createDidWebvhDriver());
+/** The shared document loader for all CLI commands. */
+export const documentLoader = securityLoader({ didResolver }).build();
+//# sourceMappingURL=documentLoader.js.map

package/dist/documentLoader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"documentLoader.js","sourceRoot":"","sources":["../src/documentLoader.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AACH,OAAO,EACL,wBAAwB,EACxB,cAAc,EACf,MAAM,mCAAmC,CAAA;AAC1C,OAAO,EACL,oBAAoB,EACpB,uBAAuB,EACxB,MAAM,kCAAkC,CAAA;AAGzC,gFAAgF;AAChF,iEAAiE;AACjE,OAAO,EAAE,uBAAuB,IAAI,gBAAgB,EAAE,CAAA;AAEtD,gFAAgF;AAChF,6EAA6E;AAC7E,MAAM,WAAW,GAAG,wBAAwB,EAAE,CAAA;AAC9C,yEAAyE;AACzE,2EAA2E;AAC3E,uEAAuE;AACvE,WAAW,CAAC,GAAG,CAAC,oBAAoB,EAAgC,CAAC,CAAA;AAErE,uDAAuD;AACvD,MAAM,CAAC,MAAM,cAAc,GAAG,cAAc,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,KAAK,EAAE,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"hmac.d.ts","sourceRoot":"","sources":["../../src/edv/hmac.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EACL,aAAa,EAEd,MAAM,8BAA8B,CAAA;AAOrC,iFAAiF;AACjF,eAAO,MAAM,aAAa,sBAAsB,CAAA;AAyBhD;;;;;;;;;;GAUG;AACH,wBAAsB,WAAW,CAAC,EAChC,GAAG,EACJ,EAAE;IACD,GAAG,CAAC,EAAE,MAAM,CAAA;CACb,GAAG,OAAO,CAAC,aAAa,CAAC,CA+CzB"}
+{"version":3,"file":"hmac.d.ts","sourceRoot":"","sources":["../../src/edv/hmac.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EACL,aAAa,EAEd,MAAM,8BAA8B,CAAA;AAQrC,iFAAiF;AACjF,eAAO,MAAM,aAAa,sBAAsB,CAAA;AAyBhD;;;;;;;;;;GAUG;AACH,wBAAsB,WAAW,CAAC,EAChC,GAAG,EACJ,EAAE;IACD,GAAG,CAAC,EAAE,MAAM,CAAA;CACb,GAAG,OAAO,CAAC,aAAa,CAAC,CAyCzB"}

package/dist/edv/hmac.js

@@ -8,6 +8,7 @@
  */
 import { SHA256HMACKey } from '@interop/data-integrity-core';
 import { listCollection, loadFromCollection, loadMetaFromCollection } from '../storage.js';
+import { resolveByHandle } from '../meta.js';
 /** The stored `type` value of an HMAC blinding key (the EDV protocol string). */
 export const HMAC_KEY_TYPE = 'Sha256HmacKey2019';
 /**
@@ -17,7 +18,7 @@ export const HMAC_KEY_TYPE = 'Sha256HmacKey2019';
  */
 async function listStoredHmacs() {
     const storageIds = await listCollection('keys');
-    const stored = await Promise.all(storageIds.map(storageId => loadFromCollection('keys', storageId)));
+    const stored = await Promise.all(storageIds.map(storageId => loadFromCollection({ collection: 'keys', storageId })));
     return storageIds
         .map((storageId, index) => ({ storageId, stored: stored[index] }))
         .filter(({ stored }) => stored.type === HMAC_KEY_TYPE);
@@ -50,18 +51,17 @@ export async function resolveHmac({ ref }) {
     if (direct) {
         return SHA256HMACKey.from(direct.stored);
     }
-    const metas = await Promise.all(candidates.map(candidate => loadMetaFromCollection({
-        collection: 'keys',
-        storageId: candidate.storageId
-    })));
-    const byHandle = candidates.filter((_candidate, index) => metas[index]?.handle === ref);
-    if (byHandle.length === 0) {
+    const match = await resolveByHandle({
+        ref,
+        noun: 'HMAC keys',
+        alternative: 'key id',
+        storageIds: candidates.map(candidate => candidate.storageId),
+        loadMeta: storageId => loadMetaFromCollection({ collection: 'keys', storageId })
+    });
+    if (!match) {
         throw new Error(`No HMAC key found for "${ref}".`);
     }
-    if (byHandle.length > 1) {
-        throw new Error(`Handle "${ref}" matches ${byHandle.length} HMAC keys; ` +
-            'use the key id instead.');
-    }
-    return SHA256HMACKey.from(byHandle[0].stored);
+    const candidate = candidates.find(candidate => candidate.storageId === match.storageId);
+    return SHA256HMACKey.from(candidate.stored);
 }
 //# sourceMappingURL=hmac.js.map

package/dist/edv/hmac.js.map

@@ -1 +1 @@
-{"version":3,"file":"hmac.js","sourceRoot":"","sources":["../../src/edv/hmac.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EACL,aAAa,EAEd,MAAM,8BAA8B,CAAA;AACrC,OAAO,EACL,cAAc,EACd,kBAAkB,EAClB,sBAAsB,EACvB,MAAM,eAAe,CAAA;AAEtB,iFAAiF;AACjF,MAAM,CAAC,MAAM,aAAa,GAAG,mBAAmB,CAAA;AAQhD;;;;GAIG;AACH,KAAK,UAAU,eAAe;IAC5B,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC,MAAM,CAAC,CAAA;IAC/C,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAC9B,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CACzB,kBAAkB,CAAiB,MAAM,EAAE,SAAS,CAAC,CACtD,CACF,CAAA;IACD,OAAO,UAAU;SACd,GAAG,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;SACjE,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,aAAa,CAAC,CAAA;AAC1D,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,EAChC,GAAG,EAGJ;IACC,MAAM,UAAU,GAAG,MAAM,eAAe,EAAE,CAAA;IAC1C,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CACb,mDAAmD;YACjD,qCAAqC,CACxC,CAAA;IACH,CAAC;IAED,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACtB,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CACb,kBAAkB,UAAU,CAAC,MAAM,cAAc;gBAC/C,4BAA4B,CAC/B,CAAA;QACH,CAAC;QACD,OAAO,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;IACjD,CAAC;IAED,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAC5B,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,KAAK,GAAG,IAAI,SAAS,CAAC,SAAS,KAAK,GAAG,CACxE,CAAA;IACD,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IAC1C,CAAC;IAED,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CAC7B,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CACzB,sBAAsB,CAAC;QACrB,UAAU,EAAE,MAAM;QAClB,SAAS,EAAE,SAAS,CAAC,SAAS;KAC/B,CAAC,CACH,CACF,CAAA;IACD,MAAM,QAAQ,GAAG,UAAU,CAAC,MAAM,CAChC,CAAC,UAAU,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,KAAK,GAAG,CACpD,CAAA;IACD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,0BAA0B,GAAG,IAAI,CAAC,CAAA;IACpD,CAAC;IACD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CACb,WAAW,GAAG,aAAa,QAAQ,CAAC,MAAM,cAAc;YACtD,yBAAyB,CAC5B,CAAA;IACH,CAAC;IACD,OAAO,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;AAC/C,CAAC"}
+{"version":3,"file":"hmac.js","sourceRoot":"","sources":["../../src/edv/hmac.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EACL,aAAa,EAEd,MAAM,8BAA8B,CAAA;AACrC,OAAO,EACL,cAAc,EACd,kBAAkB,EAClB,sBAAsB,EACvB,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAE5C,iFAAiF;AACjF,MAAM,CAAC,MAAM,aAAa,GAAG,mBAAmB,CAAA;AAQhD;;;;GAIG;AACH,KAAK,UAAU,eAAe;IAC5B,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC,MAAM,CAAC,CAAA;IAC/C,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAC9B,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CACzB,kBAAkB,CAAiB,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CACtE,CACF,CAAA;IACD,OAAO,UAAU;SACd,GAAG,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;SACjE,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,aAAa,CAAC,CAAA;AAC1D,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,EAChC,GAAG,EAGJ;IACC,MAAM,UAAU,GAAG,MAAM,eAAe,EAAE,CAAA;IAC1C,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CACb,mDAAmD;YACjD,qCAAqC,CACxC,CAAA;IACH,CAAC;IAED,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACtB,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CACb,kBAAkB,UAAU,CAAC,MAAM,cAAc;gBAC/C,4BAA4B,CAC/B,CAAA;QACH,CAAC;QACD,OAAO,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;IACjD,CAAC;IAED,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAC5B,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,KAAK,GAAG,IAAI,SAAS,CAAC,SAAS,KAAK,GAAG,CACxE,CAAA;IACD,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IAC1C,CAAC;IAED,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC;QAClC,GAAG;QACH,IAAI,EAAE,WAAW;QACjB,WAAW,EAAE,QAAQ;QACrB,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC;QAC5D,QAAQ,EAAE,SAAS,CAAC,EAAE,CACpB,sBAAsB,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;KAC5D,CAAC,CAAA;IACF,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,0BAA0B,GAAG,IAAI,CAAC,CAAA;IACpD,CAAC;IACD,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAC/B,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,SAAS,KAAK,KAAK,CAAC,SAAS,CACpD,CAAA;IACF,OAAO,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;AAC7C,CAAC"}

package/dist/edv/recipients.d.ts

@@ -1,6 +1,8 @@
 import { X25519KeyAgreementKey2020 } from '@interop/x25519-key-agreement-key';
 /** The X25519 key-agreement verification-method type minimal-cipher expects. */
 export declare const KEY_AGREEMENT_TYPE = "X25519KeyAgreementKey2020";
+/** The multibase prefix of an X25519 `publicKeyMultibase`. */
+export declare const X25519_MULTIBASE_PREFIX = "z6LS";
 /**
  * An X25519 key-agreement key instance with its `.id` (`kid`) populated. Used
  * both as a resolved recipient (encrypt reads `id` + `publicKeyMultibase`) and

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

@@ -1 +1 @@
-{"version":3,"file":"recipients.d.ts","sourceRoot":"","sources":["../../src/edv/recipients.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAA;AAI7E,gFAAgF;AAChF,eAAO,MAAM,kBAAkB,8BAA8B,CAAA;AAW7D;;;;GAIG;AACH,MAAM,MAAM,eAAe,GAAG,YAAY,CAAC,OAAO,yBAAyB,CAAC,GAAG;IAC7E,EAAE,EAAE,MAAM,CAAA;CACX,CAAA;AAqKD;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CAAC,EACrC,GAAG,EACJ,EAAE;IACD,GAAG,EAAE,MAAM,CAAA;CACZ,GAAG,OAAO,CAAC,eAAe,CAAC,CAmB3B;AAED;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CAAC,EACzC,IAAI,EACL,EAAE;IACD,IAAI,EAAE,MAAM,CAAA;CACb,GAAG,OAAO,CAAC,eAAe,CAAC,CAa3B;AAED;;;;;;;;GAQG;AACH,wBAAsB,mBAAmB,CAAC,EACxC,GAAG,EACJ,EAAE;IACD,GAAG,EAAE,MAAM,CAAA;CACZ,GAAG,OAAO,CAAC,eAAe,CAAC,CAa3B;AAED;;;;;;;;GAQG;AACH,wBAAsB,yBAAyB,CAAC,EAC9C,GAAG,EACJ,EAAE;IACD,GAAG,EAAE;QAAE,UAAU,CAAC,EAAE;YAAE,MAAM,CAAC,EAAE;gBAAE,GAAG,CAAC,EAAE,MAAM,CAAA;aAAE,CAAA;SAAE,EAAE,CAAA;KAAE,CAAA;CACtD,GAAG,OAAO,CAAC,eAAe,CAAC,CAsC3B"}
+{"version":3,"file":"recipients.d.ts","sourceRoot":"","sources":["../../src/edv/recipients.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAA;AAK7E,gFAAgF;AAChF,eAAO,MAAM,kBAAkB,8BAA8B,CAAA;AAE7D,8DAA8D;AAC9D,eAAO,MAAM,uBAAuB,SAAS,CAAA;AAoB7C;;;;GAIG;AACH,MAAM,MAAM,eAAe,GAAG,YAAY,CAAC,OAAO,yBAAyB,CAAC,GAAG;IAC7E,EAAE,EAAE,MAAM,CAAA;CACX,CAAA;AAkKD;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CAAC,EACrC,GAAG,EACJ,EAAE;IACD,GAAG,EAAE,MAAM,CAAA;CACZ,GAAG,OAAO,CAAC,eAAe,CAAC,CAmB3B;AAED;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CAAC,EACzC,IAAI,EACL,EAAE;IACD,IAAI,EAAE,MAAM,CAAA;CACb,GAAG,OAAO,CAAC,eAAe,CAAC,CAa3B;AAED;;;;;;;;GAQG;AACH,wBAAsB,mBAAmB,CAAC,EACxC,GAAG,EACJ,EAAE;IACD,GAAG,EAAE,MAAM,CAAA;CACZ,GAAG,OAAO,CAAC,eAAe,CAAC,CAa3B;AAED;;;;;;;;GAQG;AACH,wBAAsB,yBAAyB,CAAC,EAC9C,GAAG,EACJ,EAAE;IACD,GAAG,EAAE;QAAE,UAAU,CAAC,EAAE;YAAE,MAAM,CAAC,EAAE;gBAAE,GAAG,CAAC,EAAE,MAAM,CAAA;aAAE,CAAA;SAAE,EAAE,CAAA;KAAE,CAAA;CACtD,GAAG,OAAO,CAAC,eAAe,CAAC,CAsC3B"}

package/dist/edv/recipients.js

@@ -10,20 +10,14 @@
  * for decrypt.
  */
 import { readFile } from 'node:fs/promises';
-import { securityLoader } from '@interop/security-document-loader';
 import { X25519KeyAgreementKey2020 } from '@interop/x25519-key-agreement-key';
+import { documentLoader } from '../documentLoader.js';
 import { listCollection, loadFromCollection } from '../storage.js';
 import { resolveKeyRef } from '../meta.js';
 /** The X25519 key-agreement verification-method type minimal-cipher expects. */
 export const KEY_AGREEMENT_TYPE = 'X25519KeyAgreementKey2020';
-/**
- * Document loader for DID-URL recipient resolution: resolves a bare DID to its
- * DID document and dereferences a `did#fragment` URL straight to its
- * verification-method node, for both did:key (offline) and did:web (fetched).
- * Built once and reused. (Per project convention, DID/JSON-LD resolution goes
- * through `@interop/security-document-loader`, never a hand-rolled loader.)
- */
-const documentLoader = securityLoader().build();
+/** The multibase prefix of an X25519 `publicKeyMultibase`. */
+export const X25519_MULTIBASE_PREFIX = 'z6LS';
 /**
  * Construct an X25519 key-agreement key from a verification method or stored
  * key pair. `didKey: true` defaults a source with no `controller`/`id` to its
@@ -33,7 +27,7 @@ const documentLoader = securityLoader().build();
  * `type: 'Multikey'` source is normalized via `fromMultikey`. The constructor
  * validates the multibase header bytes.
  *
- * @param source {Record<string, any>}
+ * @param source {VerificationMethodNode}
  * @returns {Promise<KeyAgreementKey>}
  */
 async function keyAgreementKeyFrom(source) {
@@ -61,7 +55,7 @@ function splitFragment({ ref }) {
  *
  * @param options {object}
  * @param options.url {string}
- * @returns {Promise<Record<string, any>>}
+ * @returns {Promise<VerificationMethodNode>}
  */
 async function resolveDidUrl({ url }) {
     const { document } = (await documentLoader(url));
@@ -98,7 +92,7 @@ function isX25519PublicKey(publicKeyMultibase) {
  * and construct it.
  *
  * @param options {object}
- * @param options.method {Record<string, any>}
+ * @param options.method {VerificationMethodNode}
  * @param options.ref {string}
  * @returns {Promise<KeyAgreementKey>}
  */
@@ -126,7 +120,7 @@ async function resolveDidRecipient({ ref }) {
     // A bare DID: pick the single keyAgreement key, dereferencing any entries
     // that are id references rather than embedded verification methods.
     const didDocument = await resolveDidUrl({ url: did });
-    const entries = (didDocument.keyAgreement ?? []);
+    const entries = didDocument.keyAgreement ?? [];
     const methods = [];
     for (const entry of entries) {
         methods.push(typeof entry === 'string' ? await resolveDidUrl({ url: entry }) : entry);
@@ -151,7 +145,7 @@ async function resolveDidRecipient({ ref }) {
  * @returns {Promise<KeyAgreementKey>}
  */
 export async function resolveRecipient({ ref }) {
-    if (ref.startsWith('z6LS')) {
+    if (ref.startsWith(X25519_MULTIBASE_PREFIX)) {
         return toKeyAgreementKey({
             method: { type: KEY_AGREEMENT_TYPE, publicKeyMultibase: ref },
             ref
@@ -229,7 +223,10 @@ export async function autoSelectKeyAgreementKey({ jwe }) {
     const storageIds = await listCollection('keys');
     const matches = [];
     for (const storageId of storageIds) {
-        const stored = await loadFromCollection('keys', storageId);
+        const stored = await loadFromCollection({
+            collection: 'keys',
+            storageId
+        });
         if (stored.type !== KEY_AGREEMENT_TYPE ||
             !stored.privateKeyMultibase ||
             !stored.publicKeyMultibase) {