hypercore 10.22.1 → 10.22.3

package/index.js

@@ -930,13 +930,13 @@ module.exports = class Hypercore extends EventEmitter {
     // Do nothing for now
   }
 
-  async truncate (newLength = 0, fork = -1) {
-    if (this._batch) throw BATCH_UNFLUSHED()
-
+  async truncate (newLength = 0, opts = {}) {
     if (this.opened === false) await this.opening
     if (this.writable === false) throw SESSION_NOT_WRITABLE()
 
-    if (fork === -1) fork = this.core.tree.fork + 1
+    const { fork = this.core.tree.fork + 1, force = false } = typeof opts === 'number' ? { fork: opts } : opts
+    if (this._batch && !force) throw BATCH_UNFLUSHED()
+
     await this.core.truncate(newLength, fork, this.auth)
 
     // TODO: Should propagate from an event triggered by the oplog

package/lib/batch.js

@@ -12,10 +12,10 @@ module.exports = class HypercoreBatch extends EventEmitter {
     this.opening = null
     this.closing = null
     this.autoClose = autoClose
+    this.fork = 0
 
     this._appends = []
     this._byteLength = 0
-    this._fork = 0
     this._sessionLength = 0
     this._sessionByteLength = 0
     this._flushing = null
@@ -68,6 +68,7 @@ module.exports = class HypercoreBatch extends EventEmitter {
     if (this.opened) return
     this._sessionLength = this.session.length
     this._sessionByteLength = this.session.byteLength
+    this.fork = this.session.fork
     this.opened = true
     this.emit('ready')
   }
@@ -169,7 +170,7 @@ module.exports = class HypercoreBatch extends EventEmitter {
     return b
   }
 
-  async truncate (newLength) {
+  async truncate (newLength = 0, opts = {}) {
     if (this.opened === false) await this.opening
     if (this.writable === false) throw SESSION_NOT_WRITABLE()
     if (this.closing) throw SESSION_CLOSED()
@@ -177,11 +178,22 @@ module.exports = class HypercoreBatch extends EventEmitter {
     // wait for any pending flush... (prop needs a lock)
     await this._waitForFlush()
 
+    const { fork = this.fork + 1, force = false } = typeof opts === 'number' ? { fork: opts } : opts
+
     const length = this._sessionLength
-    if (newLength < length) throw new Error('Cannot truncate committed blocks')
+    if (newLength < length) {
+      if (!force) throw new Error('Cannot truncate committed blocks')
+      this._appends.length = 0
+      this._byteLength = 0
+      await this.session.truncate(newLength, { fork, force: true })
+      this._sessionLength = this.session.length
+      this._sessionByteLength = this.session.byteLength
+    } else {
+      for (let i = newLength - length; i < this._appends.length; i++) this._byteLength -= this._appends[i].byteLength
+      this._appends.length = newLength - length
+    }
 
-    this._appends.length = newLength - length
-    this._fork++
+    this.fork = fork
 
     this.emit('truncate', newLength, this.fork)
   }
@@ -267,7 +279,7 @@ module.exports = class HypercoreBatch extends EventEmitter {
   _clearAppends () {
     this._appends = []
     this._byteLength = 0
-    this._fork = 0
+    this.fork = 0
   }
 
   _clearBatch () {

package/lib/replicator.js

@@ -295,6 +295,7 @@ class Peer {
     this.dataProcessing = 0
 
     this.canUpgrade = true
+    this.reopenMaybe = false
 
     this.needsSync = false
     this.syncsProcessing = 0
@@ -375,6 +376,7 @@ class Peer {
     }
 
     this.needsSync = false
+    if (this.replicator.downloading === false) this.reopenMaybe = true
 
     this.wireSync.send({
       fork: this.core.tree.fork,
@@ -417,7 +419,12 @@ class Peer {
   }
 
   onclose (isRemote) {
-    if (this.session) this.replicator._closeSession(this.session)
+    // we might have signalled to the remote that we are done (ie not downloading) and the remote might agree on that
+    // if that happens, the channel might be closed by the remote. if so just renegotiate it.
+    const reopen = isRemote === true && this.remoteOpened === true && this.remoteDownloading === false &&
+       this.remoteUploading === true && this.replicator.downloading === true && this.reopenMaybe === true
+
+    if (this.session && !reopen) this.replicator._closeSession(this.session)
 
     if (this.remoteOpened === false) {
       this.replicator._ifAvailable--
@@ -427,6 +434,10 @@ class Peer {
 
     this.remoteOpened = false
     this.replicator._removePeer(this)
+
+    if (reopen) {
+      this.replicator._makePeer(this.protomux, this.session)
+    }
   }
 
   async onsync ({ fork, length, remoteLength, canUpgrade, uploading, downloading }) {

package/package.json

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