Last command left.

Author: korobool

korobool/chat/Threaded.py

@@ -48,8 +48,8 @@ def notify(self, message):
 
     def close(self):
         # Send closing message to client and then close the connection
-        print('Closing notification to client is not implemented yet...')
         self.closing = True
+        self.send({'cmd': 'CMD_CLOSE'})
         self.thread.join()
 
     # These methods ere executed in separate thread. Be aware of synchronization issues.
@@ -64,6 +64,11 @@ def __serve(stw):
             command = ServingThreadWrapper.__receive_and_parse_client_command(stw)
             ServingThreadWrapper.__process_command(stw, command)
 
+        print('trying to close client connection...')
+        ServingThreadWrapper.__process_server_messages_queue(stw)
+        stw.conn.close()
+        stw.notify({'cmd': 'CMD_CLIENT_LEFT', 'id': stw})
+
     @staticmethod
     def __process_server_messages_queue(stw):
 
@@ -97,13 +102,13 @@ def __receive_and_parse_client_command(stw):
             print('Protocol error. Closing client connection.')
             stw.closing = True
 
-        print('!DATA!\n', body)
+        # print('!DATA!\n', body)
 
         command = json.loads(body)
 
         if not command:
             print('Protocol error. Closing client connection.')
-            stw.closing = True
+            stw.close()
 
         return command
 
@@ -113,10 +118,6 @@ def __process_command(stw, command):
         print('new command from client received', command['cmd'])
         if command['cmd'] == 'CMD_PING':
             stw.send({'cmd': 'CMD_PONG', 'msg': 'pong from server'})
-
-        if command['cmd'] == 'CMD_BROADCAST':
-            stw.notify(command)
-
-        if command['cmd'] == 'CMD_MESSAGE':
+        else:
             stw.notify(command)
 

korobool/chat/chat_client.py

@@ -1,4 +1,7 @@
+from contextlib import closing
+import os
 import threading
+import sys
 
 __author__ = 'Oleksandr Korobov'
 
@@ -12,10 +15,21 @@
 s.connect((HOST, PORT))
 
 
+def close_client():
+    pid = os.getpid()
+    os.kill(pid, 9)
+
+
 def receive_and_parse_command():
+
     while True:
-        header = s.recv(4)
-        if not header: return
+        try:
+            header = s.recv(4)
+            if not header: break
+        except:
+            print('connection error. exiting...')
+            close_client()
+
 
         size = int(struct.unpack('i', header)[0])
         print('receiving bytes:', size)
@@ -25,6 +39,10 @@ def receive_and_parse_command():
 
         print('data from server', command)
 
+        if command['cmd'] == 'CMD_CLOSE':
+            close_client()
+
+
 read_thread = threading.Thread(target=receive_and_parse_command)
 read_thread.start()
 
@@ -48,6 +66,9 @@ def receive_and_parse_command():
         message = input("Enter message: ")
         package = {'cmd': 'CMD_MESSAGE', 'msg': message}
 
+    if command_text.upper() == 'SCLOSESERVER':
+        package = {'cmd': 'CMD_SCLOSESERVER'}
+
     data = json.dumps(package)
 
     b = bytes(data, 'utf-8')

korobool/chat/sever.py

@@ -1,4 +1,5 @@
 import sys
+import time
 
 __author__ = 'Oleksandr Korobov'
 
@@ -19,34 +20,50 @@ def __start_serve_connection(self, conn, addr):
         self.__clients_pool.append(stw)
 
     def __close_all_clients(self):
-        for client in self.__clients_pool:
-            client.close()
-        self.__clients_pool.clear()
+        print('closing ', len(self.__clients_pool), 'clients')
+        
+        while len(self.__clients_pool) > 0:
+            self.__clients_pool[0].close()
+        #self.socket.shutdown(socket.SHUT_RDWR)
+        self.socket.close()
 
     def serve(self):
         self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         self.socket.bind((self.host, self.port))
 
+        self.socket.settimeout(2)
         while not self.closing:
+
             self.socket.listen(5)
-            conn, addr = self.socket.accept()
-            self.__start_serve_connection(conn, addr)
+            try:
+                conn, addr = self.socket.accept()
+                self.__start_serve_connection(conn, addr)
+            except:
+                pass # Remove this awful exception swallowing
         self.__close_all_clients()
 
     def stop_serve(self):
         self.closing = True
-        print('Proper server closing  is not implemented yet...')
+        self.__close_all_clients()
 
     def notify(self, sender, message):
         print('Notification received:', message)
+
         if message['cmd'] == 'CMD_BROADCAST':
             for client in self.__clients_pool:
                 if not client is None and not client.closing:
                     #print('Posting to '. client.name)
                     client.post(message)
+
         if message['cmd'] == 'CMD_MESSAGE':
             client.post({'cmd': 'CMD_SEVER_WARNING', 'msg': 'message sending is not implemented yet'})
 
+        if message['cmd'] == 'CMD_CLIENT_LEFT':
+            print('Client left', message['id'])
+            self.__clients_pool.remove(message['id'])
+
+        if message['cmd'] == 'CMD_SCLOSESERVER':
+            self.closing = True
 
 chat_sever = ChatServer(PORT = 50007)
 
@@ -57,4 +74,4 @@ def signal_handler(signal, frame):
 
 signal.signal(signal.SIGINT, signal_handler)
 
-chat_sever.serve()
+chat_sever.serve()