revert transport layer event emitters to native events

ethereumjs · Dec 20, 2024 · 3099c6d · 3099c6d
1 parent d8ab19c
commit 3099c6d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/packages/portalnetwork/src/transports/capacitorUdp.ts b/packages/portalnetwork/src/transports/capacitorUdp.ts
@@ -1,4 +1,4 @@
-import { EventEmitter } from 'eventemitter3'
+import { EventEmitter } from 'events'
 import { getSocketAddressOnENR } from '@chainsafe/discv5'
 import { decodePacket, encodePacket } from '@chainsafe/discv5/packet'
 import { UDP } from '@frontall/capacitor-udp'
@@ -9,8 +9,8 @@ import type { IPacket } from '@chainsafe/discv5/packet'
 import type {
   IPMode,
   IRemoteInfo,
-  ITransportEvents,
   ITransportService,
+  TransportEventEmitter,
 } from '@chainsafe/discv5/transport'
 import type { ENR } from '@chainsafe/enr'
 import type { Multiaddr } from '@multiformats/multiaddr'
@@ -19,7 +19,7 @@ import type { Multiaddr } from '@multiformats/multiaddr'
  * This class is responsible for encoding outgoing Packets and decoding incoming Packets over UDP
  */
 export class CapacitorUDPTransportService
-  extends EventEmitter<ITransportEvents>
+  extends (EventEmitter as { new (): TransportEventEmitter })
   implements ITransportService
 {
   private socket!: {

diff --git a/packages/portalnetwork/src/transports/websockets.ts b/packages/portalnetwork/src/transports/websockets.ts
@@ -1,4 +1,4 @@
-import { EventEmitter } from 'eventemitter3'
+import { EventEmitter } from 'events'
 import { getSocketAddressOnENR } from '@chainsafe/discv5'
 import { decodePacket, encodePacket } from '@chainsafe/discv5/packet'
 import { multiaddr as ma } from '@multiformats/multiaddr'
@@ -17,18 +17,23 @@ import type { IPacket } from '@chainsafe/discv5/packet'
 import type { ENR } from '@chainsafe/enr'
 import type { Multiaddr } from '@multiformats/multiaddr'
 import type { Debugger } from 'debug'
+import type StrictEventEmitter from 'strict-event-emitter-types/types/src'
 
 const log = debug('discv5:transport')
 
 interface WebSocketTransportEvents extends ITransportEvents {
   multiAddr: (src: Multiaddr) => void
 }
 
+export declare type WSTransportEventEmitter = StrictEventEmitter<
+  EventEmitter,
+  WebSocketTransportEvents
+>
 /**
  * This class is responsible for encoding outgoing Packets and decoding incoming Packets over Websockets
  */
 export class WebSocketTransportService
-  extends EventEmitter<WebSocketTransportEvents>
+  extends (EventEmitter as { new (): WSTransportEventEmitter })
   implements ITransportService
 {
   public multiaddr: Multiaddr