hypercore 10.0.0-alpha.46 → 10.0.0-alpha.49

package/README.md

@@ -66,7 +66,8 @@ Note that `tree`, `data`, and `bitfield` are normally heavily sparse files.
   valueEncoding: 'json' | 'utf-8' | 'binary', // defaults to binary
   encodeBatch: batch => { ... }, // optionally apply an encoding to complete batches
   keyPair: kp, // optionally pass the public key and secret key as a key pair
-  encryptionKey: k // optionally pass an encryption key to enable block encryption
+  encryptionKey: k, // optionally pass an encryption key to enable block encryption
+  onwait: () => {} // hook that is called if gets are waiting for download
 }
 ```
 

package/index.js

@@ -70,6 +70,7 @@ module.exports = class Hypercore extends EventEmitter {
     this.sessions = opts._sessions || [this]
     this.auth = opts.auth || null
     this.autoClose = !!opts.autoClose
+    this.onwait = opts.onwait || null
 
     this.closing = null
     this.opening = this._openSession(key, storage, opts)
@@ -113,6 +114,7 @@ module.exports = class Hypercore extends EventEmitter {
       indent + '  opened: ' + opts.stylize(this.opened, 'boolean') + '\n' +
       indent + '  closed: ' + opts.stylize(this.closed, 'boolean') + '\n' +
       indent + '  snapshotted: ' + opts.stylize(this.snapshotted, 'boolean') + '\n' +
+      indent + '  sparse: ' + opts.stylize(this.sparse, 'boolean') + '\n' +
       indent + '  writable: ' + opts.stylize(this.writable, 'boolean') + '\n' +
       indent + '  length: ' + opts.stylize(this.length, 'number') + '\n' +
       indent + '  byteLength: ' + opts.stylize(this.byteLength, 'number') + '\n' +
@@ -182,9 +184,13 @@ module.exports = class Hypercore extends EventEmitter {
       throw SESSION_CLOSED('Cannot make sessions on a closing core')
     }
 
+    const sparse = opts.sparse === false ? false : this.sparse
+    const onwait = opts.onwait === undefined ? this.onwait : opts.onwait
     const Clz = opts.class || Hypercore
     const s = new Clz(this.storage, this.key, {
       ...opts,
+      sparse,
+      onwait,
       _opening: this.opening,
       _sessions: this.sessions
     })
@@ -324,14 +330,27 @@ module.exports = class Hypercore extends EventEmitter {
     }
   }
 
-  _updateSnapshot () {
-    const prev = this._snapshot
-    const next = this._snapshot = {
-      length: this.core.tree.length,
-      byteLength: this.core.tree.byteLength,
+  _getSnapshot () {
+    if (this.sparse) {
+      return {
+        length: this.core.tree.length,
+        byteLength: this.core.tree.byteLength,
+        fork: this.core.tree.fork,
+        compatLength: this.core.tree.length
+      }
+    }
+
+    return {
+      length: this.core.header.contiguousLength,
+      byteLength: 0,
       fork: this.core.tree.fork,
-      compatLength: this.core.tree.length
+      compatLength: this.core.header.contiguousLength
     }
+  }
+
+  _updateSnapshot () {
+    const prev = this._snapshot
+    const next = this._snapshot = this._getSnapshot()
 
     if (!prev) return true
     return prev.length !== next.length || prev.fork !== next.fork
@@ -573,14 +592,17 @@ module.exports = class Hypercore extends EventEmitter {
     const activeRequests = (opts && opts.activeRequests) || this.activeRequests
     const req = this.replicator.addUpgrade(activeRequests)
 
-    const upgraded = await req.promise
+    let upgraded = await req.promise
 
     if (!this.sparse) {
       // Download all available blocks in non-sparse mode
       const start = this.length
       const end = this.core.tree.length
+      const contig = this.contiguousLength
 
       await this.download({ start, end, ifAvailable: true }).downloaded()
+
+      if (!upgraded) upgraded = this.contiguousLength !== contig
     }
 
     if (!upgraded) return false
@@ -643,6 +665,7 @@ module.exports = class Hypercore extends EventEmitter {
     } else {
       if (opts && opts.wait === false) return null
       if (opts && opts.onwait) opts.onwait(index)
+      else if (this.onwait) this.onwait(index)
 
       const activeRequests = (opts && opts.activeRequests) || this.activeRequests
 

package/lib/errors.js

@@ -1,42 +1,50 @@
 module.exports = class HypercoreError extends Error {
-  constructor (msg, code) {
-    super(msg)
+  constructor (msg, code, fn = HypercoreError) {
+    super(`${code}: ${msg}`)
     this.code = code
+
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this, fn)
+    }
+  }
+
+  get name () {
+    return 'HypercoreError'
   }
 
   static BAD_ARGUMENT (msg) {
-    return new HypercoreError(msg, 'BAD_ARGUMENT')
+    return new HypercoreError(msg, 'BAD_ARGUMENT', HypercoreError.BAD_ARGUMENT)
   }
 
   static STORAGE_EMPTY (msg) {
-    return new HypercoreError(msg, 'STORAGE_EMPTY')
+    return new HypercoreError(msg, 'STORAGE_EMPTY', HypercoreError.STORAGE_EMPTY)
   }
 
   static STORAGE_CONFLICT (msg) {
-    return new HypercoreError(msg, 'STORAGE_CONFLICT')
+    return new HypercoreError(msg, 'STORAGE_CONFLICT', HypercoreError.STORAGE_CONFLICT)
   }
 
   static INVALID_SIGNATURE (msg) {
-    return new HypercoreError(msg, 'INVALID_SIGNATURE')
+    return new HypercoreError(msg, 'INVALID_SIGNATURE', HypercoreError.INVALID_SIGNATURE)
   }
 
   static INVALID_CAPABILITY (msg) {
-    return new HypercoreError(msg, 'INVALID_CAPABILITY')
+    return new HypercoreError(msg, 'INVALID_CAPABILITY', HypercoreError.INVALID_CAPABILITY)
   }
 
   static SNAPSHOT_NOT_AVAILABLE (msg = 'Snapshot is not available') {
-    return new HypercoreError(msg, 'SNAPSHOT_NOT_AVAILABLE')
+    return new HypercoreError(msg, 'SNAPSHOT_NOT_AVAILABLE', HypercoreError.SNAPSHOT_NOT_AVAILABLE)
   }
 
   static REQUEST_CANCELLED (msg = 'Request was cancelled') {
-    return new HypercoreError(msg, 'REQUEST_CANCELLED')
+    return new HypercoreError(msg, 'REQUEST_CANCELLED', HypercoreError.REQUEST_CANCELLED)
   }
 
   static SESSION_NOT_WRITABLE (msg = 'Session is not writable') {
-    return new HypercoreError(msg, 'SESSION_NOT_WRITABLE')
+    return new HypercoreError(msg, 'SESSION_NOT_WRITABLE', HypercoreError.SESSION_NOT_WRITABLE)
   }
 
   static SESSION_CLOSED (msg = 'Session is closed') {
-    return new HypercoreError(msg, 'SESSION_CLOSED')
+    return new HypercoreError(msg, 'SESSION_CLOSED', HypercoreError.SESSION_CLOSED)
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore",
-  "version": "10.0.0-alpha.46",
+  "version": "10.0.0-alpha.49",
   "description": "Hypercore 10",
   "main": "index.js",
   "scripts": {