@bitfinex/bfx-facs-grc 1.0.0

package/LICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/README.md

@@ -0,0 +1,2 @@
+# bfx-facs-grc
+

package/index.js

@@ -0,0 +1,362 @@
+'use strict'
+
+const async = require('async')
+const GrLink = require('grenache-nodejs-link')
+const GrHttp = require('grenache-nodejs-http')
+const Base = require('@bitfinex/bfx-facs-base')
+const fs = require('fs')
+const { cloneDeep, difference, union } = require('@bitfinexcom/lib-js-util-base')
+
+const { buildErr } = require('./lib/utils')
+
+class Grc extends Base {
+  constructor (caller, opts, ctx) {
+    super(caller, opts, ctx)
+
+    this.name = 'grc'
+    this._hasConf = true
+
+    if (!this.opts.tickInterval) {
+      this.opts.tickInterval = 45000
+    }
+
+    if (!this.opts.secPortOffset) {
+      this.opts.secPortOffset = 2000
+    }
+
+    caller.on('started', () => {
+      this._tickItv = setInterval(() => {
+        this.tick()
+      }, this.opts.tickInterval)
+
+      this.tick()
+    })
+
+    this.init()
+  }
+
+  onPreparse (service, req, res, meta, handler) {
+    const api = this.api
+
+    // stream
+    const action = api.getStreamHandler(meta.action)
+    if (api && action) {
+      const rid = meta.infoHeaders[0]
+      const service = meta.infoHeaders[1]
+
+      if (meta.cert) {
+        meta._isSecure = true
+        meta._auth = {
+          fingerprint: meta.cert.fingerprint.toString('hex')
+        }
+      }
+
+      api.handleStream(service, action, req, res, meta, (err, res) => {
+        handler.reply(rid, buildErr(err), res)
+      })
+      return
+    }
+
+    service.handleBufferedRequest(req, res, meta)
+  }
+
+  onRequest (rid, service, payload, handler, cert) {
+    const api = this.api
+
+    if (api) {
+      if (cert) {
+        payload._isSecure = true
+        payload._auth = {
+          fingerprint: cert.fingerprint.toString('hex')
+        }
+      }
+
+      api.handle(service, payload, (err, res) => {
+        handler.reply(buildErr(err), res)
+      })
+    } else {
+      this.emit('request', rid, service, payload, handler)
+    }
+  }
+
+  setupPeers () {
+    if (!this.conf.protos) {
+      this.conf.protos = ['gen', 'sec']
+    }
+
+    const protos = this.conf.protos
+
+    if (protos.indexOf('gen') > -1) {
+      this.peer = new GrHttp.PeerRPCClient(this.link, {
+        maxActiveKeyDests: this.opts.maxActiveKeyDests
+      })
+
+      this.peerSrv = new GrHttp.PeerRPCServer(this.link, {
+        timeout: this.opts.server_timeout || 600000,
+        disableBuffered: true
+      })
+    }
+
+    if (protos.indexOf('sec') > -1) {
+      const secPath = `${this.opts.root}/sec`
+
+      if (fs.existsSync(secPath)) {
+        const sslConf = this.getSslConf(secPath)
+
+        this.peerSec = new GrHttp.PeerRPCClient(this.link, {
+          maxActiveKeyDests: this.opts.maxActiveKeyDests,
+          secure: sslConf.peer
+        })
+
+        this.peerSecSrv = new GrHttp.PeerRPCServer(this.link, {
+          timeout: this.opts.server_timeout || 600000,
+          secure: sslConf.srv,
+          disableBuffered: true
+        })
+      }
+    }
+  }
+
+  getSslConf (secPath) {
+    const peerSecOptsDefault = {
+      key: fs.readFileSync(`${secPath}/client-key.pem`),
+      cert: fs.readFileSync(`${secPath}/client-crt.pem`),
+      ca: fs.readFileSync(`${secPath}/ca-crt.pem`),
+      requestCert: true
+    }
+
+    const srvSecOptsDefault = {
+      key: fs.readFileSync(`${secPath}/server-key.pem`),
+      cert: fs.readFileSync(`${secPath}/server-crt.pem`),
+      ca: fs.readFileSync(`${secPath}/ca-crt.pem`),
+      requestCert: true
+    }
+
+    if (!this.conf.ssl) {
+      return { peer: peerSecOptsDefault, srv: srvSecOptsDefault }
+    }
+
+    let peer = peerSecOptsDefault
+    if (this.conf.ssl.peer) {
+      peer = { ...peerSecOptsDefault, ...this.conf.ssl.peer }
+    }
+
+    const srv = srvSecOptsDefault
+    if (this.conf.ssl.srv) {
+      peer = { ...srvSecOptsDefault, ...this.conf.ssl.srv }
+    }
+
+    return { peer, srv }
+  }
+
+  _start (cb) {
+    async.series([
+      next => { super._start(next) },
+      next => {
+        this.link = new GrLink({
+          grape: this.opts.grape || this.conf.grape,
+          requestTimeout: this.opts.linkRequestTimeout || 2500,
+          lruMaxAgeLookup: this.opts.linkRruMaxAgeLookup || 10000
+        })
+
+        this.link.start()
+
+        switch (this.conf.transport) {
+          case 'http':
+            this.setupPeers()
+            break
+        }
+
+        if (this.peer) {
+          this.peer.init()
+          this.peerSrv.init()
+        }
+
+        if (this.peerSec) {
+          this.peerSec.init()
+          this.peerSecSrv.init()
+        }
+
+        next()
+      }
+    ], cb)
+  }
+
+  tick () {
+    let pubServices = cloneDeep(this.opts.services)
+    if (!Array.isArray(pubServices) || !pubServices.length) {
+      pubServices = null
+    }
+
+    if (!pubServices || !this.opts.svc_port) {
+      return
+    }
+
+    if (this.peerSec) {
+      for (const s of Object.values(pubServices)) {
+        pubServices.push(`sec:${s}`)
+      }
+    }
+
+    const port = this.opts.svc_port
+    if (!port) {
+      console.error('no port set')
+      console.error('set port via commandline (--apiPort=$PORT)')
+      throw new Error('ERR_NO_PORT')
+    }
+
+    if (!this.service && this.peerSrv) {
+      this.service = this.peerSrv.transport('server')
+      this.service.listen(port)
+      this.service.on('stream', this.onPreparse.bind(this, this.service))
+      this.service.on('request', this.onRequest.bind(this))
+    }
+
+    if (!this.serviceSec && this.peerSec) {
+      this.serviceSec = this.peerSecSrv.transport('server')
+      this.serviceSec.listen(port + this.opts.secPortOffset)
+      this.serviceSec.on('stream', this.onPreparse.bind(this, this.serviceSec))
+      this.serviceSec.on('request', this.onRequest.bind(this))
+    }
+
+    async.auto({
+      announce: next => {
+        async.eachSeries(pubServices, (srv, next) => {
+          const tPort = srv.indexOf('sec:') === 0 ? port + this.opts.secPortOffset : port
+          this.link.announce(srv, tPort, {}, (err) => {
+            if (err) console.error(err)
+            next()
+          })
+        }, next)
+      }
+    }, (err) => {
+      if (err) console.error(err)
+    })
+  }
+
+  _stop (cb) {
+    async.series([
+      next => { super._stop(next) },
+      next => {
+        clearInterval(this._announceItv)
+        clearInterval(this._tickItv)
+
+        this.link.stop()
+
+        if (this.peerSec) {
+          this.peerSec.stop()
+        }
+
+        if (this.peer) {
+          this.peer.stop()
+        }
+
+        if (this.service) {
+          this.service.stop()
+          this.service.removeListener('request', this.onRequest.bind(this))
+          this.service.removeListener('stream', this.onPreparse.bind(this, this.service))
+        }
+
+        if (this.serviceSec) {
+          this.serviceSec.stop()
+          this.serviceSec.removeListener('request', this.onRequest.bind(this))
+          this.serviceSec.removeListener('stream', this.onPreparse.bind(this, this.service))
+        }
+
+        next()
+      }
+    ], cb)
+  }
+
+  setServices (ss) {
+    this.opts.services = ss
+  }
+
+  addServices (ss) {
+    if (!Array.isArray(this.opts.services)) {
+      this.opts.services = []
+    }
+
+    this.opts.services = union(this.opts.services, ss)
+  }
+
+  delServices (ss) {
+    if (!Array.isArray(this.opts.services)) {
+      this.opts.servies = []
+    }
+
+    this.opts.services = difference(this.opts.services, ss)
+  }
+
+  req (service, action, args, _opts = {}, _cb) {
+    return this._doReq('request', service, action, args, _opts, _cb)
+  }
+
+  map (service, action, args, _opts = {}, _cb) {
+    return this._doReq('map', service, action, args, _opts, _cb)
+  }
+
+  _doReq (reqType, service, action, args, _opts = {}, _cb) {
+    if (typeof _opts === 'function') {
+      _cb = _opts
+      _opts = {}
+    }
+    const isPromise = typeof _cb !== 'function'
+
+    if (typeof action !== 'string') {
+      const err = new Error('ERR_GRC_REQ_ACTION_INVALID')
+      return isPromise ? Promise.reject(err) : _cb(err)
+    }
+
+    if (!Array.isArray(args)) {
+      const err = new Error('ERR_GRC_REQ_ARGS_INVALID')
+      return isPromise ? Promise.reject(err) : _cb(err)
+    }
+
+    let isExecuted = false
+    let _resolve, _reject
+    const cb = (err, res) => {
+      if (err) {
+        if (err === 'ERR_TIMEOUT') {
+          console.error('ERR_TIMEOUT received', service, action, args)
+        } else {
+          console.error(service, action, args, err)
+        }
+      }
+
+      if (isExecuted) {
+        console.error('ERR_DOUBLE_CB', service, action, JSON.stringify(args))
+        return
+      }
+      isExecuted = true
+
+      if (isPromise) {
+        return err ? _reject(buildErr(err)) : _resolve(res)
+      } else {
+        return _cb(buildErr(err), res)
+      }
+    }
+
+    const peer = service.indexOf('sec:') === 0 ? this.peerSec : this.peer
+
+    const opts = { timeout: 120000, ..._opts }
+
+    if (isPromise) {
+      return new Promise((resolve, reject) => {
+        _resolve = resolve
+        _reject = reject
+        peer[reqType](service, {
+          action,
+          args
+        }, opts, cb)
+      })
+    }
+
+    peer[reqType](service, {
+      action,
+      args
+    }, opts, cb)
+  }
+}
+
+module.exports = Grc

package/lib/utils.js

@@ -0,0 +1,13 @@
+'use strict'
+
+const buildErr = err => {
+  if (!err) {
+    return null
+  }
+
+  return err instanceof Error ? err : new Error(err.toString())
+}
+
+module.exports = {
+  buildErr
+}

package/package.json

@@ -0,0 +1,46 @@
+{
+  "name": "@bitfinex/bfx-facs-grc",
+  "version": "1.0.0",
+  "private": false,
+  "description": "Bitfinex Grenache Facility",
+  "author": {
+    "name": "prdn",
+    "email": "paolo@bitfinex.com"
+  },
+  "main": "index.js",
+  "keywords": [
+    "bitfinex"
+  ],
+  "scripts": {
+    "lint": "standard",
+    "lint:fix": "standard --fix",
+    "test": "npm run lint && npm run unit",
+    "unit": "mocha"
+  },
+  "dependencies": {
+    "@bitfinex/bfx-facs-base": "git+https://github.com/bitfinexcom/bfx-facs-base.git",
+    "@bitfinexcom/lib-js-util-base": "git+https://github.com/bitfinexcom/lib-js-util-base#v1.20.0",
+    "async": "3.2.6",
+    "grenache-nodejs-http": "1.0.1",
+    "grenache-nodejs-link": "1.0.2"
+  },
+  "engines": {
+    "node": ">=16.0"
+  },
+  "license": "Apache-2.0",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/bitfinexcom/bfx-facs-grc.git"
+  },
+  "maintainers": [
+    {
+      "name": "prdn",
+      "email": "paolo@bitfinex.com"
+    }
+  ],
+  "devDependencies": {
+    "bfx-svc-test-helper": "git+https://github.com/bitfinexcom/bfx-svc-test-helper.git",
+    "mocha": "11.2.2",
+    "standard": "17.1.2"
+  }
+}

package/test/config/facs/grc.config.json

@@ -0,0 +1,10 @@
+{
+  "p0": {
+    "grape": "http://127.0.0.1:30001",
+    "transport": "http"
+  },
+  "p1": {
+    "grape": "http://127.0.0.1:30001",
+    "transport": "http"
+  }
+}

package/test/map.test.js

@@ -0,0 +1,198 @@
+/* eslint-env mocha */
+
+'use strict'
+
+const assert = require('assert')
+const { promisify } = require('util')
+
+const createGrapes = require('bfx-svc-test-helper/grapes')
+const createFxGrenache = require('bfx-svc-test-helper/fauxgrenache')
+
+const Fac = require('..')
+
+const stubs = {
+  'rest:util:net': {
+    getIpInfo (space, ip, cb) {
+      const res = [ip, { country: 'US', region: 'CA' }]
+      return cb(null, res)
+    }
+  }
+}
+
+const grapes = createGrapes()
+const caller = {
+  on: () => {},
+  ctx: { root: __dirname }
+}
+
+const fac = new Fac(caller, {}, { env: 'test' })
+fac.tick = () => {}
+fac.conf = { grape: 'http://127.0.0.1:30001', transport: 'http' }
+
+let fxg1
+let fxg2
+describe('RPC integration: map', () => {
+  before(async function () {
+    this.timeout(20000)
+
+    grapes.onAnnounce()
+
+    await grapes.start()
+    fxg1 = createFxGrenache(stubs, grapes, { port: 1557 })
+    fxg2 = createFxGrenache(stubs, grapes, { port: 1558 })
+    await fxg1.start()
+    await fxg2.start()
+
+    const start = promisify(fac.start).bind(fac)
+    await start()
+  })
+
+  after(async function () {
+    this.timeout(5000)
+
+    await grapes.stop()
+    await fxg1.stop()
+    await fxg2.stop()
+    fac.stop()
+  })
+
+  describe('callback', () => {
+    it('options defaults', done => {
+      fac.map('rest:util:net', 'getIpInfo', ['8.8.8.8'], (_err, res) => {
+        assert.deepStrictEqual([
+          ['8.8.8.8', { country: 'US', region: 'CA' }],
+          ['8.8.8.8', { country: 'US', region: 'CA' }]
+        ], res)
+        done()
+      })
+    })
+
+    it('success', done => {
+      fac.map('rest:util:net', 'getIpInfo', ['8.8.8.8'], {}, (_err, res) => {
+        assert.deepStrictEqual([
+          ['8.8.8.8', { country: 'US', region: 'CA' }],
+          ['8.8.8.8', { country: 'US', region: 'CA' }]
+        ], res)
+        done()
+      })
+    })
+
+    it('lookup error', done => {
+      fac.map('foo:test:net', 'getIpInfo', [], {}, (err, res) => {
+        assert.strictEqual(err.message, 'ERR_GRAPE_LOOKUP_EMPTY')
+        done()
+      })
+    })
+
+    it('double cb error', done => {
+      const originalPeer = fac.peer
+      const originalConsoleError = console.error
+
+      let errorArgs
+      console.error = (...args) => {
+        if (errorArgs) {
+          done(new Error('Should have been called once'))
+        }
+        errorArgs = args
+      }
+
+      fac.peer = {
+        map (service, args, opts, cb) {
+          cb()
+          cb()
+          fac.peer = originalPeer
+          console.error = originalConsoleError
+          assert.strictEqual(errorArgs[0], 'ERR_DOUBLE_CB')
+          assert.strictEqual(errorArgs[1], 'rest:util:net')
+          assert.strictEqual(errorArgs[2], 'getIpInfo')
+          done()
+        }
+      }
+
+      fac.map('rest:util:net', 'getIpInfo', [], {}, () => {
+        assert.strictEqual(errorArgs, undefined)
+      })
+    })
+
+    it('invalid args', done => {
+      fac.map('rest:util:net', 'getIpInfo', {}, {}, (err, res) => {
+        assert.strictEqual(err.message, 'ERR_GRC_REQ_ARGS_INVALID')
+        done()
+      })
+    })
+
+    it('invalid action', done => {
+      fac.map('rest:util:net', {}, [], {}, (err, res) => {
+        assert.strictEqual(err.message, 'ERR_GRC_REQ_ACTION_INVALID')
+        done()
+      })
+    })
+  })
+
+  describe('promise', () => {
+    it('success', async () => {
+      const res = await fac.map('rest:util:net', 'getIpInfo', ['8.8.8.8'], {})
+      assert.deepStrictEqual([
+        ['8.8.8.8', { country: 'US', region: 'CA' }],
+        ['8.8.8.8', { country: 'US', region: 'CA' }]
+      ], res)
+    })
+
+    it('lookup error', async () => {
+      try {
+        await fac.map('foo:test:net', 'getIpInfo', [], {})
+      } catch (e) {
+        assert.strictEqual(e.message, 'ERR_GRAPE_LOOKUP_EMPTY')
+        return
+      }
+      throw new Error('Should have thrown')
+    })
+
+    it('double cb error', async () => {
+      const originalPeer = fac.peer
+      const originalConsoleError = console.error
+
+      fac.peer = {
+        map (service, args, opts, cb) {
+          cb()
+          cb()
+          assert.strictEqual(errorArgs[0], 'ERR_DOUBLE_CB')
+          assert.strictEqual(errorArgs[1], 'rest:util:net')
+          assert.strictEqual(errorArgs[2], 'getIpInfo')
+          fac.peer = originalPeer
+          console.error = originalConsoleError
+        }
+      }
+
+      let errorArgs
+      console.error = (...args) => {
+        if (errorArgs) {
+          throw new Error('Should have been called once')
+        }
+        errorArgs = args
+      }
+
+      await fac.map('rest:util:net', 'getIpInfo', [], {})
+    })
+
+    it('invalid args', async () => {
+      try {
+        await fac.map('rest:util:net', 'getIpInfo', {}, {})
+      } catch (e) {
+        assert.strictEqual(e.message, 'ERR_GRC_REQ_ARGS_INVALID')
+        return
+      }
+      throw new Error('Should have thrown')
+    })
+
+    it('invalid action', async () => {
+      try {
+        await fac.map('rest:util:net', {}, [], {})
+      } catch (e) {
+        assert.strictEqual(e.message, 'ERR_GRC_REQ_ACTION_INVALID')
+        return
+      }
+      throw new Error('Should have thrown')
+    })
+  })
+})

package/test/req.test.js

@@ -0,0 +1,184 @@
+/* eslint-env mocha */
+
+'use strict'
+
+const assert = require('assert')
+const { promisify } = require('util')
+
+const createGrapes = require('bfx-svc-test-helper/grapes')
+const createFxGrenache = require('bfx-svc-test-helper/fauxgrenache')
+
+const Fac = require('..')
+
+const stubs = {
+  'rest:util:net': {
+    getIpInfo (space, ip, cb) {
+      const res = [ip, { country: 'US', region: 'CA' }]
+      return cb(null, res)
+    },
+    getTimeoutErr () {}
+  }
+}
+
+const grapes = createGrapes()
+const caller = {
+  on: () => {},
+  ctx: { root: __dirname }
+}
+
+const fac = new Fac(caller, { requestTimeout: 5000 }, { env: 'test' })
+fac.tick = () => {}
+fac.conf = { grape: 'http://127.0.0.1:30001', transport: 'http' }
+
+let fxg
+describe('RPC integration: req', () => {
+  before(async function () {
+    this.timeout(20000)
+
+    await grapes.start()
+    fxg = createFxGrenache(stubs, grapes)
+    await fxg.start()
+
+    const start = promisify(fac.start).bind(fac)
+    await start()
+  })
+
+  after(async function () {
+    this.timeout(5000)
+
+    await grapes.stop()
+    await fxg.stop()
+    fac.stop()
+  })
+
+  describe('callback', () => {
+    it('options defaults', done => {
+      fac.req('rest:util:net', 'getIpInfo', ['8.8.8.8'], (_err, res) => {
+        assert.deepStrictEqual(['8.8.8.8', { country: 'US', region: 'CA' }], res)
+        done()
+      })
+    })
+
+    it('success', done => {
+      fac.req('rest:util:net', 'getIpInfo', ['8.8.8.8'], {}, (_err, res) => {
+        assert.deepStrictEqual(['8.8.8.8', { country: 'US', region: 'CA' }], res)
+        done()
+      })
+    })
+
+    it('lookup error', done => {
+      fac.req('foo:test:net', 'getIpInfo', ['8.8.8.8'], {}, (err) => {
+        assert.strictEqual(err.message, 'ERR_GRAPE_LOOKUP_EMPTY')
+        done()
+      })
+    })
+
+    it('double cb error', done => {
+      const originalPeer = fac.peer
+      const originalConsoleError = console.error
+
+      let errorArgs
+      console.error = (...args) => {
+        if (errorArgs) {
+          done(new Error('Should have been called once'))
+        }
+        errorArgs = args
+      }
+
+      fac.peer = {
+        request (service, args, opts, cb) {
+          cb()
+          cb()
+          fac.peer = originalPeer
+          console.error = originalConsoleError
+          assert.strictEqual(errorArgs[0], 'ERR_DOUBLE_CB')
+          assert.strictEqual(errorArgs[1], 'rest:util:net')
+          assert.strictEqual(errorArgs[2], 'getIpInfo')
+          done()
+        }
+      }
+
+      fac.req('rest:util:net', 'getIpInfo', [], {}, () => {
+        assert.strictEqual(errorArgs, undefined)
+      })
+    })
+
+    it('invalid args', done => {
+      fac.req('rest:util:net', 'getIpInfo', {}, {}, (err, res) => {
+        assert.strictEqual(err.message, 'ERR_GRC_REQ_ARGS_INVALID')
+        done()
+      })
+    })
+
+    it('invalid action', done => {
+      fac.req('rest:util:net', {}, [], {}, (err, res) => {
+        assert.strictEqual(err.message, 'ERR_GRC_REQ_ACTION_INVALID')
+        done()
+      })
+    })
+  })
+
+  describe('promise', () => {
+    it('success', async () => {
+      const res = await fac.req('rest:util:net', 'getIpInfo', ['8.8.8.8'], {})
+      assert.deepStrictEqual(['8.8.8.8', { country: 'US', region: 'CA' }], res)
+    })
+
+    it('lookup error', async () => {
+      try {
+        await fac.req('foo:test:net', 'getIpInfo', [], {})
+      } catch (e) {
+        assert.strictEqual(e.message, 'ERR_GRAPE_LOOKUP_EMPTY')
+        return
+      }
+      throw new Error('Should have thrown')
+    })
+
+    it('double cb error', async () => {
+      const originalPeer = fac.peer
+      const originalConsoleError = console.error
+
+      fac.peer = {
+        request (service, args, opts, cb) {
+          cb()
+          cb()
+          assert.strictEqual(errorArgs[0], 'ERR_DOUBLE_CB')
+          assert.strictEqual(errorArgs[1], 'rest:util:net')
+          assert.strictEqual(errorArgs[2], 'getIpInfo')
+          fac.peer = originalPeer
+          console.error = originalConsoleError
+        }
+      }
+
+      let errorArgs
+      console.error = (...args) => {
+        if (errorArgs) {
+          throw new Error('Should have been called once')
+        }
+        errorArgs = args
+      }
+
+      await fac.req('rest:util:net', 'getIpInfo', [], {})
+    })
+
+    it('invalid args', async () => {
+      try {
+        await fac.req('rest:util:net', 'getIpInfo', {}, {})
+      } catch (e) {
+        assert.strictEqual(e.message, 'ERR_GRC_REQ_ARGS_INVALID')
+        return
+      }
+      throw new Error('Should have thrown')
+    })
+
+    it('invalid action', async () => {
+      try {
+        await fac.req('rest:util:net', {}, [], {})
+      } catch (e) {
+        assert.strictEqual(e.message, 'ERR_GRC_REQ_ACTION_INVALID')
+        return
+      }
+      throw new Error('Should have thrown')
+    })
+  })
+})

package/upstream-merge.sh

@@ -0,0 +1,2 @@
+git fetch upstream
+git merge upstream/master