hypercore 10.33.4 → 10.34.1

package/index.js

@@ -9,6 +9,7 @@ const NoiseSecretStream = require('@hyperswarm/secret-stream')
 const Protomux = require('protomux')
 const z32 = require('z32')
 const id = require('hypercore-id-encoding')
+const safetyCatch = require('safety-catch')
 const { createTracer } = require('hypertrace')
 
 const Replicator = require('./lib/replicator')
@@ -92,7 +93,7 @@ module.exports = class Hypercore extends EventEmitter {
     this._active = opts.active !== false
 
     this.opening = this._openSession(key, storage, opts)
-    this.opening.catch(noop)
+    this.opening.catch(safetyCatch)
   }
 
   [inspect] (depth, opts) {
@@ -874,6 +875,8 @@ module.exports = class Hypercore extends EventEmitter {
     let block = await req
     if (!block) return null
 
+    if (opts && opts.raw) return block
+
     if (this.encryption && (!opts || opts.decrypt !== false)) {
       // Copy the block as it might be shared with other sessions.
       block = b4a.from(block)
@@ -972,7 +975,7 @@ module.exports = class Hypercore extends EventEmitter {
     const req = this._download(range)
 
     // do not crash in the background...
-    req.catch(noop)
+    req.catch(safetyCatch)
 
     return new Download(req)
   }
@@ -1127,8 +1130,6 @@ module.exports = class Hypercore extends EventEmitter {
   }
 }
 
-function noop () {}
-
 function isStream (s) {
   return typeof s === 'object' && s && typeof s.pipe === 'function'
 }

package/lib/batch.js

@@ -2,6 +2,7 @@ const { BLOCK_NOT_AVAILABLE, SESSION_CLOSED } = require('hypercore-errors')
 const EventEmitter = require('events')
 const c = require('compact-encoding')
 const b4a = require('b4a')
+const safetyCatch = require('safety-catch')
 
 module.exports = class HypercoreBatch extends EventEmitter {
   constructor (session, checkoutLength, autoClose, restore, clear) {
@@ -28,7 +29,7 @@ module.exports = class HypercoreBatch extends EventEmitter {
     this._clear = clear
 
     this.opening = this._open()
-    this.opening.catch(noop)
+    this.opening.catch(safetyCatch)
   }
 
   get id () {
@@ -169,12 +170,19 @@ module.exports = class HypercoreBatch extends EventEmitter {
     throw BLOCK_NOT_AVAILABLE()
   }
 
-  async get (index, opts) {
+  async get (index, opts = {}) {
     if (this.opened === false) await this.opening
     if (this.closing) throw SESSION_CLOSED()
 
     const length = this._sessionLength
-    if (index < length) return this.session.get(index, { ...opts, tree: this._sessionBatch })
+
+    if (index < length) {
+      return this.session.get(index, { ...opts, tree: this._sessionBatch })
+    }
+
+    if (opts && opts.raw) {
+      return this._appendsActual[index - length] || null
+    }
 
     const buffer = this._appends[index - length] || null
     if (!buffer) throw BLOCK_NOT_AVAILABLE()
@@ -404,5 +412,3 @@ module.exports = class HypercoreBatch extends EventEmitter {
     this.fork = 0
   }
 }
-
-function noop () {}

package/lib/core.js

@@ -124,6 +124,8 @@ module.exports = class Core {
       if (!opts.key && !Verifier.isValidManifest(header.key, Verifier.createManifest(opts.manifest))) {
         throw STORAGE_CONFLICT('Manifest does not hash to provided key')
       }
+
+      if (!header.manifest) header.manifest = opts.manifest
     }
 
     if (opts.key && !b4a.equals(header.key, opts.key)) {
@@ -224,7 +226,7 @@ module.exports = class Core {
     return false
   }
 
-  async copyFrom (src, signature, { length = src.tree.length, fork = src.tree.fork, additional = [] } = {}) {
+  async copyFrom (src, signature, { length = src.tree.length, sourceLength = src.tree.length, fork = src.tree.fork, additional = [] } = {}) {
     await this._mutex.lock()
 
     try {
@@ -279,13 +281,16 @@ module.exports = class Core {
 
       await this.tree.flush()
 
+      this.tree.fork = fork
+
       let batch = this.tree.batch()
 
       // add additional blocks
       if (length > src.tree.length) {
         const missing = length - src.tree.length
+        const offset = src.tree.length - sourceLength
 
-        if (additional.length < missing) {
+        if (additional.length < missing + offset) {
           throw INVALID_OPERATION('Insufficient additional nodes were passed')
         }
 
@@ -295,7 +300,7 @@ module.exports = class Core {
         batch.length = source.length
         batch.byteLength = source.byteLength
 
-        const blocks = additional.length === missing ? additional : additional.slice(0, missing)
+        const blocks = additional.length === missing ? additional : additional.slice(offset, offset + missing)
 
         await this.blocks.putBatch(source.length, blocks, source.byteLength)
         this.bitfield.setRange(source.length, missing, true)
@@ -334,9 +339,8 @@ module.exports = class Core {
 
       await batch.commit()
 
-      this.tree.fork = fork
-
       this.header.tree.length = this.tree.length
+      this.header.tree.fork = this.tree.fork
       this.header.tree.rootHash = this.tree.hash()
       this.header.tree.signature = this.tree.signature
 

package/lib/replicator.js

@@ -1087,7 +1087,7 @@ class Peer {
       return false
     }
 
-    const end = Math.min(r.end === -1 ? this.remoteLength : r.end, this.remoteLength)
+    const end = Math.min(this.core.tree.length, Math.min(r.end === -1 ? this.remoteLength : r.end, this.remoteLength))
     if (end <= r.start || fork !== this.remoteFork) return false
 
     const len = end - r.start
@@ -2012,7 +2012,7 @@ module.exports = class Replicator {
   }
 
   _closeSession (session) {
-    session.close().catch(noop)
+    session.close().catch(safetyCatch)
   }
 
   attached (protomux) {

package/package.json

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