hypercore 11.0.16 → 11.0.18

package/index.js

@@ -288,7 +288,6 @@ class Hypercore extends EventEmitter {
     try {
       await this._openSession(opts)
     } catch (err) {
-      if (this.closing) return
       if (this.core.autoClose && this.core.hasSession() === false) await this.core.close()
 
       if (this.exclusive) this.core.unlockExclusive()
@@ -298,6 +297,7 @@ class Hypercore extends EventEmitter {
 
       if (this.state !== null) this.state.removeSession(this)
 
+      this.closed = true
       this.emit('close', this.core.hasSession() === false)
       throw err
     }
@@ -428,7 +428,14 @@ class Hypercore extends EventEmitter {
   }
 
   async _close (error) {
-    if (this.opened === false) await this.opening
+    if (this.opened === false) {
+      try {
+        await this.opening
+      } catch (err) {
+        if (!this.closed) throw err
+      }
+    }
+
     if (this.closed === true) return
 
     this.core.removeMonitor(this)

package/lib/session-state.js

@@ -850,14 +850,21 @@ module.exports = class SessionState {
     return head
   }
 
-  _moveToCore (core) {
+  _moveToCore (core, truncated, appended) {
     const head = this.core.sessionStates.pop()
     if (head !== this) this.core.sessionStates[(head.index = this.index)] = head
 
     this.core = core
     this.index = this.core.sessionStates.push(this) - 1
 
-    for (let i = this.sessions.length - 1; i >= 0; i--) this.sessions[i].transferSession(this.core)
+    for (let i = this.sessions.length - 1; i >= 0; i--) {
+      const s = this.sessions[i]
+      const manifest = s.manifest
+      s.transferSession(this.core)
+      if (!manifest && s.manifest) s.emit('manifest')
+      if (truncated) s.emit('truncate', truncated.to, truncated.fork)
+      if (appended) s.emit('append')
+    }
   }
 
   async moveTo (core, length) {
@@ -872,6 +879,9 @@ module.exports = class SessionState {
 
       const treeLength = this.length
 
+      let truncated = null
+      let appended = false
+
       if (!this.isSnapshot()) {
         if (this.lingers === null) this.lingers = []
         this.lingers.push(this.storage)
@@ -900,10 +910,14 @@ module.exports = class SessionState {
         this.roots = await this.tree.getRoots(length)
 
         if (truncation) {
-          const { dependency, tree } = truncation
+          const { dependency } = truncation
 
           if (dependency) this.storage.updateDependencyLength(dependency.length, true)
-          this.ontruncate(tree, tree.length, treeLength, true)
+          truncated = { to: treeLength, fork }
+        }
+
+        if (this.length > treeLength) {
+          appended = true
         }
       }
 
@@ -913,7 +927,7 @@ module.exports = class SessionState {
         if (state.name === this.name) state._moveToCore(core.core)
       }
 
-      this._moveToCore(core.core)
+      this._moveToCore(core.core, truncated, appended)
     } finally {
       this.mutex.unlock()
     }

package/package.json

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