@interop/was-client 0.99.1 → 0.100.0

package/dist/WasClient.js

@@ -1,41 +1,59 @@
-import { baseUrlOfSpacesUrl, collectionItemsUrl, parseSpaceTarget, spacesUrl } from './internal/paths.js';
+import { isValidTarget } from '@interop/zcap';
+import { canonicalContainerUrl, parseAbsoluteHttpUrl, parseSpaceTarget } from './internal/paths.js';
 import { send, rawRequest, unsignedRequest } from './internal/request.js';
-import { createdId, parseResource, readJsonData } from './internal/content.js';
+import { parseResource, readJsonData } from './internal/content.js';
 import { buildPageWalk, collectPages, collectWalk, signedPageWalk, walkItems, walkPagesOrEmpty } from './internal/pagination.js';
 import { delegateGrant } from './internal/grant.js';
-import { spaceIdOf, submitRevocation } from './internal/revoke.js';
+import { spaceUrlOf, submitRevocation } from './internal/revoke.js';
 import { Memo } from './internal/memo.js';
-import { discoverService, selectServiceVersion } from './internal/service.js';
+import { discoverService, readServiceDescription, selectServiceVersion } from './internal/service.js';
 import { IncompatibleServerError, NotSupportedError, ValidationError, WasServerError } from './errors.js';
 import { zcapClientForSigner } from './zcapClient.js';
 import { Space } from './Space.js';
 import { Collection } from './Collection.js';
 import { Resource } from './Resource.js';
+/**
+ * Checks that `value` is an absolute `http(s)` URL and returns it as `URL`
+ * serializes it, or throws.
+ *
+ * @param options {object}
+ * @param options.name {string}    the option's name, for the error
+ * @param options.value {string}
+ * @returns {string}
+ * @throws {ValidationError}
+ */
+function absoluteHttpUrl({ name, value }) {
+    const parsed = parseAbsoluteHttpUrl(value);
+    if (parsed === null) {
+        throw new ValidationError(`${name} "${value}" is not an absolute http(s) URL.`);
+    }
+    return parsed.toString();
+}
 export class WasClient {
     /**
-     * The server's Spaces Repository URL, in canonical trailing-slash form
-     * (`https://host/spaces/`). Service discovery starts here.
+     * The service description's URL, when the client was built from one. Read
+     * directly by discovery.
      */
-    serverUrl;
+    serviceUrl;
     /**
-     * The server base URL every Space path hangs off, without a trailing slash:
-     * the parent of {@link serverUrl} (`https://host`, or `https://host/was` on
-     * a sub-path mount). Zcap `invocationTarget`s are built beneath it.
+     * The Spaces Repository URL the client was built from, when it was built
+     * from one, in canonical container form (trailing slash supplied).
+     * Discovery probes it for the `service` link. The URL `createSpace` and
+     * `listSpaces` address is the service description's `spaces` member, not
+     * this value.
      */
-    baseUrl;
+    spacesUrl;
     zcapClient;
     encryption;
     /**
      * @param options {object}
-     * @param options.serverUrl {string}    the server's Spaces Repository URL
-     *   (`https://host/spaces/`, or `https://host/was/spaces/` on a sub-path
-     *   mount). The base URL for Space paths and zcap `invocationTarget`s is
-     *   its parent. Service discovery starts from this URL rather than from the
-     *   base, which is often a landing page with no `service` link. The value
-     *   is normalized to canonical form; `baseUrlOfSpacesUrl` in `./paths`
-     *   states what is accepted. The client is built from this URL only: a
-     *   server with no Spaces Repository (the spec leaves the endpoint
-     *   optional) has no URL this constructor accepts and is not supported.
+     * @param [options.serviceUrl] {string}   the URL of the server's service
+     *   description. Discovery reads it with an unsigned `GET`. Exactly one of
+     *   `serviceUrl` and `spacesUrl` is given
+     * @param [options.spacesUrl] {string}   the server's Spaces Repository
+     *   URL, for a caller that holds that rather than the service URL.
+     *   Discovery sends an unsigned `HEAD` to it and follows the `service`
+     *   link every response carries
      * @param options.zcapClient {ZcapClient}   an ezcap client holding the signer
      * @param [options.encryption] {EncryptionProvider}   the keystore that
      *   supplies keys for collections declared encrypted (by their `encryption`
@@ -46,22 +64,31 @@ export class WasClient {
      *   closed rather than silently downgrading to plaintext.
      * @param [options.serviceDescription] {ServiceDescription}   a service
      *   description the caller already holds (from a cache, say). The client
-     *   selects its version from this copy instead of discovering the document
-     *   from `serverUrl`, and still refuses it with `IncompatibleServerError` if
-     *   it names no version this client speaks or advertises a Spaces Repository
-     *   other than `serverUrl`. `service({ refresh: true })` discards it and
-     *   discovers afresh.
-     * @throws {ValidationError}   when `serverUrl` is not a Spaces Repository URL
+     *   selects its version from this copy instead of discovering the document,
+     *   and still refuses it with `IncompatibleServerError` if it names no
+     *   version this client speaks, or (for a client built from `serviceUrl`)
+     *   if its `url` is another server's service URL. `service({ refresh:
+     *   true })` discards it and discovers afresh.
+     * @throws {ValidationError}   when neither or both of `serviceUrl` and
+     *   `spacesUrl` are given, or the one given is not an absolute http(s) URL
      */
-    constructor({ serverUrl, zcapClient, encryption, serviceDescription }) {
-        const baseUrl = baseUrlOfSpacesUrl(serverUrl);
-        if (baseUrl === null) {
-            throw new ValidationError(`serverUrl "${serverUrl}" is not a Spaces Repository URL. Pass the ` +
-                "server's `/spaces/` URL as an absolute URL, for example " +
-                '"https://host/spaces/".');
+    constructor({ serviceUrl, spacesUrl, zcapClient, encryption, serviceDescription }) {
+        if ((serviceUrl === undefined) === (spacesUrl === undefined)) {
+            throw new ValidationError('A WasClient is built from exactly one of `serviceUrl` (the service ' +
+                'description URL) and `spacesUrl` (the Spaces Repository URL).');
+        }
+        if (serviceUrl !== undefined) {
+            this.serviceUrl = absoluteHttpUrl({
+                name: 'serviceUrl',
+                value: serviceUrl
+            });
+        }
+        else {
+            // Canonical container form, so the probe addresses the container
+            // itself rather than its redirect, and `was.spacesUrl` reads the same
+            // as the `spacesUrl` discovery reports for the same repository.
+            this.spacesUrl = canonicalContainerUrl(absoluteHttpUrl({ name: 'spacesUrl', value: spacesUrl }));
         }
-        this.serverUrl = spacesUrl({ baseUrl });
-        this.baseUrl = baseUrl;
         this.zcapClient = zcapClient;
         this.encryption = encryption;
         this.#serviceDescription = serviceDescription;
@@ -76,16 +103,17 @@ export class WasClient {
      * and never needs a JSON-LD document loader to serve the suite's context.
      *
      * @param options {object}
-     * @param options.serverUrl {string}
+     * @param [options.serviceUrl] {string}   see the constructor
+     * @param [options.spacesUrl] {string}    see the constructor
      * @param options.signer {ISigner}
      * @param [options.encryption] {EncryptionProvider}   see the constructor
      * @param [options.serviceDescription] {ServiceDescription}   see the
      *   constructor
      * @returns {WasClient}
      */
-    static fromSigner({ serverUrl, signer, encryption, serviceDescription }) {
+    static fromSigner({ signer, encryption, serviceDescription, ...locator }) {
         return new WasClient({
-            serverUrl,
+            ...locator,
             zcapClient: zcapClientForSigner({ signer }),
             encryption,
             serviceDescription
@@ -106,35 +134,46 @@ export class WasClient {
     }
     #serviceDescription;
     #service = new Memo(async () => {
-        const info = this.#serviceDescription === undefined
-            ? await discoverService({ url: this.serverUrl })
-            : selectServiceVersion(this.#serviceDescription);
-        // Every Space path is built beneath the parent of `serverUrl`, so a server
-        // that advertises its Spaces Repository elsewhere would be addressed at
-        // the wrong mount. Refuse it by name rather than misroute. Both sides are
-        // compared in canonical base-URL form, so an advertised value that differs
-        // only in serialization (host case, default port, trailing slash) passes.
-        if (info.spacesUrl !== undefined) {
-            const advertisedBase = baseUrlOfSpacesUrl(info.spacesUrl);
-            if (advertisedBase !== this.baseUrl) {
-                const why = advertisedBase === null
-                    ? `which is not a Spaces Repository URL (an absolute http(s) ` +
-                        `URL ending in a "spaces" segment, with no query or fragment).`
-                    : `but this client was given "${this.serverUrl}".`;
-                throw new IncompatibleServerError(`The server advertises its Spaces Repository at ` +
-                    `"${info.spacesUrl}", ${why}`, { requestUrl: this.serverUrl });
-            }
+        if (this.#serviceDescription !== undefined) {
+            const info = selectServiceVersion(this.#serviceDescription);
+            this.#assertDescribesThisServer(info);
+            return info;
         }
-        return info;
+        return this.serviceUrl !== undefined
+            ? readServiceDescription({ serviceUrl: this.serviceUrl })
+            : discoverService({ url: this.spacesUrl });
     });
+    /**
+     * Refuses a caller-supplied service description of another server than
+     * the one this client was built for: a cache entry keyed wrongly, or kept
+     * across deployments, would otherwise route `createSpace` and `listSpaces`
+     * to the other server's Spaces Repository. A server is identified by its
+     * service URL, so the description's `url` must be the `serviceUrl` given.
+     * A client built from `spacesUrl` names no service URL and is not checked;
+     * nor is a discovered description, which came from the server named.
+     *
+     * @param info {ServiceInfo}
+     * @throws {IncompatibleServerError}
+     */
+    #assertDescribesThisServer(info) {
+        if (this.serviceUrl === undefined) {
+            return;
+        }
+        const described = parseAbsoluteHttpUrl(info.description.url)?.toString();
+        if (described !== this.serviceUrl) {
+            throw new IncompatibleServerError(`The service description given is of ` +
+                `"${info.description.url}", but this client was built for ` +
+                `"${this.serviceUrl}".`);
+        }
+    }
     /**
      * Discovers the server's service description and the WAS version this
-     * client speaks with it. Follows the `rel="service"` link on the response to
-     * an unsigned `HEAD` of `serverUrl` (the Spaces Repository URL), then reads
-     * the linked document with an unsigned `GET`. No capability is invoked. The
-     * result is memoized for the life of the client and shared by every handle;
-     * concurrent callers share one discovery, and a failure is not memoized, so
-     * the next call retries.
+     * client speaks with it. A client built from `serviceUrl` reads the document
+     * with an unsigned `GET`; one built from `spacesUrl` first follows the
+     * `rel="service"` link on the response to an unsigned `HEAD` of that URL.
+     * No capability is invoked. The result is memoized for the life of the
+     * client and shared by every handle; concurrent callers share one
+     * discovery, and a failure is not memoized, so the next call retries.
      *
      * Every signed request waits on this discovery, so a caller rarely needs to
      * call it first. It is the way to read the server-wide affordances:
@@ -150,10 +189,9 @@ export class WasClient {
      *   caller about to rely on an affordance the server may have stopped
      *   advertising
      * @returns {Promise<ServiceInfo>}
-     * @throws {IncompatibleServerError}   when the server's responses carry no
-     *   `service` link (it predates v0.5), the document is malformed, it lists
-     *   no version this client speaks, or it advertises a Spaces Repository URL
-     *   other than `serverUrl`
+     * @throws {IncompatibleServerError}   when the probed response carries no
+     *   `service` link (the server predates v0.5), the document is malformed,
+     *   or it lists no version this client speaks
      */
     async service(options = {}) {
         if (options.refresh) {
@@ -163,31 +201,30 @@ export class WasClient {
         return this.#service.get();
     }
     /**
-     * Waits for discovery and refuses a server whose service description has no
-     * Spaces Repository. Discovery has already checked that an advertised
-     * `spaces` URL names `serverUrl`, so callers address `serverUrl` directly.
+     * Waits for discovery and returns the Spaces Repository URL the service
+     * description names, refusing a server whose description has none.
      *
-     * @returns {Promise<void>}
+     * @returns {Promise<string>}
      * @throws {NotSupportedError}   when the server does not implement the
      *   Spaces Repository
      */
-    async #assertSpacesRepository() {
-        const { spacesUrl, version } = await this.service();
+    async #spacesRepositoryUrl() {
+        const { spacesUrl, version, description } = await this.service();
         if (spacesUrl === undefined) {
-            throw new NotSupportedError(`The server at "${this.baseUrl}" does not implement the Spaces ` +
+            throw new NotSupportedError(`The server at "${description.url}" does not implement the Spaces ` +
                 `Repository: its WAS ${version} service description entry has no ` +
                 '`spaces` URL.');
         }
+        return spacesUrl;
     }
     #cachedContext;
     get #context() {
-        // `baseUrl`, `zcapClient` and `encryption` are all constructor-fixed, so
-        // the context is derived once and reused rather than reallocating the
-        // object on every handle access.
+        // `zcapClient` and `encryption` are constructor-fixed, so the context is
+        // derived once and reused rather than reallocating the object on every
+        // handle access.
         if (this.#cachedContext === undefined) {
             const readControllerDid = () => this.controllerDid;
             this.#cachedContext = {
-                baseUrl: this.baseUrl,
                 zcapClient: this.zcapClient,
                 // Read lazily, so building a handle costs nothing and a
                 // delegation-only client (a `ZcapClient` with a delegation signer and
@@ -204,9 +241,13 @@ export class WasClient {
         return this.#cachedContext;
     }
     /**
-     * Returns a lazy handle to a space by id. No I/O.
+     * Returns a lazy handle to a Space by its absolute URL, as the server
+     * named it (the `Location` of the create response, a listing item's `url`,
+     * a stored pointer, or the URL a self-locating DID resolves to). No I/O.
+     * The URL is canonicalized (see `canonicalSpaceUrl` on the `./paths`
+     * entry), and every Collection and Resource URL derives from it.
      *
-     * @param spaceId {string}
+     * @param spaceUrl {string}
      * @param options {object}
      * @param [options.capability] {IZcap}
      * @param [options.encryption] {EncryptionOverride}   the default encryption
@@ -214,11 +255,12 @@ export class WasClient {
      *   `EncryptionOverride`); `space.collection(id, { encryption })` overrides
      *   it per collection
      * @returns {Space}
+     * @throws {ValidationError}   when `spaceUrl` is not a Space URL
      */
-    space(spaceId, options = {}) {
+    spaceAt(spaceUrl, options = {}) {
         return new Space({
             context: this.#context,
-            spaceId,
+            spaceUrl,
             capability: options.capability,
             encryption: options.encryption
         });
@@ -227,7 +269,9 @@ export class WasClient {
      * Creates a space (server-generated id unless `id` is given). `name` is
      * optional (both in the spec and on the reference server); `controller` must
      * match the wrapped signer's DID (which is the default). The request goes
-     * to the Spaces Repository URL the service description names.
+     * to the Spaces Repository URL the service description names, and the
+     * returned handle is opened on the Space URL the response's `Location`
+     * names: the server chooses where the Space lives.
      *
      * @param desc {object}
      * @param [desc.id] {string}
@@ -239,6 +283,7 @@ export class WasClient {
      *   immutable after creation
      * @returns {Promise<Space>}
      * @throws {NotSupportedError}   when the server has no Spaces Repository
+     * @throws {WasServerError}   when the create response carries no `Location`
      */
     async createSpace(desc = {}) {
         const controller = desc.controller ?? this.controllerDid;
@@ -248,13 +293,22 @@ export class WasClient {
             ...(desc.name !== undefined && { name: desc.name }),
             ...(desc.type !== undefined && { type: desc.type })
         };
-        await this.#assertSpacesRepository();
+        const spacesUrl = await this.#spacesRepositoryUrl();
         const response = await send(this.#context, {
-            url: this.serverUrl,
+            url: spacesUrl,
             method: 'POST',
             json: body
         });
-        return this.space(createdId(response));
+        // Only the `Location` is needed here: the Space id is read off the Space
+        // URL by the handle, so the response body's `id` goes unread.
+        const location = response?.headers.get('location');
+        if (!location) {
+            throw new WasServerError(`The Create Space response from "${spacesUrl}" carries no ` +
+                '`Location` header, so the new Space cannot be located.');
+        }
+        // RFC 9110 permits a relative `Location`; resolve it against the request
+        // URL so the handle is opened on an absolute Space URL.
+        return this.spaceAt(new URL(location, spacesUrl).toString());
     }
     /**
      * Lists the spaces in the repository visible to the wrapped signer, as a
@@ -263,7 +317,8 @@ export class WasClient {
      * authorized for, auxiliary spaces included. Each item carries the space's
      * `type` array, the same value as its Space Metadata object's `type`, so a
      * caller can tell an auxiliary space (one whose `type` names
-     * `AuxiliarySpace`) from a user-data one without reading each space.
+     * `AuxiliarySpace`) from a user-data one without reading each space, and
+     * its `url`, the Space URL to open a handle on with {@link spaceAt}.
      * An unauthorized caller is not an error -- the server
      * returns an empty `items` list (the spec's explicit exception to 404
      * masking), so nothing is revealed about which spaces exist.
@@ -277,9 +332,9 @@ export class WasClient {
      * @throws {WasServerError}   when the listing cannot be read in full
      */
     async listSpaces() {
-        await this.#assertSpacesRepository();
+        const spacesUrl = await this.#spacesRepositoryUrl();
         const walk = await signedPageWalk(this.#context, {
-            firstUrl: this.serverUrl
+            firstUrl: spacesUrl
         });
         // The first page always carries the listing body (an unauthorized caller
         // still gets an empty `items` list, not an error), so a `null` walk is a
@@ -287,7 +342,7 @@ export class WasClient {
         // body did not parse as JSON. Report it as one, rather than as a
         // `TypeError` from destructuring `null`.
         if (walk === null) {
-            throw new WasServerError(`The space listing at "${this.serverUrl}" answered with no JSON body.`);
+            throw new WasServerError(`The space listing at "${spacesUrl}" answered with no JSON body.`);
         }
         return collectPages(walk);
     }
@@ -321,7 +376,7 @@ export class WasClient {
     async #publicListWalk(collectionUrl) {
         return buildPageWalk({
             // The collection listing endpoint is the trailing-slash items URL.
-            firstUrl: collectionItemsUrl(collectionUrl),
+            firstUrl: canonicalContainerUrl(collectionUrl),
             fetchPage: async (pageUrl) => {
                 const pageResponse = await unsignedRequest({
                     url: pageUrl,
@@ -384,7 +439,15 @@ export class WasClient {
     /**
      * Rebuilds an access handle from a received capability, returning a handle at
      * the depth implied by the capability's `invocationTarget` (space /
-     * collection / resource), pre-bound with that capability.
+     * collection / resource), pre-bound with that capability. The Space is read
+     * off the capability's delegation chain, which starts at the Space's root
+     * capability (whose id encodes the Space URL), so a capability from any
+     * server locates its own Space with no out-of-band base. The root's target
+     * is taken to be the Space URL: a Space URL has no shape of its own, so a
+     * chain rooted elsewhere (a bare `was.grant({ target })` for a server with
+     * no Space hierarchy roots at its target) is read as if that target were
+     * the Space, and the server refuses the handle's requests. See `spaceUrlOf`
+     * on the `./paths` entry.
      *
      * A resource-scoped capability cannot read the Collection Metadata object, so
      * an encryption-capable client cannot discover whether the collection is
@@ -401,28 +464,26 @@ export class WasClient {
      * @param [options.encryption] {EncryptionOverride}   per-handle encryption
      *   override for the returned handle (see `EncryptionOverride`)
      * @returns {Space | Collection | Resource}
+     * @throws {ValidationError}   when the capability's chain starts at no root
+     *   capability or at one whose target cannot be a Space URL, or its
+     *   `invocationTarget` is not at or beneath that Space, addresses a
+     *   reserved sub-resource with no navigational handle, or is not in
+     *   canonical form (so the handle's requests would fall outside it)
      */
     fromCapability(zcap, { encryption } = {}) {
         const target = zcap.invocationTarget;
-        try {
-            new URL(target);
-        }
-        catch (err) {
-            throw new ValidationError(`invocationTarget "${target}" is not a valid absolute URL.`, { cause: err });
-        }
-        // `parseSpaceTarget` owns the path grammar: it strips `baseUrl`'s path
-        // first (so a WAS mounted under a sub-path -- `https://host/was/` --
-        // classifies just as a bare-origin deployment does, which `parseSpacePath`
-        // alone cannot) and percent-decodes each segment, since the path builders
-        // re-encode every id. Classifying the full segment list -- rather than
-        // destructuring the first three ids -- keeps a sub-resource target
-        // (`/space/s/policy`, `/space/s/c/r/meta`, ...) from being silently
-        // truncated to the nearest containment handle, whose derived URLs would
-        // mismatch the capability's invocation target.
-        const parsed = parseSpaceTarget({ baseUrl: this.baseUrl, target });
+        const spaceUrl = spaceUrlOf(zcap);
+        // `parseSpaceTarget` owns the grammar beneath a Space: it percent-decodes
+        // each segment (the builders re-encode every id) and classifies the full
+        // segment list, so a sub-resource target (`{s}policy`, `{s}{c}/{r}/meta`,
+        // ...) is refused rather than silently truncated to the nearest
+        // containment handle, whose derived URLs would mismatch the capability's
+        // invocation target.
+        const parsed = parseSpaceTarget({ spaceUrl, target });
         if (parsed === null) {
             throw new ValidationError(`Cannot derive a handle from invocationTarget "${target}": it does ` +
-                `not address a resource on "${this.baseUrl}".`);
+                `not address anything at or beneath the Space "${spaceUrl}" the ` +
+                'capability is rooted in.');
         }
         if (parsed.kind === 'sub-resource') {
             throw new ValidationError(`invocationTarget "${target}" addresses a reserved ` +
@@ -431,37 +492,53 @@ export class WasClient {
                 '`resource.meta()`), or use the `was.request()` escape hatch.');
         }
         const context = this.#context;
+        let handle;
         if (parsed.kind === 'resource') {
-            return new Resource({
+            handle = new Resource({
                 context,
-                spaceId: parsed.spaceId,
+                spaceUrl,
                 collectionId: parsed.collectionId,
                 resourceId: parsed.resourceId,
                 capability: zcap,
                 encryption
             });
         }
-        if (parsed.kind === 'collection') {
-            return new Collection({
+        else if (parsed.kind === 'collection') {
+            handle = new Collection({
                 context,
-                spaceId: parsed.spaceId,
+                spaceUrl,
                 collectionId: parsed.collectionId,
                 capability: zcap,
                 encryption
             });
         }
-        return new Space({
-            context,
-            spaceId: parsed.spaceId,
-            capability: zcap,
-            encryption
-        });
+        else {
+            handle = new Space({ context, spaceUrl, capability: zcap, encryption });
+        }
+        // `send` matches every request URL against the capability's target by
+        // string prefix, so a target in a non-canonical serialization (upper-case
+        // host, explicit default port) would let the handle be built and then
+        // refuse every request from it. Refuse it here, by name.
+        if (!isValidTarget({
+            invocationTarget: handle.url,
+            baseInvocationTarget: target,
+            allowTargetAttenuation: true
+        })) {
+            throw new ValidationError(`invocationTarget "${target}" is not in canonical form: the handle ` +
+                `would address "${handle.url}", which the capability does not cover.`);
+        }
+        return handle;
     }
     /**
      * The general delegation primitive. Delegates a capability per `GrantOptions`
-     * and returns the signed zcap to hand off out-of-band. `target` (any URL) and
-     * `capability` (a parent capability to attenuate) make this a superset of the
-     * `space`/`collection` grant sugar.
+     * and returns the signed zcap to hand off out-of-band. `target` (any URL),
+     * `spaceUrl` (the Space to root a revocable grant in) and `capability` (a
+     * parent capability to attenuate) make this a superset of the
+     * `space`/`collection` grant sugar, which fills the first two from the
+     * handle. Without `spaceUrl` or `capability`, the grant is rooted at the
+     * target's own root capability: the shape for a server with no Space
+     * hierarchy (fixed collections, or resources alone), where there is no
+     * Space to root a chain in. Such a grant is not Space-revocable.
      *
      * @param options {GrantOptions}
      * @returns {Promise<IDelegatedZcap>}
@@ -470,11 +547,12 @@ export class WasClient {
         return delegateGrant(this.#context, options);
     }
     /**
-     * The general revocation primitive -- the inverse of {@link grant}. Derives
-     * the owning space from the capability's `invocationTarget` (which a
-     * Space-rooted capability always addresses at or beneath) and submits it to
-     * that space's revocation endpoint. Equivalent to
-     * `was.space(id).revoke(zcap)`.
+     * The general revocation primitive -- the inverse of {@link grant}. Reads
+     * the owning Space off the capability's delegation chain (a Space-rooted
+     * chain starts at the Space's root capability) and submits it to that
+     * Space's revocation endpoint. Equivalent to `was.spaceAt(url).revoke(zcap)`.
+     * The chain root's target is taken to be the Space (see `spaceUrlOf` on the
+     * `./paths` entry); the server refuses a chain not rooted exactly in it.
      *
      * Revocation is scoped to one space: there is no cross-space or global
      * revocation. See {@link Space.revoke} for who may call it, what it does and
@@ -482,18 +560,19 @@ export class WasClient {
      *
      * @param zcap {IDelegatedZcap}   the delegated capability to revoke
      * @returns {Promise<void>}
+     * @throws {ValidationError}   when the capability's chain starts at no root
+     *   capability, or at one whose target cannot be a Space URL
      */
     async revoke(zcap) {
-        const context = this.#context;
-        return submitRevocation(context, {
-            spaceId: spaceIdOf(context, zcap),
+        return submitRevocation(this.#context, {
+            spaceUrl: spaceUrlOf(zcap),
             zcap
         });
     }
     /**
-     * The signed escape hatch, mirroring ezcap's generic `request()`. Resolves
-     * `path` against `baseUrl`, defaults `action` to `method`, uppercases both
-     * (as {@link grant} does, so `'put'` signs `PUT`), and signs via the wrapped
+     * The signed escape hatch, mirroring ezcap's generic `request()`. Takes an
+     * absolute `url`, defaults `action` to `method`, uppercases both (as
+     * {@link grant} does, so `'put'` signs `PUT`), and signs via the wrapped
      * client. Returns the raw `HttpResponse` and throws raw ky/ezcap
      * errors -- it does not apply the null-on-404 or typed-error conveniences.
      * Like every signed request it waits on {@link service} first, and rejects

package/dist/WasClient.js.map

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

package/dist/codec.d.ts

@@ -444,7 +444,8 @@ export interface EncryptionProvider {
      * Builds the encrypting codec for a collection already known to be encrypted.
      *
      * @param input {object}
-     * @param input.spaceId {string}
+     * @param input.spaceUrl {string}   the Space holding the collection, in
+     *   canonical form
      * @param input.collectionId {string}
      * @param input.scheme {string}   the declared encryption scheme (e.g. `edv`)
      * @param [input.encryption] {CollectionEncryption}   the full encryption
@@ -460,7 +461,7 @@ export interface EncryptionProvider {
      *   provider holds no keys / does not handle `scheme` (core then fails closed)
      */
     codecFor(input: {
-        spaceId: string;
+        spaceUrl: string;
         collectionId: string;
         scheme: string;
         encryption?: CollectionEncryption;