add ws

Author: mvayngrib

example.js

@@ -5,6 +5,7 @@ const leveldown = require('leveldown')
 const async = require('async')
 const utils = require('./utils')
 const debug = require('./debug')
+const setupWS = require('./ws-stack')
 const TLS_ENABLED = true
 
 const aliceOpts = {
@@ -41,7 +42,16 @@ async.map([
   meet([alice, bob], err => {
     if (err) throw err
 
-    haveFun(alice, bob)
+    alice.on('message', function (message) {
+      console.log('alice received a message from bob', message)
+    })
+
+    bob.on('message', function (message) {
+      console.log('bob received a message from alice', message)
+    })
+
+    haveTCPFun(alice, bob)
+    // haveWebsocketsFun(alice, bob)
   })
 })
 
@@ -54,7 +64,7 @@ function meet (nodes, cb) {
   }, cb)
 }
 
-function haveFun (alice, bob) {
+function connectTCP (alice, bob) {
   const aliceServer = tcp.createServer({
     port: 12345,
     // TLS using axolotl
@@ -72,10 +82,6 @@ function haveFun (alice, bob) {
 
   aliceServer.on('error', console.error)
 
-  alice.on('message', function (message) {
-    console.log('alice received a message from bob', message)
-  })
-
   const bobClient = tcp.createClient({
     port: 12345,
     // TLS using axolotl
@@ -92,11 +98,35 @@ function haveFun (alice, bob) {
   bobClient.on('message', data => {
     bob.receive(data, alice._recipientOpts, logErr)
   })
+}
 
-  bob.on('message', function (message) {
-    console.log('bob received a message from alice', message)
-  })
+function connectWebSockets (alice, bob) {
+  const url = 'ws://localhost:42824'
+  connect(url, alice)
+  connect(url, bob)
 
+  function connect (url, node) {
+    const setup = setupWS(node)
+    const stack = setup.networkingStack({
+      url: url,
+      tls: TLS_ENABLED
+    })
+
+    // stack.on('error', logErr)
+  }
+}
+
+function haveWebsocketsFun (alice, bob) {
+  connectWebSockets(alice, bob)
+  chat(alice, bob)
+}
+
+function haveTCPFun (alice, bob) {
+  connectTCP(alice, bob)
+  chat(alice, bob)
+}
+
+function chat (alice, bob) {
   alice.signAndSend({
     to: bob._recipientOpts,
     object: {
@@ -123,5 +153,8 @@ function logErr (err) {
   if (err) {
     console.error(err)
     console.error(err.stack)
+    if (err.tfError) {
+      console.error(err.tfError.stack)
+    }
   }
 }

package.json

@@ -25,6 +25,9 @@
     "mkdirp": "^0.5.1",
     "nkey-bitcoin": "^1.1.1",
     "nkey-ec": "^2.0.1",
+    "sendy": "^2.2.0",
+    "sendy-axolotl": "^1.0.1",
+    "sendy-ws": "^1.4.0",
     "through2": "^2.0.1",
     "write-file-atomic": "^1.1.4",
     "xtend": "^4.0.1"

ws-stack.js

@@ -0,0 +1,102 @@
+const TLSClient = require('sendy-axolotl')
+const Sendy = require('sendy')
+const SendyWS = require('sendy-ws')
+const newSwitchboard = SendyWS.Switchboard
+const WebSocketClient = SendyWS.Client
+const tradle = require('@tradle/engine')
+// const utils = require('./utils')
+
+module.exports = function createConnector (node) {
+  const connector = {
+    myIdentifier: function (tls) {
+      return connector.getIdentifier(node.identity, tls)
+    },
+
+    getIdentifier: function (identity, tls) {
+      const pk = tls ? tradle.utils.find(identity.pubkeys, k => {
+        return k.type === 'ec' && k.purpose === 'tls'
+      }) : tradle.utils.find(identity.pubkeys, k => {
+        return k.type === 'ec' && k.purpose === 'sign'
+      })
+
+      return tradle.utils.serializePubKey(pk).toString('hex')
+    },
+
+    parseIdentifier: function (identifier) {
+      const pubKey = tradle.utils.unserializePubKey(new Buffer(identifier, 'hex'))
+      pubKey.pub = new Buffer(pubKey.pub, 'hex')
+      return pubKey
+    },
+
+    networkingStack: function (opts) {
+      const url = opts.url
+      const tlsEnabled = opts.tls
+      const webSocketClient = new WebSocketClient({
+        url: url,
+        autoConnect: true,
+        // for now, till we figure out why binary
+        // doesn't work (socket.io parser errors on decode)
+        // forceBase64: true
+      })
+
+      webSocketClient.on('disconnect', function () {
+        switchboard.clients().forEach(function (c) {
+          // reset OTR session, restart on connect
+          debug('aborting pending sends due to disconnect')
+          c.destroy()
+        })
+
+        // pause all channels
+        node.sender.pause()
+      })
+
+      webSocketClient.on('connect', function (recipient) {
+        // resume all paused channels
+        node.sender.resume()
+      })
+
+      const tlsKey = tlsEnabled && tradle.utils.find(node.keys, key => {
+        return key.get('purpose') === 'tls'
+      })
+
+      const switchboard = newSwitchboard({
+        identifier: connector.myIdentifier(tlsEnabled),
+        unreliable: webSocketClient,
+        clientForRecipient: function (recipient) {
+          const sendy = new Sendy(opts)
+          if (!tlsKey) return sendy
+
+          return new TLSClient({
+            key: {
+              secretKey: tlsKey.priv,
+              publicKey: tlsKey.pub
+            },
+            client: sendy,
+            theirPubKey: new Buffer(connector.parseIdentifier(recipient).pub, 'hex')
+          })
+        }
+      })
+
+      switchboard.on('timeout', function (identifier) {
+        switchboard.cancelPending(identifier)
+      })
+
+      node._send = function (msg, recipientInfo, cb) {
+        const identifier = connector.getIdentifier(recipientInfo.object, tlsEnabled)
+        switchboard.send(identifier, msg, cb)
+      }
+
+      switchboard.on('message', function (msg, sender) {
+        const pubKey = connector.parseIdentifier(sender)
+        node.receive(msg, { pubKey })
+      })
+
+      return {
+        switchboard,
+        webSocketClient
+      }
+    }
+  }
+
+  return connector
+}