Fix send

butterfly/routes.py

@@ -182,7 +182,7 @@ class TermWebSocket(Route, tornado.websocket.WebSocketHandler):
             if session in self.user_sessions:
                 # Session already here, registering websocket
                 self.user_sessions[session].append(self)
-                self.write_message(TermWebSocket.history[session])
+                self.write_message('S' + TermWebSocket.history[session])
                 # And returning, we don't want another terminal
                 return
             else:

butterfly/static/main.js

@@ -53,6 +53,10 @@
         term.resize(cols, rows, true);
         return;
       }
+      if (e.data[0] !== 'S') {
+        console.error('Garbage message');
+        return;
+      }
       if (t_queue) {
         clearTimeout(t_queue);
       }

butterfly/terminal.py

@@ -92,7 +92,7 @@ class Terminal(object):
                     .decode('utf-8')
                     .replace('\r', '')
                     .replace('\n', '\r\n'))
-            self.send(motd)
+            self.send('S' + motd)
 
         log.info('Forking pty for user %r' % self.user)
 

coffees/main.coffee

@@ -60,6 +60,10 @@ document.addEventListener 'DOMContentLoaded', ->
       term.resize cols, rows, true
       return
 
+    if e.data[0] isnt 'S'
+      console.error 'Garbage message'
+      return
+
     clearTimeout t_queue if t_queue
     queue += e.data.slice(1)
     if term.stop