@calimero-network/mero-js 29.7.5 → 29.7.7

package/dist/index.mjs

@@ -1592,11 +1592,18 @@ function cancelled(message) {
   error.name = "NotAllowedError";
   return error;
 }
-async function ask(method, options) {
+async function ask(method, options, signal, what) {
   const container = navigator.credentials;
   const own = globalThis.CredentialsContainer?.prototype?.[method];
   const call = own ?? container[method];
-  return call.call(container, options);
+  try {
+    return await call.call(container, signal ? { ...options, signal } : options);
+  } catch (error) {
+    if (signal?.aborted || error?.name === "AbortError") {
+      throw Object.assign(cancelled(`${what} was cancelled`), { cause: error });
+    }
+    throw error;
+  }
 }
 function es256First(params) {
   const es256 = params.filter((p) => p.alg === -7);
@@ -1604,7 +1611,7 @@ function es256First(params) {
 }
 function browserPasskey() {
   return {
-    async create(options) {
+    async create(options, createOptions) {
       const o = options;
       const cred = await ask("create", {
         publicKey: {
@@ -1620,7 +1627,7 @@ function browserPasskey() {
           attestation: "none",
           timeout: o.timeout
         }
-      });
+      }, createOptions?.signal, "passkey creation");
       if (!cred) throw cancelled("passkey creation was cancelled");
       const r = cred.response;
       return {
@@ -1639,7 +1646,7 @@ function browserPasskey() {
             id: buf(fromB64url(id))
           }))
         }
-      });
+      }, options?.signal, "passkey sign-in");
       if (!cred) throw cancelled("passkey sign-in was cancelled");
       const r = cred.response;
       return {
@@ -1857,8 +1864,8 @@ function pageDeployment(href) {
     return null;
   }
 }
-function userVerificationOf(named) {
-  return named === "required" || named === "preferred" || named === "discouraged" ? named : "required";
+function userVerificationOf(named, fallback) {
+  return named === "required" || named === "preferred" || named === "discouraged" ? named : fallback;
 }
 function promptFailure(error) {
   const e = error;
@@ -2244,11 +2251,16 @@ var CalimeroClient = class _CalimeroClient {
       origin === void 0 ? { name, ...invite } : { name, origin, ...invite },
       origin
     );
-    const registration = await passkey.create(begin.options);
-    const session = await this.postConfirmed(
+    const signal = options.signal;
+    const registration = await (signal ? passkey.create(begin.options, { signal }) : passkey.create(begin.options));
+    const session = await this.confirmed(
+      "POST",
       "auth/passkey/register/finish",
       { challengeId: begin.challengeId, registration, ...invite },
-      passkey
+      passkey,
+      void 0,
+      "preferred",
+      signal
     );
     this.useSession(session);
     return session;
@@ -2269,7 +2281,8 @@ var CalimeroClient = class _CalimeroClient {
     const origin = this.pageOrigin(options);
     const begin = await this.begin("auth/passkey/login/begin", origin === void 0 ? void 0 : { origin }, origin);
     const rpId = begin.options.rpId ?? begin.options.rp?.id ?? "";
-    const assertion = await passkey.get(fromB64url(begin.options.challenge), rpId);
+    const challenge = fromB64url(begin.options.challenge);
+    const assertion = await (options.signal ? passkey.get(challenge, rpId, void 0, { signal: options.signal }) : passkey.get(challenge, rpId));
     const session = await this.post("auth/passkey/login/finish", {
       challengeId: begin.challengeId,
       assertion
@@ -2338,16 +2351,31 @@ var CalimeroClient = class _CalimeroClient {
     if (this.current === current) this.useSession(session);
     return session;
   }
+  /**
+   * End this session. The client is signed out whether or not the node
+   * answers: the revoke (`POST /auth/logout`) is attempted, and its failure
+   * (the node unreachable, say) is thrown after the session is dropped, so a
+   * caller can say the server may still hold it, but no request after this
+   * one carries its token.
+   */
   async signOut() {
-    await this.post("auth/logout");
-    this.auth = void 0;
-    this.current = void 0;
+    await this.signingOut("auth/logout");
   }
-  /** End every session of the signed-in account, on every device, this one too. */
+  /**
+   * End every session of the signed-in account, on every device, this one
+   * too. Like {@link signOut}, this client is signed out even when the
+   * request fails, and the failure is thrown.
+   */
   async signOutEverywhere() {
-    await this.post("auth/logout-all");
-    this.auth = void 0;
-    this.current = void 0;
+    await this.signingOut("auth/logout-all");
+  }
+  async signingOut(path) {
+    try {
+      await this.post(path);
+    } finally {
+      this.auth = void 0;
+      this.current = void 0;
+    }
   }
   /** Who the credential is: the account, how it signed in, and the package (`app`) and `origin` a session is bound to. */
   me() {
@@ -2639,7 +2667,7 @@ var CalimeroClient = class _CalimeroClient {
   deleteConfirmed(path, passkey, body = {}) {
     return this.confirmed("DELETE", path, body, passkey);
   }
-  async confirmed(method, path, body, passkey, send = (b) => this.json(method, path, b)) {
+  async confirmed(method, path, body, passkey, send = (b) => this.json(method, path, b), userVerification = "required", signal) {
     try {
       return await send(body);
     } catch (error) {
@@ -2648,7 +2676,8 @@ var CalimeroClient = class _CalimeroClient {
       let assertion;
       try {
         assertion = await passkey.get(fromB64url(d.challenge), d.rpId, d.allowCredentials, {
-          userVerification: userVerificationOf(d.userVerification)
+          userVerification: userVerificationOf(d.userVerification, userVerification),
+          ...signal ? { signal } : {}
         });
       } catch (declined) {
         throw promptFailure(declined);