Update local server to run on 0.0.0.0 by default, add host param to connect method

michalsnik · michalsnik · commit 3ef10b8910b8 · 2018-01-18T22:46:57.000+01:00
diff --git a/shells/electron/index.js b/shells/electron/index.js
@@ -1,7 +1,8 @@
 require('./build/hook.js')
 
 module.exports = {
-  connect: () => {
+  connect: (host) => {
+    window.__VUE_DEVTOOLS_HOST__ = host
     require('./build/backend.js')
   }
 }
diff --git a/shells/electron/server.js b/shells/electron/server.js
@@ -32,6 +32,6 @@ io.on('connection', function (socket) {
   })
 })
 
-http.listen(port, () => {
-  console.log('listening on *:' + port)
+http.listen(port, '0.0.0.0', () => {
+  console.log('listening on 0.0.0.0:' + port)
 })
diff --git a/shells/electron/src/backend.js b/shells/electron/src/backend.js
@@ -3,6 +3,10 @@ import { initBackend } from 'src/backend'
 import Bridge from 'src/bridge'
 import { installToast } from 'src/backend/toast'
 
+const host = window.__VUE_DEVTOOLS_HOST__ || 'http://localhost'
+const port = process.env.PORT || 8098
+const socket = io(host + ':' + port)
+
 const connectedMessage = () => {
   if (window.__VUE_DEVTOOLS_TOAST__) {
     window.__VUE_DEVTOOLS_TOAST__('Remote Devtools Connected', 'normal')
@@ -15,40 +19,37 @@ const disconnectedMessage = () => {
   }
 }
 
-(function () {
-  const host = window.__VUE_DEVTOOLS_HOST__ || 'http://localhost'
-  const port = process.env.PORT || 8098
-  const socket = io(host + ':' + port)
-
-  // Disconnect socket once other client is connected
-  socket.on('vue-devtools-disconnect-backend', () => {
-    socket.disconnect()
-  })
-
-  // Global disconnect handler. Fires in two cases:
-  // - after calling above socket.disconnect()
-  // - once devtools is closed (that's why we need socket.disconnect() here too, to prevent further polling)
-  socket.on('disconnect', (reason) => {
-    socket.disconnect()
-    disconnectedMessage()
-  })
-
-  const bridge = new Bridge({
-    listen (fn) {
-      socket.on('vue-message', data => fn(data))
-    },
-    send (data) {
-      socket.emit('vue-message', data)
-    }
-  })
-
-  bridge.on('shutdown', () => {
-    socket.disconnect()
-    disconnectedMessage()
-  })
-
-  installToast(window)
-  initBackend(bridge)
-  socket.emit('vue-devtools-init')
+socket.on('connect', () => {
   connectedMessage()
-}())
+})
+
+// Global disconnect handler. Fires in two cases:
+// - after calling above socket.disconnect()
+// - once devtools is closed (that's why we need socket.disconnect() here too, to prevent further polling)
+socket.on('disconnect', (reason) => {
+  socket.disconnect()
+  disconnectedMessage()
+})
+
+// Disconnect socket once other client is connected
+socket.on('vue-devtools-disconnect-backend', () => {
+  socket.disconnect()
+})
+
+const bridge = new Bridge({
+  listen (fn) {
+    socket.on('vue-message', data => fn(data))
+  },
+  send (data) {
+    socket.emit('vue-message', data)
+  }
+})
+
+bridge.on('shutdown', () => {
+  socket.disconnect()
+  disconnectedMessage()
+})
+
+installToast(window)
+initBackend(bridge)
+socket.emit('vue-devtools-init')

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`require('./build/hook.js')`
`2`	`2`
`3`	`3`	`module.exports = {`
`4`		`- connect: () => {`
	`4`	`+ connect: (host) => {`
	`5`	`+ window.__VUE_DEVTOOLS_HOST__ = host`
`5`	`6`	`require('./build/backend.js')`
`6`	`7`	`}`
`7`	`8`	`}`