dht-rpc 6.8.0 → 6.8.2

package/index.js

@@ -109,7 +109,7 @@ class DHT extends EventEmitter {
   async suspend () {
     await this.io.bind()
     if (this.suspended || this.destroyed) return
-    this.suspended = false
+    this.suspended = true
     this.io.suspend()
     this.emit('suspend')
   }

package/lib/errors.js

@@ -1,20 +1,29 @@
-exports.UNKNOWN_COMMAND = 1
-exports.INVALID_TOKEN = 2
+module.exports = class DHTError extends Error {
+  constructor (msg, code, fn = DHTError) {
+    super(`${code}: ${msg}`)
+    this.code = code
 
-exports.createTimeoutError = () => {
-  const timeoutErr = new Error('Request timed out')
-  timeoutErr.code = 'ETIMEDOUT'
-  return timeoutErr
-}
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this, fn)
+    }
+  }
 
-exports.createSuspendError = () => {
-  const suspendErr = new Error('Suspended')
-  suspendErr.code = 'ESUSPENDED'
-  return suspendErr
-}
+  get name () {
+    return 'DHTError'
+  }
+
+  static UNKNOWN_COMMAND = 1
+  static INVALID_TOKEN = 2
+
+  static REQUEST_TIMEOUT (msg = 'Request timed out') {
+    return new DHTError(msg, 'REQUEST_TIMEOUT', DHTError.REQUEST_TIMEOUT)
+  }
+
+  static REQUEST_DESTROYED (msg = 'Request destroyed') {
+    return new DHTError(msg, 'REQUEST_DESTROYED', DHTError.REQUEST_DESTROYED)
+  }
 
-exports.createDestroyedError = () => {
-  const destroyErr = new Error('Request destroyed')
-  destroyErr.code = 'EDESTROYED'
-  return destroyErr
+  static IO_SUSPENDED (msg = 'I/O suspended') {
+    return new DHTError(msg, 'IO_SUSPENDED', DHTError.IO_SUSPENDED)
+  }
 }

package/lib/io.js

@@ -3,7 +3,12 @@ const sodium = require('sodium-universal')
 const c = require('compact-encoding')
 const b4a = require('b4a')
 const peer = require('./peer')
-const errors = require('./errors')
+const {
+  INVALID_TOKEN,
+  REQUEST_TIMEOUT,
+  REQUEST_DESTROYED,
+  IO_SUSPENDED
+} = require('./errors')
 
 const VERSION = 0b11
 const RESPONSE_ID = (0b0001 << 4) | VERSION
@@ -53,7 +58,7 @@ module.exports = class IO {
       const req = Request.decode(this, socket, from, state)
       if (req === null) return
       if (req.token !== null && !b4a.equals(req.token, this.token(req.from, 1)) && !b4a.equals(req.token, this.token(req.from, 0))) {
-        req.error(errors.INVALID_TOKEN, { token: true })
+        req.error(INVALID_TOKEN, { token: true })
         return
       }
       this.onrequest(req, external)
@@ -127,7 +132,7 @@ module.exports = class IO {
 
       if (req.session) req.session._detach(req)
 
-      req.onerror(suspended ? errors.createSuspendError() : errors.createDestroyedError(), req)
+      req.onerror(suspended ? IO_SUSPENDED() : REQUEST_DESTROYED(), req)
     }
 
     await Promise.allSettled([
@@ -360,7 +365,7 @@ class Request {
 
     if (this.session) this.session._detach(this)
 
-    this.onerror(err || errors.createDestroyedError(), this)
+    this.onerror(err || REQUEST_DESTROYED(), this)
   }
 
   _sendReply (error, value, token, hasCloserNodes, from, socket) {
@@ -460,7 +465,7 @@ function oncycle (req) {
   req._timeout = null
   req.oncycle(req)
   if (req.sent >= req.retries) {
-    req.destroy(errors.createTimeoutError())
+    req.destroy(REQUEST_TIMEOUT())
     req._io.ontimeout(req)
   } else {
     req.send()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dht-rpc",
-  "version": "6.8.0",
+  "version": "6.8.2",
   "description": "Make RPC calls over a Kademlia based DHT",
   "main": "index.js",
   "files": [