From 2561f886c617a1b4beed825c72246f5e069a247d Mon Sep 17 00:00:00 2001 From: Leo dev Date: Sun, 12 Oct 2025 13:00:35 +0200 Subject: [PATCH] Support for supabase api --- src/auth.rs | 6 +-- src/requests/message.rs | 2 +- src/types.rs | 12 +++-- src/utils/client.rs | 15 +++--- src/utils/database.rs | 12 ++--- test-plugin/Cargo.lock | 105 +++++++++++++++++++++++++++++++++++++++- test-plugin/src/lib.rs | 5 ++ 7 files changed, 135 insertions(+), 22 deletions(-) diff --git a/src/auth.rs b/src/auth.rs index 7d5d1e5..877a32b 100644 --- a/src/auth.rs +++ b/src/auth.rs @@ -9,17 +9,17 @@ logger!(LOGGER "Auth"); #[derive(Debug, Deserialize)] struct AuthApiRes { - user_id: u32, + user_id: String, } -pub fn auth(_server: &Arc, client: &mut Client, token: &str) -> crate::Result { +pub fn auth(_server: &Arc, client: &mut Client, token: &str) -> crate::Result { let mut res = ureq::get(format!( "http://localhost:3000/api/auth?intents=server&token={token}" )) .call() .context("Failed to authenticate")?; let api_res: AuthApiRes = serde_json::from_str(&res.body_mut().read_to_string()?)?; - client.set_uuid(api_res.user_id); + client.set_uuid(&api_res.user_id); LOGGER.info(format!("{} successfully authenticated", api_res.user_id)); Ok(api_res.user_id) } diff --git a/src/requests/message.rs b/src/requests/message.rs index f041eb7..d059c03 100644 --- a/src/requests/message.rs +++ b/src/requests/message.rs @@ -22,7 +22,7 @@ pub fn send( let msg = server.db.insert_message( &channel_id, - client.get_uuid()?, + &client.get_uuid()?, &contents, chrono::Utc::now().timestamp(), )?; diff --git a/src/types.rs b/src/types.rs index 90e054a..4abb434 100644 --- a/src/types.rs +++ b/src/types.rs @@ -26,7 +26,7 @@ pub enum ClientMessage { pub enum ServerMessage { /// Successful authentication Authenticated { - uuid: u32, + uuid: Author, messages: Vec, }, @@ -48,13 +48,13 @@ pub enum ServerMessage { /// Presence updates PresenceUpdate { - user_id: String, + user_id: Author, status: String, }, /// Typing indicator Typing { - user_id: String, + user_id: Author, channel_id: String, }, } @@ -77,15 +77,19 @@ pub enum WsMessage Deserialize<'de>> { String(String), } +pub type Author = String; + /// Shared data structures pub mod data { use serde::{Deserialize, Serialize}; + use crate::types::Author; + #[derive(Debug, Clone, Serialize, Deserialize)] pub struct Message { pub id: i64, pub channel_id: String, - pub from: u32, + pub from: Author, pub contents: String, pub timestamp: i64, } diff --git a/src/utils/client.rs b/src/utils/client.rs index 9e52911..180099a 100644 --- a/src/utils/client.rs +++ b/src/utils/client.rs @@ -11,8 +11,8 @@ use serde::{Deserialize, Serialize}; use crate::types::{ClientMessage, WsMessage}; pub mod handshake { - use base64::engine::general_purpose::STANDARD as Base64; use base64::Engine; + use base64::engine::general_purpose::STANDARD as Base64; use sha1::{Digest, Sha1}; use std::collections::HashMap; use std::io::{BufRead, BufReader, Write}; @@ -100,7 +100,7 @@ pub mod handshake { } } -pub struct Client(TcpStream, Option, u64); +pub struct Client(TcpStream, Option, u64); impl Client { /// Create a client with no timeouts @@ -324,12 +324,15 @@ impl Client { self.read_t() } - pub fn get_uuid(&self) -> crate::Result { - self.1.ok_or(anyhow!("Invalid UUID")) + pub fn get_uuid(&self) -> crate::Result { + match &self.1 { + Some(v) => Ok(v.clone()), + None => Err(anyhow!("Client ({}) UUID not set", self.2).into()), + } } - pub fn set_uuid(&mut self, uuid: u32) { - self.1 = Some(uuid) + pub fn set_uuid(&mut self, uuid: &str) { + self.1 = Some(uuid.to_string()) } #[deprecated] diff --git a/src/utils/database.rs b/src/utils/database.rs index 84cf4ab..641fb26 100644 --- a/src/utils/database.rs +++ b/src/utils/database.rs @@ -12,7 +12,7 @@ impl Database { "CREATE TABLE IF NOT EXISTS chat ( id INTEGER PRIMARY KEY AUTOINCREMENT, channel_id TEXT NOT NULL, - user_id INTEGER NOT NULL, + user_id TEXT NOT NULL, contents TEXT NOT NULL, timestamp INTEGER NOT NULL )", @@ -30,7 +30,7 @@ impl Database { pub fn insert_message( &self, channel_id: &str, - user_id: u32, + user_id: &str, contents: &str, timestamp: i64, ) -> Result { @@ -45,7 +45,7 @@ impl Database { Ok(Message { id, channel_id: channel_id.to_string(), - from: user_id, + from: user_id.to_string(), contents: contents.to_string(), timestamp, }) @@ -73,7 +73,7 @@ impl Database { } /// Get a message by its ID - pub fn get_message_by_id(&self, message_id: usize) -> Result> { + pub fn get_message_by_id(&self, message_id: &str) -> Result> { let mut stmt = self.0.prepare( "SELECT id, channel_id, user_id, contents, timestamp FROM chat @@ -95,7 +95,7 @@ impl Database { return Ok(Some(Message { id, channel_id, - from: user_id, + from: user_id.to_string(), contents, timestamp, })); @@ -116,7 +116,7 @@ impl Database { Ok(Message { id: row.get::<_, i64>(0)?, channel_id: row.get::<_, String>(1)?, - from: row.get::<_, u32>(2)?, + from: row.get::<_, String>(2)?, contents: row.get::<_, String>(3)?, timestamp: row.get::<_, i64>(4)?, }) diff --git a/test-plugin/Cargo.lock b/test-plugin/Cargo.lock index 0b37a69..11c94a1 100644 --- a/test-plugin/Cargo.lock +++ b/test-plugin/Cargo.lock @@ -193,7 +193,19 @@ checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ "cfg-if", "libc", - "wasi", + "wasi 0.11.1+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" +dependencies = [ + "cfg-if", + "libc", + "r-efi", + "wasi 0.14.7+wasi-0.2.4", ] [[package]] @@ -335,6 +347,15 @@ version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" +[[package]] +name = "ppv-lite86" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy", +] + [[package]] name = "proc-macro2" version = "1.0.101" @@ -353,6 +374,41 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "r-efi" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + +[[package]] +name = "rand" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" +dependencies = [ + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" +dependencies = [ + "getrandom 0.3.3", +] + [[package]] name = "ring" version = "0.17.14" @@ -361,7 +417,7 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" dependencies = [ "cc", "cfg-if", - "getrandom", + "getrandom 0.2.16", "libc", "untrusted", "windows-sys", @@ -590,6 +646,7 @@ dependencies = [ "base64", "chrono", "once_cell", + "rand", "rusqlite", "serde", "serde_json", @@ -603,6 +660,24 @@ version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" +[[package]] +name = "wasi" +version = "0.14.7+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "883478de20367e224c0090af9cf5f9fa85bed63a95c1abf3afc5c083ebc06e8c" +dependencies = [ + "wasip2", +] + +[[package]] +name = "wasip2" +version = "1.0.1+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" +dependencies = [ + "wit-bindgen", +] + [[package]] name = "wasm-bindgen" version = "0.2.101" @@ -803,6 +878,32 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "wit-bindgen" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" + +[[package]] +name = "zerocopy" +version = "0.8.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "zeroize" version = "1.8.1" diff --git a/test-plugin/src/lib.rs b/test-plugin/src/lib.rs index 4f0ea34..72621f2 100644 --- a/test-plugin/src/lib.rs +++ b/test-plugin/src/lib.rs @@ -26,6 +26,11 @@ impl Plugin for MyPlugin { ) => { if contents == "ping" { LOGGER.info("Pong!"); + // client + // .send(voxa_server::types::ServerMessage::TempMessage { + // message: "pong".to_string(), + // }) + // .unwrap(); client .send(voxa_server::types::ServerMessage::TempMessage { message: "pong".to_string(),