Merge pull request #6 from diasdavid/browser-tests

Testing libp2p-spdy on the browser

.travis.yml

@@ -9,4 +9,11 @@ before_install:
 
 script:
   - npm run lint
-  - npm test
+  - npm test
+
+addons:
+  firefox: 'latest'
+
+before_script:
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start

karma.conf.js

@@ -0,0 +1,40 @@
+module.exports = function (config) {
+  config.set({
+    basePath: '',
+    frameworks: ['mocha'],
+
+    files: [
+      'tests/spdy-test.js',
+      'tests/browser-nodejs/browser.js'
+    ],
+
+    preprocessors: {
+      'tests/*': ['webpack'],
+      'tests/browser-nodejs/*': ['webpack']
+    },
+
+    webpack: {
+      resolve: {
+        extensions: ['', '.js']
+      },
+      node: {
+        Buffer: true
+      }
+    },
+
+    webpackMiddleware: {
+      noInfo: true,
+      stats: {
+        colors: true
+      }
+    },
+    reporters: ['spec'],
+    port: 9876,
+    colors: true,
+    logLevel: config.LOG_INFO,
+    autoWatch: false,
+    browsers: process.env.TRAVIS ? ['Firefox'] : ['Chrome'],
+    captureTimeout: 60000,
+    singleRun: true
+  })
+}

package.json

@@ -5,7 +5,9 @@
   "main": "src/index.js",
   "scripts": {
     "lint": "standard",
-    "test": "mocha tests/*-test.js",
+    "test:node": "mocha tests/*-test.js",
+    "test:browser": "node tests/browser-nodejs/test.js",
+    "test": "npm run test:node && npm run test:browser",
     "compliance": "node tests/compliance.js"
   },
   "pre-commit": [
@@ -26,15 +28,25 @@
   },
   "homepage": "https://github.com/diasdavid/js-libp2p-spdy",
   "devDependencies": {
+    "bl": "^1.1.2",
     "chai": "^3.5.0",
     "interface-stream-muxer": "^0.3.1",
+    "karma": "^0.13.22",
+    "karma-chrome-launcher": "^0.2.2",
+    "karma-firefox-launcher": "^0.1.7",
+    "karma-mocha": "^0.2.2",
+    "karma-spec-reporter": "0.0.24",
+    "karma-webpack": "^1.7.0",
+    "libp2p-websockets": "^0.2.1",
     "pre-commit": "^1.1.2",
     "standard": "^6.0.7",
     "stream-pair": "^1.0.3",
     "tape": "^4.2.0",
-    "timed-tape": "^0.1.0"
+    "timed-tape": "^0.1.0",
+    "webpack": "^2.1.0-beta.4"
   },
   "dependencies": {
+    "browserify-zlib": "github:ipfs/browserify-zlib",
     "mocha": "^2.4.5",
     "spdy-transport": "^2.0.10"
   }

tests/browser-nodejs/browser.js

@@ -0,0 +1,38 @@
+/* eslint-env mocha */
+
+const expect = require('chai').expect
+const WSlibp2p = require('libp2p-websockets')
+const spdy = require('./../../src')
+const multiaddr = require('multiaddr')
+
+describe('browser + server', () => {
+  var ws
+  before((done) => {
+    ws = new WSlibp2p()
+    done()
+  })
+
+  it('ricochet test', (done) => {
+    const mh = multiaddr('/ip4/127.0.0.1/tcp/9095/websockets')
+
+    const transportSocket = ws.dial(mh)
+
+    const muxedConn = spdy(transportSocket, false)
+
+    muxedConn.on('stream', (conn) => {
+      conn.on('data', (data) => {
+        expect(data.toString()).to.equal('hey')
+      })
+
+      conn.on('end', () => {
+        conn.end()
+      })
+    })
+
+    const conn = muxedConn.newStream()
+    conn.write('hey')
+    conn.end()
+    conn.on('data', () => {}) // let it floooow
+    conn.on('end', done)
+  })
+})

tests/browser-nodejs/test.js

@@ -0,0 +1,35 @@
+const karma = require('karma')
+const path = require('path')
+const WSlibp2p = require('libp2p-websockets')
+const multiaddr = require('multiaddr')
+const spdy = require('./../../src')
+
+var ws
+
+function createListener (done) {
+  ws = new WSlibp2p()
+  const mh = multiaddr('/ip4/127.0.0.1/tcp/9095/websockets')
+  ws.createListener(mh, (transportSocket) => {
+    const muxedConn = spdy(transportSocket, true)
+
+    muxedConn.on('stream', (connRx) => {
+      const connTx = muxedConn.newStream()
+      connRx.pipe(connTx)
+      connTx.pipe(connRx)
+    })
+  }, done)
+}
+
+function run (done) {
+  const karmaServer = new karma.Server({
+    configFile: path.join(__dirname, '../../karma.conf.js')
+  }, done)
+
+  return karmaServer.start()
+}
+
+createListener(() => {
+  run((exitCode) => {
+    process.exit(exitCode)
+  })
+})

tests/spdy-over-ws-test.js

@@ -0,0 +1,131 @@
+/* eslint-env mocha */
+
+const expect = require('chai').expect
+const WSlibp2p = require('libp2p-websockets')
+const multiaddr = require('multiaddr')
+const bl = require('bl')
+const spdy = require('../src')
+const path = require('path')
+const fs = require('fs')
+
+describe('spdy-over-ws', () => {
+  var listener
+  var dialer
+
+  var ws
+  var mh = multiaddr('/ip4/127.0.0.1/tcp/9090/websockets')
+
+  before((done) => {
+    ws = new WSlibp2p()
+
+    done()
+  })
+
+  it('attach to a websocket, as listener', (done) => {
+    ws.createListener(mh, (socket) => {
+      expect(socket).to.exist
+      listener = spdy(socket, true)
+      expect(listener).to.exist
+    }, done)
+  })
+
+  it('attach to a websocket, as dialer', (done) => {
+    const socket = ws.dial(mh)
+    expect(socket).to.exist
+    dialer = spdy(socket, false)
+    expect(dialer).to.exist
+    done()
+  })
+
+  it('open a multiplex stream from dialer', (done) => {
+    listener.once('stream', (conn) => {
+      conn.pipe(conn)
+    })
+
+    const conn = dialer.newStream()
+
+    conn.on('error', (err) => {
+      expect(err).to.not.exist
+    })
+
+    conn.on('data', () => {}) // otherwise data doesn't flow
+    conn.on('end', done)
+    conn.end()
+  })
+
+  it('open a multiplex stream from listener', (done) => {
+    dialer.once('stream', (conn) => {
+      conn.pipe(conn)
+    })
+
+    const conn = listener.newStream()
+
+    conn.on('error', (err) => {
+      expect(err).to.not.exist
+    })
+
+    conn.on('data', () => {}) // otherwise data doesn't flow
+    conn.on('end', done)
+    conn.end()
+  })
+
+  it('open a spdy stream from dialer and write to it', (done) => {
+    listener.once('stream', (conn) => {
+      conn.pipe(conn)
+    })
+
+    const conn = dialer.newStream()
+    conn.write('hello world')
+    conn.end()
+
+    conn.on('error', (err) => {
+      expect(err).to.not.exist
+    })
+    conn.pipe(bl((err, data) => {
+      expect(err).to.not.exist
+      expect(data.toString()).to.equal('hello world')
+      done()
+    }))
+  })
+
+  it('open a spdy stream from listener and write to it', (done) => {
+    dialer.once('stream', (conn) => {
+      conn.pipe(conn)
+    })
+
+    const conn = listener.newStream()
+    conn.write('hello world')
+    conn.end()
+
+    conn.on('error', (err) => {
+      expect(err).to.not.exist
+    })
+    conn.pipe(bl((err, data) => {
+      expect(err).to.not.exist
+      expect(data.toString()).to.equal('hello world')
+      done()
+    }))
+  })
+
+  it('open a spdy stream from listener and write a lot', (done) => {
+    dialer.once('stream', (conn) => {
+      conn.pipe(conn)
+    })
+
+    const filePath = path.join(process.cwd(), '/tests/test-data/1.2MiB.txt')
+
+    const conn = listener.newStream()
+    fs.createReadStream(filePath).pipe(conn)
+
+    conn.on('error', (err) => {
+      expect(err).to.not.exist
+    })
+
+    conn.pipe(bl((err, data) => {
+      expect(err).to.not.exist
+      const expected = fs.readFileSync(filePath)
+      expect(data).to.deep.equal(expected)
+      done()
+    }))
+  })
+})

tests/spdy-test.js

@@ -46,7 +46,7 @@ describe('spdy', () => {
     conn.end()
   })
 
-  it('open a multiplex stream from server', (done) => {
+  it('open a multiplex stream from listener', (done) => {
     dialer.once('stream', (conn) => {
       conn.pipe(conn)
     })