optional cbs, trim deps

Author: mafintosh

index.js

@@ -1,24 +1,20 @@
-const crypto = require('crypto')
-const { promisify } = require('util')
-
 const { NanoresourcePromise: Nanoresource } = require('nanoresource-promise/emitter')
 const HypercoreProtocol = require('hypercore-protocol')
 const hyperswarm = require('hyperswarm')
 const codecs = require('codecs')
 const pump = require('pump')
+const maybe = require('call-me-maybe')
 
 const STREAM_PEER = Symbol('networker-stream-peer')
 
 class CorestoreNetworker extends Nanoresource {
   constructor (corestore, opts = {}) {
     super()
     this.corestore = corestore
-    this.id = opts.id || crypto.randomBytes(32)
     this.opts = opts
     this.keyPair = opts.keyPair || HypercoreProtocol.keyPair()
 
     this._replicationOpts = {
-      id: this.id,
       encrypt: true,
       live: true,
       keyPair: this.keyPair
@@ -61,7 +57,12 @@ class CorestoreNetworker extends Nanoresource {
       lookup: opts.lookup
     })
     if (opts.flush !== false) {
-      await promisify(this.swarm.flush.bind(this.swarm))()
+      await new Promise((resolve, reject) => {
+        this.swarm.flush(err => {
+          if (err) reject(err)
+          else resolve()
+        })
+      })
       if (!this._joined.has(keyString)) {
         return
       }
@@ -221,12 +222,18 @@ class CorestoreNetworker extends Nanoresource {
   }
 
   allStatuses () {
-    return this._configurations
+    return [ ...this._configurations].map(([k, v]) => {
+      return {
+        discoveryKey: Buffer.from(k, 'hex'),
+        announce: v.announce,
+        lookup: v.lookup
+      }
+    })
   }
 
-  configure (discoveryKey, opts = {}) {
+  configure (discoveryKey, opts = {}, cb) {
     if (!this.swarm) this.open() // it is sync, which makes this easier below inregards to race conditions
-    if (this.swarm && this.swarm.destroyed) return Promise.resolve()
+    if (this.swarm && this.swarm.destroyed) return maybeOptional(cb, Promise.resolve())
 
     const id = Symbol('id')
     const prom = this._configure(discoveryKey, opts, id, false)
@@ -237,10 +244,16 @@ class CorestoreNetworker extends Nanoresource {
     prom.discoveryKey = discoveryKey
     prom.previous = prev
 
+    maybeOptional(cb, prom)
+
     return prom
   }
 
-  async unconfigure (prom) {
+  unconfigure (prom, cb) {
+    return maybeOptional(cb, this._unconfigure(prom))
+  }
+
+  async _unconfigure (prom) {
     if (this.swarm && this.swarm.destroyed) return null
     if (!this.swarm) {
       await this.listen()
@@ -365,3 +378,11 @@ function intoPeer (stream) {
 function toString (dk) {
   return typeof dk === 'string' ? dk : dk.toString('hex')
 }
+
+function noop () {}
+
+function maybeOptional (cb, prom) {
+  if (cb) maybe(cb, prom)
+  else prom.catch(noop)
+  return prom
+}

package.json

@@ -4,6 +4,7 @@
   "description": "A corestore networking module based on Hyperswarm.",
   "main": "index.js",
   "dependencies": {
+    "call-me-maybe": "^1.0.1",
     "codecs": "^2.1.0",
     "hypercore-protocol": "^8.0.0",
     "hyperswarm": "^2.14.1",