hypercore 10.0.0-alpha.48 → 10.0.0-alpha.50

package/index.js

@@ -185,10 +185,12 @@ module.exports = class Hypercore extends EventEmitter {
     }
 
     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
     })
@@ -662,8 +664,8 @@ module.exports = class Hypercore extends EventEmitter {
       if (this.cache) this.cache.set(index, req)
     } else {
       if (opts && opts.wait === false) return null
-      if (opts && opts.onwait) opts.onwait(index)
-      else if (this.onwait) this.onwait(index)
+      if (opts && opts.onwait) opts.onwait(index, this)
+      else if (this.onwait) this.onwait(index, this)
 
       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.48",
+  "version": "10.0.0-alpha.50",
   "description": "Hypercore 10",
   "main": "index.js",
   "scripts": {
@@ -32,7 +32,7 @@
     "lib/**.js"
   ],
   "dependencies": {
-    "@hyperswarm/secret-stream": "^5.2.0",
+    "@hyperswarm/secret-stream": "^6.0.0",
     "b4a": "^1.1.0",
     "big-sparse-array": "^1.0.2",
     "codecs": "^3.0.0",