hypercore 10.32.2 → 10.32.4

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/messages.js

@@ -87,6 +87,11 @@ const manifestv0 = {
     hashes.preencode(state, m.hash)
     state.end++ // type
 
+    if (m.prologue && m.signers.length === 0) {
+      c.fixed32.preencode(state, m.prologue.hash)
+      return
+    }
+
     if (m.quorum === 1 && m.signers.length === 1 && !m.allowPatch) {
       signer.preencode(state, m.signers[0])
     } else {
@@ -98,12 +103,18 @@ const manifestv0 = {
   encode (state, m) {
     hashes.encode(state, m.hash)
 
+    if (m.prologue && m.signers.length === 0) {
+      c.uint.encode(state, 0)
+      c.fixed32.encode(state, m.prologue.hash)
+      return
+    }
+
     if (m.quorum === 1 && m.signers.length === 1 && !m.allowPatch) {
       c.uint.encode(state, 1)
       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)
     }
@@ -112,9 +123,22 @@ const manifestv0 = {
     const hash = hashes.decode(state)
     const type = c.uint.decode(state)
 
-    if (type === 0) throw new Error('Type 0 is deprecated')
     if (type > 2) throw new Error('Unknown type: ' + type)
 
+    if (type === 0) {
+      return {
+        version: 0,
+        hash,
+        allowPatch: false,
+        quorum: 0,
+        signers: [],
+        prologue: {
+          hash: c.fixed32.decode(state),
+          length: 0
+        }
+      }
+    }
+
     if (type === 1) {
       return {
         version: 0,

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
     }
   }
 
@@ -208,8 +208,9 @@ function toMap (nodes) {
 }
 
 function defaultQuorum (man) {
-  if (!man.signers) return 0
-  return typeof man.quorum === 'number' ? man.quorum : (man.signers.length >> 1) + 1
+  if (typeof man.quorum === 'number') return man.quorum
+  if (!man.signers || !man.signers.length) return 0
+  return (man.signers.length >> 1) + 1
 }
 
 function generateUpgrade (patch, start, length) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore",
-  "version": "10.32.2",
+  "version": "10.32.4",
   "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",