@fairfox/polly 0.49.0 → 0.50.0

package/dist/src/mesh.js

@@ -1019,12 +1019,15 @@ var DEFAULT_MESH_KEY_ID = "polly-mesh-default";
 
 class MeshNetworkAdapter extends NetworkAdapter {
   base;
-  keyring;
+  keyringSource;
   encryptionEnabled;
+  get keyring() {
+    return this.keyringSource();
+  }
   constructor(options) {
     super();
     this.base = options.base;
-    this.keyring = options.keyring;
+    this.keyringSource = options.keyringSource;
     this.encryptionEnabled = options.encryptionEnabled ?? true;
     this.base.on("close", () => this.emit("close"));
     this.base.on("peer-candidate", (payload) => this.emit("peer-candidate", payload));
@@ -1057,10 +1060,11 @@ class MeshNetworkAdapter extends NetworkAdapter {
     this.base.send(wrapped);
   }
   wrap(message) {
+    const keyring = this.keyringSource();
     const serialised = serialiseMessage(message);
     let payloadToSign;
     if (this.encryptionEnabled) {
-      const docKey = this.keyring.documentKeys.get(DEFAULT_MESH_KEY_ID);
+      const docKey = keyring.documentKeys.get(DEFAULT_MESH_KEY_ID);
       if (!docKey) {
         throw new Error(`MeshNetworkAdapter: missing document encryption key under id "${DEFAULT_MESH_KEY_ID}". Provision the key in the keyring before sending.`);
       }
@@ -1069,7 +1073,7 @@ class MeshNetworkAdapter extends NetworkAdapter {
     } else {
       payloadToSign = serialised;
     }
-    const signed = signEnvelope(payloadToSign, message.senderId, this.keyring.identity.secretKey);
+    const signed = signEnvelope(payloadToSign, message.senderId, keyring.identity.secretKey);
     const signedBytes = encodeSignedEnvelope(signed);
     return {
       type: message.type,
@@ -1087,10 +1091,11 @@ class MeshNetworkAdapter extends NetworkAdapter {
     } catch {
       return;
     }
-    if (this.keyring.revokedPeers.has(signed.senderId)) {
+    const keyring = this.keyringSource();
+    if (keyring.revokedPeers.has(signed.senderId)) {
       return;
     }
-    const senderKey = this.keyring.knownPeers.get(signed.senderId);
+    const senderKey = keyring.knownPeers.get(signed.senderId);
     if (!senderKey) {
       return;
     }
@@ -1109,7 +1114,7 @@ class MeshNetworkAdapter extends NetworkAdapter {
     } catch {
       return;
     }
-    const docKey = this.keyring.documentKeys.get(encrypted.documentId);
+    const docKey = keyring.documentKeys.get(encrypted.documentId);
     if (!docKey) {
       return;
     }
@@ -2165,7 +2170,8 @@ async function resolveIceServers(rtc) {
   return rtc?.iceServers;
 }
 async function createMeshClient(options) {
-  const keyring = await resolveKeyring(options.keyring);
+  const keyringSource = await resolveKeyringSource(options.keyring);
+  const keyring = keyringSource();
   const encryptionEnabled = options.encryptionEnabled ?? true;
   if (encryptionEnabled && !keyring.documentKeys.has(DEFAULT_MESH_KEY_ID)) {
     throw new Error(`createMeshClient: encryption is enabled but the keyring has no document key for "${DEFAULT_MESH_KEY_ID}". Bootstrap or apply a pairing token that carries the document key before connecting.`);
@@ -2210,7 +2216,7 @@ async function createMeshClient(options) {
   webrtcAdapter = new MeshWebRTCAdapter(webrtcAdapterOptions);
   const networkAdapter = new MeshNetworkAdapter({
     base: webrtcAdapter,
-    keyring,
+    keyringSource,
     encryptionEnabled
   });
   const repo = new Repo({
@@ -2222,7 +2228,9 @@ async function createMeshClient(options) {
   await signaling.connect();
   return {
     repo,
-    keyring,
+    get keyring() {
+      return keyringSource();
+    },
     signaling,
     networkAdapter,
     webrtcAdapter,
@@ -2233,15 +2241,18 @@ async function createMeshClient(options) {
     }
   };
 }
-async function resolveKeyring(source) {
+async function resolveKeyringSource(source) {
+  if (typeof source === "object" && source !== null && "source" in source) {
+    return source.source;
+  }
   if ("storage" in source) {
     const loaded = await source.storage.load();
     if (loaded === null) {
       throw new Error("createMeshClient: keyring storage returned null (no saved keyring). In a Node CLI, bootstrap with `bootstrapCliKeyring` from `@fairfox/polly/mesh/node`; in a browser, run your pairing flow first and save the keyring through the storage adapter before constructing the client.");
     }
-    return loaded;
+    return () => loaded;
   }
-  return source;
+  return () => source;
 }
 // src/shared/lib/pairing.ts
 init_encryption();
@@ -2637,4 +2648,4 @@ export {
   $meshCounter
 };
 
-//# debugId=1DAAF5727BCAB57A64756E2164756E21
+//# debugId=B2B892016D246AC464756E2164756E21