Merge pull request #1494 from ethereum/refactorremixdcall

embark/index.js

@@ -12,6 +12,11 @@ module.exports = (embark) => {
   })
 
   server.listen(8080, '127.0.0.1', function () {})
-  var router = new remixd.Router()
-  router.start(path.join(__dirname, '/../../'))
+  var router = new remixd.Router(65520, remixd.services.sharedFolder, (webSocket) => {
+    remixd.services.sharedFolder.setWebSocket(webSocket)
+    var sharedFolder = path.join(__dirname, '/../../')
+    remixd.services.sharedFolder.setupNotifications(sharedFolder)
+    remixd.services.sharedFolder.sharedFolder(sharedFolder)
+  })
+  router.start()
 }

src/app.js

@@ -137,7 +137,7 @@ class App {
     registry.put({api: self._components.filesProviders['browser'], name: 'fileproviders/browser'})
     registry.put({api: self._components.filesProviders['config'], name: 'fileproviders/config'})
 
-    var remixd = new Remixd()
+    var remixd = new Remixd(65520)
     registry.put({api: remixd, name: 'remixd'})
     remixd.event.register('system', (message) => {
       if (message.error) toolTip(message.error)

src/lib/remixd.js

@@ -4,8 +4,9 @@ var modalDialog = require('../app/ui/modaldialog')
 var yo = require('yo-yo')
 
 class Remixd {
-  constructor () {
+  constructor (port) {
     this.event = new EventManager()
+    this.port = port
     this.callbacks = {}
     this.callid = 0
     this.socket = null
@@ -30,7 +31,7 @@ class Remixd {
       } catch (e) {}
     }
     this.event.trigger('connecting', [])
-    this.socket = new WebSocket('ws://localhost:65520', 'echo-protocol') // eslint-disable-line
+    this.socket = new WebSocket('ws://localhost:' + this.port, 'echo-protocol') // eslint-disable-line
 
     this.socket.addEventListener('open', (event) => {
       this.connected = true