deps: bump aegir from 38.1.8 to 39.0.1

package.json

@@ -38,7 +38,7 @@
     "release": "aegir run release"
   },
   "dependencies": {
-    "aegir": "^38.1.6"
+    "aegir": "^39.0.10"
   },
   "workspaces": [
     "packages/*"

packages/libp2p-daemon-client/package.json

@@ -155,7 +155,8 @@
     "@libp2p/interface-mocks": "^11.0.0",
     "@libp2p/interface-peer-store": "^2.0.0",
     "@libp2p/interface-pubsub": "^4.0.0",
-    "aegir": "^38.1.6",
+    "@types/sinon": "^10.0.14",
+    "aegir": "^39.0.10",
     "it-all": "^3.0.1",
     "it-pipe": "^3.0.0",
     "sinon": "^15.0.1",

packages/libp2p-daemon-client/src/dht.ts

@@ -1,16 +1,16 @@
-import { CID } from 'multiformats/cid'
-import { multiaddr } from '@multiformats/multiaddr'
-import { CodeError } from '@libp2p/interfaces/errors'
 import {
   Request,
   Response,
   DHTRequest,
   DHTResponse
 } from '@libp2p/daemon-protocol'
+import { isPeerId, type PeerId } from '@libp2p/interface-peer-id'
+import { CodeError } from '@libp2p/interfaces/errors'
+import { peerIdFromBytes } from '@libp2p/peer-id'
+import { multiaddr } from '@multiformats/multiaddr'
+import { CID } from 'multiformats/cid'
 import type { DaemonClient } from './index.js'
-import { isPeerId, PeerId } from '@libp2p/interface-peer-id'
 import type { PeerInfo } from '@libp2p/interface-peer-info'
-import { peerIdFromBytes } from '@libp2p/peer-id'
 
 export class DHT {
   private readonly client: DaemonClient

packages/libp2p-daemon-client/src/index.ts

@@ -1,21 +1,21 @@
+import { type PSMessage, Request, Response, StreamInfo } from '@libp2p/daemon-protocol'
+import { StreamHandler } from '@libp2p/daemon-protocol/stream-handler'
+import { passThroughUpgrader } from '@libp2p/daemon-protocol/upgrader'
+import { isPeerId, type PeerId } from '@libp2p/interface-peer-id'
 import { CodeError } from '@libp2p/interfaces/errors'
+import { logger } from '@libp2p/logger'
+import { peerIdFromBytes } from '@libp2p/peer-id'
 import { tcp } from '@libp2p/tcp'
-import { PSMessage, Request, Response, StreamInfo } from '@libp2p/daemon-protocol'
-import { StreamHandler } from '@libp2p/daemon-protocol/stream-handler'
-import type { Multiaddr } from '@multiformats/multiaddr'
 import { multiaddr, isMultiaddr } from '@multiformats/multiaddr'
 import { DHT } from './dht.js'
 import { Pubsub } from './pubsub.js'
-import { isPeerId, PeerId } from '@libp2p/interface-peer-id'
-import { passThroughUpgrader } from '@libp2p/daemon-protocol/upgrader'
-import { peerIdFromBytes } from '@libp2p/peer-id'
+import type { MultiaddrConnection } from '@libp2p/interface-connection'
+import type { PeerInfo } from '@libp2p/interface-peer-info'
+import type { Transport } from '@libp2p/interface-transport'
+import type { Multiaddr } from '@multiformats/multiaddr'
 import type { Duplex, Source } from 'it-stream-types'
 import type { CID } from 'multiformats/cid'
-import type { PeerInfo } from '@libp2p/interface-peer-info'
-import type { MultiaddrConnection } from '@libp2p/interface-connection'
 import type { Uint8ArrayList } from 'uint8arraylist'
-import { logger } from '@libp2p/logger'
-import type { Transport } from '@libp2p/interface-transport'
 
 const log = logger('libp2p:daemon-client')
 
@@ -42,7 +42,7 @@ class Client implements DaemonClient {
   async connectDaemon (): Promise<MultiaddrConnection> {
     // @ts-expect-error because we use a passthrough upgrader,
     // this is actually a MultiaddrConnection and not a Connection
-    return await this.tcp.dial(this.multiaddr, {
+    return this.tcp.dial(this.multiaddr, {
       upgrader: passThroughUpgrader
     })
   }

packages/libp2p-daemon-client/src/pubsub.ts

@@ -1,13 +1,13 @@
-import { CodeError } from '@libp2p/interfaces/errors'
 import {
   Request,
   Response,
   PSRequest,
   PSMessage
 } from '@libp2p/daemon-protocol'
+import { CodeError } from '@libp2p/interfaces/errors'
+import { peerIdFromBytes } from '@libp2p/peer-id'
 import type { DaemonClient, Subscription } from './index.js'
 import type { PeerId } from '@libp2p/interface-peer-id'
-import { peerIdFromBytes } from '@libp2p/peer-id'
 
 export class Pubsub {
   private readonly client: DaemonClient

packages/libp2p-daemon-client/test/dht.spec.ts

@@ -1,16 +1,16 @@
 /* eslint-env mocha */
 
+import { createServer, type Libp2pServer } from '@libp2p/daemon-server'
+import { type DualDHT, type ValueEvent, type FinalPeerEvent, type PeerResponseEvent, MessageType, EventTypes, type DHT } from '@libp2p/interface-dht'
+import { peerIdFromString } from '@libp2p/peer-id'
+import { multiaddr } from '@multiformats/multiaddr'
 import { expect } from 'aegir/chai'
+import all from 'it-all'
+import { CID } from 'multiformats/cid'
 import sinon from 'sinon'
+import { type StubbedInstance, stubInterface } from 'sinon-ts'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
-import { createServer, Libp2pServer } from '@libp2p/daemon-server'
-import { createClient, DaemonClient } from '../src/index.js'
-import { multiaddr } from '@multiformats/multiaddr'
-import { StubbedInstance, stubInterface } from 'sinon-ts'
-import { DualDHT, ValueEvent, FinalPeerEvent, PeerResponseEvent, MessageType, EventTypes, DHT } from '@libp2p/interface-dht'
-import { peerIdFromString } from '@libp2p/peer-id'
-import { CID } from 'multiformats/cid'
-import all from 'it-all'
+import { createClient, type DaemonClient } from '../src/index.js'
 import type { Libp2p } from '@libp2p/interface-libp2p'
 import type { PubSub } from '@libp2p/interface-pubsub'
 

packages/libp2p-daemon-client/test/index.spec.ts

@@ -1,17 +1,17 @@
 /* eslint-env mocha */
 
-import { expect } from 'aegir/chai'
-import sinon from 'sinon'
-import { createServer, Libp2pServer } from '@libp2p/daemon-server'
-import { createClient, DaemonClient } from '../src/index.js'
-import { multiaddr } from '@multiformats/multiaddr'
-import { StubbedInstance, stubInterface } from 'sinon-ts'
+import { createServer, type Libp2pServer } from '@libp2p/daemon-server'
+import { mockConnection, mockDuplex, mockMultiaddrConnection } from '@libp2p/interface-mocks'
 import { isPeerId } from '@libp2p/interface-peer-id'
 import { peerIdFromString } from '@libp2p/peer-id'
-import { mockConnection, mockDuplex, mockMultiaddrConnection } from '@libp2p/interface-mocks'
-import type { PeerStore } from '@libp2p/interface-peer-store'
-import type { Libp2p } from '@libp2p/interface-libp2p'
+import { multiaddr } from '@multiformats/multiaddr'
+import { expect } from 'aegir/chai'
+import sinon from 'sinon'
+import { type StubbedInstance, stubInterface } from 'sinon-ts'
+import { createClient, type DaemonClient } from '../src/index.js'
 import type { DHT } from '@libp2p/interface-dht'
+import type { Libp2p } from '@libp2p/interface-libp2p'
+import type { PeerStore } from '@libp2p/interface-peer-store'
 import type { PubSub } from '@libp2p/interface-pubsub'
 
 const defaultMultiaddr = multiaddr('/ip4/0.0.0.0/tcp/0')

packages/libp2p-daemon-client/test/pubsub.spec.ts

@@ -1,16 +1,16 @@
 /* eslint-env mocha */
 
+import { createServer, type Libp2pServer } from '@libp2p/daemon-server'
+import { peerIdFromString } from '@libp2p/peer-id'
+import { multiaddr } from '@multiformats/multiaddr'
 import { expect } from 'aegir/chai'
 import sinon from 'sinon'
+import { type StubbedInstance, stubInterface } from 'sinon-ts'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
-import { createServer, Libp2pServer } from '@libp2p/daemon-server'
-import { createClient, DaemonClient } from '../src/index.js'
-import { multiaddr } from '@multiformats/multiaddr'
-import { StubbedInstance, stubInterface } from 'sinon-ts'
-import type { PubSub } from '@libp2p/interface-pubsub'
-import { peerIdFromString } from '@libp2p/peer-id'
-import type { Libp2p } from '@libp2p/interface-libp2p'
+import { createClient, type DaemonClient } from '../src/index.js'
 import type { DHT } from '@libp2p/interface-dht'
+import type { Libp2p } from '@libp2p/interface-libp2p'
+import type { PubSub } from '@libp2p/interface-pubsub'
 
 const defaultMultiaddr = multiaddr('/ip4/0.0.0.0/tcp/12345')
 

packages/libp2p-daemon-client/test/stream.spec.ts

@@ -1,21 +1,21 @@
 /* eslint-env mocha */
 
+import { createServer, type Libp2pServer } from '@libp2p/daemon-server'
+import { mockRegistrar, connectionPair } from '@libp2p/interface-mocks'
+import { peerIdFromString } from '@libp2p/peer-id'
+import { multiaddr } from '@multiformats/multiaddr'
 import { expect } from 'aegir/chai'
+import all from 'it-all'
+import { pipe } from 'it-pipe'
 import sinon from 'sinon'
-import { createServer, Libp2pServer } from '@libp2p/daemon-server'
-import { createClient, DaemonClient } from '../src/index.js'
-import { multiaddr } from '@multiformats/multiaddr'
-import { StubbedInstance, stubInterface } from 'sinon-ts'
-import { peerIdFromString } from '@libp2p/peer-id'
-import { mockRegistrar, connectionPair } from '@libp2p/interface-mocks'
-import type { PeerStore } from '@libp2p/interface-peer-store'
+import { type StubbedInstance, stubInterface } from 'sinon-ts'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
-import all from 'it-all'
-import { pipe } from 'it-pipe'
+import { createClient, type DaemonClient } from '../src/index.js'
 import type { DHT } from '@libp2p/interface-dht'
-import type { PubSub } from '@libp2p/interface-pubsub'
 import type { Libp2p } from '@libp2p/interface-libp2p'
+import type { PeerStore } from '@libp2p/interface-peer-store'
+import type { PubSub } from '@libp2p/interface-pubsub'
 
 const defaultMultiaddr = multiaddr('/ip4/0.0.0.0/tcp/0')
 
@@ -82,7 +82,7 @@ describe('daemon stream client', function () {
     const data = await pipe(
       [uint8ArrayFromString('hello world')],
       stream,
-      async (source) => await all(source)
+      async (source) => all(source)
     )
 
     expect(data).to.have.lengthOf(1)

packages/libp2p-daemon-protocol/package.json

@@ -163,7 +163,7 @@
     "uint8arraylist": "^2.3.2"
   },
   "devDependencies": {
-    "aegir": "^38.1.6",
+    "aegir": "^39.0.10",
     "protons": "^7.0.2"
   }
 }

packages/libp2p-daemon-protocol/src/stream-handler.ts

@@ -1,8 +1,8 @@
-import * as lp from 'it-length-prefixed'
-import { handshake } from 'it-handshake'
 import { logger } from '@libp2p/logger'
-import type { Duplex, Source } from 'it-stream-types'
+import { handshake } from 'it-handshake'
+import * as lp from 'it-length-prefixed'
 import type { Handshake } from 'it-handshake'
+import type { Duplex, Source } from 'it-stream-types'
 import type { Uint8ArrayList } from 'uint8arraylist'
 
 const log = logger('libp2p:daemon-protocol:stream-handler')

packages/libp2p-daemon-server/package.json

@@ -143,11 +143,8 @@
     "@libp2p/interface-dht": "^2.0.0",
     "@libp2p/interface-libp2p": "^3.0.0",
     "@libp2p/interface-peer-id": "^2.0.0",
-    "@libp2p/interface-peer-store": "^2.0.0",
     "@libp2p/interface-pubsub": "^4.0.0",
-    "@libp2p/interface-registrar": "^2.0.1",
     "@libp2p/interface-transport": "^4.0.0",
-    "@libp2p/interfaces": "^3.2.0",
     "@libp2p/logger": "^2.0.0",
     "@libp2p/peer-id": "^2.0.0",
     "@libp2p/tcp": "^7.0.1",
@@ -160,7 +157,7 @@
     "uint8arrays": "^4.0.2"
   },
   "devDependencies": {
-    "aegir": "^38.1.6",
+    "aegir": "^39.0.10",
     "sinon-ts": "^1.0.0"
   }
 }

packages/libp2p-daemon-server/src/dht.ts

@@ -3,12 +3,12 @@
 import {
   DHTResponse
 } from '@libp2p/daemon-protocol'
+import { logger } from '@libp2p/logger'
+import drain from 'it-drain'
 import { ErrorResponse, OkResponse } from './responses.js'
-import type { PeerId } from '@libp2p/interface-peer-id'
 import type { DHT } from '@libp2p/interface-dht'
+import type { PeerId } from '@libp2p/interface-peer-id'
 import type { CID } from 'multiformats/cid'
-import drain from 'it-drain'
-import { logger } from '@libp2p/logger'
 
 const log = logger('libp2p:daemon-server:dht')
 

packages/libp2p-daemon-server/src/index.ts

@@ -1,30 +1,30 @@
 /* eslint max-depth: ["error", 6] */
 
-import { tcp } from '@libp2p/tcp'
-import { multiaddr, protocols } from '@multiformats/multiaddr'
-import type { Multiaddr } from '@multiformats/multiaddr'
-import { CID } from 'multiformats/cid'
-import * as lp from 'it-length-prefixed'
-import { pipe } from 'it-pipe'
-import { StreamHandler } from '@libp2p/daemon-protocol/stream-handler'
-import { passThroughUpgrader } from '@libp2p/daemon-protocol/upgrader'
 import {
   Request,
   DHTRequest,
   PeerstoreRequest,
   PSRequest,
   StreamInfo
 } from '@libp2p/daemon-protocol'
-import type { Listener, Transport } from '@libp2p/interface-transport'
-import type { Connection, MultiaddrConnection, Stream } from '@libp2p/interface-connection'
-import type { DHT } from '@libp2p/interface-dht'
-import type { PubSub } from '@libp2p/interface-pubsub'
-import { ErrorResponse, OkResponse } from './responses.js'
-import { DHTOperations } from './dht.js'
+import { StreamHandler } from '@libp2p/daemon-protocol/stream-handler'
+import { passThroughUpgrader } from '@libp2p/daemon-protocol/upgrader'
+import { logger } from '@libp2p/logger'
 import { peerIdFromBytes } from '@libp2p/peer-id'
+import { tcp } from '@libp2p/tcp'
+import { multiaddr, protocols } from '@multiformats/multiaddr'
+import * as lp from 'it-length-prefixed'
+import { pipe } from 'it-pipe'
+import { CID } from 'multiformats/cid'
+import { DHTOperations } from './dht.js'
 import { PubSubOperations } from './pubsub.js'
-import { logger } from '@libp2p/logger'
+import { ErrorResponse, OkResponse } from './responses.js'
+import type { Connection, MultiaddrConnection, Stream } from '@libp2p/interface-connection'
+import type { DHT } from '@libp2p/interface-dht'
 import type { Libp2p } from '@libp2p/interface-libp2p'
+import type { PubSub } from '@libp2p/interface-pubsub'
+import type { Listener, Transport } from '@libp2p/interface-transport'
+import type { Multiaddr } from '@multiformats/multiaddr'
 
 const LIMIT = 1 << 22 // 4MB
 const log = logger('libp2p:daemon-server')
@@ -89,7 +89,7 @@ export class Server implements Libp2pServer {
     await this.libp2p.peerStore.merge(peerId, {
       multiaddrs: addrs
     })
-    return await this.libp2p.dial(peerId)
+    return this.libp2p.dial(peerId)
   }
 
   /**

packages/libp2p-daemon-server/src/pubsub.ts

@@ -3,11 +3,11 @@
 import {
   PSMessage
 } from '@libp2p/daemon-protocol'
+import { logger } from '@libp2p/logger'
+import { pushable } from 'it-pushable'
+import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { ErrorResponse, OkResponse } from './responses.js'
 import type { PubSub } from '@libp2p/interface-pubsub'
-import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
-import { pushable } from 'it-pushable'
-import { logger } from '@libp2p/logger'
 
 const log = logger('libp2p:daemon-server:pubsub')
 

packages/libp2p-daemon-server/test/index.spec.ts

@@ -3,10 +3,10 @@
 
 import { multiaddr } from '@multiformats/multiaddr'
 import { expect } from 'aegir/chai'
-import { createServer } from '../src/index.js'
 import { stubInterface } from 'sinon-ts'
-import type { Libp2p } from '@libp2p/interface-libp2p'
+import { createServer } from '../src/index.js'
 import type { DHT } from '@libp2p/interface-dht'
+import type { Libp2p } from '@libp2p/interface-libp2p'
 import type { PubSub } from '@libp2p/interface-pubsub'
 
 const ma = multiaddr('/ip4/0.0.0.0/tcp/0')

packages/libp2p-daemon/package.json

@@ -143,7 +143,7 @@
     "yargs-promise": "^1.1.0"
   },
   "devDependencies": {
-    "aegir": "^38.1.6",
+    "aegir": "^39.0.10",
     "sinon": "^15.0.1"
   }
 }

packages/libp2p-daemon/src/index.ts

@@ -1,13 +1,13 @@
 #! /usr/bin/env node
 /* eslint no-console: ["error", { allow: ["log", "warn", "error"] }] */
 
-import type { Multiaddr } from '@multiformats/multiaddr'
 import { multiaddr } from '@multiformats/multiaddr'
+import esMain from 'es-main'
 import yargs from 'yargs'
 // @ts-expect-error no types
 import YargsPromise from 'yargs-promise'
 import type { Libp2pServer } from '@libp2p/daemon-server'
-import esMain from 'es-main'
+import type { Multiaddr } from '@multiformats/multiaddr'
 
 const args = process.argv.slice(2)
 const parser = new YargsPromise(yargs)