chore: upgrade aegir to 38.1.2 (#109)

Author: maschad

package.json

@@ -144,13 +144,14 @@
     "@libp2p/peer-id": "^2.0.0",
     "any-signal": "^3.0.1",
     "err-code": "^3.0.1",
+    "ipfs-core-types": "^0.14.0",
     "multiformats": "^11.0.0",
     "p-defer": "^4.0.0",
     "p-queue": "^7.2.0"
   },
   "devDependencies": {
     "@libp2p/peer-id-factory": "^2.0.0",
-    "aegir": "^37.9.1",
+    "aegir": "^38.1.2",
     "go-ipfs": "^0.15.0",
     "ipfs-http-client": "^59.0.0",
     "ipfsd-ctl": "^12.0.2",

src/index.ts

@@ -148,15 +148,15 @@ class DelegatedPeerRouting implements PeerRouting, Startable {
     log(`enabled DelegatedPeerRouting via ${protocol}://${host}:${port}`)
   }
 
-  isStarted () {
+  isStarted (): boolean {
     return this.started
   }
 
-  start () {
+  start (): void {
     this.started = true
   }
 
-  stop () {
+  stop (): void {
     this.httpQueue.clear()
     this.abortController.abort()
     this.abortController = new AbortController()
@@ -166,7 +166,7 @@ class DelegatedPeerRouting implements PeerRouting, Startable {
   /**
    * Attempts to find the given peer
    */
-  async findPeer (id: PeerId, options: HTTPClientExtraOptions & AbortOptions = {}) {
+  async findPeer (id: PeerId, options: HTTPClientExtraOptions & AbortOptions = {}): Promise<PeerInfo> {
     log('findPeer starts: %p', id)
     options.timeout = options.timeout ?? DEFAULT_TIMEOUT
     options.signal = anySignal([this.abortController.signal].concat((options.signal != null) ? [options.signal] : []))
@@ -208,7 +208,7 @@ class DelegatedPeerRouting implements PeerRouting, Startable {
   /**
    * Attempt to find the closest peers on the network to the given key
    */
-  async * getClosestPeers (key: Uint8Array, options: HTTPClientExtraOptions & AbortOptions = {}) {
+  async * getClosestPeers (key: Uint8Array, options: HTTPClientExtraOptions & AbortOptions = {}): AsyncGenerator<PeerInfo, void, undefined> {
     let cidOrPeerId: CID | PeerId
     const cid = CID.asCID(key)
 

test/index.spec.ts

@@ -29,7 +29,7 @@ const factory = createFactory({
   endpoint: 'http://localhost:57583'
 })
 
-async function spawnNode (bootstrap: any[] = []) {
+async function spawnNode (bootstrap: any[] = []): Promise<{ node: Controller, id: IDResult }> {
   const node = await factory.spawn({
     // Lock down the nodes so testing can be deterministic
     ipfsOptions: {
@@ -46,7 +46,7 @@ async function spawnNode (bootstrap: any[] = []) {
   }
 }
 
-function createIpfsClient (opts: Options) {
+function createIpfsClient (opts: Options): any {
   const client = create(opts)
 
   return {
@@ -119,7 +119,7 @@ describe('DelegatedPeerRouting', function () {
         port: 8000,
         host: 'localhost'
       })
-      // @ts-expect-error ipfs-http-client types are out of date
+
       const router = delegatedPeerRouting(client)()
 
       expect(router).to.have.property('client')
@@ -138,33 +138,30 @@ describe('DelegatedPeerRouting', function () {
     it('should be able to find peers via the delegate with a peer id string', async () => {
       const opts = delegatedNode.apiAddr.toOptions()
 
-      // @ts-expect-error ipfs-http-client types are out of date
       const router = delegatedPeerRouting(createIpfsClient({
         protocol: 'http',
         port: opts.port,
         host: opts.host
       }))()
 
-      // @ts-expect-error ipfs-http-client types are out of date
       const peer = await router.findPeer(peerIdToFind.id)
 
       const { id, multiaddrs } = peer
       expect(id).to.exist()
       expect(multiaddrs).to.exist()
-      // @ts-expect-error ipfs-http-client types are out of date
+
       expect(id.equals(peerIdToFind.id)).to.be.true()
     })
 
     it('should be able to find peers via the delegate with a peerid', async () => {
       const opts = delegatedNode.apiAddr.toOptions()
-      // @ts-expect-error ipfs-http-client types are out of date
+
       const router = delegatedPeerRouting(createIpfsClient({
         protocol: 'http',
         port: opts.port,
         host: opts.host
       }))()
 
-      // @ts-expect-error ipfs-http-client types are out of date
       const peer = await router.findPeer(peerIdToFind.id)
 
       const { id, multiaddrs } = peer
@@ -176,15 +173,14 @@ describe('DelegatedPeerRouting', function () {
 
     it('should be able to specify a timeout', async () => {
       const opts = delegatedNode.apiAddr.toOptions()
-      // @ts-expect-error ipfs-http-client types are out of date
+
       const router = delegatedPeerRouting(createIpfsClient({
         protocol: 'http',
         port: opts.port,
         host: opts.host
       }))()
       const controller = new TimeoutController(5e3)
 
-      // @ts-expect-error ipfs-http-client types are out of date
       const peer = await router.findPeer(peerIdToFind.id, { signal: controller.signal })
 
       const { id, multiaddrs } = peer
@@ -198,7 +194,7 @@ describe('DelegatedPeerRouting', function () {
 
     it('should not be able to find peers not on the network', async () => {
       const opts = delegatedNode.apiAddr.toOptions()
-      // @ts-expect-error ipfs-http-client types are out of date
+
       const router = delegatedPeerRouting(createIpfsClient({
         protocol: 'http',
         port: opts.port,
@@ -216,7 +212,6 @@ describe('DelegatedPeerRouting', function () {
     it('should be able to query for the closest peers', async () => {
       const opts = delegatedNode.apiAddr.toOptions()
 
-      // @ts-expect-error ipfs-http-client types are out of date
       const router = delegatedPeerRouting(createIpfsClient({
         protocol: 'http',
         port: opts.port,
@@ -234,7 +229,7 @@ describe('DelegatedPeerRouting', function () {
       expect(closerPeers.length).to.equal(2)
       closerPeers.forEach(result => {
         // shouldn't be the delegate
-        // @ts-expect-error ipfs-http-client types are out of date
+
         expect(delegatePeerId.equals(result.id)).to.equal(false)
         expect(result.multiaddrs).to.be.an('array')
       })
@@ -243,7 +238,6 @@ describe('DelegatedPeerRouting', function () {
     it('should find closest peers even if the peer does not exist', async () => {
       const opts = delegatedNode.apiAddr.toOptions()
 
-      // @ts-expect-error ipfs-http-client types are out of date
       const router = delegatedPeerRouting(createIpfsClient({
         protocol: 'http',
         port: opts.port,
@@ -260,7 +254,7 @@ describe('DelegatedPeerRouting', function () {
       expect(closerPeers.length).to.equal(2)
       closerPeers.forEach(result => {
         // shouldnt be the delegate
-        // @ts-expect-error ipfs-http-client types are out of date
+
         expect(delegatePeerId.equals(result.id)).to.equal(false)
         expect(result.multiaddrs).to.be.an('array')
       })
@@ -270,7 +264,7 @@ describe('DelegatedPeerRouting', function () {
   describe('stop', () => {
     it('should cancel in-flight requests when stopping', async () => {
       const opts = delegatedNode.apiAddr.toOptions()
-      // @ts-expect-error ipfs-http-client types are out of date
+
       const router = delegatedPeerRouting(createIpfsClient({
         protocol: 'http',
         port: opts.port,