Merge branch 'main' into dependabot/npm_and_yarn/sinon-18.0.0

Author: SgtPooki

CHANGELOG.md

@@ -36,7 +36,7 @@
     "docs:no-publish": "aegir docs --publish false"
   },
   "devDependencies": {
-    "aegir": "^42.2.0",
+    "aegir": "^44.1.1",
     "npm-run-all": "^4.1.5"
   },
   "type": "module",

package.json

@@ -61,7 +61,7 @@
   },
   "devDependencies": {
     "@libp2p/peer-id-factory": "^4.0.4",
-    "aegir": "^42.2.0",
+    "aegir": "^44.1.1",
     "body-parser": "^1.20.2",
     "it-all": "^3.0.2"
   },

packages/client/package.json

@@ -301,24 +301,28 @@ export class DefaultDelegatedRoutingV1HttpApiClient implements DelegatedRoutingV
   }
 
   #conformToPeerSchema (record: any): PeerRecord | undefined {
-    const protocols: string[] = []
-    const multiaddrs: Multiaddr[] = record.Addrs?.map(multiaddr) ?? []
+    try {
+      const protocols: string[] = []
+      const multiaddrs: Multiaddr[] = record.Addrs?.map(multiaddr) ?? []
 
-    if (record.Protocols != null) {
-      protocols.push(...record.Protocols)
-    }
+      if (record.Protocols != null) {
+        protocols.push(...record.Protocols)
+      }
 
-    if (record.Protocol != null) {
-      protocols.push(record.Protocol)
-      delete record.Protocol
-    }
+      if (record.Protocol != null) {
+        protocols.push(record.Protocol)
+        delete record.Protocol
+      }
 
-    return {
-      ...record,
-      Schema: 'peer',
-      ID: peerIdFromString(record.ID),
-      Addrs: multiaddrs,
-      Protocols: protocols
+      return {
+        ...record,
+        Schema: 'peer',
+        ID: peerIdFromString(record.ID),
+        Addrs: multiaddrs,
+        Protocols: protocols
+      }
+    } catch (err) {
+      log.error('could not conform record to peer schema', err)
     }
   }
 }

packages/client/src/client.ts

@@ -41,11 +41,11 @@
     "@helia/delegated-routing-v1-http-api-client": "^3.0.0",
     "@helia/delegated-routing-v1-http-api-server": "^3.0.0",
     "@helia/ipns": "^7.1.0",
-    "@libp2p/identify": "^1.0.10",
+    "@libp2p/identify": "^2.1.0",
     "@libp2p/interface": "^1.1.1",
     "@libp2p/kad-dht": "^12.0.3",
     "@libp2p/peer-id-factory": "^4.0.4",
-    "aegir": "^42.2.0",
+    "aegir": "^44.1.1",
     "fastify": "^4.17.0",
     "helia": "^4.0.0",
     "ipns": "^9.0.0",

packages/interop/package.json

@@ -63,6 +63,7 @@ describe('delegated-routing-v1-http-api interop', () => {
     const cid = CID.createV1(raw.code, digest)
 
     await network[1].blockstore.put(cid, input)
+    await network[1].routing.provide(cid)
 
     let foundProvider = false
 

packages/interop/test/index.spec.ts

@@ -71,7 +71,7 @@
     "fastify": "^4.17.0",
     "ipns": "^9.0.0",
     "multiformats": "^13.0.0",
-    "raw-body": "^2.5.2"
+    "raw-body": "^3.0.0"
   },
   "devDependencies": {
     "@libp2p/peer-id-factory": "^4.0.4",