From a9793807befcbe99a853612d1d30313fa3271606 Mon Sep 17 00:00:00 2001
From: Kyle Johnsen <kjohnsen@uga.edu>
Date: Mon, 20 Dec 2021 11:33:01 -0500
Subject: [PATCH] small changes after talking with brook

---
 server_basics.txt  | 30 ++++++++++++++++++++++--------
 threaded_server.py | 12 +++---------
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/server_basics.txt b/server_basics.txt
index 540de42..87cf8aa 100644
--- a/server_basics.txt
+++ b/server_basics.txt
@@ -18,22 +18,36 @@ Join room - The server will put you in a valid room, or it will create a room an
 
 2:room:password\n 
 
+2:-1\n - Leave room, this should choose a new room owner or something
+
 Send message - You can say "all", "others", or list specific users that should receive the message.  
 3:0:Message\n - others in room
-3:1:Message\n - others in room
-3:2:u1:u2...:uN:Message\n - others
+3:1:Message\n - all in room
+3:2:Message\n - others in the room, at once, meaning order is maintained
+3:3:Message\n - all in room, order maintained
+3:4:u1:u2...:uN:Message\n - others
 
 OUTGOING MESSAGES (send by server)
 
 Session_started - you know you are logged in, subsequent commands will succeed
 0:[client_id]\n
 
-Session_ended - you know you are logged out, subsequent commands will fail
-0:-1\n
+rooms - a list of rooms on the server, with counts
+1:r1-N,r2-N...\n
 
-rooms - a list of rooms on the server, each with a list of user_ids that are in the room. 
-1:r1,u1,u2:r2,u3,u4:r3,u5,u6:r4\n
+2:user_id:room_joined\n - room joined
+2:user_id:\n - room left
+
+3:user_id:Message\n - message from sender user_id
+
+
+Unity-side. 
+
+Instantiate message creates a network id, assigning that player as owner
+--A network id is a simple number + the creator server id, which uniquely identifies it
+
+Take ownership reassigns a player as owner. Must use the order_maintained parts above.
+
+Update network id sends a packet to specifically serialize parts of an object that have changed.  A change flag indicates what parts have changed.  
 
-message - a message sent by someone on the server, who may or may not be in your room.  This is simply interpreted by the user, so it's not the server's problem to solve.  It will be the client's responsibility to do something.  This can be used, for example to ask a user to join your room, or implement a party system.  
 
-3:Message\n
diff --git a/threaded_server.py b/threaded_server.py
index 7aaea99..3d6e4b7 100644
--- a/threaded_server.py
+++ b/threaded_server.py
@@ -3,18 +3,12 @@ import socket
 from _thread import *
 import threading
 import types
-#each room gets a message queue.  This is created upon joining a room.  
-#List of room message queues is a locked resource for all threads.  
-#List of clients is a locked resource for all threads.
-#Each client has a message queue.  
-#client write thread draws from this message queue
-#client read thread reads from client, and when it gets a complete message, adds it to the message queue
-#client has a read thread, write thread, 
 
 rooms = {} #will be a list of room objects.  #this must be locked when when adding or removing rooms
 rooms_lock = threading.Lock()
 client_dict = {} #will be a list of client objects.  #this must be locked when adding or removing clients
 client_lock = threading.Lock()
+
 HOST = ""
 PORT = 80
 
@@ -162,7 +156,6 @@ def client_read_thread(conn, addr, client):
     del client_dict[client.id] #remove the client from the list of clients...
     rooms_lock.release()
     client_lock.release()
-    print("sending room message")
     send_room_message(client.room, f"2:{client.id}:\n")
     print("client destroyed")
 def client_write_thread(conn, addr, client):
@@ -179,6 +172,7 @@ def client_write_thread(conn, addr, client):
         client.message_ready.wait()
         client.message_ready.clear()
     client.write_thread_dead = True
+
 with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
     sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
    
@@ -192,7 +186,7 @@ with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
                                         alive=True, 
                                         message_queue=[],
                                         message_lock=threading.Lock(), 
-                                        inb='',
+                                        inb='', #read buffer
                                         message_ready=threading.Event(),
                                         logged_in=False,
                                         username='',