메시지 전송부분 수정

Author: woo1

client.html

@@ -18,7 +18,8 @@
 
       ws.onmessage = function(e) {
         // e.data contains received string.
-        output("onmessage: " + e.data);
+        const data = JSON.parse(e.data)
+        output(data.id+": " + data.msg);
       };
 
       ws.onclose = function() {
@@ -36,7 +37,7 @@
       var input = document.getElementById("input");
       // You can send message to the Web Socket using ws.send.
       ws.send(input.value);
-      output("send: " + input.value);
+      //output("send: " + input.value);
       input.value = "";
       input.focus();
     }

server.py

@@ -1,9 +1,13 @@
 from websocket_server import WebsocketServer
+import json
+
+def get_msg_bytes(cliend_id, msg):
+	return json.dumps({"id": cliend_id, "msg": msg})
 
 # Called for every client connecting (after handshake)
 def new_client(client, server):
 	print("New client connected and was given id %d" % client['id'])
-	server.send_message_to_all("Hey all, a new client has joined us")
+	server.send_message_to_all(get_msg_bytes("server", str(client['id']) + " has joined us"))
 
 
 # Called for every client disconnecting
@@ -16,6 +20,7 @@ def message_received(client, server, message):
 	if len(message) > 200:
 		message = message[:200]+'..'
 	print("Client(%d) said: %s" % (client['id'], message))
+	server.send_message_to_all(get_msg_bytes(client['id'], message))
 
 
 PORT=9001