be stateless

Author: mafintosh

index.js

@@ -7,10 +7,8 @@ var stream = require('readable-stream')
 var events = require('events')
 var sodium = require('sodium-prebuilt').api // TODO: make me work in the browser
 var increment = require('increment-buffer')
-var bitfield = require('bitfield')
 var messages = require('./messages')
 
-var MAX_BITFIELD = 4 * 1024 * 1024
 var MAX_MESSAGE = 5 * 1024 * 1024
 var MAX_EXTENSIONS = 64 // theoretically we can support any amount though
 var MAX_SINGLE_BYTE_VARINT = 127
@@ -52,17 +50,10 @@ function use (extensions) {
     this.id = id
     this.key = null
     this.context = null // someone else can set this
-
     this.remoteOpened = false
     this.opened = false
-
     this.closed = false
 
-    this.remotePausing = true
-    this.pausing = true
-
-    this.remoteBitfield = bitfield(1, {grow: MAX_BITFIELD})
-
     this._secure = protocol._secure !== false
     this._nonce = null
     this._remoteNonce = null
@@ -106,9 +97,9 @@ function use (extensions) {
     this.emit('update')
   }
 
-  Channel.prototype.have = function (blocks, bitfield) {
-    if (typeof blocks === 'number') blocks = [blocks]
-    this._send(2, {blocks: blocks, bitfield: toBuffer(bitfield)})
+  Channel.prototype.have = function (have) {
+    if (typeof have === 'number') this._send(2, {blocks: [have]})
+    else this._send(2, have)
   }
 
   Channel.prototype.resume = function () {
@@ -119,16 +110,18 @@ function use (extensions) {
     this._send(4, null)
   }
 
-  Channel.prototype.request = function (block) {
-    this._send(5, {block: block})
+  Channel.prototype.request = function (request) {
+    if (typeof request === 'number') this._send(5, {block: request})
+    else this._send(5, request)
   }
 
-  Channel.prototype.response = function (block, data, proof) {
-    this._send(6, {block: block, data: data, proof: proof})
+  Channel.prototype.response = function (response) {
+    this._send(6, response)
   }
 
-  Channel.prototype.cancel = function (block) {
-    this._send(7, {block: block})
+  Channel.prototype.cancel = function (cancel) {
+    if (typeof cancel === 'number') this._send(7, {block: cancel})
+    else this._send(7, cancel)
   }
 
   Channel.prototype.remoteSupports = function (id) {
@@ -274,48 +267,27 @@ function use (extensions) {
   }
 
   Channel.prototype._onhave = function (message) {
-    if (this.closed) return
-
-    if (message.bitfield) {
-      // TODO: this should be a proof bitfield instead
-      this.remoteBitfield = bitfield(message.bitfield, {grow: MAX_BITFIELD})
-    }
-
-    var i = 0
-
-    for (i = 0; i < message.blocks.length; i++) {
-      var block = message.blocks[i]
-      this.remoteBitfield.set(block)
-    }
-
-    this.emit('have')
-    this.emit('update')
+    if (!this.closed) this.emit('have')
   }
 
   Channel.prototype._onresume = function () {
-    if (this.closed) return
-    this.remotePausing = false
-    this.emit('resume')
-    this.emit('update')
+    if (this.closed) this.emit('resume')
   }
 
   Channel.prototype._onpause = function () {
-    if (this.closed) return
-    this.remotePausing = true
-    this.emit('pause')
-    this.emit('update')
+    if (!this.closed) this.emit('pause')
   }
 
   Channel.prototype._onrequest = function (message) {
-    if (!this.closed) this.emit('request', message.block)
+    if (!this.closed) this.emit('request', message)
   }
 
   Channel.prototype._onresponse = function (message) {
-    if (!this.closed) this.emit('response', message.block, message.data, message.proof)
+    if (!this.closed) this.emit('response', message)
   }
 
   Channel.prototype._oncancel = function (message) {
-    if (!this.closed) this.emit('cancel', message.block)
+    if (!this.closed) this.emit('cancel', message)
   }
 
   Channel.prototype._decrypt = function (cipher) {
@@ -557,12 +529,6 @@ function publicId (key) {
   return crypto.createHmac('sha256', key).update('hypercore').digest()
 }
 
-function toBuffer (bitfield) {
-  if (!bitfield) return null
-  if (Buffer.isBuffer(bitfield)) return bitfield
-  return bitfield.buffer
-}
-
 function toString (val) {
   return val.toString()
 }

package.json

@@ -4,7 +4,6 @@
   "description": "Stream that implements the hypercore protocol",
   "main": "index.js",
   "dependencies": {
-    "bitfield": "^1.1.2",
     "brfs": "^1.4.3",
     "duplexify": "^3.4.3",
     "increment-buffer": "^1.0.0",

test.js

@@ -62,7 +62,7 @@ tape('encrypts messages', function (t) {
   })
 
   var ch = p.join(key)
-  ch.response(0, Buffer('hello i should be encrypted.'))
+  ch.response({block: 0, data: Buffer('hello i should be encrypted.')})
   p.end()
 })
 
@@ -78,18 +78,18 @@ tape('remote joins', function (t) {
     remoteJoined--
   })
 
-  ch1.on('request', function (block) {
-    t.same(block, 42, 'received request')
-    ch1.response(42, Buffer('some data'))
+  ch1.on('request', function (request) {
+    t.same(request.block, 42, 'received request')
+    ch1.response({block: 42, data: Buffer('some data')})
   })
 
   var ch2 = p2.join(key)
 
   ch2.request(42)
 
-  ch2.on('response', function (block, data, proof) {
-    t.same(block, 42, 'received response')
-    t.same(data, Buffer('some data'), 'expected data')
+  ch2.on('response', function (response) {
+    t.same(response.block, 42, 'received response')
+    t.same(response.data, Buffer('some data'), 'expected data')
     t.same(remoteJoined, 0, 'both emitted open')
     t.end()
   })