2 files changed, 57 insertions, 36 deletions
diff --git a/include/libsock/server/client.hpp b/include/libsock/server/client.hpp
index 9c7fc9f..1799f34 100644
--- a/include/libsock/server/client.hpp
+++ b/include/libsock/server/client.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "../types.hpp"
-#include "server.hpp"
 #include <any>
 #include <format>
 #include <functional>
@@ -9,12 +8,16 @@
 #include <optional>
 #include <string>
 #include <sys/socket.h>
-#include <thread>
-#include <vector>
 
 namespace LibSock {
 namespace Server {
 
+class Server;
+class Clients;
+
+extern SP<Server>  pServer;
+extern SP<Clients> pClients;
+
 struct SRecvData {
 	std::string	 data;
 	const size_t size = 1024;
@@ -31,9 +34,6 @@ enum eEventType : std::uint8_t {
 	WRITE
 };
 
-class Clients;
-inline SP<Clients> pClients;
-
 class Client {
   public:
 	~Client();
@@ -70,35 +70,5 @@ class Client {
 	friend class Clients;
 };
 
-struct SData {
-	std::string				  msg;
-	std::optional<WP<Client>> sender = std::nullopt;
-};
-
-class Clients {
-  public:
-	Clients();
-	~Clients();
-
-	WP<Client> newClient(std::optional<std::function<std::any(WP<Client>)>> cb = std::nullopt);
-
-	void broadcast(const std::string &msg, std::optional<WP<Client>> self = std::nullopt); // second param only specified when we want to exclude the sender
-	void kick(WP<Client> client, const bool kill = false, const std::string &reason = "", std::optional<std::function<std::any(const std::vector<std::pair<std::jthread, SP<Client>>>::iterator &)>> cb = std::nullopt);
-	void addClient(const Client &client);
-
-	void shutdownClients(std::optional<std::function<std::any(const std::vector<std::pair<std::jthread, SP<Client>>> &)>> cb = std::nullopt);
-
-	SP<Client>				getByIp(const std::string &ip) const;
-	std::vector<SP<Client>> getClients() const;
-	std::vector<SData>		getDatas() const;
-
-  private:
-	void broadcast(const SData &msg);
-
-	std::vector<std::pair<std::jthread, SP<Client>>> m_vClients;
-	std::vector<SData>								 m_vDatas;
-
-	friend class Client;
-};
 } // namespace Server
 } // namespace LibSock
diff --git a/include/libsock/server/clients.hpp b/include/libsock/server/clients.hpp
new file mode 100644
index 0000000..9b94127
--- /dev/null
+++ b/include/libsock/server/clients.hpp
@@ -0,0 +1,51 @@
+#pragma once
+
+#include "../types.hpp"
+#include <any>
+#include <functional>
+#include <optional>
+#include <string>
+#include <thread>
+#include <vector>
+
+namespace LibSock {
+namespace Server {
+
+class Client;
+
+struct SData {
+	std::string				  msg;
+	std::optional<WP<Client>> sender = std::nullopt;
+};
+class Clients {
+  public:
+	Clients();
+	~Clients();
+
+	WP<Client> newClient(
+		std::optional<std::function<std::any(WP<Client>)>> cb = std::nullopt
+	);
+
+	void broadcast(const std::string		&msg,
+				   std::optional<WP<Client>> self = std::nullopt); // second param only specified when we
+																   // want to exclude the sender
+	void kick(WP<Client> client, const bool kill = false, const std::string &reason = "", std::optional<std::function<std::any(const std::vector<std::pair<std::jthread, SP<Client>>>::iterator &)>> cb = std::nullopt);
+	void addClient(const Client &client);
+
+	void shutdownClients(std::optional<std::function<std::any(const std::vector<std::pair<std::jthread, SP<Client>>> &)>> cb = std::nullopt);
+
+	SP<Client>				getByIp(const std::string &ip) const;
+	std::vector<SP<Client>> getClients() const;
+	std::vector<SData>		getDatas() const;
+
+  private:
+	void broadcast(const SData &msg);
+
+	std::vector<std::pair<std::jthread, SP<Client>>> m_vClients;
+	std::vector<SData>								 m_vDatas;
+
+	friend class Client;
+};
+
+} // namespace Server
+} // namespace LibSock