From 875ce0328d1d919d639797972e4cf60c6715503f Mon Sep 17 00:00:00 2001
From: "Claudius \"keldu\" Holeksa" <mail@keldu.de>
Date: Tue, 21 May 2024 12:13:10 +0200
Subject: Fixing up echo builders and names

---
 modules/io/examples/echo.hpp                   |  14 ++-
 modules/io/examples/echo_client.cpp            |   4 +-
 modules/io/examples/echo_server.cpp            |  15 ++-
 modules/io_codec/examples/SConscript           |   4 +-
 modules/io_codec/examples/echo_client.cpp      |  70 -----------
 modules/io_codec/examples/echo_server.cpp      | 165 -------------------------
 modules/io_codec/examples/peer_echo_client.cpp |  28 +++++
 modules/io_codec/examples/peer_echo_server.cpp |   2 +
 8 files changed, 54 insertions(+), 248 deletions(-)
 delete mode 100644 modules/io_codec/examples/echo_client.cpp
 delete mode 100644 modules/io_codec/examples/echo_server.cpp
 create mode 100644 modules/io_codec/examples/peer_echo_client.cpp

diff --git a/modules/io/examples/echo.hpp b/modules/io/examples/echo.hpp
index 4eb8084..84416b9 100644
--- a/modules/io/examples/echo.hpp
+++ b/modules/io/examples/echo.hpp
@@ -1,9 +1,15 @@
 #pragma once
 
+#include <string>
+#include <cstdint>
+
+namespace saw {
 struct message {
-	std::array<uint8_t, 256> data;
-	uint64_t already_read = 0;
-	uint64_t already_written = 0;
+       std::array<uint8_t, 256> data;
+       uint64_t already_read = 0;
+       uint64_t already_written = 0;
 };
 
-constexpr std::string_view message_content = "Hello! This is an echo msg.";
+constexpr std::string echo_address = "::1";
+constexpr uint16_t echo_port = 4322;
+}
diff --git a/modules/io/examples/echo_client.cpp b/modules/io/examples/echo_client.cpp
index 53ebe54..4b95158 100644
--- a/modules/io/examples/echo_client.cpp
+++ b/modules/io/examples/echo_client.cpp
@@ -34,7 +34,7 @@ int main(){
 	std::array<uint8_t, 32> read_data;
 	uint64_t read_bytes = 0;
 	auto& network = aio.io->get_network();
-	network.resolve_address("127.0.0.1", 4322).then([&](auto addr){
+	network.resolve_address(saw::echo_address, saw::echo_port).then([&](auto addr){
 		net_addr = std::move(addr);
 		network.connect(*net_addr).then([&](auto rmt_srv){
 			async_rmt = saw::heap<saw::async_io_stream>(std::move(rmt_srv));
@@ -43,6 +43,8 @@ int main(){
 			async_rmt->read(&read_data[0], 3, read_data.size()-1);
 
 			async_rmt->read_done().then([&](size_t b){
+	
+					std::cout<<"Received bytes:\n"<<std::endl;
 					for(uint64_t i = 0; i < b; ++i){
 						std::cout<<static_cast<char>(read_data[i]);
 					}
diff --git a/modules/io/examples/echo_server.cpp b/modules/io/examples/echo_server.cpp
index 50863db..aa052a0 100644
--- a/modules/io/examples/echo_server.cpp
+++ b/modules/io/examples/echo_server.cpp
@@ -4,7 +4,7 @@
 
 #include "echo.hpp"
 
-saw::error_or<void> handle_echo_write(saw::io_stream& rmt_clt, message& state, uint64_t tbw){
+saw::error_or<void> handle_echo_write(saw::io_stream& rmt_clt, saw::message& state, uint64_t tbw){
 	auto eov = rmt_clt.write(&state.data[state.already_written], tbw);
 	if(eov.is_error()){
 		return std::move(eov.get_error());
@@ -19,7 +19,7 @@ saw::error_or<void> handle_echo_write(saw::io_stream& rmt_clt, message& state, u
 	return saw::void_t{};
 }
 
-void handle_echo_message(saw::io_stream& rmt_clt, bool& keep_running, message& state){
+void handle_echo_message(saw::io_stream& rmt_clt, bool& keep_running, saw::message& state){
 	rmt_clt.read_ready().then([&](){
 		for(;;){
 			uint64_t tbr = state.data.size() < state.already_read ? 0: state.data.size() - state.already_read;
@@ -37,7 +37,10 @@ void handle_echo_message(saw::io_stream& rmt_clt, bool& keep_running, message& s
 					break;
 				}
 			}
-			auto read_bytes = eov.get_value();
+			auto& read_bytes = eov.get_value();
+
+			std::cout<<"Read "<<read_bytes<<" bytes"<<std::endl;
+			
 			if(read_bytes == 0u){
 				exit(-1);
 			}
@@ -53,7 +56,7 @@ void handle_echo_message(saw::io_stream& rmt_clt, bool& keep_running, message& s
 				if(eov.is_error()){
 					auto& err = eov.get_error();
 					if(err.is_critical()){
-						std::cerr<<err.get_category()<<std::endl;
+						std::cerr<<"After triggered write: "<<err.get_category()<<std::endl;
 						exit(err.get_id());
 					}else {
 						break;
@@ -114,13 +117,13 @@ int main(){
 	saw::own<saw::server> srv = nullptr;
 	saw::own<saw::io_stream> remote_client = nullptr;
 
-	message msg_state;
+	saw::message msg_state;
 
 	std::cout<<"Starting to resolve address"<<std::endl;
 	/**
 	 * Try to resolve address. If resolved
 	 */
-	network.resolve_address("127.0.0.1", 4322).then([&](auto net_addr){
+	network.resolve_address(saw::echo_address, saw::echo_port).then([&](auto net_addr){
 		std::cout<<"Resolved address"<<std::endl;
 		addr = std::move(net_addr);
 		srv = network.listen(*addr);
diff --git a/modules/io_codec/examples/SConscript b/modules/io_codec/examples/SConscript
index 1f0c218..fb06ec0 100644
--- a/modules/io_codec/examples/SConscript
+++ b/modules/io_codec/examples/SConscript
@@ -19,8 +19,8 @@ env.sources += examples_env.sources;
 env.headers += examples_env.headers;
 
 objects_static = []
-examples_env.echo_client = examples_env.Program('#bin/echo_client', ['echo_client.cpp', env.library_static]);
-examples_env.echo_server = examples_env.Program('#bin/echo_server', ['echo_server.cpp', env.library_static]);
+examples_env.echo_client = examples_env.Program('#bin/peer_echo_client', ['peer_echo_client.cpp', env.library_static]);
+examples_env.echo_server = examples_env.Program('#bin/peer_echo_server', ['peer_echo_server.cpp', env.library_static]);
 
 # Set Alias
 env.examples = [
diff --git a/modules/io_codec/examples/echo_client.cpp b/modules/io_codec/examples/echo_client.cpp
deleted file mode 100644
index dadf5e0..0000000
--- a/modules/io_codec/examples/echo_client.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-#include "../c++/io_peer.hpp"
-
-#include <array>
-#include <iostream>
-
-#include "echo.hpp"
-
-int main(){
-	/**
-	 * Create EventLoop
-	 * Setup EventPort to the outside world
-	 * And setup the io comms to the outside.
-	 */
-	auto eo_aio = saw::setup_async_io();
-	if(eo_aio.is_error()){
-		auto& err = eo_aio.get_error();
-		std::cerr<<err.get_message()<<std::endl;
-		return err.get_id();
-	}
-	auto& aio = eo_aio.get_value();
-	/**
-	 * Make the event loop the current event loop on this thread
-	 */
-	saw::wait_scope wait_scope{aio.event_loop};
-
-	bool keep_running = true;
-	aio.event_port.on_signal(saw::Signal::Terminate).then([&keep_running](){
-		keep_running = false;
-	}).detach();
-
-	saw::own<saw::network_address> net_addr = nullptr;
-	saw::own<saw::async_io_stream> async_rmt = nullptr;
-
-	std::array<uint8_t, 32> read_data;
-	uint64_t read_bytes = 0;
-	auto& network = aio.io->get_network();
-	network.resolve_address(saw::echo_address, saw::echo_port).then([&](auto addr){
-		net_addr = std::move(addr);
-		network.connect(*net_addr).then([&](auto rmt_srv){
-			async_rmt = saw::heap<saw::async_io_stream>(std::move(rmt_srv));
-			async_rmt->write("foo", 3);
-
-			async_rmt->read(&read_data[0], 3, read_data.size()-1);
-
-			async_rmt->read_done().then([&](size_t b){
-	
-					std::cout<<"Received bytes:\n"<<std::endl;
-					for(uint64_t i = 0; i < b; ++i){
-						std::cout<<static_cast<char>(read_data[i]);
-					}
-					std::cout<<std::endl;
-
-					keep_running = false;
-			}).detach();
-
-			async_rmt->on_read_disconnected().then([&](){
-				keep_running = false;
-			}).detach();
-		}).detach();
-	}).detach();
-
-	wait_scope.poll();
-	while(keep_running){
-		wait_scope.wait();
-	}
-
-	std::cout<<"Shutting down echo client"<<std::endl;
-
-	return 0;
-}
diff --git a/modules/io_codec/examples/echo_server.cpp b/modules/io_codec/examples/echo_server.cpp
deleted file mode 100644
index 23e29eb..0000000
--- a/modules/io_codec/examples/echo_server.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-#include "../c++/io_peer.hpp"
-
-#include <iostream>
-
-#include "echo.hpp"
-
-saw::error_or<void> handle_echo_write(saw::io_stream& rmt_clt, message& state, uint64_t tbw){
-	auto eov = rmt_clt.write(&state.data[state.already_written], tbw);
-	if(eov.is_error()){
-		return std::move(eov.get_error());
-	}
-
-	auto val = eov.get_value();
-	state.already_written += val;
-	if(state.already_written > state.already_read){
-		exit(-1);
-	}
-
-	return saw::void_t{};
-}
-
-void handle_echo_message(saw::io_stream& rmt_clt, bool& keep_running, message& state){
-	rmt_clt.read_ready().then([&](){
-		for(;;){
-			uint64_t tbr = state.data.size() < state.already_read ? 0: state.data.size() - state.already_read;
-			if(tbr == 0){
-				exit(-1);
-			}
-			auto eov = rmt_clt.read(&state.data[state.already_read], tbr);
-
-			if(eov.is_error()){
-				auto& err = eov.get_error();
-				if(err.is_critical()){
-					std::cerr<<err.get_category()<<std::endl;
-					exit(err.get_id());
-				}else{
-					break;
-				}
-			}
-			auto& read_bytes = eov.get_value();
-
-			std::cout<<"Read "<<read_bytes<<" bytes"<<std::endl;
-			auto read_bytes = eov.get_value();
-			if(read_bytes == 0u){
-				exit(-1);
-			}
-
-			bool trigger_write = (state.already_read == state.already_written);
-
-			state.already_read += read_bytes;
-			if(state.already_read > state.data.size()){
-				state.already_read = state.data.size();
-			}
-			if(trigger_write){
-				auto eov = handle_echo_write(rmt_clt, state, state.already_read - state.already_written);
-				if(eov.is_error()){
-					auto& err = eov.get_error();
-					if(err.is_critical()){
-						std::cerr<<"After triggered write: "<<err.get_category()<<std::endl;
-						exit(err.get_id());
-					}else {
-						break;
-					}
-				}
-			}
-		}
-	}).detach();
-
-	rmt_clt.write_ready().then([&](){
-		for(;;){
-			if(state.already_read < state.already_written){
-				exit(-1);
-			}
-			uint64_t tbw = state.already_read - state.already_written;
-			if(tbw == 0){
-				break;
-			}
-
-			auto eov = handle_echo_write(rmt_clt, state, tbw);
-			if(eov.is_error()){
-				auto& err = eov.get_error();
-				if(err.is_critical()){
-					std::cerr<<err.get_category()<<std::endl;
-					exit(err.get_id());
-				}else {
-					break;
-				}
-			}
-		}
-	}).detach();
-
-	rmt_clt.on_read_disconnected().then([&](){
-		keep_running = false;
-	}).detach();
-}
-
-int main(){
-	auto eo_aio = saw::setup_async_io();
-	if(eo_aio.is_error()){
-		auto& err = eo_aio.get_error();
-		std::cerr<<err.get_message()<<std::endl;
-		return err.get_id();
-	}
-	auto& aio = eo_aio.get_value();
-	/**
-	 * Make the event loop the current event loop on this thread
-	 */
-	saw::wait_scope wait_scope{aio.event_loop};
-
-	bool keep_running = true;
-	aio.event_port.on_signal(saw::Signal::Terminate).then([&keep_running](){
-		keep_running = false;
-	}).detach();
-
-	auto& network = aio.io->get_network();
-	saw::own<saw::network_address> addr = nullptr;
-	saw::own<saw::server> srv = nullptr;
-	saw::own<saw::io_stream> remote_client = nullptr;
-
-	// message msg_state;
-
-	std::cout<<"Starting to resolve address"<<std::endl;
-	/**
-	 * Try to resolve address. If resolved
-	 */
-	network.resolve_address(saw::echo_address, saw::echo_port).then([&](auto net_addr){
-		std::cout<<"Resolved address"<<std::endl;
-		addr = std::move(net_addr);
-		srv = network.listen(*addr);
-		if(srv){
-			srv->accept().then([&](auto client) -> saw::error_or<void>{
-
-				if(!remote_client){
-					std::cout<<"Accepted client"<<std::endl;
-					remote_client = std::move(client);
-
-					if(remote_client){
-						std::cout<<"Spinning up handler"<<std::endl;
-						handle_echo_message(*remote_client, keep_running, msg_state);
-					}else{
-						keep_running = false;
-					}
-				}
-				return saw::make_error<saw::err::critical>();
-			}).detach();
-		}else{
-			keep_running = false;
-		}
-	}).detach([&](auto err) {
-		std::cout<<"Failed to resolve address: "<<err.get_category()<<":"<<err.get_message()<<std::endl;
-		keep_running = false;
-		return err;
-	});
-
-	std::cout<<"Entering waiting loop"<<std::endl;
-
-	wait_scope.poll();
-	while(keep_running){
-		wait_scope.wait(std::chrono::seconds{5});
-	}
-
-	std::cout<<"\n\nShutting down echo server"<<std::endl;
-
-	return 0;
-}
diff --git a/modules/io_codec/examples/peer_echo_client.cpp b/modules/io_codec/examples/peer_echo_client.cpp
new file mode 100644
index 0000000..ec8cf8d
--- /dev/null
+++ b/modules/io_codec/examples/peer_echo_client.cpp
@@ -0,0 +1,28 @@
+#include "echo.hpp"
+
+#include "../c++/io_peer.hpp"
+
+#include <iostream>
+
+int main(){
+	auto eo_aio = saw::setup_async_io();
+	if(eo_aio.is_error()){
+		auto& err = eo_aio.get_error();
+		std::cerr<<err.get_message()<<std::endl;
+		return err.get_id();
+	}
+	auto& aio = eo_aio.get_value();
+	/**
+	 * Make the event loop the current event loop on this thread
+	 */
+	saw::wait_scope wait_scope{aio.event_loop};
+
+	bool keep_running = true;
+	aio.event_port.on_signal(saw::Signal::Terminate).then([&keep_running](){
+		keep_running = false;
+	}).detach();
+
+	auto& network = aio.io->get_network();
+
+	return 0;
+}
diff --git a/modules/io_codec/examples/peer_echo_server.cpp b/modules/io_codec/examples/peer_echo_server.cpp
index 586202a..ec8cf8d 100644
--- a/modules/io_codec/examples/peer_echo_server.cpp
+++ b/modules/io_codec/examples/peer_echo_server.cpp
@@ -2,6 +2,8 @@
 
 #include "../c++/io_peer.hpp"
 
+#include <iostream>
+
 int main(){
 	auto eo_aio = saw::setup_async_io();
 	if(eo_aio.is_error()){
-- 
cgit v1.2.3