test(interop): add js to js test

Author: dignifiedquire

test/interop/daemons/js.js

@@ -9,16 +9,37 @@ const IPFSRepo = require('ipfs-repo')
 const IPFS = require('../../../src/core')
 const HTTPAPI = require('../../../src/http-api')
 
+function setPorts (ipfs, port, callback) {
+  series([
+    (cb) => ipfs.config.set(
+      'Addresses.Gateway',
+      '/ip4/127.0.0.1/tcp/' + (9090 + port),
+      cb
+    ),
+    (cb) => ipfs.config.set(
+      'Addresses.API',
+      '/ip4/127.0.0.1/tcp/' + (5002 + port),
+      cb
+    ),
+    (cb) => ipfs.config.set(
+      'Addresses.Swarm',
+      ['/ip4/0.0.0.0/tcp/' + (4002 + port)],
+      cb
+    )
+  ], callback)
+}
+
 class JsDaemon {
   constructor (opts) {
-    opts = opts || {
+    opts = Object.assign({}, {
       disposable: true,
       init: true
-    }
+    }, opts || {})
 
     this.path = opts.path
     this.disposable = opts.disposable
     this.init = opts.init
+    this.port = opts.port
 
     this.path = opts.path || os.tmpdir() + `/${Math.ceil(Math.random() * 1000)}`
     if (this.init) {
@@ -41,6 +62,14 @@ class JsDaemon {
           cb()
         }
       },
+      (cb) => {
+        if (this.port) {
+          console.log('setting to port', this.port)
+          setPorts(this.ipfs, this.port, cb)
+        } else {
+          cb()
+        }
+      },
       (cb) => {
         this.node = new HTTPAPI(this.ipfs._repo)
         this.node.start(cb)

test/interop/index.js

@@ -14,21 +14,25 @@ const JsDaemon = require('./daemons/js')
 describe('basic', () => {
   let goDaemon
   let jsDaemon
+  let js2Daemon
 
   before((done) => {
     goDaemon = new GoDaemon()
     jsDaemon = new JsDaemon()
+    js2Daemon = new JsDaemon({port: 1})
 
     parallel([
       (cb) => goDaemon.start(cb),
-      (cb) => jsDaemon.start(cb)
+      (cb) => jsDaemon.start(cb),
+      (cb) => js2Daemon.start(cb)
     ], done)
   })
 
   after((done) => {
-    parallel([
+    series([
       (cb) => goDaemon.stop(cb),
-      (cb) => jsDaemon.stop(cb)
+      (cb) => jsDaemon.stop(cb),
+      (cb) => js2Daemon.stop(cb)
     ], done)
   })
 
@@ -60,8 +64,36 @@ describe('basic', () => {
     ], done)
   })
 
+  it('connect js <-> js', (done) => {
+    let jsId
+    let js2Id
+
+    series([
+      (cb) => parallel([
+        (cb) => jsDaemon.api.id(cb),
+        (cb) => js2Daemon.api.id(cb)
+      ], (err, ids) => {
+        expect(err).to.not.exist
+        jsId = ids[0]
+        js2Id = ids[1]
+        cb()
+      }),
+      (cb) => js2Daemon.api.swarm.connect(jsId.addresses[0], cb),
+      (cb) => jsDaemon.api.swarm.connect(js2Id.addresses[0], cb),
+      (cb) => parallel([
+        (cb) => js2Daemon.api.swarm.peers(cb),
+        (cb) => jsDaemon.api.swarm.peers(cb)
+      ], (err, peers) => {
+        expect(err).to.not.exist
+        expect(peers[0].map((p) => p.peer.toB58String())).to.include(jsId.id)
+        expect(peers[1].map((p) => p.peer.toB58String())).to.include(js2Id.id)
+        cb()
+      })
+    ], done)
+  })
+
   it('cat file: go -> js', (done) => {
-    const data = crypto.randomBytes(1024 * 5)
+    const data = crypto.randomBytes(1024 * 1024)
     waterfall([
       (cb) => goDaemon.api.add(data, cb),
       (res, cb) => jsDaemon.api.cat(res[0].hash, cb),
@@ -74,7 +106,8 @@ describe('basic', () => {
   })
 
   it('cat file: js -> go', (done) => {
-    const data = crypto.randomBytes(1024 * 5)
+    // This will fail once the size is increased to 64512 = 1024 * 63
+    const data = crypto.randomBytes(1024 * 63 - 1)
     waterfall([
       (cb) => jsDaemon.api.add(data, cb),
       (res, cb) => goDaemon.api.cat(res[0].hash, cb),
@@ -85,4 +118,17 @@ describe('basic', () => {
       done()
     })
   })
+
+  it('cat file: js -> js', (done) => {
+    const data = crypto.randomBytes(1024 * 1024)
+    waterfall([
+      (cb) => js2Daemon.api.add(data, cb),
+      (res, cb) => jsDaemon.api.cat(res[0].hash, cb),
+      (stream, cb) => stream.pipe(bl(cb))
+    ], (err, file) => {
+      expect(err).to.not.exist
+      expect(file).to.be.eql(data)
+      done()
+    })
+  })
 })