add raw flag to batch and hypercore get

Author: chm-diederichs

index.js

@@ -875,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)

lib/batch.js

@@ -170,12 +170,17 @@ 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 })
+    } else if (opts && opts.raw) {
+      return this._appendsActual[index - length] || null
+    }
 
     const buffer = this._appends[index - length] || null
     if (!buffer) throw BLOCK_NOT_AVAILABLE()
@@ -186,20 +191,6 @@ module.exports = class HypercoreBatch extends EventEmitter {
     return c.decode(encoding, buffer)
   }
 
-  async getRaw (index, opts) {
-    if (this.opened === false) await this.opening
-    if (this.closing) throw SESSION_CLOSED()
-
-    const length = this._sessionLength
-    if (index < length) {
-      const block = await this.session.get(index, { ...opts, tree: this._sessionBatch })
-      if (!this.session.encryption) return block
-      return this._encrypt(index, block)
-    }
-
-    return this._appendsActual[index - length] || null
-  }
-
   async _waitForFlush () {
     // wait for any pending flush...
     while (this._flushing) {

test/batch.js

@@ -678,7 +678,7 @@ test('copy from with encrypted batch', async function (t) {
   const tree = clone.core.tree.batch()
 
   for (let i = 0; i < blocks; i++) {
-    await tree.append(await b.getRaw(i))
+    await tree.append(await b.get(i, { raw: true }))
   }
 
   t.alike(tree.hash(), manifest.prologue.hash)