From b46ba43e06aba714abc0afb29566a56d69891691 Mon Sep 17 00:00:00 2001
From: littleblack111 <littleblack11111@gmail.com>
Date: Mon, 16 Jun 2025 19:25:57 +0800
Subject: fix!: create new client without SP<Clients>(this) param

API: removed run(), use newClient() to accept a new client, now
returning a WP of the client instance
API: allow all cb to return std::any
---
 include/libsock/server/client.hpp | 10 +++++-----
 src/server/client.cpp             | 10 ++++------
 src/server/clients.cpp            | 15 ++++++---------
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/include/libsock/server/client.hpp b/include/libsock/server/client.hpp
index eb528a2..6a5aa88 100644
--- a/include/libsock/server/client.hpp
+++ b/include/libsock/server/client.hpp
@@ -2,6 +2,7 @@
 
 #include "../types.hpp"
 #include "server.hpp"
+#include <any>
 #include <format>
 #include <functional>
 #include <netinet/in.h>
@@ -42,9 +43,9 @@ class Client {
 	const std::string &getIp() const;
 	bool			   isAdmin() const;
 
-	UP<SRecvData> read(std::optional<std::function<void(const SRecvData &)>> cb = std::nullopt);
-	UP<SRecvData> read(const std::string &msg, std::optional<std::function<void(const SRecvData &)>> cb = std::nullopt);
-	bool		  write(const std::string &msg, std::optional<std::function<void(const SRecvData &)>> cb = std::nullopt);
+	UP<SRecvData> read(std::optional<std::function<std::any(const SRecvData &)>> cb = std::nullopt);
+	UP<SRecvData> read(const std::string &msg, std::optional<std::function<std::any(const SRecvData &)>> cb = std::nullopt);
+	bool		  write(const std::string &msg, std::optional<std::function<std::any(const SRecvData &)>> cb = std::nullopt);
 	template <typename... Args>
 	bool write(std::format_string<Args...> fmt, Args &&...args);
 
@@ -81,9 +82,8 @@ class Clients {
 	Clients();
 	~Clients();
 
-	void newClient(std::optional<std::function<void()>> cb = std::nullopt);
+	WP<Client> newClient(std::optional<std::function<std::any(WP<Client>)>> cb = std::nullopt);
 
-	void run(std::optional<std::function<void()>> 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 = "");
 	void addClient(const Client &client);
diff --git a/src/server/client.cpp b/src/server/client.cpp
index 5de8b79..f8dc1ca 100644
--- a/src/server/client.cpp
+++ b/src/server/client.cpp
@@ -75,8 +75,7 @@ void SRecvData::sanitize() {
 		data.clear();
 }
 
-UP<SRecvData>
-Client::read(std::optional<std::function<void(const SRecvData &)>> cb) {
+UP<SRecvData> Client::read(std::optional<std::function<std::any(const SRecvData &)>> cb) {
 	auto recvData = std::make_unique<SRecvData>();
 
 	recvData->data.resize(recvData->size);
@@ -99,11 +98,10 @@ Client::read(std::optional<std::function<void(const SRecvData &)>> cb) {
 	return recvData;
 }
 
-UP<SRecvData>
-Client::read(const std::string &msg, std::optional<std::function<void(const SRecvData &)>> cb) {
+UP<SRecvData> Client::read(const std::string &msg, std::optional<std::function<std::any(const SRecvData &)>> cb) {
 	write("{}", msg);
 	m_szReading = msg;
-	return read();
+	return read(cb);
 }
 
 void Client::run() {
@@ -126,7 +124,7 @@ bool Client::isValid() {
 		   err == 0;
 }
 
-bool Client::write(const std::string &msg, std::optional<std::function<void(const SRecvData &)>> cb) {
+bool Client::write(const std::string &msg, std::optional<std::function<std::any(const SRecvData &)>> cb) {
 	const auto r = write("{}", msg);
 	if (cb) {
 		auto recvData  = std::make_unique<SRecvData>();
diff --git a/src/server/clients.cpp b/src/server/clients.cpp
index 5fc63df..210581a 100644
--- a/src/server/clients.cpp
+++ b/src/server/clients.cpp
@@ -1,5 +1,6 @@
 #include "libsock/server/client.hpp"
 #include <algorithm>
+#include <any>
 #include <format>
 #include <ranges>
 #include <unistd.h>
@@ -44,17 +45,13 @@ Clients::~Clients() {
 	}
 }
 
-void Clients::newClient(std::optional<std::function<void()>> cb) {
-	if (cb)
-		(*cb)();
-	SP	  client		  = std::make_shared<Client>(pServer, SP<Clients>(this));
+WP<Client> Clients::newClient(std::optional<std::function<std::any(WP<Client>)>> cb) {
+	SP	  client		  = std::make_shared<Client>();
 	auto &instance		  = m_vClients.emplace_back(std::jthread([client]() { client->run(); }), client);
 	instance.second->self = std::weak_ptr<Client>(instance.second);
-}
-
-void Clients::run(std::optional<std::function<void()>> cb) {
-	while (true)
-		newClient(cb);
+	if (cb)
+		(*cb)(instance.second);
+	return instance.second;
 }
 
 void Clients::broadcast(const std::string &msg, std::optional<std::weak_ptr<Client>> self) {
-- 
cgit v1.2.3