X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=new2%2Frogue_chat_curses.py;h=0ffceeb2d4c5d64c5d60df1fb1e4e38881ffa403;hb=d2490690904d56c3d1fe9e92413dc7d74ad8ac70;hp=bb3dac263e84670c8f9ef851f8b87844d6b9e4a6;hpb=29930c6b44e4b1d5b60446c0b83059588a9e2d9e;p=plomrogue2-experiments diff --git a/new2/rogue_chat_curses.py b/new2/rogue_chat_curses.py index bb3dac2..0ffceeb 100755 --- a/new2/rogue_chat_curses.py +++ b/new2/rogue_chat_curses.py @@ -1,14 +1,49 @@ #!/usr/bin/env python3 import curses -import socket import queue import threading -from plomrogue.io_tcp import PlomSocket from plomrogue.game import GameBase from plomrogue.parser import Parser from plomrogue.mapping import YX, MapGeometrySquare, MapGeometryHex from plomrogue.things import ThingBase from plomrogue.misc import quote +from plomrogue.errors import BrokenSocketConnection + +from ws4py.client import WebSocketBaseClient +class WebSocketClient(WebSocketBaseClient): + + def __init__(self, recv_handler, *args, **kwargs): + super().__init__(*args, **kwargs) + self.recv_handler = recv_handler + self.connect() + + def received_message(self, message): + if message.is_text: + message = str(message) + self.recv_handler(message) + + @property + def plom_closed(self): + return self.client_terminated + +from plomrogue.io_tcp import PlomSocket +class PlomSocketClient(PlomSocket): + + def __init__(self, recv_handler, url): + import socket + self.recv_handler = recv_handler + host, port = url.split(':') + super().__init__(socket.create_connection((host, port))) + + def close(self): + self.socket.close() + + def run(self): + try: + for msg in self.recv(): + self.recv_handler(msg) + except BrokenSocketConnection: + pass # we assume socket will be known as dead by now def cmd_TURN(game, n): game.turn = n @@ -73,9 +108,7 @@ def cmd_GAME_STATE_COMPLETE(game): game.tui.query_info() player = game.get_thing(game.player_id, False) if player.position in game.portals: - #host, port = game.portals[player.position].split(':') game.tui.teleport_target_host = game.portals[player.position] - game.tui.teleport_target_port = 5000 game.tui.switch_mode('teleport') game.turn_complete = True game.tui.do_refresh = True @@ -152,11 +185,10 @@ class TUI: self.shows_info = shows_info self.is_intro = is_intro - def __init__(self, host, port): + def __init__(self, host): import os import json self.host = host - self.port = port self.mode_play = self.Mode('play') self.mode_study = self.Mode('study', shows_info=True) self.mode_edit = self.Mode('edit') @@ -176,19 +208,19 @@ class TUI: self.login_name = None self.switch_mode('waiting_for_server') self.keys = { - 'switch_to_chat': 'C', - 'switch_to_play': 'P', - 'switch_to_annotate': 'E', - 'switch_to_portal': 'p', + 'switch_to_chat': 't', + 'switch_to_play': 'p', + 'switch_to_annotate': 'm', + 'switch_to_portal': 'P', 'switch_to_study': '?', - 'switch_to_edit': 'E', - 'flatten': 'f', + 'switch_to_edit': 'm', + 'flatten': 'F', 'hex_move_upleft': 'w', 'hex_move_upright': 'e', 'hex_move_right': 'd', - 'hex_move_downright': 'c', - 'hex_move_downleft': 'x', - 'hex_move_left': 's', + 'hex_move_downright': 'x', + 'hex_move_downleft': 'y', + 'hex_move_left': 'a', 'square_move_up': 'w', 'square_move_left': 'a', 'square_move_down': 's', @@ -206,8 +238,10 @@ class TUI: def send(self, msg): try: + if hasattr(self.socket, 'plom_closed') and self.socket.plom_closed: + raise BrokenSocketConnection self.socket.send(msg) - except BrokenPipeError: + except (BrokenPipeError, BrokenSocketConnection): self.log_msg('@ server disconnected :(') self.do_refresh = True @@ -232,8 +266,7 @@ class TUI: else: self.log_msg('@ enter username') elif self.mode.name == 'teleport': - self.log_msg("@ May teleport to %s:%s" % (self.teleport_target_host, - self.teleport_target_port)); + self.log_msg("@ May teleport to %s" % (self.teleport_target_host)), self.log_msg("@ Enter 'YES!' to enthusiastically affirm."); elif self.mode.name == 'annotate' and self.explorer in self.game.info_db: info = self.game.info_db[self.explorer] @@ -248,8 +281,8 @@ class TUI: self.log_msg(" /nick NAME - re-name yourself to NAME"); self.log_msg(" /msg USER TEXT - send TEXT to USER"); self.log_msg(" /help - show this help"); - self.log_msg(" /P or /play - switch to play mode"); - self.log_msg(" /? or /study - switch to study mode"); + self.log_msg(" /%s or /play - switch to play mode" % self.keys['switch_to_play']); + self.log_msg(" /%s or /study - switch to study mode" % self.keys['switch_to_study']); self.log_msg("commands common to study and play mode:"); self.log_msg(" %s - move" % ','.join(self.movement_keys)); self.log_msg(" %s - switch to chat mode" % self.keys['switch_to_chat']); @@ -262,6 +295,7 @@ class TUI: self.log_msg(" %s - switch to play mode" % self.keys['switch_to_play']); def loop(self, stdscr): + import time def safe_addstr(y, x, line): if y < self.size.y - 1 or x + len(line) < self.size.x: @@ -275,19 +309,20 @@ class TUI: stdscr.addstr(y, x, cut) def connect(): - import time - def recv_loop(): - for msg in self.socket.recv(): - if msg == 'BYE': - break + 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: - s = socket.create_connection((self.host, self.port)) - self.socket = PlomSocket(s) - self.socket_thread = threading.Thread(target=recv_loop) + self.socket = socket_client_class(handle_recv, self.host) + self.socket_thread = threading.Thread(target=self.socket.run) self.socket_thread.start() self.switch_mode('login') return @@ -299,6 +334,8 @@ class TUI: 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() @@ -443,6 +480,7 @@ class TUI: draw_map() curses.curs_set(False) # hide cursor + curses.use_default_colors(); stdscr.timeout(10) reset_screen_size() self.explorer = YX(0, 0) @@ -520,7 +558,6 @@ class TUI: elif self.mode == self.mode_teleport and key == '\n': if self.input_ == 'YES!': self.host = self.teleport_target_host - self.port = self.teleport_target_port reconnect() else: self.log_msg('@ teleport aborted') @@ -552,4 +589,4 @@ class TUI: self.send('TASK:WRITE ' + key) self.switch_mode('play') -TUI('127.0.0.1', 5000) +TUI('127.0.0.1:5000')