Skip to content

Commit cc7b34c

Browse files
authored
fix: deduplicate typed event target (#3170)
Re-use main-event implementation to reduce bundle sizes slightly.
1 parent b8600fc commit cc7b34c

File tree

127 files changed

+234
-259
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+234
-259
lines changed

packages/integration-tests/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
"it-map": "^3.1.3",
7171
"it-pipe": "^3.0.1",
7272
"libp2p": "^2.8.8",
73+
"main-event": "^1.0.1",
7374
"multiformats": "^13.3.6",
7475
"p-defer": "^4.0.1",
7576
"p-event": "^6.0.1",

packages/integration-tests/test/bootstrap.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22

33
import { bootstrap } from '@libp2p/bootstrap'
44
import { generateKeyPair } from '@libp2p/crypto/keys'
5-
import { TypedEventEmitter, peerDiscoverySymbol } from '@libp2p/interface'
5+
import { peerDiscoverySymbol } from '@libp2p/interface'
66
import { mplex } from '@libp2p/mplex'
77
import { peerIdFromPrivateKey } from '@libp2p/peer-id'
88
import { plaintext } from '@libp2p/plaintext'
99
import { webSockets } from '@libp2p/websockets'
1010
import { multiaddr } from '@multiformats/multiaddr'
1111
import { expect } from 'aegir/chai'
1212
import { createLibp2p } from 'libp2p'
13+
import { TypedEventEmitter } from 'main-event'
1314
import defer from 'p-defer'
1415
import sinon from 'sinon'
1516
import type { Libp2p, PeerDiscovery, PeerDiscoveryEvents, PeerId } from '@libp2p/interface'

packages/interface-compliance-tests/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@
126126
"it-stream-types": "^2.0.2",
127127
"it-to-buffer": "^4.0.9",
128128
"libp2p": "^2.8.8",
129+
"main-event": "^1.0.1",
129130
"p-defer": "^4.0.1",
130131
"p-event": "^6.0.1",
131132
"p-limit": "^6.2.0",

packages/interface-compliance-tests/src/mocks/connection-manager.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ import { PeerMap } from '@libp2p/peer-collections'
33
import { peerIdFromString } from '@libp2p/peer-id'
44
import { isMultiaddr } from '@multiformats/multiaddr'
55
import { connectionPair } from './connection.js'
6-
import type { PrivateKey, PeerId, ComponentLogger, Libp2pEvents, PendingDial, Connection, TypedEventTarget, PubSub, Startable } from '@libp2p/interface'
6+
import type { PrivateKey, PeerId, ComponentLogger, Libp2pEvents, PendingDial, Connection, PubSub, Startable } from '@libp2p/interface'
77
import type { ConnectionManager, Registrar } from '@libp2p/interface-internal'
88
import type { Multiaddr } from '@multiformats/multiaddr'
99
import type { AbortOptions } from 'it-pushable'
10+
import type { TypedEventTarget } from 'main-event'
1011

1112
export interface MockNetworkComponents {
1213
peerId: PeerId

packages/interface-compliance-tests/src/mocks/upgrader.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
import { setMaxListeners } from '@libp2p/interface'
21
import { anySignal } from 'any-signal'
2+
import { setMaxListeners } from 'main-event'
33
import { mockConnection } from './connection.js'
4-
import type { Libp2pEvents, Connection, MultiaddrConnection, TypedEventTarget, Upgrader, UpgraderOptions, ClearableSignal, ConnectionEncrypter, StreamMuxerFactory } from '@libp2p/interface'
4+
import type { Libp2pEvents, Connection, MultiaddrConnection, Upgrader, UpgraderOptions, ClearableSignal, ConnectionEncrypter, StreamMuxerFactory } from '@libp2p/interface'
55
import type { Registrar } from '@libp2p/interface-internal'
6+
import type { TypedEventTarget } from 'main-event'
67

78
export interface MockUpgraderInit {
89
registrar?: Registrar

packages/interface-compliance-tests/src/pubsub/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { generateKeyPair } from '@libp2p/crypto/keys'
2-
import { TypedEventEmitter } from '@libp2p/interface'
32
import { defaultLogger } from '@libp2p/logger'
43
import { peerIdFromPrivateKey } from '@libp2p/peer-id'
4+
import { TypedEventEmitter } from 'main-event'
55
import { pEvent } from 'p-event'
66
import pWaitFor from 'p-wait-for'
77
import { mockConnectionManager, mockRegistrar, mockNetwork } from '../mocks/index.js'

packages/interface/package.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,13 @@
4444
"@multiformats/multiaddr": "^12.4.0",
4545
"it-pushable": "^3.2.3",
4646
"it-stream-types": "^2.0.2",
47+
"main-event": "^1.0.1",
4748
"multiformats": "^13.3.6",
4849
"progress-events": "^1.0.1",
4950
"uint8arraylist": "^2.4.8"
5051
},
5152
"devDependencies": {
5253
"aegir": "^47.0.14"
5354
},
54-
"browser": {
55-
"./dist/src/events.js": "./dist/src/events.browser.js"
56-
},
57-
"react-native": {
58-
"./dist/src/events.js": "./dist/src/events.browser.js"
59-
},
6055
"sideEffects": false
6156
}

packages/interface/src/event-target.ts

Lines changed: 0 additions & 106 deletions
This file was deleted.

packages/interface/src/events.browser.ts

Lines changed: 0 additions & 4 deletions
This file was deleted.

packages/interface/src/events.ts

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)