@weaveprotocol/cli 0.2.4 → 0.2.5

package/dist/weave.mjs

@@ -7527,14 +7527,18 @@ async function proveRead(access, label, provider) {
 }
 async function checkRead(access, peerDid, label, proof, provider) {
   const current = access.current();
+  const admit = (readKey2) => {
+    access.admitted?.(peerDid, readKey2);
+    return true;
+  };
   const claimed = typeof proof.readKey === "string" ? proof.readKey : current;
   if (claimed.startsWith("did:key:") && await verifyBy(provider, claimed, proof.read, label)) {
-    if (claimed === current) return true;
-    if (access.admits && await access.admits(peerDid, claimed, proof.member)) return true;
+    if (claimed === current) return admit(current);
+    if (access.admits && await access.admits(peerDid, claimed, proof.member)) return admit(claimed);
   }
   const earlier = Array.isArray(proof.earlier) ? proof.earlier.slice(0, MAX_EARLIER_READ_KEYS) : [];
   const ours = earlier.find((item) => item?.readKey === current);
-  return ours !== void 0 && current.startsWith("did:key:") && verifyBy(provider, current, ours.read, label);
+  return ours !== void 0 && current.startsWith("did:key:") && await verifyBy(provider, current, ours.read, label) && admit(current);
 }
 function peerNonce() {
   return base64UrlEncode(globalThis.crypto.getRandomValues(new Uint8Array(16)));
@@ -8016,6 +8020,12 @@ function createMesh(config) {
         broadcast: (message) => {
           for (const peer of room.peers.keys()) send2(peer, message);
         },
+        drop(peer) {
+          if (rooms.get(name) !== room || !room.peers.has(peer)) return;
+          sendFrame(peer, { room: name, type: LEAVE_MESSAGE });
+          drop(room, peer);
+          closeIfIdle(peer);
+        },
         getPeers: () => [...room.peers.values()],
         on: room.events.on,
         off: room.events.off,
@@ -8066,6 +8076,9 @@ function createNetworkManager(config) {
     broadcast: (message) => {
       for (const peerId of peers.keys()) send2(peerId, message);
     },
+    drop: (peerId) => {
+      if (peers.has(peerId)) transport.close(peerId);
+    },
     getPeers: () => [...peers.values()],
     on,
     off,
@@ -9011,6 +9024,8 @@ var writeCapability = (spaceId) => ({
 });
 var noteCid = (encoded) => cidFromBytes(utf8Encode(encoded));
 var NO_ACCOUNT = Object.freeze({ account: null, agent: false });
+var STALE_ADMISSION_MS = 6e4;
+var WHO_WAIT_MS = 1e4;
 var WHO_MESSAGE = "who";
 var LIVE_MESSAGE = "live";
 var MAX_LIVE_BYTES = 64 * 1024;
@@ -9564,6 +9579,8 @@ async function openSpaceRuntime(deps) {
     for (const mirror of mirrors) mirror.changed();
     void refreshHolds().catch(() => {
     });
+    void letGoOfOutsiders().catch(() => {
+    });
   };
   function currentKey2(state) {
     const epoch = state.keys.at(-1);
@@ -9721,6 +9738,7 @@ async function openSpaceRuntime(deps) {
       keysRunning = null;
     });
   }
+  const admittedOn = /* @__PURE__ */ new Map();
   const readAccess = space2.visibility !== "private" ? null : {
     async key() {
       const held = newestKey((await access()).history.current);
@@ -9744,6 +9762,9 @@ async function openSpaceRuntime(deps) {
       if (!held) return false;
       const { account } = await accountOf(peerDid, await openWith(held, membership, membershipContext(space2.id)));
       return account !== null && readers(history.current).has(account);
+    },
+    admitted(peerDid, readKey2) {
+      admittedOn.set(peerDid, { readKey: readKey2, at: Date.now() });
     }
   };
   const mirrors = [];
@@ -9853,6 +9874,24 @@ async function openSpaceRuntime(deps) {
     if (!routes.has(peer)) return;
     emit({ type: "message", space: space2.id, from: account, peer, agent, message: payload });
   }
+  async function letGoOfOutsiders() {
+    if (admittedOn.size === 0) return;
+    const connected = new Set(connectedPeers());
+    for (const [peer, { at }] of admittedOn) {
+      if (!connected.has(peer) && Date.now() - at > STALE_ADMISSION_MS) admittedOn.delete(peer);
+    }
+    const allowed = readers((await access()).history.current);
+    for (const peer of connected) {
+      const admission = admittedOn.get(peer);
+      if (!admission || admission.readKey === currentReadKey) continue;
+      if (!peerAccounts.has(peer) && Date.now() - admission.at < WHO_WAIT_MS) continue;
+      const { account } = await peerAccounts.get(peer) ?? NO_ACCOUNT;
+      if (account !== null && allowed.has(account)) continue;
+      if (admittedOn.get(peer) !== admission) continue;
+      admittedOn.delete(peer);
+      for (const network of networks) network.drop(peer);
+    }
+  }
   for (const network of networks) {
     network.on("message", (message) => {
       if (message.type === "sync") void sync.handleMessage(message.from, message.payload);
@@ -9864,6 +9903,8 @@ async function openSpaceRuntime(deps) {
           if (peerAccounts.get(message.from) !== checked) return;
           knownAccounts.set(message.from, known);
           emit({ type: "status", space: space2.id });
+          void letGoOfOutsiders().catch(() => {
+          });
         });
       } else if (message.type === LIVE_MESSAGE) void onLive(message.from, message.payload);
     });
@@ -9873,6 +9914,8 @@ async function openSpaceRuntime(deps) {
       sync.addPeer(info.did);
       sync.notifyPeers([info.did]);
       emit({ type: "status", space: space2.id });
+      void letGoOfOutsiders().catch(() => {
+      });
     });
     network.on("peer-disconnected", (info) => {
       if (routes.get(info.did) === network) {
@@ -9882,6 +9925,7 @@ async function openSpaceRuntime(deps) {
         knownAccounts.delete(info.did);
         liveAllowance.delete(info.did);
       }
+      if (!connectedPeers().includes(info.did)) admittedOn.delete(info.did);
       emit({ type: "status", space: space2.id });
     });
     network.on("error", () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weaveprotocol/cli",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "The Weave protocol from a terminal: manage spaces, run an always-on node, serve MCP to agents",
   "type": "module",
   "bin": {