Merge pull request #88 from ethereumjs/fix-typescript-type-exports

k-bucket Update to v5.0.0 / esModuleInterop issue on client integration Fix

Author: holgerd77

definitions/k-bucket.d.ts

@@ -53,12 +53,13 @@
     "test": "node_modules/tape/bin/tape -r ts-node/register ./test/index.ts"
   },
   "dependencies": {
+    "@types/k-bucket": "^5.0.0",
     "babel-runtime": "^6.11.6",
     "bl": "^1.1.2",
     "debug": "^2.2.0",
     "inherits": "^2.0.1",
     "ip": "^1.1.3",
-    "k-bucket": "^3.2.1",
+    "k-bucket": "^5.0.0",
     "keccak": "^3.0.0",
     "lru-cache": "^5.1.1",
     "ms": "^0.7.1",
@@ -92,7 +93,7 @@
     "ts-node": "^8.1.0",
     "typedoc": "^0.17.4",
     "typedoc-plugin-markdown": "^1.2.0",
-    "typescript": "^3.4.5",
+    "typescript": "^3.9.7",
     "typestrict": "^1.0.2"
   }
 }

package.json

@@ -1,5 +1,5 @@
 import { EventEmitter } from 'events'
-import _KBucket from 'k-bucket'
+import _KBucket = require('k-bucket')
 
 const KBUCKET_SIZE = 16
 const KBUCKET_CONCURRENCY = 3
@@ -17,7 +17,7 @@ export class KBucket extends EventEmitter {
     super()
 
     this._kbucket = new _KBucket({
-      localNodeId: id,
+      localNodeId: typeof id === 'string' ? Buffer.from(id) : id,
       numberOfNodesPerKBucket: KBUCKET_SIZE,
       numberOfNodesToPing: KBUCKET_CONCURRENCY,
     })
@@ -59,12 +59,12 @@ export class KBucket extends EventEmitter {
     return null
   }
 
-  getAll() {
+  getAll(): Array<any> {
     return this._kbucket.toArray()
   }
 
   closest(id: string): any {
-    return this._kbucket.closest(id, KBUCKET_SIZE)
+    return this._kbucket.closest(Buffer.from(id), KBUCKET_SIZE)
   }
 
   remove(obj: Buffer | string | KObj) {

src/dpt/kbucket.ts

@@ -2,7 +2,7 @@ import { EventEmitter } from 'events'
 import * as dgram from 'dgram'
 import ms from 'ms'
 import { debug as createDebugLogger } from 'debug'
-import LRUCache from 'lru-cache'
+import LRUCache = require('lru-cache')
 import { encode, decode } from './message'
 import { keccak256, pk2id, createDeferred, formatLogId } from '../util'
 import { DPT } from './dpt'

src/dpt/server.ts

@@ -1,7 +1,7 @@
 import { EventEmitter } from 'events'
 import rlp from 'rlp-encoding'
 import * as util from '../util'
-import BufferList from 'bl'
+import BufferList = require('bl')
 import ms from 'ms'
 import { debug as createDebugLogger } from 'debug'
 import { int2buffer, buffer2int, formatLogData } from '../util'

src/rlpx/peer.ts

@@ -4,7 +4,7 @@ import ms from 'ms'
 import { publicKeyCreate } from 'secp256k1'
 import { EventEmitter } from 'events'
 import { debug as createDebugLogger } from 'debug'
-import LRUCache from 'lru-cache'
+import LRUCache = require('lru-cache')
 // note: relative path only valid in .js file in dist
 const { version: pVersion } = require('../../package.json')
 import { pk2id, createDeferred, formatLogId } from '../util'