@highway1/core 0.1.29 → 0.1.31

package/dist/index.js

@@ -1092,11 +1092,15 @@ function createDHTOperations(libp2p) {
             break;
           }
         }
-        const caps = (card.capabilities ?? []).map(
-          (c) => typeof c === "string" ? c : c.name
-        ).filter(Boolean);
+        const caps = (card.capabilities ?? []).flatMap((c) => {
+          if (typeof c === "string") return [c];
+          return [c.name, c.id].filter(Boolean);
+        });
         caps.push("__all__");
         const importantCaps = ["__all__"];
+        if (caps.some((cap) => capKey(cap) === "relay")) {
+          importantCaps.push("relay");
+        }
         await Promise.all(importantCaps.map(async (cap) => {
           const capKeyStr = `/clawiverse/cap/${capKey(cap)}`;
           const capDHTKey = fromString(capKeyStr);
@@ -1379,13 +1383,13 @@ function createMessageRouter(libp2p, verifyFn, dht, relayPeers) {
           } catch {
           }
         }
+        let lastError;
         if (!stream) {
           const allRelayAddrs = [
             ...relayMultiaddrs,
             ...(relayPeers ?? []).map((r) => buildCircuitRelayAddr(r, targetPeerIdStr))
           ];
           const uniqueRelayAddrs = [...new Set(allRelayAddrs)];
-          let lastError;
           for (const addr of uniqueRelayAddrs) {
             try {
               const conn = await libp2p.dial(multiaddr(addr));
@@ -1398,7 +1402,6 @@ function createMessageRouter(libp2p, verifyFn, dht, relayPeers) {
               lastError = relayErr;
             }
           }
-          if (!stream) throw lastError ?? new MessagingError("All dial attempts failed");
         }
         if (!stream && dht && "queryRelayPeers" in dht) {
           const discoveredRelays = await dht.queryRelayPeers();
@@ -1411,9 +1414,12 @@ function createMessageRouter(libp2p, verifyFn, dht, relayPeers) {
               break;
             } catch (e) {
               logger5.warn("DHT relay failed", { relayAddr, error: e.message });
+              lastError = e;
             }
           }
-          if (!stream) throw new MessagingError("All dial attempts failed (including DHT-discovered relays)");
+        }
+        if (!stream) {
+          throw lastError ?? new MessagingError("All dial attempts failed (including DHT-discovered relays)");
         }
         const encoded = encodeMessage(envelope);
         await stream.sink(
@@ -1496,7 +1502,7 @@ function createMessageRouter(libp2p, verifyFn, dht, relayPeers) {
 function buildCircuitRelayAddr(relayAddr, targetPeerId) {
   return `${relayAddr}/p2p-circuit/p2p/${targetPeerId}`;
 }
-async function handleIncomingStream(stream, handlers, catchAllHandler, _verifyFn) {
+async function handleIncomingStream(stream, handlers, catchAllHandler, verifyFn) {
   try {
     const chunks = [];
     for await (const chunk of stream.source) {
@@ -1515,6 +1521,37 @@ async function handleIncomingStream(stream, handlers, catchAllHandler, _verifyFn
       logger5.warn("Received invalid message envelope");
       return;
     }
+    const isValidSignature = await verifyEnvelope(envelope, async (signature, data2) => {
+      const senderPublicKey = extractPublicKey(envelope.from);
+      return verify(signature, data2, senderPublicKey);
+    });
+    if (!isValidSignature) {
+      logger5.warn("Received message with invalid signature", {
+        id: envelope.id,
+        from: envelope.from
+      });
+      return;
+    }
+    try {
+      const { signature, ...envelopeWithoutSig } = envelope;
+      const dataBytes = new TextEncoder().encode(JSON.stringify(envelopeWithoutSig));
+      const signatureBytes = Buffer.from(signature, "hex");
+      const hookValid = await verifyFn(signatureBytes, dataBytes);
+      if (!hookValid) {
+        logger5.warn("Message rejected by custom verifier", {
+          id: envelope.id,
+          from: envelope.from
+        });
+        return;
+      }
+    } catch (error) {
+      logger5.warn("Custom verification hook failed", {
+        id: envelope.id,
+        from: envelope.from,
+        error: error.message
+      });
+      return;
+    }
     logger5.info("Received message", {
       id: envelope.id,
       from: envelope.from,