Skip to content
This repository was archived by the owner on Aug 29, 2023. It is now read-only.

Commit e7eea28

Browse files
dependabot[bot]achingbrain
dependabot[bot]
and
achingbrain
authored
deps(dev): bump aegir from 37.12.1 to 38.1.0 (#243)
* deps(dev): bump aegir from 37.12.1 to 38.1.0 Bumps [aegir](https://github.com/ipfs/aegir) from 37.12.1 to 38.1.0. - [Release notes](https://github.com/ipfs/aegir/releases) - [Changelog](https://github.com/ipfs/aegir/blob/master/CHANGELOG.md) - [Commits](ipfs/aegir@v37.12.1...v38.1.0) --- updated-dependencies: - dependency-name: aegir dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * chore: fix linting --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: achingbrain <alex@achingbrain.net>
1 parent 6f01bd1 commit e7eea28

9 files changed

+34
-34
lines changed

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
"devDependencies": {
155155
"@libp2p/interface-mocks": "^9.1.1",
156156
"@libp2p/interface-transport-compliance-tests": "^3.0.0",
157-
"aegir": "^37.7.3",
157+
"aegir": "^38.1.0",
158158
"it-all": "^2.0.0",
159159
"it-pipe": "^2.0.3",
160160
"p-defer": "^4.0.0",

‎src/index.ts

+9-9
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ class TCP implements Transport {
9292
return true
9393
}
9494

95-
get [Symbol.toStringTag] () {
95+
get [Symbol.toStringTag] (): string {
9696
return '@libp2p/tcp'
9797
}
9898

@@ -114,7 +114,7 @@ class TCP implements Transport {
114114
metrics: this.metrics?.dialerEvents
115115
})
116116

117-
const onAbort = () => {
117+
const onAbort = (): void => {
118118
maConn.close().catch(err => {
119119
log.error('Error closing maConn after abort', err)
120120
})
@@ -138,7 +138,7 @@ class TCP implements Transport {
138138
return conn
139139
}
140140

141-
async _connect (ma: Multiaddr, options: TCPDialOptions) {
141+
async _connect (ma: Multiaddr, options: TCPDialOptions): Promise<Socket> {
142142
if (options.signal?.aborted === true) {
143143
throw new AbortError()
144144
}
@@ -151,14 +151,14 @@ class TCP implements Transport {
151151
log('dialing %j', cOpts)
152152
const rawSocket = net.connect(cOpts)
153153

154-
const onError = (err: Error) => {
154+
const onError = (err: Error): void => {
155155
err.message = `connection error ${cOptsStr}: ${err.message}`
156156
this.metrics?.dialerEvents.increment({ error: true })
157157

158158
done(err)
159159
}
160160

161-
const onTimeout = () => {
161+
const onTimeout = (): void => {
162162
log('connection timeout %s', cOptsStr)
163163
this.metrics?.dialerEvents.increment({ timeout: true })
164164

@@ -167,20 +167,20 @@ class TCP implements Transport {
167167
rawSocket.emit('error', err)
168168
}
169169

170-
const onConnect = () => {
170+
const onConnect = (): void => {
171171
log('connection opened %j', cOpts)
172172
this.metrics?.dialerEvents.increment({ connect: true })
173173
done()
174174
}
175175

176-
const onAbort = () => {
176+
const onAbort = (): void => {
177177
log('connection aborted %j', cOpts)
178178
this.metrics?.dialerEvents.increment({ abort: true })
179179
rawSocket.destroy()
180180
done(new AbortError())
181181
}
182182

183-
const done = (err?: any) => {
183+
const done = (err?: any): void => {
184184
rawSocket.removeListener('error', onError)
185185
rawSocket.removeListener('timeout', onTimeout)
186186
rawSocket.removeListener('connect', onConnect)
@@ -190,7 +190,7 @@ class TCP implements Transport {
190190
}
191191

192192
if (err != null) {
193-
return reject(err)
193+
reject(err); return
194194
}
195195

196196
resolve(rawSocket)

‎src/listener.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const log = logger('libp2p:tcp:listener')
1919
/**
2020
* Attempts to close the given maConn. If a failure occurs, it will be logged
2121
*/
22-
async function attemptClose (maConn: MultiaddrConnection) {
22+
async function attemptClose (maConn: MultiaddrConnection): Promise<void> {
2323
try {
2424
await maConn.close()
2525
} catch (err) {
@@ -54,7 +54,7 @@ export interface TCPListenerMetrics {
5454
events: CounterGroup
5555
}
5656

57-
type Status = {started: false} | {
57+
type Status = { started: false } | {
5858
started: true
5959
listeningAddr: Multiaddr
6060
peerId: string | null
@@ -150,7 +150,7 @@ export class TCPListener extends EventEmitter<ListenerEvents> implements Listene
150150
})
151151
}
152152

153-
private onSocket (socket: net.Socket) {
153+
private onSocket (socket: net.Socket): void {
154154
// Avoid uncaught errors caused by unstable connections
155155
socket.on('error', err => {
156156
log('socket error', err)
@@ -230,7 +230,7 @@ export class TCPListener extends EventEmitter<ListenerEvents> implements Listene
230230
}
231231
}
232232

233-
getAddrs () {
233+
getAddrs (): Multiaddr[] {
234234
if (!this.status.started) {
235235
return []
236236
}
@@ -262,7 +262,7 @@ export class TCPListener extends EventEmitter<ListenerEvents> implements Listene
262262
return addrs.map(ma => peerId != null ? ma.encapsulate(`/p2p/${peerId}`) : ma)
263263
}
264264

265-
async listen (ma: Multiaddr) {
265+
async listen (ma: Multiaddr): Promise<void> {
266266
if (this.status.started) {
267267
throw Error('server is already listening')
268268
}
@@ -280,9 +280,9 @@ export class TCPListener extends EventEmitter<ListenerEvents> implements Listene
280280
await this.netListen()
281281
}
282282

283-
async close () {
283+
async close (): Promise<void> {
284284
await Promise.all(
285-
Array.from(this.connections.values()).map(async maConn => await attemptClose(maConn))
285+
Array.from(this.connections.values()).map(async maConn => { await attemptClose(maConn) })
286286
)
287287

288288
// netClose already checks if server.listening

‎src/socket-to-conn.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ interface ToConnectionOptions {
2626
* Convert a socket into a MultiaddrConnection
2727
* https://github.com/libp2p/interface-transport#multiaddrconnection
2828
*/
29-
export const toMultiaddrConnection = (socket: Socket, options: ToConnectionOptions) => {
29+
export const toMultiaddrConnection = (socket: Socket, options: ToConnectionOptions): MultiaddrConnection => {
3030
const metrics = options.metrics
3131
const metricPrefix = options.metricPrefix ?? ''
3232
const inactivityTimeout = options.socketInactivityTimeout ?? SOCKET_TIMEOUT

‎src/utils.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@ export function multiaddrToNetConfig (addr: Multiaddr): NetConfig {
2525
return addr.toOptions()
2626
}
2727

28-
export function getMultiaddrs (proto: 'ip4' | 'ip6', ip: string, port: number) {
29-
const toMa = (ip: string) => multiaddr(`/${proto}/${ip}/tcp/${port}`)
28+
export function getMultiaddrs (proto: 'ip4' | 'ip6', ip: string, port: number): Multiaddr[] {
29+
const toMa = (ip: string): Multiaddr => multiaddr(`/${proto}/${ip}/tcp/${port}`)
3030
return (isAnyAddr(ip) ? getNetworkAddrs(ProtoFamily[proto]) : [ip]).map(toMa)
3131
}
3232

33-
export function isAnyAddr (ip: string) {
33+
export function isAnyAddr (ip: string): boolean {
3434
return ['0.0.0.0', '::'].includes(ip)
3535
}
3636

3737
const networks = os.networkInterfaces()
3838

39-
function getNetworkAddrs (family: string) {
40-
const addresses = []
39+
function getNetworkAddrs (family: string): string[] {
40+
const addresses: string[] = []
4141

4242
for (const [, netAddrs] of Object.entries(networks)) {
4343
if (netAddrs != null) {

‎test/connection.spec.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ describe('valid localAddr and remoteAddr', () => {
2121
let handled: (conn: Connection) => void
2222
const handlerPromise = new Promise<Connection>(resolve => { handled = resolve })
2323

24-
const handler = (conn: Connection) => handled(conn)
24+
const handler = (conn: Connection): void => { handled(conn) }
2525

2626
// Create a listener with the handler
2727
const listener = transport.createListener({
@@ -52,7 +52,7 @@ describe('valid localAddr and remoteAddr', () => {
5252
let handled: (conn: Connection) => void
5353
const handlerPromise = new Promise<Connection>(resolve => { handled = resolve })
5454

55-
const handler = (conn: Connection) => handled(conn)
55+
const handler = (conn: Connection): void => { handled(conn) }
5656

5757
// Create a listener with the handler
5858
const listener = transport.createListener({
@@ -76,7 +76,7 @@ describe('valid localAddr and remoteAddr', () => {
7676

7777
// Close the dialer with two simultaneous calls to `close`
7878
await Promise.race([
79-
new Promise((resolve, reject) => setTimeout(() => reject(new Error('Timed out waiting for connection close')), 500)),
79+
new Promise((resolve, reject) => setTimeout(() => { reject(new Error('Timed out waiting for connection close')) }, 500)),
8080
await Promise.all([
8181
dialerConn.close(),
8282
dialerConn.close()

‎test/listen-dial.spec.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ describe('dial', () => {
259259
// let multistream select finish before closing
260260
setTimeout(() => {
261261
void conn.close()
262-
.then(() => handled())
262+
.then(() => { handled() })
263263
}, 100)
264264
},
265265
upgrader
@@ -272,7 +272,7 @@ describe('dial', () => {
272272
upgrader
273273
})
274274
const stream = await conn.newStream([protocol])
275-
await pipe(stream)
275+
pipe(stream)
276276

277277
await handledPromise
278278
await conn.close()
@@ -340,7 +340,7 @@ describe('dial', () => {
340340

341341
// take a long time to give us time to abort the dial
342342
await new Promise<void>((resolve) => {
343-
setTimeout(() => resolve(), 100)
343+
setTimeout(() => { resolve() }, 100)
344344
})
345345
}
346346

@@ -352,7 +352,7 @@ describe('dial', () => {
352352
const abortController = new AbortController()
353353

354354
// abort once the upgrade process has started
355-
void maConnPromise.promise.then(() => abortController.abort())
355+
void maConnPromise.promise.then(() => { abortController.abort() })
356356

357357
await expect(transport.dial(ma, {
358358
upgrader,

‎test/max-connections-close.spec.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ describe('close server on maxConnections', () => {
4545
return socket
4646
}
4747

48-
async function assertConnectedSocket (i: number) {
48+
async function assertConnectedSocket (i: number): Promise<net.Socket> {
4949
const socket = createSocket()
5050

5151
await new Promise<void>((resolve, reject) => {
@@ -61,7 +61,7 @@ describe('close server on maxConnections', () => {
6161
return socket
6262
}
6363

64-
async function assertRefusedSocket (i: number) {
64+
async function assertRefusedSocket (i: number): Promise<void> {
6565
const socket = createSocket()
6666

6767
await new Promise<void>((resolve, reject) => {
@@ -79,7 +79,7 @@ describe('close server on maxConnections', () => {
7979
})
8080
}
8181

82-
async function assertServerConnections (connections: number) {
82+
async function assertServerConnections (connections: number): Promise<void> {
8383
// Expect server connections but allow time for sockets to connect or disconnect
8484
for (let i = 0; i < 100; i++) {
8585
// eslint-disable-next-line @typescript-eslint/dot-notation

‎test/socket-to-conn.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { toMultiaddrConnection } from '../src/socket-to-conn.js'
55
import os from 'os'
66
import type { ServerOpts, SocketConstructorOpts } from 'net'
77

8-
async function setup (opts?: { server?: ServerOpts, client?: SocketConstructorOpts }) {
8+
async function setup (opts?: { server?: ServerOpts, client?: SocketConstructorOpts }): Promise<{ server: Server, serverSocket: Socket, clientSocket: Socket }> {
99
const serverListening = defer()
1010

1111
const server = createServer(opts?.server)

0 commit comments

Comments
 (0)