Make the user pass in a WebRTC implementation (for #7)

bin/bridge.js

@@ -14,6 +14,7 @@ var argv = require('minimist')(process.argv.slice(2))
 
 var bridge = new Bridge({
   network: argv.testnet ? Networks.testnet : Networks.livenet,
+  wrtc: require('wrtc'),
   localPeer: argv.local
 })
 

bin/wallet.js

@@ -5,6 +5,7 @@ var Node = require('../lib/node.js')
 
 var node = new Node({
   network: Networks.livenet,
+  wrtc: require('wrtc'),
   path: 'data',
   acceptWeb: true
 })

lib/bridge.js

@@ -17,7 +17,7 @@ var Bridge = module.exports = function (opts) {
 
   webSeeds.forEach(function (uri) {
     debug('bridge connecting to web seed', uri)
-    var client = new PeerhubClient(uri, function () {
+    var client = new PeerhubClient(uri, { wrtc: opts.wrtc }, function () {
       debug('bridge connected to web seed', uri)
       self.webSeeds.push(client)
       self.emit('seedconnect', client)

lib/node.js

@@ -24,6 +24,7 @@ var Node = module.exports = function (opts, cb) {
 
   this.peers = opts.peers || new PeerGroup({
     network: this.network,
+    wrtc: opts.wrtc,
     acceptWeb: opts.accept || opts.acceptWeb,
     acceptTcp: opts.accept || opts.acceptTcp,
     getTip: function () { return self.chain.getTip() },

lib/peerGroup.js

@@ -14,17 +14,6 @@ var u = require('./utils.js')
 
 var webSeeds = require('./constants.js').webSeeds
 
-var supportsWebRTC = false
-if (process.browser) {
-  var RTCPC = window.mozRTCPeerConnection || window.webkitRTCPeerConnection || window.RTCPeerConnection
-  supportsWebRTC = !!RTCPC
-} else {
-  try {
-    require('wrtc')
-    supportsWebRTC = true
-  } catch (e) {}
-}
-
 // HACK: suppress warnings from Buffer#get()
 Buffer.prototype.get = function get (offset) {
   return this.readUInt8(offset)
@@ -35,6 +24,7 @@ var commands = Object.keys((new Builder()).commandsMap)
 var PeerGroup = module.exports = function (opts) {
   opts = opts || {}
   this.network = Networks.get(opts.network) || Networks.defaultNetwork
+  this.wrtc = opts.wrtc
   this.acceptTcp = opts.acceptTcp || false
   this.acceptWeb = opts.acceptWeb || false
   this.tcpCount = opts.tcpCount != null ? opts.tcpCount : 5
@@ -173,10 +163,10 @@ PeerGroup.prototype.connect = function (opts, cb) {
     })
   }
 
-  if (supportsWebRTC) {
+  if (self.wrtc) {
     tasks.push(function (cb) {
       async.each(webSeeds, function (uri, cb) {
-        var client = new PeerhubClient(uri, function () {
+        var client = new PeerhubClient(uri, { wrtc: self.wrtc }, function () {
           self.webSeeds.push(client)
           self.emit('seedconnect', client)
           self._connectToWebPeers()
@@ -271,7 +261,7 @@ PeerGroup.prototype._onWebPeerConnect = function (conn, incoming) {
 }
 
 PeerGroup.prototype.acceptWebPeers = function () {
-  if (!supportsWebRTC) throw new Error('WebRTC is not supported')
+  if (!this.wrtc) throw new Error('WebRTC is not supported')
   this.webSeeds.forEach(this._acceptFromPeerhub.bind(this))
   this.acceptWeb = true
 }

package.json

@@ -47,9 +47,6 @@
     "buffertools": "browserify-buffertools",
     "bitcore-p2p": "bitcore-p2p-browserify"
   },
-  "optionalDependencies": {
-    "wrtc": "0.0.58"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/mappum/webcoin"

test/blockchain.js

@@ -6,6 +6,7 @@ var BlockStore = require('../lib/blockStore.js')
 var Blockchain = require('../lib/blockchain.js')
 var u = require('../lib/utils.js')
 var constants = require('../lib/constants.js')
+var common = require('./common.js')
 
 try {
   var leveldown = require('leveldown')
@@ -49,7 +50,7 @@ test('creating blockchain instances', function (t) {
 
   t.test('create blockchain with instantiated BlockStore', function (t) {
     t.doesNotThrow(function () {
-      var peers = new PeerGroup()
+      var peers = new PeerGroup({wrtc: common.wrtc})
       var store = new BlockStore({ path: storePath })
       var chain = new Blockchain({ peerGroup: peers, store: store })
       endStore(chain.store, t)
@@ -58,7 +59,7 @@ test('creating blockchain instances', function (t) {
 
   t.test('create blockchain with path instead of BlockStore', function (t) {
     t.doesNotThrow(function () {
-      var peers = new PeerGroup()
+      var peers = new PeerGroup({wrtc: common.wrtc})
       var chain = new Blockchain({ peerGroup: peers, path: storePath })
       endStore(chain.store, t)
     })
@@ -397,7 +398,7 @@ test('blockchain queries', function (t) {
 })
 
 test('blockchain sync', function (t) {
-  var peers = new PeerGroup()
+  var peers = new PeerGroup({wrtc: common.wrtc})
   peers.on('error', function (err) { console.error(err) })
   peers.connect()
 

test/common.js

@@ -0,0 +1,2 @@
+// Feel free to substitute in an implementation of your preference.
+module.exports.wrtc = require('wrtc')

test/node.js

@@ -1,6 +1,7 @@
 var test = require('tape')
 var Networks = require('bitcore-lib').Networks
 var Node = require('../lib/node.js')
+var common = require('./common.js')
 
 test('Node constructor', function (t) {
   var HEIGHT = 1000
@@ -10,6 +11,7 @@ test('Node constructor', function (t) {
     t.plan(1)
     node = new Node({
       network: Networks.testnet,
+      wrtc: common.wrtc,
       path: 'data/' + process.pid,
       to: HEIGHT
     })

test/wallet.js

@@ -1,14 +1,15 @@
 var test = require('tape')
 var Networks = require('bitcore-lib').Networks
 var Node = require('../lib/node.js')
-// var Wallet = require('../lib/wallet.js')
+var common = require('./common.js')
 
 test('Node wallet creation', function (t) {
   var node
 
   t.test('setup', function (t) {
     node = new Node({
       network: Networks.testnet,
+      wrtc: common.wrtc,
       path: 'data/' + process.pid,
       to: 1000
     })