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

Commit 3ed1235

Browse files
dependabot[bot]achingbrain
dependabot[bot]
and
achingbrain
authored
deps(dev): bump aegir from 38.1.8 to 39.0.10 (#279)
* deps(dev): bump aegir from 38.1.8 to 39.0.10 Bumps [aegir](https://github.com/ipfs/aegir) from 38.1.8 to 39.0.10. - [Release notes](https://github.com/ipfs/aegir/releases) - [Changelog](https://github.com/ipfs/aegir/blob/master/CHANGELOG.md) - [Commits](ipfs/aegir@v38.1.8...v39.0.10) --- updated-dependencies: - dependency-name: aegir dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * chore: fix linting * chore: fix build --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: achingbrain <[email protected]>
1 parent ff5f44a commit 3ed1235

12 files changed

+46
-50
lines changed

‎package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,13 @@
149149
"@libp2p/utils": "^3.0.2",
150150
"@multiformats/mafmt": "^12.0.0",
151151
"@multiformats/multiaddr": "^12.0.0",
152+
"@types/sinon": "^10.0.15",
152153
"stream-to-it": "^0.2.2"
153154
},
154155
"devDependencies": {
155156
"@libp2p/interface-mocks": "^12.0.1",
156157
"@libp2p/interface-transport-compliance-tests": "^4.0.0",
157-
"aegir": "^38.1.0",
158+
"aegir": "^39.0.10",
158159
"it-all": "^3.0.1",
159160
"it-pipe": "^3.0.1",
160161
"p-defer": "^4.0.0",

‎src/index.ts

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import net from 'net'
2-
import * as mafmt from '@multiformats/mafmt'
2+
import { type CreateListenerOptions, type DialOptions, type Listener, symbol, type Transport } from '@libp2p/interface-transport'
3+
import { AbortError, CodeError } from '@libp2p/interfaces/errors'
34
import { logger } from '@libp2p/logger'
5+
import * as mafmt from '@multiformats/mafmt'
6+
import { CODE_CIRCUIT, CODE_P2P, CODE_UNIX } from './constants.js'
7+
import { type CloseServerOnMaxConnectionsOpts, TCPListener } from './listener.js'
48
import { toMultiaddrConnection } from './socket-to-conn.js'
5-
import { CloseServerOnMaxConnectionsOpts, TCPListener } from './listener.js'
69
import { multiaddrToNetConfig } from './utils.js'
7-
import { AbortError, CodeError } from '@libp2p/interfaces/errors'
8-
import { CODE_CIRCUIT, CODE_P2P, CODE_UNIX } from './constants.js'
9-
import { CreateListenerOptions, DialOptions, Listener, symbol, Transport } from '@libp2p/interface-transport'
10-
import type { AbortOptions, Multiaddr } from '@multiformats/multiaddr'
11-
import type { Socket, IpcSocketConnectOpts, TcpSocketConnectOpts } from 'net'
1210
import type { Connection } from '@libp2p/interface-connection'
1311
import type { CounterGroup, Metrics } from '@libp2p/interface-metrics'
12+
import type { AbortOptions, Multiaddr } from '@multiformats/multiaddr'
13+
import type { Socket, IpcSocketConnectOpts, TcpSocketConnectOpts } from 'net'
1414

1515
const log = logger('libp2p:tcp')
1616

@@ -94,13 +94,9 @@ class TCP implements Transport {
9494
}
9595
}
9696

97-
get [symbol] (): true {
98-
return true
99-
}
97+
readonly [symbol] = true
10098

101-
get [Symbol.toStringTag] (): string {
102-
return '@libp2p/tcp'
103-
}
99+
readonly [Symbol.toStringTag] = '@libp2p/tcp'
104100

105101
async dial (ma: Multiaddr, options: TCPDialOptions): Promise<Connection> {
106102
options.keepAlive = options.keepAlive ?? true
@@ -149,7 +145,7 @@ class TCP implements Transport {
149145
throw new AbortError()
150146
}
151147

152-
return await new Promise<Socket>((resolve, reject) => {
148+
return new Promise<Socket>((resolve, reject) => {
153149
const start = Date.now()
154150
const cOpts = multiaddrToNetConfig(ma) as (IpcSocketConnectOpts & TcpSocketConnectOpts)
155151
const cOptsStr = cOpts.path ?? `${cOpts.host ?? ''}:${cOpts.port}`

‎src/listener.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
import net from 'net'
2+
import { EventEmitter, CustomEvent } from '@libp2p/interfaces/events'
23
import { logger } from '@libp2p/logger'
3-
import { toMultiaddrConnection } from './socket-to-conn.js'
44
import { CODE_P2P } from './constants.js'
5+
import { toMultiaddrConnection } from './socket-to-conn.js'
56
import {
67
getMultiaddrs,
78
multiaddrToNetConfig,
8-
NetConfig
9+
type NetConfig
910
} from './utils.js'
10-
import { EventEmitter, CustomEvent } from '@libp2p/interfaces/events'
11+
import type { TCPCreateListenerOptions } from './index.js'
1112
import type { MultiaddrConnection, Connection } from '@libp2p/interface-connection'
13+
import type { CounterGroup, MetricGroup, Metrics } from '@libp2p/interface-metrics'
1214
import type { Upgrader, Listener, ListenerEvents } from '@libp2p/interface-transport'
1315
import type { Multiaddr } from '@multiformats/multiaddr'
14-
import type { TCPCreateListenerOptions } from './index.js'
15-
import type { CounterGroup, MetricGroup, Metrics } from '@libp2p/interface-metrics'
1616

1717
const log = logger('libp2p:tcp:listener')
1818

‎src/socket-to-conn.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1+
import { CodeError } from '@libp2p/interfaces/errors'
12
import { logger } from '@libp2p/logger'
3+
import { ipPortToMultiaddr as toMultiaddr } from '@libp2p/utils/ip-port-to-multiaddr'
24
// @ts-expect-error no types
35
import toIterable from 'stream-to-it'
4-
import { ipPortToMultiaddr as toMultiaddr } from '@libp2p/utils/ip-port-to-multiaddr'
56
import { CLOSE_TIMEOUT, SOCKET_TIMEOUT } from './constants.js'
67
import { multiaddrToNetConfig } from './utils.js'
7-
import { CodeError } from '@libp2p/interfaces/errors'
8-
import type { Socket } from 'net'
9-
import type { Multiaddr } from '@multiformats/multiaddr'
108
import type { MultiaddrConnection } from '@libp2p/interface-connection'
119
import type { CounterGroup } from '@libp2p/interface-metrics'
10+
import type { Multiaddr } from '@multiformats/multiaddr'
11+
import type { Socket } from 'net'
1212

1313
const log = logger('libp2p:tcp:socket')
1414

‎src/utils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
import os from 'os'
2+
import path from 'path'
13
import { multiaddr } from '@multiformats/multiaddr'
24
import type { Multiaddr } from '@multiformats/multiaddr'
35
import type { ListenOptions, IpcSocketConnectOpts, TcpSocketConnectOpts } from 'net'
4-
import os from 'os'
5-
import path from 'path'
66

77
const ProtoFamily = { ip4: 'IPv4', ip6: 'IPv6' }
88

‎test/compliance.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import sinon from 'sinon'
1+
import net from 'net'
22
import tests from '@libp2p/interface-transport-compliance-tests'
33
import { multiaddr } from '@multiformats/multiaddr'
4-
import net from 'net'
4+
import sinon from 'sinon'
55
import { tcp } from '../src/index.js'
66

77
describe('interface-transport compliance', () => {

‎test/connection.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
import { mockUpgrader } from '@libp2p/interface-mocks'
2+
import { EventEmitter } from '@libp2p/interfaces/events'
3+
import { multiaddr } from '@multiformats/multiaddr'
14
import { expect } from 'aegir/chai'
25
import { tcp } from '../src/index.js'
3-
import { multiaddr } from '@multiformats/multiaddr'
4-
import { mockUpgrader } from '@libp2p/interface-mocks'
56
import type { Connection } from '@libp2p/interface-connection'
67
import type { Transport, Upgrader } from '@libp2p/interface-transport'
7-
import { EventEmitter } from '@libp2p/interfaces/events'
88

99
describe('valid localAddr and remoteAddr', () => {
1010
let transport: Transport

‎test/filter.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import { multiaddr } from '@multiformats/multiaddr'
12
import { expect } from 'aegir/chai'
23
import { tcp } from '../src/index.js'
3-
import { multiaddr } from '@multiformats/multiaddr'
44
import type { Transport } from '@libp2p/interface-transport'
55

66
describe('filter addrs', () => {

‎test/listen-dial.spec.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
import { expect } from 'aegir/chai'
2-
import { tcp } from '../src/index.js'
31
import os from 'os'
42
import path from 'path'
3+
import { mockRegistrar, mockUpgrader } from '@libp2p/interface-mocks'
4+
import { EventEmitter } from '@libp2p/interfaces/events'
55
import { multiaddr } from '@multiformats/multiaddr'
6-
import { pipe } from 'it-pipe'
6+
import { expect } from 'aegir/chai'
77
import all from 'it-all'
8-
import { mockRegistrar, mockUpgrader } from '@libp2p/interface-mocks'
9-
import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
10-
import type { Transport, Upgrader } from '@libp2p/interface-transport'
8+
import { pipe } from 'it-pipe'
119
import pDefer from 'p-defer'
10+
import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
11+
import { tcp } from '../src/index.js'
1212
import type { MultiaddrConnection } from '@libp2p/interface-connection'
13-
import { EventEmitter } from '@libp2p/interfaces/events'
13+
import type { Transport, Upgrader } from '@libp2p/interface-transport'
1414

1515
const isCI = process.env.CI
1616

@@ -196,7 +196,7 @@ describe('dial', () => {
196196
const values = await pipe(
197197
[uint8ArrayFromString('hey')],
198198
stream,
199-
async (source) => await all(source)
199+
async (source) => all(source)
200200
)
201201

202202
expect(values[0].subarray()).to.equalBytes(uint8ArrayFromString('hey'))
@@ -222,7 +222,7 @@ describe('dial', () => {
222222
const values = await pipe(
223223
[uint8ArrayFromString('hey')],
224224
stream,
225-
async (source) => await all(source)
225+
async (source) => all(source)
226226
)
227227
expect(values[0].subarray()).to.equalBytes(uint8ArrayFromString('hey'))
228228
await conn.close()
@@ -244,7 +244,7 @@ describe('dial', () => {
244244
const values = await pipe(
245245
[uint8ArrayFromString('hey')],
246246
stream,
247-
async (source) => await all(source)
247+
async (source) => all(source)
248248
)
249249

250250
expect(values[0].subarray()).to.equalBytes(uint8ArrayFromString('hey'))
@@ -326,7 +326,7 @@ describe('dial', () => {
326326
const values = await pipe(
327327
[uint8ArrayFromString('hey')],
328328
stream,
329-
async (source) => await all(source)
329+
async (source) => all(source)
330330
)
331331
expect(values[0].subarray()).to.equalBytes(uint8ArrayFromString('hey'))
332332

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import net from 'node:net'
22
import { promisify } from 'util'
3-
import { expect } from 'aegir/chai'
43
import { mockUpgrader } from '@libp2p/interface-mocks'
4+
import { EventEmitter } from '@libp2p/interfaces/events'
55
import { multiaddr } from '@multiformats/multiaddr'
6+
import { expect } from 'aegir/chai'
67
import { tcp } from '../src/index.js'
78
import type { TCPListener } from '../src/listener.js'
8-
import { EventEmitter } from '@libp2p/interfaces/events'
99

1010
describe('close server on maxConnections', () => {
1111
const afterEachCallbacks: Array<() => Promise<any> | any> = []

‎test/max-connections.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import { expect } from 'aegir/chai'
21
import net from 'node:net'
32
import { promisify } from 'node:util'
43
import { mockUpgrader } from '@libp2p/interface-mocks'
4+
import { EventEmitter } from '@libp2p/interfaces/events'
55
import { multiaddr } from '@multiformats/multiaddr'
6+
import { expect } from 'aegir/chai'
67
import { tcp } from '../src/index.js'
7-
import { EventEmitter } from '@libp2p/interfaces/events'
88

99
describe('maxConnections', () => {
1010
const afterEachCallbacks: Array<() => Promise<any> | any> = []

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1+
import { createServer, Socket, type Server, type ServerOpts, type SocketConstructorOpts } from 'net'
2+
import os from 'os'
13
import { expect } from 'aegir/chai'
2-
import { createServer, Socket, Server } from 'net'
34
import defer from 'p-defer'
45
import { toMultiaddrConnection } from '../src/socket-to-conn.js'
5-
import os from 'os'
6-
import type { ServerOpts, SocketConstructorOpts } from 'net'
76

87
async function setup (opts?: { server?: ServerOpts, client?: SocketConstructorOpts }): Promise<{ server: Server, serverSocket: Socket, clientSocket: Socket }> {
98
const serverListening = defer()

0 commit comments

Comments
 (0)