Handle closing devtools, add comments

michalsnik · michalsnik · commit 9112156be6e6 · 2018-01-22T19:31:04.000+01:00
diff --git a/shells/electron/server.js b/shells/electron/server.js
@@ -17,6 +17,10 @@ io.on('connection', function (socket) {
   // Disconnect any previously connected apps
   socket.broadcast.emit('vue-devtools-disconnect-backend')
 
+  socket.on('vue-devtools-init', () => {
+    socket.broadcast.emit('vue-devtools-init')
+  })
+
   socket.on('disconnect', (reason) => {
     if (reason.indexOf('client')) {
       socket.broadcast.emit('vue-devtools-disconnect-devtools')
@@ -26,9 +30,6 @@ io.on('connection', function (socket) {
   socket.on('vue-message', data => {
     socket.broadcast.emit('vue-message', data)
   })
-  socket.on('vue-devtools-init', () => {
-    socket.broadcast.emit('vue-devtools-init')
-  })
 })
 
 http.listen(port, () => {
diff --git a/shells/electron/src/backend.js b/shells/electron/src/backend.js
@@ -19,13 +19,22 @@ const disconnectedMessage = () => {
   const port = process.env.PORT || 8098
   const socket = io('http://localhost:' + 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))
-      socket.on('vue-devtools-disconnect-backend', () => {
-        socket.disconnect()
-        disconnectedMessage()
-      })
     },
     send (data) {
       socket.emit('vue-message', data)
diff --git a/shells/electron/src/devtools.js b/shells/electron/src/devtools.js
@@ -14,9 +14,11 @@ socket.on('vue-devtools-disconnect-devtools', () => {
 })
 
 socket.on('vue-devtools-init', () => {
-  socket.off('vue-message')
   $intro.classList.add('hidden')
 
+  // Reset attached listeners
+  socket.off('vue-message')
+
   // If new page is opened reload devtools
   if (reload) return reload()
 
