hypercore 10.25.0 → 10.25.1

package/README.md

@@ -283,15 +283,15 @@ A range can have the following properties:
 }
 ```
 
-To download the full core continously (often referred to as non sparse mode) do
+To download the full core continuously (often referred to as non sparse mode) do
 
 ``` js
-// Note that this will never be consider downloaded as the range
+// Note that this will never be considered downloaded as the range
 // will keep waiting for new blocks to be appended.
 core.download({ start: 0, end: -1 })
 ```
 
-To downloaded a discrete range of blocks pass a list of indices.
+To download a discrete range of blocks pass a list of indices.
 
 ```js
 core.download({ blocks: [4, 9, 7] })
@@ -434,7 +434,7 @@ How much padding is applied to each block of this core? Will be `0` unless block
 
 Create a replication stream. You should pipe this to another Hypercore instance.
 
-The `isInitiator` argument is a boolean indicating whether you are the iniatior of the connection (ie the client)
+The `isInitiator` argument is a boolean indicating whether you are the initiator of the connection (ie the client)
 or if you are the passive part (ie the server).
 
 If you are using a P2P swarm like [Hyperswarm](https://github.com/hyperswarm/hyperswarm) you can know this by checking if the swarm connection is a client socket or server socket. In Hyperswarm you can check that using the [client property on the peer details object](https://github.com/hyperswarm/hyperswarm#swarmonconnection-socket-details--)

package/index.js

@@ -211,8 +211,8 @@ module.exports = class Hypercore extends EventEmitter {
 
   session (opts = {}) {
     if (this.closing) {
-      // This makes the closing logic alot easier. If this turns out to be a problem
-      // in practive, open an issue and we'll try to make a solution for it.
+      // This makes the closing logic a lot easier. If this turns out to be a problem
+      // in practice, open an issue and we'll try to make a solution for it.
       throw SESSION_CLOSED('Cannot make sessions on a closing core')
     }
 
@@ -1100,7 +1100,7 @@ function preappend (blocks) {
 
 function ensureEncryption (core, opts) {
   if (!opts.encryptionKey) return
-  // Only override the block encryption if its either not already set or if
+  // Only override the block encryption if it's either not already set or if
   // the caller provided a different key.
   if (core.encryption && b4a.equals(core.encryption.key, opts.encryptionKey)) return
   core.encryption = new BlockEncryption(opts.encryptionKey, core.key)

package/lib/batch.js

@@ -1,6 +1,7 @@
 const { BLOCK_NOT_AVAILABLE, SESSION_CLOSED } = require('hypercore-errors')
 const EventEmitter = require('events')
 const c = require('compact-encoding')
+const b4a = require('b4a')
 
 module.exports = class HypercoreBatch extends EventEmitter {
   constructor (session, checkoutLength, autoClose) {
@@ -16,6 +17,7 @@ module.exports = class HypercoreBatch extends EventEmitter {
     this.fork = 0
 
     this._appends = []
+    this._appendsActual = null
     this._checkoutLength = checkoutLength
     this._byteLength = 0
     this._sessionLength = 0
@@ -80,6 +82,7 @@ module.exports = class HypercoreBatch extends EventEmitter {
       this._sessionBatch = this.session.createTreeBatch()
     }
 
+    this._appendsActual = this.session.encryption ? [] : this._appends
     this.fork = this.session.fork
     this.opened = true
     this.emit('ready')
@@ -174,13 +177,13 @@ module.exports = class HypercoreBatch extends EventEmitter {
     if (len < this._sessionLength || length > maxLength) return null
 
     for (let i = 0; i < len - this._sessionLength; i++) {
-      b.append(this._appends[i])
+      b.append(this._appendsActual[i])
     }
 
     if (len < this.length) return b
 
     for (let i = 0; i < length - len; i++) {
-      b.append(blocks[i])
+      b.append(this._appendsActual === this._appends ? blocks[i] : this._encrypt(b.length + i, blocks[i]))
     }
 
     return b
@@ -232,11 +235,16 @@ module.exports = class HypercoreBatch extends EventEmitter {
 
     if (session.encodeBatch === null) {
       for (let i = 0; i < blocks.length; i++) {
-        const buffer = session._encode(session.valueEncoding, blocks[i])
+        const buffer = this._encode(session.valueEncoding, blocks[i])
         buffers[i] = buffer
         this._byteLength += buffer.byteLength
       }
     }
+    if (this._appends !== this._appendsActual) {
+      for (let i = 0; i < buffers.length; i++) {
+        this._appendsActual.push(this._encrypt(this._sessionLength + this._appendsActual.length, buffers[i]))
+      }
+    }
 
     this._appends.push(...buffers)
 
@@ -246,6 +254,35 @@ module.exports = class HypercoreBatch extends EventEmitter {
     return info
   }
 
+  _encode (enc, val) {
+    const state = { start: 0, end: 0, buffer: null }
+
+    if (b4a.isBuffer(val)) {
+      if (state.start === 0) return val
+      state.end += val.byteLength
+    } else if (enc) {
+      enc.preencode(state, val)
+    } else {
+      val = b4a.from(val)
+      if (state.start === 0) return val
+      state.end += val.byteLength
+    }
+
+    state.buffer = b4a.allocUnsafe(state.end)
+
+    if (enc) enc.encode(state, val)
+    else state.buffer.set(val, state.start)
+
+    return state.buffer
+  }
+
+  _encrypt (index, buffer) {
+    const block = b4a.allocUnsafe(buffer.byteLength + 8)
+    block.set(buffer, 8)
+    this.session.encryption.encrypt(index, block, this.fork)
+    return block
+  }
+
   async flush (opts = {}) {
     if (this.opened === false) await this.opening
     if (this.closing) throw SESSION_CLOSED()
@@ -275,7 +312,7 @@ module.exports = class HypercoreBatch extends EventEmitter {
     const batch = this.createTreeBatch(this._sessionLength + flushingLength)
     if (batch === null) return false
 
-    const info = await this.core.insertBatch(batch, this._appends, { keyPair, signature })
+    const info = await this.core.insertBatch(batch, this._appendsActual, { keyPair, signature })
     if (info === null) return false
 
     const delta = info.byteLength - this._sessionByteLength

package/lib/replicator.js

@@ -346,6 +346,7 @@ class Peer {
   }
 
   broadcastRange (start, length, drop) {
+    if (drop) this.skipList.setRange(start, length, false)
     this.wireRange.send({
       drop,
       start,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore",
-  "version": "10.25.0",
+  "version": "10.25.1",
   "description": "Hypercore is a secure, distributed append-only log",
   "main": "index.js",
   "scripts": {