fix: event emitter and discovery and routing interfaces (#95)

src/content-routing/types.d.ts

@@ -1,11 +1,14 @@
-export = ContentRouting;
-
 import PeerId from 'peer-id'
-import Multiaddr from 'multiaddr'
+import { Multiaddr } from 'multiaddr'
 import CID from 'cids'
 
-declare class ContentRouting {
-  constructor (options: Object);
+export interface ContentRoutingFactory {
+  new (options?: any): ContentRouting;
+}
+
+export interface ContentRouting {
   provide (cid: CID): Promise<void>;
   findProviders (cid: CID, options: Object): AsyncIterable<{ id: PeerId, multiaddrs: Multiaddr[] }>;
 }
+
+export default ContentRouting;

src/peer-discovery/types.d.ts

@@ -1,10 +1,13 @@
-export = PeerDiscovery;
+import { EventEmitter } from 'events';
 
-import events from 'events';
-
-declare class PeerDiscovery extends events.EventEmitter {
-  constructor (options: Object);
-  start (): Promise<void>;
-  stop (): Promise<void>;
+export interface PeerDiscoveryFactory {
+  new (options?: any): PeerDiscovery;
   tag: string;
 }
+
+export interface PeerDiscovery extends EventEmitter {
+  start(): void|Promise<void>;
+  stop(): void|Promise<void>;
+}
+
+export default PeerDiscovery;

src/peer-routing/types.d.ts

@@ -1,10 +1,13 @@
-export = PeerRouting;
-
 import PeerId from 'peer-id'
-import Multiaddr from 'multiaddr'
+import { Multiaddr } from 'multiaddr'
+
+export interface PeerRoutingFactory {
+  new (options?: any): PeerRouting;
+}
 
-declare class PeerRouting {
-  constructor (options?: Object);
+export interface PeerRouting {
   findPeer (peerId: PeerId, options?: Object): Promise<{ id: PeerId, multiaddrs: Multiaddr[] }>;
   getClosestPeers(key: Uint8Array, options?: Object): AsyncIterable<{ id: PeerId, multiaddrs: Multiaddr[] }>;
 }
+
+export default PeerRouting;

src/pubsub/index.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const debug = require('debug')
-const EventEmitter = require('events')
+const { EventEmitter } = require('events')
 const errcode = require('err-code')
 
 const { pipe } = require('it-pipe')

src/pubsub/peer-streams.js

@@ -4,7 +4,7 @@ const debug = require('debug')
 const log = Object.assign(debug('libp2p-pubsub:peer-streams'), {
   error: debug('libp2p-pubsub:peer-streams:err')
 })
-const EventEmitter = require('events')
+const { EventEmitter } = require('events')
 
 const lp = require('it-length-prefixed')
 const pushable = require('it-pushable')

src/transport/types.d.ts

@@ -1,6 +1,6 @@
 import BufferList from 'bl'
 import events from 'events'
-import Multiaddr from 'multiaddr'
+import { Multiaddr } from 'multiaddr'
 import Connection from '../connection/connection'
 import { Sink } from '../stream-muxer/types'
 

src/types.d.ts

@@ -1,5 +1,5 @@
-export type SelectFn = function (Uint8Array, Uint8Array[]): number
-export type ValidateFn = function (Uint8Array, Uint8Array): Promise<void>
+export type SelectFn = (key: Uint8Array, records: Uint8Array[]) => number
+export type ValidateFn = (a: Uint8Array, b: Uint8Array) => Promise<void>
 
 export type DhtSelectors = { [key: string]: SelectFn }
 export type DhtValidators = { [key: string]: { func: ValidateFn } }