bare-rpc 0.1.0 → 0.1.2

package/index.js

@@ -1,4 +1,5 @@
 const safetyCatch = require('safety-catch')
+const b4a = require('b4a')
 const c = require('compact-encoding')
 const m = require('./lib/messages')
 const { type: t, stream: s } = require('./lib/constants')
@@ -99,7 +100,7 @@ module.exports = class RPC {
 
   _ondata (data) {
     if (this._buffer === null) this._buffer = data
-    else this._buffer = Buffer.concat([this._buffer, data])
+    else this._buffer = b4a.concat([this._buffer, data])
 
     while (this._buffer !== null) {
       const state = { start: 0, end: this._buffer.length, buffer: this._buffer }

package/lib/incoming-request.js

@@ -1,3 +1,4 @@
+const b4a = require('b4a')
 const errors = require('./errors')
 
 module.exports = class RPCIncomingRequest {
@@ -12,11 +13,11 @@ module.exports = class RPCIncomingRequest {
     this._responseStream = null
   }
 
-  reply (data) {
+  reply (data, encoding) {
     if (this.sent) throw errors.ALREADY_SENT('Response has already been sent')
     this.sent = true
 
-    this.rpc._sendResponse(this, typeof data === 'string' ? Buffer.from(data) : data)
+    this.rpc._sendResponse(this, typeof data === 'string' ? b4a.from(data, encoding) : data)
   }
 
   createResponseStream (opts = {}) {

package/lib/outgoing-request.js

@@ -1,3 +1,4 @@
+const b4a = require('b4a')
 const errors = require('./errors')
 
 module.exports = class RPCOutgoingRequest {
@@ -7,25 +8,26 @@ module.exports = class RPCOutgoingRequest {
     this.command = command
     this.sent = false
 
-    const { promise, resolve, reject } = Promise.withResolvers()
-
-    this._promise = promise
-    this._resolve = resolve
-    this._reject = reject
+    this._promise = new Promise((resolve, reject) => {
+      this._resolve = resolve
+      this._reject = reject
+    })
 
     this._requestStream = null
     this._responseStream = null
   }
 
-  send (data) {
+  send (data, encoding) {
     if (this.sent) throw errors.ALREADY_SENT('Request has already been sent')
     this.sent = true
 
-    this.rpc._sendRequest(this, typeof data === 'string' ? Buffer.from(data) : data)
+    this.rpc._sendRequest(this, typeof data === 'string' ? b4a.from(data, encoding) : data)
   }
 
-  reply () {
-    return this._promise
+  reply (encoding) {
+    return encoding && encoding !== 'buffer'
+      ? this._promise.then((data) => b4a.toString(data, encoding))
+      : this._promise
   }
 
   createRequestStream (opts = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-rpc",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "librpc ABI compatible RPC for Bare",
   "exports": {
     ".": "./index.js",
@@ -24,10 +24,8 @@
     "url": "https://github.com/holepunchto/bare-rpc/issues"
   },
   "homepage": "https://github.com/holepunchto/bare-rpc#readme",
-  "engines": {
-    "bare": ">=1.4.0"
-  },
   "dependencies": {
+    "b4a": "^1.6.6",
     "bare-stream": "^2.1.3",
     "compact-encoding": "^2.15.0",
     "safety-catch": "^1.0.2"