hypercore 10.32.3 → 10.32.5

package/index.js

@@ -813,8 +813,8 @@ module.exports = class Hypercore extends EventEmitter {
     return true
   }
 
-  batch ({ checkout = -1, autoClose = true, session = true, restore = false } = {}) {
-    return new Batch(session ? this.session() : this, checkout, autoClose, restore)
+  batch ({ checkout = -1, autoClose = true, session = true, restore = false, clear = false } = {}) {
+    return new Batch(session ? this.session() : this, checkout, autoClose, restore, clear)
   }
 
   async seek (bytes, opts) {

package/lib/batch.js

@@ -4,7 +4,7 @@ const c = require('compact-encoding')
 const b4a = require('b4a')
 
 module.exports = class HypercoreBatch extends EventEmitter {
-  constructor (session, checkoutLength, autoClose, restore) {
+  constructor (session, checkoutLength, autoClose, restore, clear) {
     super()
 
     this.session = session
@@ -25,8 +25,10 @@ module.exports = class HypercoreBatch extends EventEmitter {
     this._sessionByteLength = 0
     this._sessionBatch = null
     this._flushing = null
+    this._clear = clear
 
-    this.opening = this.ready().catch(noop)
+    this.opening = this._open()
+    this.opening.catch(noop)
   }
 
   get id () {
@@ -69,23 +71,27 @@ module.exports = class HypercoreBatch extends EventEmitter {
     return this.session.manifest
   }
 
-  async ready () {
+  ready () {
+    return this.opening
+  }
+
+  async _open () {
     await this.session.ready()
-    if (this.opened) return
+
+    if (this._clear) this._checkoutLength = this.core.tree.length
 
     if (this._checkoutLength !== -1) {
       const batch = await this.session.core.tree.restoreBatch(this._checkoutLength)
       batch.treeLength = this._checkoutLength
-      if (this.opened) return
       this._sessionLength = batch.length
       this._sessionByteLength = batch.byteLength
       this._sessionBatch = batch
+      if (this._clear) await this.core.clearBatch()
     } else {
       const last = this.restore ? this.session.core.bitfield.findFirst(false, this.session.length) : 0
 
       if (last > this.session.length) {
         const batch = await this.session.core.tree.restoreBatch(last)
-        if (this.opened) return
         this._sessionLength = batch.length
         this._sessionByteLength = batch.byteLength - this.session.padding * batch.length
         this._sessionBatch = batch

package/lib/block-store.js

@@ -1,4 +1,5 @@
 const b4a = require('b4a')
+const { WRITE_FAILED } = require('hypercore-errors')
 
 module.exports = class BlockStore {
   constructor (storage, tree) {
@@ -54,7 +55,7 @@ module.exports = class BlockStore {
   _write (offset, data) {
     return new Promise((resolve, reject) => {
       this.storage.write(offset, data, (err) => {
-        if (err) reject(err)
+        if (err) reject(WRITE_FAILED(err.message))
         else resolve(offset + data.byteLength)
       })
     })

package/lib/core.js

@@ -440,6 +440,40 @@ module.exports = class Core {
     }
   }
 
+  async clearBatch () {
+    await this._mutex.lock()
+
+    try {
+      const len = this.bitfield.findFirst(false, this.tree.length)
+      if (len <= this.tree.length) return
+
+      const batch = await this.tree.truncate(this.tree.length, this.tree.fork)
+
+      batch.signature = this.tree.signature // same sig
+
+      const entry = {
+        userData: null,
+        treeNodes: batch.nodes,
+        treeUpgrade: batch,
+        bitfield: {
+          drop: true,
+          start: batch.ancestors,
+          length: len - batch.ancestors
+        }
+      }
+
+      await this.oplog.append([entry], false)
+
+      this.bitfield.setRange(batch.ancestors, len - batch.ancestors, false)
+      batch.commit()
+
+      // TODO: (see below todo)
+      await this._flushOplog()
+    } finally {
+      this._mutex.unlock()
+    }
+  }
+
   async clear (start, end, cleared) {
     await this._mutex.lock()
 

package/lib/messages.js

@@ -114,7 +114,7 @@ const manifestv0 = {
       signer.encode(state, m.signers[0])
     } else {
       c.uint.encode(state, 2)
-      c.uint.encode(state, m.allowPatched ? 1 : 0)
+      c.uint.encode(state, m.allowPatch ? 1 : 0)
       c.uint.encode(state, m.quorum)
       signerArray.encode(state, m.signers)
     }

package/lib/oplog.js

@@ -1,7 +1,7 @@
 const cenc = require('compact-encoding')
 const b4a = require('b4a')
 const { crc32 } = require('crc-universal')
-const { OPLOG_CORRUPT, OPLOG_HEADER_OVERFLOW } = require('hypercore-errors')
+const { OPLOG_CORRUPT, OPLOG_HEADER_OVERFLOW, WRITE_FAILED } = require('hypercore-errors')
 
 module.exports = class Oplog {
   constructor (storage, { pageSize = 4096, headerEncoding = cenc.raw, entryEncoding = cenc.raw, readonly = false } = {}) {
@@ -216,7 +216,7 @@ module.exports = class Oplog {
   _append (buf, count) {
     return new Promise((resolve, reject) => {
       this.storage.write(this._entryOffset + this.byteLength, buf, err => {
-        if (err) return reject(err)
+        if (err) return reject(WRITE_FAILED(err.message))
 
         this.byteLength += buf.byteLength
         this.length += count

package/lib/replicator.js

@@ -706,6 +706,14 @@ class Peer {
       }
     } catch (err) {
       safetyCatch(err)
+
+      if (err.code === 'WRITE_FAILED') {
+        // For example, we don't want to keep pulling data when storage is full
+        // TODO: notify the user somehow
+        this.paused = true
+        return
+      }
+
       if (this.core.closed && !isCriticalError(err)) return
 
       if (err.code !== 'INVALID_OPERATION') {

package/lib/verifier.js

@@ -73,7 +73,7 @@ module.exports = class Verifier {
 
     return {
       proofs: proofs.map(proofToVersion1),
-      patch: patch
+      patch
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore",
-  "version": "10.32.3",
+  "version": "10.32.5",
   "description": "Hypercore is a secure, distributed append-only log",
   "main": "index.js",
   "scripts": {
@@ -44,7 +44,7 @@
     "fast-fifo": "^1.3.0",
     "flat-tree": "^1.9.0",
     "hypercore-crypto": "^3.2.1",
-    "hypercore-errors": "^1.1.0",
+    "hypercore-errors": "^1.1.1",
     "hypercore-id-encoding": "^1.2.0",
     "hypertrace": "^1.2.1",
     "is-options": "^1.0.1",