hypercore 11.28.1 → 11.30.0

package/index.js

@@ -34,7 +34,8 @@ const {
   SESSION_MOVED,
   SESSION_NOT_WRITABLE,
   SNAPSHOT_NOT_AVAILABLE,
-  DECODING_ERROR
+  DECODING_ERROR,
+  REQUEST_CANCELLED
 } = require('hypercore-errors')
 
 // Hypercore actually does not have any notion of max/min block sizes
@@ -192,7 +193,12 @@ class Hypercore extends EventEmitter {
   }
 
   static clearRequests(session, err) {
-    return Replicator.clearRequests(session, err)
+    Replicator.clearRequests(session, err)
+  }
+
+  static destroyRequests(session, err) {
+    Replicator.clearRequests(session, err)
+    session.push(null) // mark as dead
   }
 
   static async treeHashFromStorage(session, length = session.length) {
@@ -736,6 +742,8 @@ class Hypercore extends EventEmitter {
 
     if (!upgraded && remoteWait) {
       const activeRequests = (opts && opts.activeRequests) || this.activeRequests
+      if (isRequestsDestroyed(activeRequests)) throw REQUEST_CANCELLED()
+
       const req = this.core.replicator.addUpgrade(activeRequests)
 
       try {
@@ -755,6 +763,7 @@ class Hypercore extends EventEmitter {
     if (!isValidIndex(bytes)) throw ASSERTION('seek is invalid', this.discoveryKey)
 
     const activeRequests = (opts && opts.activeRequests) || this.activeRequests
+    if (isRequestsDestroyed(activeRequests)) throw REQUEST_CANCELLED()
 
     if (this.encryption && !this.core.manifest) {
       const req = this.replicator.addUpgrade(activeRequests)
@@ -777,6 +786,7 @@ class Hypercore extends EventEmitter {
 
     if (!this._shouldWait(opts, this.wait)) return null
 
+    if (isRequestsDestroyed(activeRequests)) throw REQUEST_CANCELLED()
     const req = this.core.replicator.addSeek(activeRequests, s)
 
     const timeout = opts && opts.timeout !== undefined ? opts.timeout : this.timeout
@@ -916,6 +926,7 @@ class Hypercore extends EventEmitter {
     if (this.onwait) this.onwait(index, this)
 
     const activeRequests = (opts && opts.activeRequests) || this.activeRequests
+    if (isRequestsDestroyed(activeRequests)) throw REQUEST_CANCELLED()
 
     const force = opts ? opts.force === true : false
     const req = this.core.replicator.addBlock(activeRequests, index, force)
@@ -1393,3 +1404,8 @@ function createDiscoveryKeyHandler(fn) {
     return fn(id)
   }
 }
+
+function isRequestsDestroyed(activeRequests) {
+  // TODO: move this to an object instead so we can store a property in next major
+  return activeRequests.length > 0 && activeRequests[0] === null
+}

package/lib/messages.js

@@ -1,11 +1,8 @@
 const c = require('compact-encoding')
-const b4a = require('b4a')
 const { DEFAULT_NAMESPACE } = require('./caps')
 const { INVALID_OPLOG_VERSION } = require('hypercore-errors')
 const unslab = require('unslab')
 
-const EMPTY = b4a.alloc(0)
-
 const MANIFEST_PATCH = 0b00000001
 const MANIFEST_PROLOGUE = 0b00000010
 const MANIFEST_LINKED = 0b00000100
@@ -403,14 +400,14 @@ const dataUpgrade = {
     c.uint.preencode(state, u.length)
     nodeArray.preencode(state, u.nodes)
     nodeArray.preencode(state, u.additionalNodes)
-    c.buffer.preencode(state, u.signature)
+    c.optionalBuffer.preencode(state, u.signature)
   },
   encode(state, u) {
     c.uint.encode(state, u.start)
     c.uint.encode(state, u.length)
     nodeArray.encode(state, u.nodes)
     nodeArray.encode(state, u.additionalNodes)
-    c.buffer.encode(state, u.signature)
+    c.optionalBuffer.encode(state, u.signature)
   },
   decode(state) {
     return {
@@ -418,7 +415,7 @@ const dataUpgrade = {
       length: c.uint.decode(state),
       nodes: nodeArray.decode(state),
       additionalNodes: nodeArray.decode(state),
-      signature: c.buffer.decode(state)
+      signature: c.optionalBuffer.decode(state)
     }
   }
 }
@@ -454,7 +451,7 @@ const dataBlock = {
   decode(state) {
     return {
       index: c.uint.decode(state),
-      value: c.buffer.decode(state) || EMPTY,
+      value: c.buffer.decode(state),
       nodes: nodeArray.decode(state)
     }
   }

package/lib/replicator.js

@@ -2277,6 +2277,7 @@ module.exports = class Replicator {
 
   static clearRequests(session, err) {
     if (session.length === 0) return
+    if (session.length === 1 && session[0] === null) return
 
     const updated = new Set()
 

package/lib/session-state.js

@@ -408,8 +408,12 @@ class SessionState {
       const batch = this.createTreeBatch()
       await MerkleTree.truncate(this, length, batch, fork)
 
-      if (!signature && keyPair && length > 0) signature = this.core.verifier.sign(batch, keyPair)
-      if (signature) batch.signature = signature
+      if (signature) {
+        batch.signature = signature
+        this.core._verifyBatchUpgrade(batch)
+      } else if (keyPair) {
+        batch.signature = this.core.verifier.sign(batch, keyPair)
+      }
 
       const tx = this.createWriteBatch()
 
@@ -646,8 +650,12 @@ class SessionState {
         throw INVALID_OPERATION('Append is not consistent with prologue', this.core.discoveryKey)
       }
 
-      if (!signature && keyPair) signature = this.core.verifier.sign(batch, keyPair)
-      if (signature) batch.signature = signature
+      if (signature) {
+        batch.signature = signature
+        this.core._verifyBatchUpgrade(batch)
+      } else if (keyPair) {
+        batch.signature = this.core.verifier.sign(batch, keyPair)
+      }
 
       batch.commit(tx)
 
@@ -873,9 +881,11 @@ class SessionState {
 
     rx.tryFlush()
 
-    const blocks = await Promise.all(blockPromises)
-    const nodes = await Promise.all(treePromises)
-    const roots = await Promise.all(rootPromises)
+    const [blocks, nodes, roots] = await Promise.all([
+      Promise.all(blockPromises),
+      Promise.all(treePromises),
+      Promise.all(rootPromises)
+    ])
 
     if (this.core.destroyed) throw new Error('Core destroyed')
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore",
-  "version": "11.28.1",
+  "version": "11.30.0",
   "description": "Hypercore is a secure, distributed append-only log",
   "main": "index.js",
   "scripts": {
@@ -48,7 +48,7 @@
     "b4a": "^1.1.0",
     "bare-events": "^2.2.0",
     "big-sparse-array": "^1.0.3",
-    "compact-encoding": "^2.11.0",
+    "compact-encoding": "^3.0.0",
     "fast-fifo": "^1.3.0",
     "flat-tree": "^1.9.0",
     "hypercore-crypto": "^3.2.1",