bare-rpc 0.0.0 → 0.0.1

package/index.js

@@ -1,3 +1,4 @@
+const safetyCatch = require('safety-catch')
 const c = require('compact-encoding')
 const m = require('./lib/messages')
 const { type } = require('./lib/constants')
@@ -47,8 +48,15 @@ module.exports = class RPC {
     }))
   }
 
-  _receive (request) {
-    return this._requests.get(request.id)
+  _error (request, err) {
+    this._stream.write(c.encode(m.message, {
+      type: type.RESPONSE,
+      id: request.id,
+      error: true,
+      message: err.message,
+      code: err.code || '',
+      status: err.errno || 0
+    }))
   }
 
   _ondata (data) {
@@ -62,18 +70,34 @@ module.exports = class RPC {
       try {
         message = m.message.decode(state)
       } catch (err) {
-        // TODO
+        safetyCatch(err)
+
+        return this._stream.destroy(err)
       }
 
       if (message === null) return
 
       switch (message.type) {
-        case type.REQUEST:
-          this._onrequest(new IncomingRequest(this, message.id, message.command, message.data))
+        case type.REQUEST: {
+          const request = new IncomingRequest(this, message.id, message.command, message.data)
+
+          try {
+            this._onrequest(request)
+          } catch (err) {
+            safetyCatch(err)
+
+            this._error(request, err)
+          }
+
           break
+        }
 
         case type.RESPONSE:
-          this._onresponse(message)
+          try {
+            this._onresponse(message)
+          } catch (err) {
+            safetyCatch(err)
+          }
       }
 
       this._buffer = state.start === state.end ? null : this._buffer.subarray(state.start)

package/lib/errors.js

@@ -0,0 +1,22 @@
+module.exports = class RPCError extends Error {
+  constructor (msg, code, fn = RPCError) {
+    super(`${code}: ${msg}`)
+    this.code = code
+
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this, fn)
+    }
+  }
+
+  get name () {
+    return 'RPCError'
+  }
+
+  static UNKNOWN_MESSAGE (msg) {
+    return new RPCError(msg, 'UNKNOWN_MESSAGE', RPCError.UNKNOWN_MESSAGE)
+  }
+
+  static ALREADY_SENT (msg) {
+    return new RPCError(msg, 'ALREADY_SENT', RPCError.ALREADY_SENT)
+  }
+}

package/lib/messages.js

@@ -1,5 +1,6 @@
 const c = require('compact-encoding')
 const { type: t } = require('./constants')
+const errors = require('./errors')
 
 const request = {
   preencode (state, m) {
@@ -127,7 +128,7 @@ exports.message = {
       case t.RESPONSE:
         return { type: t.RESPONSE, id, ...response.decode(state, id) }
       default:
-        throw new Error(`Unknown message type '${type}'`)
+        throw errors.UNKNOWN_MESSAGE(`Unknown message '${type}'`)
     }
   }
 }

package/lib/outgoing-request.js

@@ -1,7 +1,10 @@
+const errors = require('./errors')
+
 module.exports = class RPCOutgoingRequest {
   constructor (rpc, command) {
     this.rpc = rpc
     this.command = command
+    this.sent = false
 
     this._resolve = null
     this._reject = null
@@ -9,6 +12,9 @@ module.exports = class RPCOutgoingRequest {
   }
 
   send (data) {
+    if (this.sent) throw errors.ALREADY_SENT('Response has already been sent')
+    this.sent = true
+
     this._promise = new Promise((resolve, reject) => {
       this._resolve = resolve
       this._reject = reject

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-rpc",
-  "version": "0.0.0",
+  "version": "0.0.1",
   "description": "librpc ABI compatible RPC for Bare",
   "exports": {
     ".": "./index.js",
@@ -25,7 +25,8 @@
   },
   "homepage": "https://github.com/holepunchto/bare-rpc#readme",
   "dependencies": {
-    "compact-encoding": "^2.15.0"
+    "compact-encoding": "^2.15.0",
+    "safety-catch": "^1.0.2"
   },
   "devDependencies": {
     "bare-stream": "^2.1.3",