From 097b29682859a8a61572d998e6d309fef037c395 Mon Sep 17 00:00:00 2001
From: BuildTools <buffer@sidekek.ml>
Date: Sat, 25 Sep 2021 20:22:58 -0400
Subject: [PATCH] remove client, msg class

---
 client/manager_client.py | 11 -----------
 server/msg.py            | 12 ++++++++++++
 server/server.py         |  6 ++++--
 3 files changed, 16 insertions(+), 13 deletions(-)
 delete mode 100644 client/manager_client.py
 create mode 100644 server/msg.py

diff --git a/client/manager_client.py b/client/manager_client.py
deleted file mode 100644
index a9770ef..0000000
--- a/client/manager_client.py
+++ /dev/null
@@ -1,11 +0,0 @@
-import socket
-s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-s.connect(("192.168.1.2", 1337))
-while True:
-    data = s.recv(1024)
-    if not data:
-        continue
-    msg = data.decode("ASCII")
-    if msg == "STA":
-        print("[SOUND THE ALARM]")
-s.close()
\ No newline at end of file
diff --git a/server/msg.py b/server/msg.py
new file mode 100644
index 0000000..ffe16f3
--- /dev/null
+++ b/server/msg.py
@@ -0,0 +1,12 @@
+import json
+class msg:
+    def __init__(self, t, b):
+        self.type = t
+        self.body = b
+    def unpack_data(self, data):
+        as_str = data.decode("ASCII")
+        as_json = json.loads(as_str)
+        self.type = as_json["type"]
+        self.body = as_json["body"]
+    def pack(self):
+        return json.dumps(self.__dict__).encode("ASCII")
\ No newline at end of file
diff --git a/server/server.py b/server/server.py
index f22139a..faccfc3 100644
--- a/server/server.py
+++ b/server/server.py
@@ -6,6 +6,8 @@ import alarm
 import http_server
 import asyncio
 from aiohttp import web
+import msg
+import json
 
 class server:
     def __init__(self, address, port):
@@ -27,14 +29,14 @@ class server:
         het = threading.Thread(target=self.launch_http_server, args=(runner,))
         het.start()
 
-        self.tasks.append(alarm.alarm(time.time() + 30))
+        # self.tasks.append(alarm.alarm(time.time() + 30))
 
         while True:
             time.sleep(10)
             for task in self.tasks:
                 if task.check():
                     for c in self.clients:
-                        c.sock.sendall("STA".encode("ASCII"))
+                        c.sock.sendall(msg.msg("task", json.dumps(task.__dict__)))
     def handle_connections(self):
         while True:
             (client_sock, address) = self.sock.accept()