bare-rpc 1.1.0 → 1.3.0

package/index.d.ts

@@ -1,11 +1,5 @@
 import Buffer, { BufferEncoding } from 'bare-buffer'
-import {
-  Readable,
-  ReadableOptions,
-  Writable,
-  WritableOptions,
-  Duplex
-} from 'bare-stream'
+import { Readable, ReadableOptions, Writable, WritableOptions, Duplex } from 'bare-stream'
 
 declare const constants: {
   type: { REQUEST: 1; RESPONSE: 2; STREAM: 3 }
@@ -106,10 +100,7 @@ interface RPC {
 }
 
 declare class RPC {
-  constructor(
-    stream: Duplex,
-    onrequest: (req: RPCIncomingRequest) => void | Promise<void>
-  )
+  constructor(stream: Duplex, onrequest: (req: RPCIncomingRequest) => void | Promise<void>)
 }
 
 declare namespace RPC {

package/index.js

@@ -39,10 +39,7 @@ module.exports = exports = class RPC {
     this._ondata = this._ondata.bind(this)
     this._ondrain = this._ondrain.bind(this)
 
-    this._stream
-      .on('error', this._onerror)
-      .on('data', this._ondata)
-      .on('drain', this._ondrain)
+    this._stream.on('error', this._onerror).on('data', this._ondata).on('drain', this._ondrain)
   }
 
   event(command) {
@@ -92,25 +89,13 @@ module.exports = exports = class RPC {
     if (isInitiator) {
       this._outgoingRequests.set(request.id, request)
 
-      request._requestStream = new OutgoingStream(
-        this,
-        request,
-        t.REQUEST,
-        opts
-      )
+      request._requestStream = new OutgoingStream(this, request, t.REQUEST, opts)
     } else {
       this._incomingRequests.set(request.id, request)
 
-      request._requestStream = new IncomingStream(
-        this,
-        request,
-        t.REQUEST,
-        opts
-      )
+      request._requestStream = new IncomingStream(this, request, t.REQUEST, opts)
 
-      request._requestStream.on('close', () =>
-        this._incomingRequests.delete(request.id)
-      )
+      request._requestStream.on('close', () => this._incomingRequests.delete(request.id))
     }
   }
 
@@ -128,25 +113,13 @@ module.exports = exports = class RPC {
     if (isInitiator) {
       this._outgoingResponses.set(request.id, request)
 
-      request._responseStream = new OutgoingStream(
-        this,
-        request,
-        t.RESPONSE,
-        opts
-      )
+      request._responseStream = new OutgoingStream(this, request, t.RESPONSE, opts)
     } else {
       this._incomingResponses.set(request.id, request)
 
-      request._responseStream = new IncomingStream(
-        this,
-        request,
-        t.RESPONSE,
-        opts
-      )
+      request._responseStream = new IncomingStream(this, request, t.RESPONSE, opts)
 
-      request._responseStream.on('close', () =>
-        this._incomingResponses.delete(request.id)
-      )
+      request._responseStream.on('close', () => this._incomingResponses.delete(request.id))
     }
   }
 
@@ -180,8 +153,7 @@ module.exports = exports = class RPC {
   _onbeforeframe() {
     if (this._buffered < 4) return
 
-    const buffer =
-      this._buffer.length === 1 ? this._buffer[0] : b4a.concat(this._buffer)
+    const buffer = this._buffer.length === 1 ? this._buffer[0] : b4a.concat(this._buffer)
 
     this._buffer = [buffer]
     this._frame = 4 + c.uint32.decode(c.state(0, 4, buffer))
@@ -192,8 +164,7 @@ module.exports = exports = class RPC {
   _onafterframe() {
     if (this._buffered < this._frame) return
 
-    const buffer =
-      this._buffer.length === 1 ? this._buffer[0] : b4a.concat(this._buffer)
+    const buffer = this._buffer.length === 1 ? this._buffer[0] : b4a.concat(this._buffer)
 
     const frame = this._frame
 
@@ -216,16 +187,11 @@ module.exports = exports = class RPC {
     }
 
     switch (message.type) {
-      case t.REQUEST:
+      case t.REQUEST: {
         const request =
           message.id === 0
             ? new IncomingEvent(this, message.command, message.data)
-            : new IncomingRequest(
-                this,
-                message.id,
-                message.command,
-                message.data
-              )
+            : new IncomingRequest(this, message.id, message.command, message.data)
 
         try {
           await this._onrequest(request)
@@ -236,6 +202,7 @@ module.exports = exports = class RPC {
           else this._stream.destroy(err)
         }
         break
+      }
       case t.RESPONSE:
         try {
           this._onresponse(message)

package/lib/messages.js

@@ -95,10 +95,7 @@ exports.header = {
 
     state.start = frame
 
-    c.uint32.encode(
-      state,
-      end - start + (hasData && m.data ? m.data.byteLength : 0)
-    )
+    c.uint32.encode(state, end - start + (hasData && m.data ? m.data.byteLength : 0))
 
     state.start = end
   }
@@ -137,7 +134,7 @@ exports.message = {
         return { type, id, stream, error: null, data: null }
       }
 
-      case t.STREAM:
+      case t.STREAM: {
         const stream = c.uint.decode(state)
 
         if (stream & s.ERROR) {
@@ -149,6 +146,7 @@ exports.message = {
         }
 
         return { type, id, stream, error: null, data: null }
+      }
 
       default:
         throw errors.UNKNOWN_MESSAGE(`Unknown message '${type}'`)

package/lib/outgoing-request.js

@@ -44,9 +44,7 @@ module.exports = class RPCOutgoingRequest {
 
     this.received = true
 
-    return encoding
-      ? this._promise.then((data) => c.decode(encoding, data))
-      : this._promise
+    return encoding ? this._promise.then((data) => c.decode(encoding, data)) : this._promise
   }
 
   createRequestStream(opts = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-rpc",
-  "version": "1.1.0",
+  "version": "1.3.0",
   "description": "librpc ABI compatible RPC for Bare",
   "exports": {
     ".": {
@@ -8,10 +8,12 @@
       "default": "./index.js"
     },
     "./package": "./package.json",
+    "./constants": "./lib/constants.js",
     "./errors": {
       "types": "./lib/errors.d.ts",
       "default": "./lib/errors.js"
-    }
+    },
+    "./messages": "./lib/messages.js"
   },
   "files": [
     "index.js",
@@ -19,7 +21,9 @@
     "lib"
   ],
   "scripts": {
-    "test": "prettier . --check && bare test.js"
+    "format": "prettier --write . && lunte --fix",
+    "lint": "prettier --check . && lunte",
+    "test": "brittle-bare --coverage test.js"
   },
   "repository": {
     "type": "git",
@@ -41,8 +45,9 @@
     "bare-buffer": "^3.0.1",
     "bare-ipc": "^1.1.0",
     "brittle": "^3.2.1",
+    "lunte": "^1.7.0",
     "prettier": "^3.4.2",
-    "prettier-config-standard": "^7.0.0"
+    "prettier-config-holepunch": "^2.0.0"
   },
   "peerDependencies": {
     "bare-buffer": "*"