hypercore 10.18.0 → 10.18.2

package/errors.js

@@ -1,2 +1,2 @@
 // explicitly exposed as hypercore/errors
-module.exports = require('./lib/errors')
+module.exports = require('hypercore-errors')

package/index.js

@@ -23,7 +23,7 @@ const {
   SESSION_CLOSED,
   SESSION_NOT_WRITABLE,
   SNAPSHOT_NOT_AVAILABLE
-} = require('./lib/errors')
+} = require('hypercore-errors')
 
 const promises = Symbol.for('hypercore.promises')
 const inspect = Symbol.for('nodejs.util.inspect.custom')
@@ -258,7 +258,7 @@ module.exports = class Hypercore extends EventEmitter {
   }
 
   async _openFromExisting (from, opts) {
-    await from.opening
+    if (!from.opened) await from.opening
 
     // includes ourself as well, so the loop below also updates us
     const sessions = this.sessions
@@ -279,7 +279,7 @@ module.exports = class Hypercore extends EventEmitter {
     const isFirst = !opts._opening
 
     if (!isFirst) await opts._opening
-    if (opts.preload) opts = { ...opts, ...(await opts.preload()) }
+    if (opts.preload) opts = { ...opts, ...(await this._retryPreload(opts.preload)) }
 
     const keyPair = (key && opts.keyPair)
       ? { ...opts.keyPair, publicKey: key }
@@ -329,6 +329,18 @@ module.exports = class Hypercore extends EventEmitter {
     this.emit('ready')
   }
 
+  async _retryPreload (preload) {
+    while (true) { // TODO: better long term fix is allowing lib/core.js creation from the outside...
+      const result = await preload()
+      const from = result && result.from
+      if (from) {
+        if (!from.opened) await from.ready()
+        if (from.closing) continue
+      }
+      return result
+    }
+  }
+
   async _openCapabilities (keyPair, storage, opts) {
     if (opts.from) return this._openFromExisting(opts.from, opts)
 

package/lib/batch.js

@@ -1,4 +1,4 @@
-const { SESSION_NOT_WRITABLE, BATCH_ALREADY_FLUSHED } = require('./errors')
+const { SESSION_NOT_WRITABLE, BATCH_ALREADY_FLUSHED } = require('hypercore-errors')
 
 module.exports = class Batch {
   constructor (session) {

package/lib/core.js

@@ -6,7 +6,7 @@ const MerkleTree = require('./merkle-tree')
 const BlockStore = require('./block-store')
 const Bitfield = require('./bitfield')
 const Info = require('./info')
-const { BAD_ARGUMENT, STORAGE_EMPTY, STORAGE_CONFLICT, INVALID_SIGNATURE } = require('./errors')
+const { BAD_ARGUMENT, STORAGE_EMPTY, STORAGE_CONFLICT, INVALID_SIGNATURE } = require('hypercore-errors')
 const m = require('./messages')
 
 module.exports = class Core {

package/lib/merkle-tree.js

@@ -4,7 +4,7 @@ const c = require('compact-encoding')
 const Xache = require('xache')
 const b4a = require('b4a')
 const caps = require('./caps')
-const { INVALID_PROOF, INVALID_CHECKSUM, INVALID_OPERATION, BAD_ARGUMENT } = require('./errors')
+const { INVALID_PROOF, INVALID_CHECKSUM, INVALID_OPERATION, BAD_ARGUMENT } = require('hypercore-errors')
 
 const BLANK_HASH = b4a.alloc(32)
 const OLD_TREE = b4a.from([5, 2, 87, 2, 0, 0, 40, 7, 66, 76, 65, 75, 69, 50, 98])

package/lib/messages.js

@@ -1,6 +1,6 @@
 const c = require('compact-encoding')
 const b4a = require('b4a')
-const { INVALID_OPLOG_VERSION } = require('./errors')
+const { INVALID_OPLOG_VERSION } = require('hypercore-errors')
 
 const EMPTY = b4a.alloc(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 } = require('./errors')
+const { OPLOG_CORRUPT } = require('hypercore-errors')
 
 module.exports = class Oplog {
   constructor (storage, { pageSize = 4096, headerEncoding = cenc.raw, entryEncoding = cenc.raw, readonly = false } = {}) {

package/lib/replicator.js

@@ -3,7 +3,7 @@ const safetyCatch = require('safety-catch')
 const RandomIterator = require('random-array-iterator')
 const ReceiverQueue = require('./receiver-queue')
 const RemoteBitfield = require('./remote-bitfield')
-const { REQUEST_CANCELLED, REQUEST_TIMEOUT, INVALID_CAPABILITY, SNAPSHOT_NOT_AVAILABLE } = require('./errors')
+const { REQUEST_CANCELLED, REQUEST_TIMEOUT, INVALID_CAPABILITY, SNAPSHOT_NOT_AVAILABLE } = require('hypercore-errors')
 const m = require('./messages')
 const caps = require('./caps')
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore",
-  "version": "10.18.0",
+  "version": "10.18.2",
   "description": "Hypercore is a secure, distributed append-only log",
   "main": "index.js",
   "scripts": {
@@ -44,6 +44,7 @@
     "fast-fifo": "^1.3.0",
     "flat-tree": "^1.9.0",
     "hypercore-crypto": "^3.2.1",
+    "hypercore-errors": "^1.0.0",
     "is-options": "^1.0.1",
     "protomux": "^3.5.0",
     "quickbit-universal": "^2.1.1",

package/lib/errors.js

@@ -1,90 +0,0 @@
-module.exports = class HypercoreError extends Error {
-  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', HypercoreError.BAD_ARGUMENT)
-  }
-
-  static STORAGE_EMPTY (msg) {
-    return new HypercoreError(msg, 'STORAGE_EMPTY', HypercoreError.STORAGE_EMPTY)
-  }
-
-  static STORAGE_CONFLICT (msg) {
-    return new HypercoreError(msg, 'STORAGE_CONFLICT', HypercoreError.STORAGE_CONFLICT)
-  }
-
-  static INVALID_SIGNATURE (msg) {
-    return new HypercoreError(msg, 'INVALID_SIGNATURE', HypercoreError.INVALID_SIGNATURE)
-  }
-
-  static INVALID_CAPABILITY (msg) {
-    return new HypercoreError(msg, 'INVALID_CAPABILITY', HypercoreError.INVALID_CAPABILITY)
-  }
-
-  static INVALID_CHECKSUM (msg = 'Invalid checksum') {
-    return new HypercoreError(msg, 'INVALID_CHECKSUM', HypercoreError.INVALID_CHECKSUM)
-  }
-
-  static INVALID_OPERATION (msg) {
-    return new HypercoreError(msg, 'INVALID_OPERATION', HypercoreError.INVALID_OPERATION)
-  }
-
-  static INVALID_PROOF (msg = 'Proof not verifiable') {
-    return new HypercoreError(msg, 'INVALID_PROOF', HypercoreError.INVALID_PROOF)
-  }
-
-  static BLOCK_NOT_AVAILABLE (msg = 'Block is not available') {
-    return new HypercoreError(msg, 'BLOCK_NOT_AVAILABLE', HypercoreError.BLOCK_NOT_AVAILABLE)
-  }
-
-  static SNAPSHOT_NOT_AVAILABLE (msg = 'Snapshot is 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', HypercoreError.REQUEST_CANCELLED)
-  }
-
-  static REQUEST_TIMEOUT (msg = 'Request timed out') {
-    return new HypercoreError(msg, 'REQUEST_TIMEOUT', HypercoreError.REQUEST_TIMEOUT)
-  }
-
-  static SESSION_NOT_WRITABLE (msg = 'Session is 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', HypercoreError.SESSION_CLOSED)
-  }
-
-  static BATCH_UNFLUSHED (msg = 'Batch not yet flushed') {
-    return new HypercoreError(msg, 'BATCH_UNFLUSHED', HypercoreError.BATCH_UNFLUSHED)
-  }
-
-  static BATCH_ALREADY_EXISTS (msg = 'Batch already exists') {
-    return new HypercoreError(msg, 'BATCH_ALREADY_EXISTS', HypercoreError.BATCH_ALREADY_EXISTS)
-  }
-
-  static BATCH_ALREADY_FLUSHED (msg = 'Batch has already been flushed') {
-    return new HypercoreError(msg, 'BATCH_ALREADY_FLUSHED', HypercoreError.BATCH_ALREADY_FLUSHED)
-  }
-
-  static OPLOG_CORRUPT (msg = 'Oplog file appears corrupt or out of date') {
-    return new HypercoreError(msg, 'OPLOG_CORRUPT', HypercoreError.OPLOG_CORRUPT)
-  }
-
-  static INVALID_OPLOG_VERSION (msg = 'Invalid header version') {
-    return new HypercoreError(msg, 'INVALID_OPLOG_VERSION', HypercoreError.INVALID_OPLOG_VERSION)
-  }
-}