grenache-nodejs-http 0.7.13 → 1.0.1

package/examples/rpc_server.js

@@ -4,8 +4,6 @@ const Grenache = require('./../')
 const Link = require('grenache-nodejs-link')
 const Peer = Grenache.PeerRPCServer
 
-const _ = require('lodash')
-
 const link = new Link({
   grape: 'http://127.0.0.1:30001'
 })
@@ -17,7 +15,7 @@ const peer = new Peer(link, {
 peer.init()
 
 const service = peer.transport('server')
-service.listen(_.random(1000) + 1024)
+service.listen(Math.floor(Math.random() * 1001) + 1024)
 
 setInterval(function () {
   link.announce('rpc_test', service.port, {})

package/examples/rpc_server_stream.js

@@ -4,8 +4,6 @@ const Grenache = require('./../')
 const Link = require('grenache-nodejs-link')
 const Peer = Grenache.PeerRPCServer
 
-const _ = require('lodash')
-
 const link = new Link({
   grape: 'http://127.0.0.1:30001'
 })
@@ -18,7 +16,7 @@ const peer = new Peer(link, {
 peer.init()
 
 const service = peer.transport('server')
-service.listen(_.random(1000) + 1024)
+service.listen(Math.floor(Math.random() * 1001) + 1024)
 
 setInterval(function () {
   link.announce('rpc_stream', service.port, {})

package/examples/ssl/rpc_client_map.js

@@ -16,15 +16,15 @@ const link = new Link({
 link.start()
 
 const secure = {
-  key: fs.readFileSync(path.join(__dirname, 'client1-key.pem')),
-  cert: fs.readFileSync(path.join(__dirname, 'client1-crt.pem')),
-  ca: fs.readFileSync(path.join(__dirname, 'ca-crt.pem')),
+  key: fs.readFileSync(path.join(__dirname, '../../test/certs/client1-key.pem')),
+  cert: fs.readFileSync(path.join(__dirname, '../../test/certs/client1-crt.pem')),
+  ca: fs.readFileSync(path.join(__dirname, '../../test/certs/ca-crt.pem')),
   rejectUnauthorized: false // take care, can be dangerous in production!
 }
 
 const peer = new Peer(
   link,
-  { secure: secure }
+  { secure }
 )
 
 peer.init()

package/examples/ssl/rpc_server.js

@@ -6,7 +6,6 @@
 
 const Link = require('grenache-nodejs-link')
 const Peer = require('../../').PeerRPCServer
-const _ = require('lodash')
 const fs = require('fs')
 const path = require('path')
 
@@ -17,9 +16,9 @@ link.start()
 
 const opts = {
   secure: {
-    key: fs.readFileSync(path.join(__dirname, 'server-key.pem')),
-    cert: fs.readFileSync(path.join(__dirname, 'server-crt.pem')),
-    ca: fs.readFileSync(path.join(__dirname, 'ca-crt.pem')),
+    key: fs.readFileSync(path.join(__dirname, '../../test/certs/server-key.pem')),
+    cert: fs.readFileSync(path.join(__dirname, '../../test/certs/server-crt.pem')),
+    ca: fs.readFileSync(path.join(__dirname, '../../test/certs/ca-crt.pem')),
     requestCert: true,
     rejectUnauthorized: false // take care, can be dangerous in production!
   }
@@ -32,7 +31,7 @@ const peer = new Peer(
 peer.init()
 
 const service = peer.transport('server')
-service.listen(_.random(1000) + 1024)
+service.listen(Math.floor(Math.random() * 1001) + 1024)
 
 setInterval(function () {
   link.announce('rpc_test', service.port, {})

package/lib/TransportRPCClient.js

@@ -1,10 +1,14 @@
 'use strict'
 
-const request = require('request')
+const duplexify = require('duplexify')
+const fetch = require('node-fetch')
 const assert = require('assert')
+const http = require('http')
+const https = require('https')
+const pump = require('pump')
 const zlib = require('zlib')
+const { PassThrough } = require('stream')
 
-const _ = require('lodash')
 const Base = require('grenache-nodejs-base')
 
 class TransportRPCClient extends Base.TransportRPCClient {
@@ -18,24 +22,17 @@ class TransportRPCClient extends Base.TransportRPCClient {
   init () {
     super.init()
 
-    this.socket = this.getSocket(this.conf.secure)
-  }
-
-  getSocket (secure) {
-    if (!secure) {
-      return request
+    if (this.conf.secure) {
+      assert(Buffer.isBuffer(this.conf.secure.key), 'conf.secure.key must be a Buffer')
+      assert(Buffer.isBuffer(this.conf.secure.cert), 'conf.secure.cert must be a Buffer')
+      assert(Buffer.isBuffer(this.conf.secure.ca), 'conf.secure.ca must be a Buffer')
     }
-
-    assert(Buffer.isBuffer(secure.key), 'conf.secure.key must be a Buffer')
-    assert(Buffer.isBuffer(secure.cert), 'conf.secure.cert must be a Buffer')
-    assert(Buffer.isBuffer(secure.ca), 'conf.secure.ca must be a Buffer')
-
-    return request
   }
 
-  getOpts (opts, secure) {
+  getOpts (_opts, secure) {
     const u = secure
-      ? ('https://' + this.conf.dest) : ('http://' + this.conf.dest)
+      ? ('https://' + this.conf.dest)
+      : ('http://' + this.conf.dest)
 
     const def = {
       url: u,
@@ -43,11 +40,12 @@ class TransportRPCClient extends Base.TransportRPCClient {
       method: 'POST'
     }
 
-    if (!secure) {
-      return _.extend(def, opts)
+    const opts = { ...def, ..._opts }
+    if (secure) {
+      opts.agent = new https.Agent(secure)
     }
 
-    return _.extend(def, opts, secure)
+    return opts
   }
 
   request (key, payload, opts, cb) {
@@ -122,8 +120,7 @@ class TransportRPCClient extends Base.TransportRPCClient {
     })
   }
 
-  post (_opts, _cb) {
-    const socket = this.socket
+  async post (_opts, _cb) {
     const opts = this.getOpts(_opts, this.conf.secure)
 
     let isExecuted = false
@@ -134,24 +131,31 @@ class TransportRPCClient extends Base.TransportRPCClient {
       _cb(err, body)
     }
 
-    const req = socket.post(opts, (err, res, body) => {
-      if (err) {
+    try {
+      const resp = await fetch(opts.url, {
+        ...opts,
+        method: 'POST'
+      })
+
+      const body = await resp.buffer()
+
+      if (!resp.ok) {
+        const err = new Error(body.toString())
+        err.code = resp.status
         return cb(err)
       }
 
-      cb(null, body)
-    })
-
-    req.on('error', (err) => {
-      cb(err)
-    })
+      return cb(null, body)
+    } catch (err) {
+      return cb(err)
+    }
   }
 
-  requestStream (key, opts) {
+  async requestStream (key, opts) {
     return this._requestStream(key, opts)
   }
 
-  sendRequestStream (req) {
+  async sendRequestStream (req) {
     const addHeaders = {}
     const _h = req.opts.headers || {}
     Object.keys(_h).forEach((k) => {
@@ -165,14 +169,37 @@ class TransportRPCClient extends Base.TransportRPCClient {
     const _opts = {
       headers: {
         _gr: this.format([req.rid, req.key]),
+        connection: 'close',
+        'transfer-encoding': 'chunked',
         ...addHeaders
       },
       timeout: req.opts.timeout
     }
 
     const opts = this.getOpts(_opts, this.conf.secure)
-    const stream = this.socket.post(opts)
-    return stream
+
+    // node-fetch does not support multiplex communication, no response is received until body is fully streamed
+    const reqStream = new PassThrough()
+    const resStream = new PassThrough()
+
+    const url = new URL(opts.url)
+    const httpReq = (this.conf.secure ? https : http).request({
+      ...opts,
+      hostname: url.hostname,
+      port: url.port,
+      protocol: url.protocol,
+      path: url.pathname,
+      method: 'POST'
+    }, (res) => {
+      pump(res, resStream)
+    })
+
+    httpReq.on('error', (err) => {
+      reqStream.destroy(err)
+      resStream.destroy(err)
+    })
+    pump(reqStream, httpReq)
+    return duplexify(reqStream, resStream)
   }
 }
 

package/lib/TransportRPCServer.js

@@ -43,7 +43,7 @@ class TransportRPCServer extends Base.TransportRPCServer {
       const isCompress = enc.includes('gzip')
 
       const cert = secure ? req.socket.getPeerCertificate() : undefined
-      const meta = { cert, isStream: isStream, compress: isCompress }
+      const meta = { cert, isStream, compress: isCompress }
 
       try {
         if (req.headers._gr) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "grenache-nodejs-http",
-  "version": "0.7.13",
+  "version": "1.0.1",
   "private": false,
   "description": "Granache Node.js HTTP implementation",
   "author": "prdn <paolo@bitfinex.com> (https://bitfinex.com/)",
@@ -10,22 +10,28 @@
     "nodejs",
     "micro-services"
   ],
+  "engines": {
+    "node": ">=16.0"
+  },
   "dependencies": {
-    "async": "^3.2.4",
-    "grenache-nodejs-base": "^0.7.5",
-    "grenache-nodejs-link": "^0.7.13",
-    "lodash": "^4.17.21",
-    "request": "^2.88.0"
+    "async": "3.2.6",
+    "duplexify": "4.1.3",
+    "grenache-nodejs-base": "1.0.0",
+    "grenache-nodejs-link": "1.0.2",
+    "node-fetch": "2.7.0",
+    "pump": "3.0.2"
   },
   "main": "index.js",
   "devDependencies": {
-    "grenache-grape": "^0.9.12",
-    "mocha": "^10.2.0",
-    "standard": "^17.0.0"
+    "grenache-grape": "1.0.0",
+    "mocha": "11.1.0",
+    "standard": "17.1.2"
   },
   "scripts": {
-    "test": "npm run lint",
-    "lint": "standard"
+    "test": "npm run lint && npm run unit",
+    "unit": "mocha",
+    "lint": "standard",
+    "lint:fix": "standard --fix"
   },
   "license": "Apache-2.0",
   "repository": {

package/test/before-after.js

@@ -2,26 +2,24 @@
 
 'use strict'
 
-const { bootTwoGrapes, killGrapes } = require('./helper')
+const { startGrapes, stopGrapes } = require('./helper')
 
 let grapes
 function setupHooks (cb) {
-  beforeEach(function (done) {
+  beforeEach(async function () {
     this.timeout(20000)
-    bootTwoGrapes((err, g) => {
-      if (err) throw err
-      grapes = g
-      grapes[0].once('announce', () => {
-        done()
-      })
-
-      cb()
+
+    grapes = await startGrapes()
+    cb()
+
+    await new Promise((resolve) => {
+      grapes[0].once('announce', () => resolve())
     })
   })
 
-  afterEach(function (done) {
+  afterEach(async function () {
     this.timeout(5000)
-    killGrapes(grapes, done)
+    await stopGrapes(grapes)
   })
 
   return grapes

package/test/certs/ca-crt.pem

@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDBzCCAe+gAwIBAgIUGtaHkIywQCUpLJYn4KZRZUkZcYMwDQYJKoZIhvcNAQEL
+BQAwEzERMA8GA1UEAwwITXlUZXN0Q0EwHhcNMjUwMzI4MTYzNjQwWhcNMzUwMzI2
+MTYzNjQwWjATMREwDwYDVQQDDAhNeVRlc3RDQTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBALiTm+dXfL5/TfO3cLRqcY6p5hItEWDYuCaFEEsvq74ko6B1
+5cNCSxYzM34mGFHRItq/UZUb2WLgbsJGBWhPgH+pXHfLlS+s3xYBbQMaz5BEgaZO
+Wq/RHQHvWTv/nL/CJMjUYwUfcW1smwXg+WPsLD+LSJTCbgPnLQBp6JMrlCSo6pGd
+77qqmcPQRut7Q2/5ogZ+/b1darZa1cZcHVluq67TYgw7844V1T9Ei0+ygSzZBsrG
+4/nYMWlbVHxbn8bxcCPmIrT9YgwuFaq8JZ0OvR1KROJ6WV1A7EXK5XT3ojQkGoFD
+oHxD/H2XmOLkk3V8WqLsmh/JFrhv/tbcjyAyFG0CAwEAAaNTMFEwHQYDVR0OBBYE
+FEdhwkpjY0OljDiQyULJ/rqVKlwrMB8GA1UdIwQYMBaAFEdhwkpjY0OljDiQyULJ
+/rqVKlwrMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAAIdYQQ1
+9ZwBgtrAoGjuk0VS52cmKU2k4Ok1/FngjD4FCCt83WbOya+QOkjH7KyO89UYERio
+rA8AXkPycnSRakoPsznUzU7a0neaAfDvrEdeHd9RSc06Rijvp3EjyWe7+H0pqZUi
+v1jP5N8cEWmX+camz9Wz34TNCw/JspA6jIrXB5zLXxd5QDmHm1bRsWfbKI83g3jx
+EWlNLqDhnbNzbOXV/oxnexS2xNna4XgHQTujZIrYpEdodpyhDhnQT3XTevgWB2XW
+7TwZThq0vHFJx6VkVFdf7WrsWOTHzXSIhYKl2SNifyyNyv7rv/Vg9cpbXad0Jom7
+opXbblgZgnTHIuc=
+-----END CERTIFICATE-----

package/test/certs/ca-crt.srl

@@ -0,0 +1 @@
+3E6906002D94EF8DB3C52989D25AFF8896A12DDA

package/test/certs/ca-key.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC4k5vnV3y+f03z
+t3C0anGOqeYSLRFg2LgmhRBLL6u+JKOgdeXDQksWMzN+JhhR0SLav1GVG9li4G7C
+RgVoT4B/qVx3y5UvrN8WAW0DGs+QRIGmTlqv0R0B71k7/5y/wiTI1GMFH3FtbJsF
+4Plj7Cw/i0iUwm4D5y0AaeiTK5QkqOqRne+6qpnD0Ebre0Nv+aIGfv29XWq2WtXG
+XB1Zbquu02IMO/OOFdU/RItPsoEs2QbKxuP52DFpW1R8W5/G8XAj5iK0/WIMLhWq
+vCWdDr0dSkTielldQOxFyuV096I0JBqBQ6B8Q/x9l5ji5JN1fFqi7JofyRa4b/7W
+3I8gMhRtAgMBAAECggEARy8OUmMoReOc8aBOhBYFI4scoufkquAJ7TkmNoj1CEjj
+HhA6A1r+0FoAwub4PB2W/pwIX6Q063A45w3QKhF3MkTj14OZTqCyDK+SFj9xy2bQ
+RY40ZVgVgtiHJp+HGWFLhHR8l84vlY7sHpFMPSApVHxoCo8NlM3ESkOOIawN3zDp
+ic3vVN/b0fI9lEvcqjLLtVNDWFkhqb8OODsXgIa+29P+F+p4zIxvT0FsGN/TwYks
+74djp949oJz2TEi4mkrqm8eZHsRpTgTdPOiYqRfIQ943gKouUSjm/g8newVEe51p
+PBMth1gn/K+PgHAcfWaGZBQEcwBreFhztOH1NPfE1QKBgQDvem2AJOCqOGCNcvx7
+tMqaylMNPlw1cPSanIq6oPrY+1YFejVVN66LYNcHrsUpWxdB9I9DuoNvRlNjDqzJ
+fWUkId2XsRm2YiEX3hBlKTmgywy1KPna7g1y12fkP7qKQQeuJ6qYuDCyWYuYzl9K
+Z++kQQk6t1kT/kQqlHjOudNi1wKBgQDFT4ecehhnq/LVbiZEUoKe1A9pGeLfc+w7
+jjL8xSGDpt74uUdNc07etijElIpmkBqnD84dV8rsbNeZqWk5dMWGQBloe69TRyId
+9cY+DNH8xjU4ysts42JEUTmdJVl1aET6yIrIjunhbt8O0ThZb5BXMBTvx9cLQgQ/
+AEilhPVeWwKBgQDRVPw4woOcZ9GGc5febseXjPoSHoutr0IxkFr4DlWXrAOioBPU
+nOq3LPxp28y+fMCUx7kfo/7WGuwzL5W8Px9U+UFhIs7uDVMOMO+17dZRBoziIqJd
+TC93TnGjJE3kIjobctL90ivHCt0qwmKrgLUKqErwB2sXPfDKI6SCWA8+WwKBgDQH
+CYpAQ6kqlQikV+DSJPE+l6WuFr23MoZts5IlZPXzDX5mVJ/elOBzBgL37BqpSu3c
+ZAwmtzJqbNtu6XkmCmOhCVIcsxlxe1SNFy4LcV+G4EfOaZ+XwbSj+l4umA02ZmH+
+eWHzFUbFVnnwvzwOB/CFlC+58UFdsgLuzzkd+xlbAoGADMTT/asr09ZKFP9lyB2e
+AS2K3FCA9eio/vkBr0/PnzIv/bsjLaZ8GvmnlbLKf/gagPaKKGU8dbqyzQr8m2Tv
+ZcHMKN0GgxsV7B9c+HwoMR55hy8rj6zkeUenMyp4U5CuDtH3JEkrM7++ykvS9cyZ
++Zr4qWiMGxHN9vDpI2AMePk=
+-----END PRIVATE KEY-----

package/test/certs/client1-crt.pem

@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE-----
+MIICrDCCAZQCFD5pBgAtlO+Ns8UpidJa/4iWoS3aMA0GCSqGSIb3DQEBCwUAMBMx
+ETAPBgNVBAMMCE15VGVzdENBMB4XDTI1MDMyODE2MzgwN1oXDTM1MDMyNjE2Mzgw
+N1owEjEQMA4GA1UEAwwHY2xpZW50MTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAKiXZsaFLcb4eubwGXELePbFL//uR8W7OD0NSaKUbe6G1leLCqWt3ljS
+p8BFTr8B8R/2l3i+VuedIIuzX2wJbBsTrdSEIcOfQauRnkF6RqoWbvToo7fYWphe
+ZGiHfyVmJlr6XQbVNyzOnutEGPdpe6bJMwFdG/UCAaZeAsvAcAGxVGhAp8cjSnwh
+t/8QZJ8/FLcHBVwc0Zd5ELmtPeaMS7GDBiUvdDYRQBRTY8ls9wPvbAuBzo0f/ude
+72iHwkJuDOnTVtffXuFXhloBAVnjaXK0b7PtJ8ByGZ/mZEp1a7Pysehy4w6cL3qg
+9cq306m/jxXrmwlVM/QJd2yhVOQnSPkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEA
+HM7J+3coTFZYGwYmfG8aObCjN/3gW56VG+5SOHT9NmdfIuzvWrPBIsYE+CYj1nrK
+IFm7TP89R2Ka0U20V09+26C0L3SyE6DUTipOc0zhGQgdLTU1bneIZGg26LtYbKJc
+PV0+Bt1JPT4PulIcuq4XDRFBKaoXC0lmIo1NbfWZbunz1AaBjiJWKS2YksgJJ2Ad
+GhL8/PJO7Ro+8xxunVikcl1MWyeYiKyKFk1J6j8bQPJ940poqSwMObXFKlUMKsm4
+/e6JwqiCFv+MMPL80puUv/Fue6wmjY3rpygwAU60dBPmjLpWNBbuSb/+wjPWYtgy
+f9m+nQEyfflc7t6anZjPMg==
+-----END CERTIFICATE-----

package/test/certs/client1-csr.pem

@@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICVzCCAT8CAQAwEjEQMA4GA1UEAwwHY2xpZW50MTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAKiXZsaFLcb4eubwGXELePbFL//uR8W7OD0NSaKUbe6G
+1leLCqWt3ljSp8BFTr8B8R/2l3i+VuedIIuzX2wJbBsTrdSEIcOfQauRnkF6RqoW
+bvToo7fYWpheZGiHfyVmJlr6XQbVNyzOnutEGPdpe6bJMwFdG/UCAaZeAsvAcAGx
+VGhAp8cjSnwht/8QZJ8/FLcHBVwc0Zd5ELmtPeaMS7GDBiUvdDYRQBRTY8ls9wPv
+bAuBzo0f/ude72iHwkJuDOnTVtffXuFXhloBAVnjaXK0b7PtJ8ByGZ/mZEp1a7Py
+sehy4w6cL3qg9cq306m/jxXrmwlVM/QJd2yhVOQnSPkCAwEAAaAAMA0GCSqGSIb3
+DQEBCwUAA4IBAQA6W0JeJs4HHoNzmympMhVn131SQE0wDVMUHrAPQvf5xPjnW/sh
+V5h+gs0yHNUX0ywEn8+eDVmHsskhcYchp/UW4XjBxTFwIx0r7jqFsVYSNjSjteCi
+vhlEuLOWdv4k8pLavr0SnClgDQVV/uCdhxLY0rQJeg1Bfq1CX5YIrrv08SMfYJOz
+xopiohYOt9EqoGuVkVm6wTxso2B4WmT9NuU5PkxulN5do+s/aVC9dZD7dpBgAUFv
+iXOPYmk22cwLArOnpy0FpNEnYga9EHGwb8CUFfa17kPxTMEGyFVHfeuyXF56ubo9
+ln+J+KGh3oWrpUSrPYax7qA/1qnKv3+6y4j2
+-----END CERTIFICATE REQUEST-----

package/test/certs/client1-key.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCol2bGhS3G+Hrm
+8BlxC3j2xS//7kfFuzg9DUmilG3uhtZXiwqlrd5Y0qfARU6/AfEf9pd4vlbnnSCL
+s19sCWwbE63UhCHDn0GrkZ5BekaqFm706KO32FqYXmRoh38lZiZa+l0G1Tcszp7r
+RBj3aXumyTMBXRv1AgGmXgLLwHABsVRoQKfHI0p8Ibf/EGSfPxS3BwVcHNGXeRC5
+rT3mjEuxgwYlL3Q2EUAUU2PJbPcD72wLgc6NH/7nXu9oh8JCbgzp01bX317hV4Za
+AQFZ42lytG+z7SfAchmf5mRKdWuz8rHocuMOnC96oPXKt9Opv48V65sJVTP0CXds
+oVTkJ0j5AgMBAAECggEAUF0bWLZTQ+1eaIc7GW/mkXsdjln/THoaLMAQwbcPUAxm
+UASvZpqiyqRf4n8nMlWyoxHg0mWo928m/HDco5s6NQ4EZrE1hxJ7M1WOopeu55UZ
+/xSGNjSjus4D/u/X4/P1hJijj4ZDbtBvYKZtYEKf9rkh3xyLHxd9wdg+bPGmcqdW
+TYb0NsWGJu1uPgveUZTc/GSqzblNvOBommoDh0PNWOGcqbKUkTLcqEEJZ2Ki1Z52
+e1H6ZSx4sqIO0ztcjTlzFK5sf+2tjrlfKDUt2bCvZLlsWebJgYxr7B0nnpLHAuvb
+NLj2SdFR4Ox4S1NwEB/y8/dAm3tBcelpjajbqUiPoQKBgQDin9owiH81biVElwYt
+xlRuUagR05KCZJBp12AtNcTo9HVoL+/xufnR9KQ1a7UEleZQYhRrZ73QaMydo9FZ
+fytH2Gm5eeGWBjIVvhdFvmE7Ff740K7tKUUCNLbsHhIviZAi1bbTefPPp35vY9z5
+4fNIW/z/m3cdGUczJgvvbBAOZwKBgQC+cdJsgxF03Mn+wIZHIFj+fof/HgrFzmzV
+3X5yS14hAxOaU0NTg9T5FDsQ7XOvGcjDV4r44pcagcLimyGphzodIFjjVHe9vaeF
+tJer4g9Q/1lZGPldufA1s533yEMyjCwpdILvobTuU8VskvGzyzTyD2Z5L59PlaNt
+MN1NMgqRnwKBgQDRDfUQ4Fm4yCrI4yhoAZTRT7Ji/3Efp/UwLeYizn8fBqNnwRDv
+REgYTj1MqlcKK92SOWfszH5lSse2g/ATRyR92j1tQ+m9o2mAdSKyy7SV9OyISrmT
+PYbTSh2UIwlToOq9t7g3zUAERtZzmwO136G1FmaExL1UsoTjwi0wZ9dH8QKBgHJ8
+rok5Sfc8+9nAF3kOwzFLE6qUftlnPRpcazV+hXnHBbPStjiwmgma1d9ZQCBVmdGF
+ATCZ10jCFUxxAg2OE6uK1KTlFI7mQp0ocb2MyrRgrW/YiaCEtRkzf5WDuJHcnnfV
+aRlx1vknNxoMRG1Xjd6uz2Wu8VDAnlx38bIEkUH1AoGBAI5hPvpDYX/KbCiXRWIv
+bjJ1oz2tBMg+dsGr+IM2VBcsyOyioDDPGp4s6jeYdsq5MUq3fhZnJUXcVDwOvD/i
+F3ulQhsCBJa7Y1scc015Vm6MpbkDgKCIzWmFPb5tVDtQLdtZqevcChHrUPHAo1tT
+nZ+d7Eok1Kz1TUI5gg6nbteD
+-----END PRIVATE KEY-----

package/test/certs/server-crt.pem

@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE-----
+MIICrjCCAZYCFD5pBgAtlO+Ns8UpidJa/4iWoS3ZMA0GCSqGSIb3DQEBCwUAMBMx
+ETAPBgNVBAMMCE15VGVzdENBMB4XDTI1MDMyODE2MzczMloXDTM1MDMyNjE2Mzcz
+MlowFDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAwAHQjt8BD+n31SVmP7X+aNHu96KAAvzPM1kiFVHplVXrEJYau+8y
+Ov0eMfKnQ/Yt28jaYGFlVyRS81zpQ2P+IsdlqqOPyiwwDPPNL8Ia7X8kPgIaXRhE
+OKtSjajpkvIjHqRX2vH3wj2T1XPRsQ9HExx2Hw3NFrOdTSMs61AwGH66fcWSvNAx
+CtG8Ij1MEWdK5tS36q59fPHkRMpgOx0cbr5QY2U+giKi/25y+A02S0CeLE4mP5mg
+xQ7Rf2oaBiiaz22xCwcmARTkOuOsg5tk8/yGWoNHlAW130n7qp/to2UT9/7269H4
+LdCtQYPLqjXcFKF3dD+VyxVdc2mJzleUKQIDAQABMA0GCSqGSIb3DQEBCwUAA4IB
+AQCi/mDFU0OgxI8q1aSGR/yfS6hBhsMVl8CJ4fvSFgNU8p6hHDaBbfc0D6DR8bym
+mcpZ08QXEEhJbMlxACmpVE5EqR6usbSJF7ItvlM71YzxK5CAS66yAkdrhIyEStRe
+1L8uRicdsIoEvjDbe80p4p76Aoe+Iz0I8V+v8aXzHII9om7zRp8OBBOIP5cGMmpt
+GIifsdqPZwAKnr83l/ZgyXtUAFdaTS4raf0yh+lU86I5kTJeur7MGyKFvvwCNI2B
+V3Cp2H8dxgXXL0R4yCUMmxTyqMktLsXQjfMC8OnVa3oetrFS+dilS7JI+WCRZ5YH
+iOS8YRpx9xu4Yzy/apunvaK0
+-----END CERTIFICATE-----

package/test/certs/server-csr.pem

@@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICWTCCAUECAQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAwAHQjt8BD+n31SVmP7X+aNHu96KAAvzPM1kiFVHp
+lVXrEJYau+8yOv0eMfKnQ/Yt28jaYGFlVyRS81zpQ2P+IsdlqqOPyiwwDPPNL8Ia
+7X8kPgIaXRhEOKtSjajpkvIjHqRX2vH3wj2T1XPRsQ9HExx2Hw3NFrOdTSMs61Aw
+GH66fcWSvNAxCtG8Ij1MEWdK5tS36q59fPHkRMpgOx0cbr5QY2U+giKi/25y+A02
+S0CeLE4mP5mgxQ7Rf2oaBiiaz22xCwcmARTkOuOsg5tk8/yGWoNHlAW130n7qp/t
+o2UT9/7269H4LdCtQYPLqjXcFKF3dD+VyxVdc2mJzleUKQIDAQABoAAwDQYJKoZI
+hvcNAQELBQADggEBAFfKmC+7cPTYPzA9NU5eOLJ/grmzLiqJkbrFxcWk3YVdX5wX
+uL3gQ6JCflhZCxMo593bOy+CzqbehI95Ogk7uQlCjj5yN6oIw35OWoWZ+yG1KANs
+Tas6USWJ6wZa3FQiGZTG3LMTo2MXR1o3wfbGDUmzhtH/rLFi/puI+00TEm5RZrxF
+ZjFvcA59NiZV5N3sAiI4RMHY1OoSEW6uaFHdIDpc6m6I0lLPNh9u1AFPxnwshAIG
+SLUnoMVLJgxbGwezq+2pMixYaDmyVtUjPQB5keZmdIBsQpFPx0ZNZJWj2vjGiSwL
+AFchAHWw3AobCHDUtApnlOfSVt+8c4P9NqMLIjc=
+-----END CERTIFICATE REQUEST-----

package/test/certs/server-key.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDAAdCO3wEP6ffV
+JWY/tf5o0e73ooAC/M8zWSIVUemVVesQlhq77zI6/R4x8qdD9i3byNpgYWVXJFLz
+XOlDY/4ix2Wqo4/KLDAM880vwhrtfyQ+AhpdGEQ4q1KNqOmS8iMepFfa8ffCPZPV
+c9GxD0cTHHYfDc0Ws51NIyzrUDAYfrp9xZK80DEK0bwiPUwRZ0rm1Lfqrn188eRE
+ymA7HRxuvlBjZT6CIqL/bnL4DTZLQJ4sTiY/maDFDtF/ahoGKJrPbbELByYBFOQ6
+46yDm2Tz/IZag0eUBbXfSfuqn+2jZRP3/vbr0fgt0K1Bg8uqNdwUoXd0P5XLFV1z
+aYnOV5QpAgMBAAECggEAXMzDuznHLqTbVpZT2/kfNBQ7Fk7g5hDAKEYtNfa4GahE
+C2kxFKIgOeh6fpOUCkHimjZybWDFdR+mQ98lEqAyhSawWY/iAEnpE2mGQ03ia+Um
+ZB3qFhKTbnxHUxZPhekn1jiCCd0m7SeL2v+2WohSxsbbxFiMRiubnFui6zx/cmZ+
+Mb78bFY4c6BPsEbXlS6l62U9oiBiV28N2snhT5F79RbN9kp9fDUGotbKPZ2epEm4
+tHby4e/MxUsTdZpPA8PX05mVjSEK9JHZjfhhB44hTJpHTJyGenqm2n8CDnpOejh/
+KnVB/b6mAfKyCdu5y1SJwZOj20OiUVbG0VnKjwr+LQKBgQD3LMs6+Vh+S7efIsJd
+6Y3yIo/pF46iYvhlcpQotjIVxuYRdiYuXSFpTxomiieBcLkDXBeNWTkKpFVK/SAS
+N3LJXEKl4+ZquyR6sacEkTw0VPuHgCx7lO+8vZVP4q0SUMZV+dtCzjidQ9+JAVeh
+UKaYQfoVkCpFhNd1c271HeSWEwKBgQDG3MfDhwZIuAg3jQqr2ZzRtvbhVnltAkAf
+VSTIc5uflIfL3IEzWC861mibsfEE8JMfLA+VDcOLu8fdc1TEP6y2hEyAjjXEvY42
+xBEkYQncR1U2LPavGlqOF2LTzsRaT+/iFnJrYHkeIboWKLyDpfkZX/UxdK8WMExW
+7v5S1GbkUwKBgQCf2Fn9Y271DeZLhWEI9pcTNYK3jMJzBWn5wSVLRrgRGTWDqVJ7
+vUJ0JfGVZtaxgMJFB/M7N64J0chO3G83GKCk04NOYJmMAEZRCj4mV/4FIcggEqWx
+rdlzx26d4MtoAtCgnRpMk6xNF62hnjqbWdrCsDgYZcjQeF4V2HazEYfX/QKBgBFw
+POhNh+SKltXgPWZSf+j4BXA/OAiyINNekQou8R+uU7Yx0PairgmX0baNhRgszIn4
+QCmO+m3feqhVu8I13zxmH5tKXTaydK0ixmoNRGMXskY87Sjvw68gJ99xC1DsH5oQ
+49m8rQJSbNISom1c+ZobCxJaLBxjAd7BuHWlAJzXAoGAGrB6ZEjDH/mAjVpRNsZN
+6P+3zst7r3PWIFBRkwAhfiS9IFtlCngIUzVJDjOAo/6yPvzK05Y0zq8xcJNVI6h/
+AM42G3qhsevfEuR++blSF3i4uLOkHwkemcYjV8NcbgI3tgzn7sKBxN0l1hAVALVr
+5GKcmOJY/PcTXiU8U9+sZrI=
+-----END PRIVATE KEY-----

package/test/helper.js

@@ -1,42 +1,36 @@
 'use strict'
 
 const { Grape } = require('grenache-grape')
-const waterfall = require('async/waterfall')
+const async = require('async')
 
-exports.bootTwoGrapes = bootTwoGrapes
-function bootTwoGrapes (cb) {
-  const grape1 = new Grape({
-    dht_port: 20002,
-    dht_bootstrap: ['127.0.0.1:20001'],
-    api_port: 40001
-  })
-  const grape2 = new Grape({
-    dht_port: 20001,
-    dht_bootstrap: ['127.0.0.1:20002'],
-    api_port: 30001
-  })
+const startGrapes = async () => {
+  const grapes = [
+    new Grape({
+      dht_port: 20002,
+      dht_bootstrap: ['127.0.0.1:20001'],
+      api_port: 40001
+    }),
+    new Grape({
+      dht_port: 20001,
+      dht_bootstrap: ['127.0.0.1:20002'],
+      api_port: 30001
+    })
+  ]
 
-  waterfall([
-    (cb) => {
-      grape1.start()
-      grape1.once('ready', cb)
-    },
-    (cb) => {
-      grape2.start()
-      grape2.once('node', cb)
-    }
-  ], () => {
-    cb(null, [grape1, grape2])
+  await async.each(grapes, (grape, next) => {
+    grape.start()
+    grape.once('ready', () => next())
   })
+  return grapes
 }
 
-exports.killGrapes = killGrapes
-function killGrapes (grapes, done) {
-  grapes[0].stop((err) => {
-    if (err) throw err
-    grapes[1].stop((err) => {
-      if (err) throw err
-      done()
-    })
+const stopGrapes = async (grapes) => {
+  await async.each(grapes, (grape, next) => {
+    grape.stop(next)
   })
 }
+
+module.exports = {
+  startGrapes,
+  stopGrapes
+}