bare-rpc 0.2.1 → 0.2.3

package/index.js

@@ -154,22 +154,22 @@ module.exports = exports = class RPC {
   }
 
   _onafterframe() {
-    while (this._frame >= 0 && this._frame <= this._buffered) {
-      const buffer =
-        this._buffer.length === 1 ? this._buffer[0] : b4a.concat(this._buffer)
+    if (this._buffered < this._frame) return
 
-      const frame = this._frame
+    const buffer =
+      this._buffer.length === 1 ? this._buffer[0] : b4a.concat(this._buffer)
 
-      this._buffered -= frame
-      this._buffer = this._buffered > 0 ? [buffer.subarray(frame)] : []
-      this._frame = -1
+    const frame = this._frame
 
-      this._onmessage(buffer.subarray(0, frame))
-      this._onbeforeframe()
-    }
+    this._buffered -= frame
+    this._buffer = this._buffered > 0 ? [buffer.subarray(frame)] : []
+    this._frame = -1
+
+    this._onmessage(buffer.subarray(0, frame))
+    this._onbeforeframe()
   }
 
-  _onmessage(buffer) {
+  async _onmessage(buffer) {
     let message
     try {
       message = m.message.decode(c.state(0, buffer.length, buffer))
@@ -189,7 +189,7 @@ module.exports = exports = class RPC {
         )
 
         try {
-          this._onrequest(request)
+          await this._onrequest(request)
         } catch (err) {
           safetyCatch(err)
 

package/lib/messages.js

@@ -53,16 +53,20 @@ const response = {
     c.bool.encode(state, !!m.error)
     c.uint.encode(state, m.stream)
 
-    if (m.error) error.encode(state, m)
+    if (m.error) error.encode(state, m.error)
     else if (m.stream === 0) c.buffer.encode(state, m.data)
   },
   decode(state) {
-    const error = c.bool.decode(state)
+    const err = c.bool.decode(state)
     const stream = c.uint.decode(state)
 
-    if (error) return { stream, error: error.decode(state), data: null }
-    if (stream === 0)
+    if (err) {
+      return { stream, error: error.decode(state), data: null }
+    }
+
+    if (stream === 0) {
       return { stream, error: null, data: c.buffer.decode(state) }
+    }
 
     return { stream, error: null, data: null }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-rpc",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "librpc ABI compatible RPC for Bare",
   "exports": {
     ".": {