From 37eea6536d2dbff067bd97ff4c0859e9f7a251ac Mon Sep 17 00:00:00 2001
From: Evan Pratten <ewpratten@gmail.com>
Date: Mon, 20 Sep 2021 12:40:55 -0400
Subject: [PATCH] working on discord RPC client

---
 game/Cargo.toml               | 13 ++++++++--
 game/src/lib.rs               |  8 +++---
 game/src/utilities/discord.rs | 47 +++++++++++++++++++++++++++++++++--
 game/src/utilities/mod.rs     |  1 +
 rust-toolchain.toml           |  2 ++
 wrapper/Cargo.toml            |  3 ++-
 wrapper/src/main.rs           |  4 +++
 7 files changed, 70 insertions(+), 8 deletions(-)
 create mode 100644 game/src/utilities/mod.rs
 create mode 100644 rust-toolchain.toml

diff --git a/game/Cargo.toml b/game/Cargo.toml
index f4c65e6..ad832f4 100644
--- a/game/Cargo.toml
+++ b/game/Cargo.toml
@@ -5,7 +5,16 @@ version = "0.1.0"
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 cgmath = "0.18"
-discord-sdk = "0.1"
\ No newline at end of file
+discord-sdk = "0.1"
+tokio = { version = "1.0", features = ["macros", "rt-multi-thread"] }
+tracing = { version = "0.1", features = ["log"] }
+serde = { version = "1.0.126", features = ["derive"] }
+serde_json = "1.0.64"
+thiserror = "1.0"
+chrono = "0.4"
+
+[profile.release]
+lto = true
+codegen-units = 1
\ No newline at end of file
diff --git a/game/src/lib.rs b/game/src/lib.rs
index e8bf6f8..d99d7b0 100644
--- a/game/src/lib.rs
+++ b/game/src/lib.rs
@@ -1,5 +1,7 @@
+#[macro_use]
+extern crate thiserror;
+
+mod utilities;
 
 /// The game entrypoint
-pub fn game_begin() {
-
-}
\ No newline at end of file
+pub fn game_begin() {}
diff --git a/game/src/utilities/discord.rs b/game/src/utilities/discord.rs
index 92a0fc3..faeb471 100644
--- a/game/src/utilities/discord.rs
+++ b/game/src/utilities/discord.rs
@@ -1,9 +1,52 @@
 //! Discord Rich Presence utilities
 
-use discord_sdk::ds::{Discord, User, Wheel};
+use discord_sdk::{user::User, wheel::Wheel, Discord, DiscordApp, Subscriptions};
+use tracing::info;
+
+#[derive(Debug, Error)]
+pub enum DiscordError {
+    #[error(transparent)]
+    SdkError(#[from] discord_sdk::Error),
+    #[error(transparent)]
+    AwaitConnectionError(#[from] tokio::sync::watch::error::RecvError),
+}
 
 pub struct DiscordRpcClient {
     pub discord: Discord,
     pub user: User,
     pub wheel: Wheel,
-}
\ No newline at end of file
+}
+
+impl DiscordRpcClient {
+    pub async fn new(app_id: i64, subscriptions: Subscriptions) -> Result<Self, DiscordError> {
+        // Create a new wheel
+        let (wheel, handler) = Wheel::new(Box::new(|err| {
+            tracing::error!(error = ?err, "encountered an error");
+        }));
+        let mut user = wheel.user();
+
+        // Create the client
+        let discord = Discord::new(
+            DiscordApp::PlainId(app_id),
+            subscriptions,
+            Box::new(handler),
+        )?;
+
+        // Wait for the discord handshake
+        info!("Waiting for Discord client handshake");
+        user.0.changed().await?;
+        info!("Discord handshake success");
+
+        // Fetch the final user object
+        let user = match &*user.0.borrow() {
+            discord_sdk::wheel::UserState::Connected(u) => Ok(u.clone()),
+            discord_sdk::wheel::UserState::Disconnected(err) => Err(err),
+        }?;
+
+        Ok(Self {
+            discord,
+            user,
+            wheel,
+        })
+    }
+}
diff --git a/game/src/utilities/mod.rs b/game/src/utilities/mod.rs
new file mode 100644
index 0000000..d598d52
--- /dev/null
+++ b/game/src/utilities/mod.rs
@@ -0,0 +1 @@
+pub mod discord;
\ No newline at end of file
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
new file mode 100644
index 0000000..66eee23
--- /dev/null
+++ b/rust-toolchain.toml
@@ -0,0 +1,2 @@
+[toolchain]
+channel = "beta"
\ No newline at end of file
diff --git a/wrapper/Cargo.toml b/wrapper/Cargo.toml
index 7669340..1a7ad6a 100644
--- a/wrapper/Cargo.toml
+++ b/wrapper/Cargo.toml
@@ -7,4 +7,5 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-game =  { version = "0.1", path = "../game"}
\ No newline at end of file
+game =  { version = "0.1", path = "../game"}
+tracing-subscriber = "0.2"
\ No newline at end of file
diff --git a/wrapper/src/main.rs b/wrapper/src/main.rs
index 8460f9b..b4a235e 100644
--- a/wrapper/src/main.rs
+++ b/wrapper/src/main.rs
@@ -1,5 +1,9 @@
 use game::game_begin;
 
 fn main() {
+    // Enable logging
+    tracing_subscriber::fmt::init();
+
+    // Start the game
     game_begin();
 }