X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;ds=sidebyside;f=rogue_chat_curses.py;h=203f3eaefec758c879b3b7bc9edc451f2e385113;hb=27c9f26f715fd388087beea4b2cfb7eb495b1cc3;hp=946c8ae3315e86f5c645d002dc0a1ca6138923d6;hpb=35a30b2b2579f5cac20ba94cd5e162d11fd283ee;p=plomrogue2

diff --git a/rogue_chat_curses.py b/rogue_chat_curses.py
index 946c8ae..203f3ea 100755
--- a/rogue_chat_curses.py
+++ b/rogue_chat_curses.py
@@ -2,6 +2,7 @@
 import curses
 import queue
 import threading
+import time
 from plomrogue.game import GameBase
 from plomrogue.parser import Parser
 from plomrogue.mapping import YX, MapGeometrySquare, MapGeometryHex
@@ -257,11 +258,47 @@ class TUI:
             for k in keys_conf:
                 self.keys[k] = keys_conf[k]
         self.show_help = False
+        self.disconnected = True
+        self.force_instant_connect = True
+        self.input_lines = []
         curses.wrapper(self.loop)
 
     def flash(self):
         curses.flash()
 
+    def connect(self):
+
+        def handle_recv(msg):
+            if msg == 'BYE':
+                self.socket.close()
+            else:
+                self.queue.put(msg)
+
+        self.log_msg('@ attempting connect')
+        socket_client_class = PlomSocketClient
+        if self.host.startswith('ws://') or self.host.startswith('wss://'):
+            socket_client_class = WebSocketClient
+        try:
+            self.socket = socket_client_class(handle_recv, self.host)
+            self.socket_thread = threading.Thread(target=self.socket.run)
+            self.socket_thread.start()
+            self.disconnected = False
+            self.socket.send('TASKS')
+            self.switch_mode('login')
+        except ConnectionRefusedError:
+            self.log_msg('@ server connect failure')
+            self.disconnected = True
+            self.switch_mode('waiting_for_server')
+        self.do_refresh = True
+
+    def reconnect(self):
+        self.log_msg('@ attempting reconnect')
+        self.send('QUIT')
+        time.sleep(0.1)  # FIXME necessitated by some some strange SSL race
+                         # conditions with ws4py, find out what exactly
+        self.switch_mode('waiting_for_server')
+        self.connect()
+
     def send(self, msg):
         try:
             if hasattr(self.socket, 'plom_closed') and self.socket.plom_closed:
@@ -269,6 +306,8 @@ class TUI:
             self.socket.send(msg)
         except (BrokenPipeError, BrokenSocketConnection):
             self.log_msg('@ server disconnected :(')
+            self.disconnected = True
+            self.force_instant_connect = True
             self.do_refresh = True
 
     def log_msg(self, msg):
@@ -310,7 +349,6 @@ class TUI:
         self.restore_input_values()
 
     def loop(self, stdscr):
-        import time
         import datetime
 
         def safe_addstr(y, x, line):
@@ -324,38 +362,6 @@ class TUI:
                 stdscr.insstr(y, self.size.x - 2, ' ')
                 stdscr.addstr(y, x, cut)
 
-        def connect():
-
-            def handle_recv(msg):
-                if msg == 'BYE':
-                    self.socket.close()
-                else:
-                    self.queue.put(msg)
-
-            socket_client_class = PlomSocketClient
-            if self.host.startswith('ws://') or self.host.startswith('wss://'):
-                socket_client_class = WebSocketClient
-            while True:
-                try:
-                    self.socket = socket_client_class(handle_recv, self.host)
-                    self.socket_thread = threading.Thread(target=self.socket.run)
-                    self.socket_thread.start()
-                    self.socket.send('TASKS')
-                    self.switch_mode('login')
-                    return
-                except ConnectionRefusedError:
-                    self.log_msg('@ server connect failure, trying again …')
-                    draw_screen()
-                    stdscr.refresh()
-                    time.sleep(1)
-
-        def reconnect():
-            self.send('QUIT')
-            time.sleep(0.1)  # FIXME necessitated by some some strange SSL race
-                             # conditions with ws4py, find out what exactly
-            self.switch_mode('waiting_for_server')
-            connect()
-
         def handle_input(msg):
             command, args = self.parser.parse(msg)
             command(*args)
@@ -495,8 +501,8 @@ class TUI:
                 map_y += 1
 
         def draw_help():
-            content = "%s mode help (hit any key to disappear)\n\n%s\n\n" % (self.mode.name,
-                                                            self.mode.help_intro)
+            content = "%s mode help\n\n%s\n\n" % (self.mode.name,
+                                                  self.mode.help_intro)
             if self.mode == self.mode_play:
                 content += "Available actions:\n"
                 if 'MOVE' in self.game.tasks:
@@ -559,13 +565,18 @@ class TUI:
         self.explorer = YX(0, 0)
         self.input_ = ''
         input_prompt = '> '
-        connect()
-        last_ping = datetime.datetime.now()
-        interval = datetime.timedelta(seconds=30)
+        interval = datetime.timedelta(seconds=5)
+        last_ping = datetime.datetime.now() - interval
         while True:
+            if self.disconnected and self.force_instant_connect:
+                self.force_instant_connect = False
+                self.connect()
             now = datetime.datetime.now()
             if now - last_ping > interval:
-                self.send('PING')
+                if self.disconnected:
+                    self.connect()
+                else:
+                    self.send('PING')
                 last_ping = now
             if self.do_refresh:
                 draw_screen()
@@ -613,8 +624,6 @@ class TUI:
                         self.switch_mode('play')
                     elif self.input_ in {'/' + self.keys['switch_to_study'], '/study'}:
                         self.switch_mode('study')
-                    elif self.input_ == '/reconnect':
-                        reconnect()
                     elif self.input_.startswith('/nick'):
                         tokens = self.input_.split(maxsplit=1)
                         if len(tokens) == 2:
@@ -650,7 +659,7 @@ class TUI:
             elif self.mode == self.mode_teleport and key == '\n':
                 if self.input_ == 'YES!':
                     self.host = self.teleport_target_host
-                    reconnect()
+                    self.reconnect()
                 else:
                     self.log_msg('@ teleport aborted')
                     self.switch_mode('play')