hypercore 10.37.15 → 10.37.17

package/index.js

@@ -270,6 +270,14 @@ module.exports = class Hypercore extends EventEmitter {
     this.writable = this._isWritable()
   }
 
+  setActive (bool) {
+    const active = !!bool
+    if (active === this._active) return
+    this._active = active
+    if (!this.opened || this.closing) return
+    this.replicator.updateActivity(this._active ? 1 : -1)
+  }
+
   _passCapabilities (o) {
     if (!this.keyPair) this.keyPair = o.keyPair
     this.crypto = o.crypto

package/lib/core.js

@@ -107,7 +107,7 @@ module.exports = class Core {
         external: null,
         key: opts.key || (compat ? manifest.signers[0].publicKey : Verifier.manifestHash(manifest)),
         manifest,
-        keyPair,
+        keyPair: keyPair ? { publicKey: keyPair.publicKey, secretKey: keyPair.secretKey || null } : null,
         userData: [],
         tree: {
           fork: 0,
@@ -131,6 +131,11 @@ module.exports = class Core {
     header.tree.rootHash = unslab(header.tree.rootHash)
     header.tree.signature = unslab(header.tree.signature)
 
+    if (header.keyPair) {
+      header.keyPair.publicKey = unslab(header.keyPair.publicKey)
+      header.keyPair.secretKey = unslab(header.keyPair.secretKey)
+    }
+
     if (opts.manifest) {
       // if we provide a manifest and no key, verify that the stored key is the same
       if (!opts.key && !Verifier.isValidManifest(header.key, Verifier.createManifest(opts.manifest))) {
@@ -204,6 +209,10 @@ module.exports = class Core {
       }
     }
 
+    for (const entry of header.userData) {
+      entry.value = unslab(entry.value)
+    }
+
     return new this(header, compat, crypto, oplog, bigHeader, tree, blocks, bitfield, verifier, opts.sessions || [], legacy, opts.globalCache || null, opts.onupdate || noop, opts.onconflict || noop)
   }
 
@@ -1022,6 +1031,8 @@ function addReorgHint (list, tree, batch) {
 }
 
 function updateUserData (list, key, value) {
+  value = unslab(value)
+
   for (let i = 0; i < list.length; i++) {
     if (list[i].key === key) {
       if (value) list[i].value = value

package/lib/replicator.js

@@ -1301,7 +1301,6 @@ class Peer {
       if (this._remoteHasBlock(index) === false) continue
 
       const req = this._makeRequest(false, 0, 0)
-      if (req === null) continue
 
       req.hash = { index: 2 * index, nodes: f.batch.want.nodes }
 

package/package.json

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