hypercore 11.11.0 → 11.11.2

package/README.md

@@ -61,15 +61,24 @@ Alternatively you can pass a [Hypercore Storage](https://github.com/holepunchto/
   ongc: (session) => { ... }, // A callback called when the session is garbage collected
   notDownloadingLinger: 20000, // How many milliseconds to wait after downloading finishes keeping the connection open. Defaults to a random number between 20-40s
   allowFork: true, // Enables updating core when it forks
+  userData: { foo: 'bar' }, // An object to assign to the local User Uata storage
 }
 ```
 
-You can also set valueEncoding to any [compact-encoding](https://github.com/compact-encoding) instance.
+You can also set `valueEncoding` to any [compact-encoding](https://github.com/compact-encoding) instance.
 
-valueEncodings will be applied to individual blocks, even if you append batches. If you want to control encoding at the batch-level, you can use the `encodeBatch` option, which is a function that takes a batch and returns a binary-encoded batch. If you provide a custom valueEncoding, it will not be applied prior to `encodeBatch`.
+`valueEncoding`s will be applied to individual blocks, even if you append batches. If you want to control encoding at the batch-level, you can use the `encodeBatch` option, which is a function that takes a batch and returns a binary-encoded batch. If you provide a custom `valueEncoding`, it will not be applied prior to `encodeBatch`.
 
 The user may provide a custom encryption module as `opts.encryption`, which should satisfy the [HypercoreEncryption](https://github.com/holepunchto/hypercore-encryption) interface.
 
+##### User Data
+
+User Data is a key-value store that is persisted locally and is not replicated with the Hypercore. This is useful as a quick store for data only used by the current peer. For example, `autobase` uses User Data to store information such as encryption keys and connections between a peer's local writer and the Autobase's bootstrap core.
+
+Keys are always strings and values can be strings or buffers.
+
+See [`core.setUserData(key, value)`](#await-coresetuserdatakey-value) and [`core.getUserData(key)`](#const-value--await-coregetuserdatakey) for updating User Data.
+
 #### `const { length, byteLength } = await core.append(block)`
 
 Append a block of data (or an array of blocks) to the core.
@@ -455,6 +464,18 @@ Populated after `ready` has been emitted. Will be `0` before the event.
 
 How much padding is applied to each block of this core? Will be `0` unless block encryption is enabled.
 
+#### `await core.setUserData(key, value)`
+
+Set a key in the User Data key-value store.
+
+`key` is a string and `value` can be a string or buffer.
+
+#### `const value = await core.getUserData(key)`
+
+Return the value for a key in the User Data key-value store.
+
+`key` is a string.
+
 #### `const stream = core.replicate(isInitiatorOrReplicationStream)`
 
 Create a replication stream. You should pipe this to another Hypercore instance.

package/index.js

@@ -71,6 +71,7 @@ class Hypercore extends EventEmitter {
     this.closed = false
     this.weak = !!opts.weak
     this.snapshotted = !!opts.snapshot
+    this.onseq = opts.onseq || null
     this.onwait = opts.onwait || null
     this.wait = opts.wait !== false
     this.timeout = opts.timeout || 0
@@ -219,6 +220,7 @@ class Hypercore extends EventEmitter {
     const wait = opts.wait === false ? false : this.wait
     const writable = opts.writable === undefined ? !this._readonly : opts.writable === true
     const onwait = opts.onwait === undefined ? this.onwait : opts.onwait
+    const onseq = opts.onseq === undefined ? this.onseq : opts.onseq
     const timeout = opts.timeout === undefined ? this.timeout : opts.timeout
     const weak = opts.weak === undefined ? this.weak : opts.weak
     const Clz = opts.class || Hypercore
@@ -226,6 +228,7 @@ class Hypercore extends EventEmitter {
       ...opts,
       wait,
       onwait,
+      onseq,
       timeout,
       writable,
       weak,
@@ -768,6 +771,8 @@ class Hypercore extends EventEmitter {
 
     const encoding = (opts && opts.valueEncoding && c.from(opts.valueEncoding)) || this.valueEncoding
 
+    if (this.onseq !== null) this.onseq(index, this)
+
     const req = this._get(index, opts)
 
     let block = await req

package/lib/merkle-tree.js

@@ -1092,7 +1092,7 @@ function nodesToRoot (index, nodes, head) {
 
   for (let i = 0; i < nodes; i++) {
     ite.parent()
-    if (ite.contains(head)) throw BAD_ARGUMENT('Nodes is out of bounds')
+    if (ite.contains(head)) throw INVALID_OPERATION('Nodes is out of bounds')
   }
 
   return ite.index

package/lib/replicator.js

@@ -927,6 +927,7 @@ class Peer {
         this._checkIfConflict()
       }
 
+      this.paused = true
       this.replicator._onnodata(this, req)
       this.replicator._oninvalid(err, req, data, this)
       return
@@ -2281,7 +2282,7 @@ module.exports = class Replicator {
   }
 
   _updatePeer (peer) {
-    if (!peer.isActive() || peer.inflight >= peer.getMaxInflight()) {
+    if (!peer.isActive() || peer.inflight >= peer.getMaxInflight() || !peer.remoteUploading) {
       return false
     }
 
@@ -2313,7 +2314,7 @@ module.exports = class Replicator {
   }
 
   _updatePeerNonPrimary (peer) {
-    if (!peer.isActive() || peer.inflight >= peer.getMaxInflight()) {
+    if (!peer.isActive() || peer.inflight >= peer.getMaxInflight() || !peer.remoteUploading) {
       return false
     }
 

package/lib/session-state.js

@@ -483,7 +483,8 @@ module.exports = class SessionState {
         }
       }
 
-      tx.deleteBlockRange(start, end)
+      if ((end - start) === 1) tx.deleteBlock(start)
+      else tx.deleteBlockRange(start, end)
 
       const dependency = start < this.flushedLength() ? updateDependency(this, start, true) : null
 

package/package.json

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