@calimero-network/mero-js 24.5.0 → 24.7.0

package/dist/mero-js.d.ts

@@ -174,7 +174,10 @@ export declare class MeroJs {
      *    instance already rotated is adopted instead of replaying a stale token.
      */
     private performTokenRefresh;
-    /** Run `fn` under the cross-tab refresh lock, or directly if Web Locks are unavailable. */
+    /**
+     * Run `fn` under the refresh lock: the token store's own (shared across
+     * processes), else the cross-tab Web Lock, else directly.
+     */
     private withRefreshLock;
     /**
      * Perform the actual token refresh. Runs with the refresh lock held.

package/dist/mero-js.js

@@ -290,8 +290,13 @@ export class MeroJs {
             }
         }
     }
-    /** Run `fn` under the cross-tab refresh lock, or directly if Web Locks are unavailable. */
+    /**
+     * Run `fn` under the refresh lock: the token store's own (shared across
+     * processes), else the cross-tab Web Lock, else directly.
+     */
     withRefreshLock(fn) {
+        if (this.tokenStore?.withLock)
+            return this.tokenStore.withLock(fn);
         const locks = getLockManager();
         return locks ? locks.request(REFRESH_LOCK_NAME, fn) : fn();
     }

package/dist/token-store/index.d.ts

@@ -3,6 +3,14 @@ export interface TokenStore {
     getTokens(): TokenData | null;
     setTokens(data: TokenData): void;
     clear(): void;
+    /**
+     * Run `fn` holding a lock that every process sharing this store respects.
+     * MeroJs holds it around a token refresh, so two processes on one store never
+     * spend the same single-use refresh token. Web Locks cover tabs of one
+     * browser; a store shared across processes (a file read by several CLIs, say)
+     * needs its own lock, and implements this. Takes precedence over Web Locks.
+     */
+    withLock?<T>(fn: () => Promise<T>): Promise<T>;
 }
 export declare class MemoryTokenStore implements TokenStore {
     private tokens;

package/dist/transport/mero-client.d.ts

@@ -82,6 +82,13 @@ export interface RelayTransportConfig {
      * would have that caller take the client apart to put it back together.
      */
     relay: RelayClient | RelayClientConfig;
+    /**
+     * Fetch for everything this client sends the relay: intents (unless `relay`
+     * names its own), admin reads, the observing login and events. Typically a
+     * sealed fetch (`createAttestedSealedFetch`), so none of it can be read where
+     * TLS ends. Defaults to global `fetch`.
+     */
+    fetch?: typeof fetch;
     /**
      * A session on the relay, if this client has one.
      *
@@ -156,6 +163,8 @@ export declare class MeroClient {
     private readonly proofAuthorizer;
     private readonly relayUrl;
     private proofEvents;
+    /** The relay transport's `fetch`, if one was given. */
+    private readonly relayFetch;
     private relayPresence;
     constructor(config: MeroClientConfig);
     /**

package/dist/transport/mero-client.js

@@ -88,7 +88,7 @@ function missingNodeKey(surface) {
  * authors is the device that observes, and taking a second copy from the caller
  * is how the two come to name different keys.
  */
-function buildObserver(relay, observe) {
+function buildObserver(relay, observe, fetchImpl) {
     const nodeKey = observe?.nodeKey;
     if (!nodeKey)
         return null;
@@ -100,7 +100,7 @@ function buildObserver(relay, observe) {
         signer: observe?.signer ? async () => observe.signer : () => relay.authorSigner(),
         clientName: observe?.clientName,
         ttlSeconds: observe?.ttlSeconds,
-        fetch: observe?.fetch,
+        fetch: observe?.fetch ?? fetchImpl,
         timeoutMs: observe?.timeoutMs,
     });
 }
@@ -128,12 +128,18 @@ export class MeroClient {
         this.proofAuthorizer = null;
         this.relayUrl = null;
         this.proofEvents = null;
+        /** The relay transport's `fetch`, if one was given. */
+        this.relayFetch = undefined;
         this.relayPresence = null;
         if (config.transport === 'relay') {
             this.transport = 'relay';
             this.nodeClient = null;
-            const relay = config.relay instanceof RelayClient ? config.relay : new RelayClient(config.relay);
-            this.relayObserver = buildObserver(relay, config.observe);
+            const fetchImpl = config.fetch;
+            this.relayFetch = fetchImpl;
+            const relay = config.relay instanceof RelayClient
+                ? config.relay
+                : new RelayClient({ ...config.relay, fetch: config.relay.fetch ?? fetchImpl });
+            this.relayObserver = buildObserver(relay, config.observe, fetchImpl);
             this.rpcTransport = new RelayTransport(relay, this.relayObserver);
             this.relayUrl = relay.relayUrl;
             if (config.proof) {
@@ -150,12 +156,13 @@ export class MeroClient {
                 this.relayAdmin = createAdminApiClient({
                     baseUrl: relay.relayUrl,
                     getAuthToken: typeof token === 'string' ? async () => token : token,
+                    fetch: fetchImpl,
                 });
             }
             else if (this.proofAuthorizer) {
                 const authorizeRequest = this.proofAuthorizer;
                 this.relayAdmin = createAdminApiClientFromHttpClient(createHttpClient({
-                    fetch: (url, init) => globalThis.fetch(url, init),
+                    fetch: (url, init) => fetchImpl ? fetchImpl(url, init) : globalThis.fetch(url, init),
                     baseUrl: relay.relayUrl,
                     authorizeRequest,
                 }), { baseUrl: relay.relayUrl });
@@ -281,6 +288,7 @@ export class MeroClient {
             this.proofEvents ?? (this.proofEvents = new SseClient({
                 baseUrl: this.relayUrl,
                 authorize: this.proofAuthorizer,
+                fetch: this.relayFetch,
             }));
             return this.proofEvents;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@calimero-network/mero-js",
-  "version": "24.5.0",
+  "version": "24.7.0",
   "description": "Pure JavaScript SDK for Calimero",
   "type": "module",
   "exports": {