From 939d9b758644842c129cb912fc0d4ebee5b96b72 Mon Sep 17 00:00:00 2001
From: Joscha <joscha@plugh.de>
Date: Thu, 17 Feb 2022 21:39:59 +0100
Subject: [PATCH] Move conn to core

---
 Cargo.lock                             | 8 ++++++++
 cove-core/Cargo.toml                   | 8 ++++++++
 {cove-server => cove-core}/src/conn.rs | 3 ++-
 cove-core/src/lib.rs                   | 1 +
 cove-server/src/main.rs                | 3 +--
 5 files changed, 20 insertions(+), 3 deletions(-)
 rename {cove-server => cove-core}/src/conn.rs (99%)

diff --git a/Cargo.lock b/Cargo.lock
index 7daaf5e..5de1ea1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -86,9 +86,17 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 name = "cove-core"
 version = "0.1.0"
 dependencies = [
+ "futures",
  "hex",
+ "log",
+ "rand",
  "serde",
+ "serde_json",
  "sha2",
+ "thiserror",
+ "tokio",
+ "tokio-stream",
+ "tokio-tungstenite",
 ]
 
 [[package]]
diff --git a/cove-core/Cargo.toml b/cove-core/Cargo.toml
index 4bff230..df24bb7 100644
--- a/cove-core/Cargo.toml
+++ b/cove-core/Cargo.toml
@@ -4,6 +4,14 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
+futures = "0.3.21"
 hex = { version = "0.4.3", features = ["serde"] }
+log = "0.4.14"
+rand = "0.8.4"
 serde = { version = "1.0.136", features = ["derive"] }
+serde_json = "1.0.78"
 sha2 = "0.10.1"
+thiserror = "1.0.30"
+tokio = { version = "1.16.1", features = ["full"] }
+tokio-stream = "0.1.8"
+tokio-tungstenite = "0.16.1"
diff --git a/cove-server/src/conn.rs b/cove-core/src/conn.rs
similarity index 99%
rename from cove-server/src/conn.rs
rename to cove-core/src/conn.rs
index 7616cda..15700fd 100644
--- a/cove-server/src/conn.rs
+++ b/cove-core/src/conn.rs
@@ -3,7 +3,6 @@ use std::sync::Arc;
 use std::time::Duration;
 use std::{fmt, io, result};
 
-use cove_core::packets::Packet;
 use futures::stream::{SplitSink, SplitStream};
 use futures::StreamExt;
 use log::debug;
@@ -15,6 +14,8 @@ use tokio_stream::wrappers::UnboundedReceiverStream;
 use tokio_tungstenite::tungstenite::{self, Message};
 use tokio_tungstenite::WebSocketStream;
 
+use crate::packets::Packet;
+
 #[derive(Debug, thiserror::Error)]
 pub enum Error {
     #[error("IO error: {0}")]
diff --git a/cove-core/src/lib.rs b/cove-core/src/lib.rs
index db865b4..1f7e70c 100644
--- a/cove-core/src/lib.rs
+++ b/cove-core/src/lib.rs
@@ -1,3 +1,4 @@
+pub mod conn;
 mod id;
 mod macros;
 mod message;
diff --git a/cove-server/src/main.rs b/cove-server/src/main.rs
index 4ff9b29..5e10f50 100644
--- a/cove-server/src/main.rs
+++ b/cove-server/src/main.rs
@@ -1,6 +1,5 @@
 // TODO Logging
 
-mod conn;
 mod util;
 
 use std::collections::HashMap;
@@ -8,7 +7,7 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use anyhow::anyhow;
-use conn::{ConnMaintenance, ConnRx, ConnTx};
+use cove_core::conn::{self, ConnMaintenance, ConnRx, ConnTx};
 use cove_core::packets::{
     Cmd, HelloCmd, HelloRpl, JoinNtf, NickCmd, NickNtf, NickRpl, Packet, PartNtf, SendCmd, SendNtf,
     SendRpl, WhoCmd, WhoRpl,