hypercore 10.0.0-alpha.17 → 10.0.0-alpha.20

package/index.js

@@ -92,9 +92,28 @@ module.exports = class Hypercore extends EventEmitter {
       indent + ')'
   }
 
-  static createProtocolStream (isInitiator, opts) {
-    const noiseStream = new NoiseSecretStream(isInitiator, null, opts)
-    return noiseStream.rawStream
+  static createProtocolStream (isInitiator, opts = {}) {
+    let outerStream = isStream(isInitiator)
+      ? isInitiator
+      : opts.stream
+    let noiseStream = null
+
+    if (outerStream) {
+      noiseStream = outerStream.noiseStream
+    } else {
+      noiseStream = new NoiseSecretStream(isInitiator, null, opts)
+      outerStream = noiseStream.rawStream
+    }
+    if (!noiseStream) throw new Error('Invalid stream')
+
+    if (!noiseStream.userData) {
+      const protocol = Replicator.createProtocol(noiseStream)
+      if (opts.keepAlive !== false) protocol.setKeepAlive(true)
+      noiseStream.userData = protocol
+      noiseStream.on('error', noop) // All noise errors already propagate through outerStream
+    }
+
+    return outerStream
   }
 
   static defaultStorage (storage, opts = {}) {
@@ -268,33 +287,17 @@ module.exports = class Hypercore extends EventEmitter {
   }
 
   replicate (isInitiator, opts = {}) {
-    let outerStream = isStream(isInitiator)
-      ? isInitiator
-      : opts.stream
-    let noiseStream = null
-
-    if (outerStream) {
-      noiseStream = outerStream.noiseStream
-    } else {
-      outerStream = Hypercore.createProtocolStream(isInitiator, opts)
-      noiseStream = outerStream.noiseStream
-    }
-    if (!noiseStream) throw new Error('Invalid stream passed to replicate')
-
-    if (!noiseStream.userData) {
-      const protocol = Replicator.createProtocol(noiseStream)
-      noiseStream.userData = protocol
-      noiseStream.on('error', noop) // All noise errors already propagate through outerStream
-    }
-
+    const protocolStream = Hypercore.createProtocolStream(isInitiator, opts)
+    const noiseStream = protocolStream.noiseStream
     const protocol = noiseStream.userData
+
     if (this.opened) {
       this.replicator.joinProtocol(protocol, this.key, this.discoveryKey)
     } else {
       this.opening.then(() => this.replicator.joinProtocol(protocol, this.key, this.discoveryKey), protocol.destroy.bind(protocol))
     }
 
-    return outerStream
+    return protocolStream
   }
 
   get length () {

package/lib/merkle-tree.js

@@ -247,6 +247,8 @@ class ReorgBatch extends MerkleTreeBatch {
   }
 
   _updateDiffRoot (diff) {
+    if (this.want === null) return true
+
     const spans = flat.spans(diff.index)
     const start = spans[0] / 2
     const end = Math.min(this.treeLength, spans[1] / 2 + 1)

package/lib/protocol.js

@@ -39,7 +39,7 @@ class Extension {
   _sendAlias (message, alias) {
     if (this.destroyed) return
 
-    if (this._remoteAliases) {
+    if (this.remoteSupports) {
       return this.protocol.send(this.type, this.encoding, alias, message)
     }
 
@@ -256,11 +256,13 @@ module.exports = class Protocol {
     this._localExtensions = 128
     this._remoteExtensions = []
     this._extensions = new Map()
+    this._keepAliveInterval = null
 
     this._destroyer = this._safeDestroy.bind(this)
     this.noiseStream.on('data', this.onmessage.bind(this))
     this.noiseStream.on('end', this.noiseStream.end) // no half open
     this.noiseStream.on('close', () => {
+      this.setKeepAlive(false)
       // TODO: If the stream was destroyed with an error, we probably want to forward it here
       for (const peer of this._peers.values()) {
         peer.destroy(null)
@@ -270,6 +272,18 @@ module.exports = class Protocol {
     this._sendHandshake()
   }
 
+  setKeepAlive (enable) {
+    if (enable) {
+      if (this._keepAliveInterval) return
+      this._keepAliveInterval = setInterval(this.ping.bind(this), 5000)
+      if (this._keepAliveInterval.unref) this._keepAliveInterval.unref()
+    } else {
+      if (!this._keepAliveInterval) return
+      clearInterval(this._keepAliveInterval)
+      this._keepAliveInterval = null
+    }
+  }
+
   _sendHandshake () {
     const m = { protocolVersion: this.protocolVersion, userAgent: this.userAgent }
     const state = { start: 0, end: 0, buffer: null }
@@ -380,6 +394,8 @@ module.exports = class Protocol {
   }
 
   _decode (buffer) {
+    if (buffer.byteLength === 0) return
+
     const state = { start: 0, end: buffer.length, buffer }
 
     if (this._firstMessage === true) {
@@ -508,6 +524,11 @@ module.exports = class Protocol {
     return this.noiseStream.write(state.buffer)
   }
 
+  ping () {
+    const empty = this.noiseStream.alloc(0)
+    this.noiseStream.write(empty)
+  }
+
   destroy (err) {
     return this.noiseStream.destroy(err)
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore",
-  "version": "10.0.0-alpha.17",
+  "version": "10.0.0-alpha.20",
   "description": "Hypercore 10",
   "main": "index.js",
   "scripts": {
@@ -49,7 +49,7 @@
     "xache": "^1.0.0"
   },
   "devDependencies": {
-    "brittle": "^1.4.1",
+    "brittle": "^2.0.0",
     "hyperswarm": "next",
     "random-access-memory": "^3.1.2",
     "standard": "^16.0.3",