CardsSimulator
/
cards-simulator
3
1
Fork 0
Code Issues 7 Pull Requests Projects Releases Wiki Activity
Browse Source

Rewrite protos and disable rustfmt on them

main
ThePerkinrex 5 years ago
parent
1126683f79
commit
a559bcdf1c
No known key found for this signature in database GPG Key ID: FD81DE6D75E20917
8 changed files with 191 additions and 187 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      server/src/games/config.rs
  2. 8
      server/src/games/run/types.rs
  3. 5
      server/src/server/protos.rs
  4. 8
      server/src/server/protos/common.rs
  5. 14
      server/src/server/protos/connection.rs
  6. 52
      server/src/server/protos/game.rs
  7. 14
      server/src/server/protos/lobby.rs
  8. 62
      server/src/server/protos/protocol.rs

3
server/src/games/config.rs
View File

@ -77,8 +77,7 @@ impl Config {
let folder = folder.clone(); let folder = folder.clone();
tokio::task::spawn_blocking(|| cache_image(p, folder)); tokio::task::spawn_blocking(|| cache_image(p, folder));
} }
for for Card {
Card {
image, image,
back_image, back_image,
other: _, other: _,

8
server/src/games/run/types.rs
View File

@ -236,6 +236,12 @@ impl RunningPile {
other.insert(k, v); other.insert(k, v);
} }
Ok(Self { name, cards, face_down, visible, other }) Ok(Self {
name,
cards,
face_down,
visible,
other,
})
} }
} }

5
server/src/server/protos.rs
View File

@ -1,14 +1,19 @@
#[rustfmt::skip]
#[allow(non_camel_case_types)] #[allow(non_camel_case_types)]
pub mod connection; pub mod connection;
#[rustfmt::skip]
#[allow(non_camel_case_types)] #[allow(non_camel_case_types)]
pub mod lobby; pub mod lobby;
#[rustfmt::skip]
#[allow(non_camel_case_types)] #[allow(non_camel_case_types)]
pub mod game; pub mod game;
#[rustfmt::skip]
#[allow(non_camel_case_types)] #[allow(non_camel_case_types)]
pub mod common; pub mod common;
#[rustfmt::skip]
#[allow(non_camel_case_types)] #[allow(non_camel_case_types)]
pub mod protocol; pub mod protocol;

8
server/src/server/protos/common.rs
View File

@ -1,17 +1,17 @@
#[derive(Clone, PartialEq, ::prost::Message)] #[derive(Clone, PartialEq, ::prost::Message)]
pub struct Name { pub struct Name {
#[prost(string, tag = "1")] #[prost(string, tag="1")]
pub name: ::prost::alloc::string::String, pub name: ::prost::alloc::string::String,
} }
#[derive(Clone, PartialEq, ::prost::Message)] #[derive(Clone, PartialEq, ::prost::Message)]
pub struct LastStatusTimestamp { pub struct LastStatusTimestamp {
#[prost(message, optional, tag = "1")] #[prost(message, optional, tag="1")]
pub time: ::core::option::Option<::prost_types::Timestamp>, pub time: ::core::option::Option<::prost_types::Timestamp>,
#[prost(uint32, tag = "2")] #[prost(uint32, tag="2")]
pub lobby: u32, pub lobby: u32,
} }
#[derive(Clone, PartialEq, ::prost::Message)] #[derive(Clone, PartialEq, ::prost::Message)]
pub struct HasNewStatus { pub struct HasNewStatus {
#[prost(bool, tag = "1")] #[prost(bool, tag="1")]
pub value: bool, pub value: bool,
} }

14
server/src/server/protos/connection.rs
View File

@ -11,28 +11,28 @@
#[derive(Clone, PartialEq, ::prost::Message)] #[derive(Clone, PartialEq, ::prost::Message)]
pub struct Game { pub struct Game {
#[prost(string, tag = "1")] #[prost(string, tag="1")]
pub name: ::prost::alloc::string::String, pub name: ::prost::alloc::string::String,
#[prost(string, tag = "2")] #[prost(string, tag="2")]
pub version: ::prost::alloc::string::String, pub version: ::prost::alloc::string::String,
#[prost(string, repeated, tag = "3")] #[prost(string, repeated, tag="3")]
pub authors: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, pub authors: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
#[prost(uint32, tag = "4")] #[prost(uint32, tag="4")]
pub id: u32, pub id: u32,
} }
#[derive(Clone, PartialEq, ::prost::Message)] #[derive(Clone, PartialEq, ::prost::Message)]
pub struct UserId { pub struct UserId {
#[prost(string, tag = "1")] #[prost(string, tag="1")]
pub id: ::prost::alloc::string::String, pub id: ::prost::alloc::string::String,
} }
#[derive(Clone, PartialEq, ::prost::Message)] #[derive(Clone, PartialEq, ::prost::Message)]
pub struct LobbyConfig { pub struct LobbyConfig {
/// repeated uint32 allowed_games = 2; /// repeated uint32 allowed_games = 2;
#[prost(bool, tag = "1")] #[prost(bool, tag="1")]
pub public: bool, pub public: bool,
} }
#[derive(Clone, PartialEq, ::prost::Message)] #[derive(Clone, PartialEq, ::prost::Message)]
pub struct LobbyCode { pub struct LobbyCode {
#[prost(uint32, tag = "1")] #[prost(uint32, tag="1")]
pub code: u32, pub code: u32,
} }

52
server/src/server/protos/game.rs
View File

@ -8,97 +8,97 @@
#[derive(Clone, PartialEq, ::prost::Message)] #[derive(Clone, PartialEq, ::prost::Message)]
pub struct CardKind { pub struct CardKind {
#[prost(string, tag = "1")] #[prost(string, tag="1")]
pub kind: ::prost::alloc::string::String, pub kind: ::prost::alloc::string::String,
} }
#[derive(Clone, PartialEq, ::prost::Message)] #[derive(Clone, PartialEq, ::prost::Message)]
pub struct Image { pub struct Image {
#[prost(bytes = "vec", tag = "1")] #[prost(bytes="vec", tag="1")]
pub face: ::prost::alloc::vec::Vec<u8>, pub face: ::prost::alloc::vec::Vec<u8>,
#[prost(bytes = "vec", tag = "2")] #[prost(bytes="vec", tag="2")]
pub back: ::prost::alloc::vec::Vec<u8>, pub back: ::prost::alloc::vec::Vec<u8>,
#[prost(string, tag = "3")] #[prost(string, tag="3")]
pub kind: ::prost::alloc::string::String, pub kind: ::prost::alloc::string::String,
} }
#[derive(Clone, PartialEq, ::prost::Message)] #[derive(Clone, PartialEq, ::prost::Message)]
pub struct CardIndex { pub struct CardIndex {
#[prost(oneof = "card_index::Pos", tags = "1, 2, 3")] #[prost(oneof="card_index::Pos", tags="1, 2, 3")]
pub pos: ::core::option::Option<card_index::Pos>, pub pos: ::core::option::Option<card_index::Pos>,
} }
/// Nested message and enum types in `CardIndex`. /// Nested message and enum types in `CardIndex`.
pub mod card_index { pub mod card_index {
#[derive(Clone, PartialEq, ::prost::Oneof)] #[derive(Clone, PartialEq, ::prost::Oneof)]
pub enum Pos { pub enum Pos {
#[prost(uint32, tag = "1")] #[prost(uint32, tag="1")]
Index(u32), Index(u32),
#[prost(message, tag = "2")] #[prost(message, tag="2")]
Top(()), Top(()),
#[prost(message, tag = "3")] #[prost(message, tag="3")]
Bottom(()), Bottom(()),
} }
} }
#[derive(Clone, PartialEq, ::prost::Message)] #[derive(Clone, PartialEq, ::prost::Message)]
pub struct PileKind { pub struct PileKind {
#[prost(oneof = "pile_kind::Kind", tags = "1, 2")] #[prost(oneof="pile_kind::Kind", tags="1, 2")]
pub kind: ::core::option::Option<pile_kind::Kind>, pub kind: ::core::option::Option<pile_kind::Kind>,
} }
/// Nested message and enum types in `PileKind`. /// Nested message and enum types in `PileKind`.
pub mod pile_kind { pub mod pile_kind {
#[derive(Clone, PartialEq, ::prost::Oneof)] #[derive(Clone, PartialEq, ::prost::Oneof)]
pub enum Kind { pub enum Kind {
#[prost(uint32, tag = "1")] #[prost(uint32, tag="1")]
Owned(u32), Owned(u32),
#[prost(message, tag = "2")] #[prost(message, tag="2")]
Common(()), Common(()),
} }
} }
#[derive(Clone, PartialEq, ::prost::Message)] #[derive(Clone, PartialEq, ::prost::Message)]
pub struct CardId { pub struct CardId {
#[prost(message, optional, tag = "1")] #[prost(message, optional, tag="1")]
pub pile_kind: ::core::option::Option<PileKind>, pub pile_kind: ::core::option::Option<PileKind>,
#[prost(string, tag = "2")] #[prost(string, tag="2")]
pub pile_name: ::prost::alloc::string::String, pub pile_name: ::prost::alloc::string::String,
#[prost(message, optional, tag = "3")] #[prost(message, optional, tag="3")]
pub card_index: ::core::option::Option<CardIndex>, pub card_index: ::core::option::Option<CardIndex>,
} }
#[derive(Clone, PartialEq, ::prost::Message)] #[derive(Clone, PartialEq, ::prost::Message)]
pub struct GameStatus { pub struct GameStatus {
/// {a: [""], b:[""]} /// {a: [""], b:[""]}
#[prost(message, optional, tag = "1")] #[prost(message, optional, tag="1")]
pub common_piles: ::core::option::Option<game_status::Piles>, pub common_piles: ::core::option::Option<game_status::Piles>,
/// [{...}, {...}] /// [{...}, {...}]
#[prost(message, repeated, tag = "2")] #[prost(message, repeated, tag="2")]
pub player_piles: ::prost::alloc::vec::Vec<game_status::Piles>, pub player_piles: ::prost::alloc::vec::Vec<game_status::Piles>,
#[prost(message, repeated, tag = "3")] #[prost(message, repeated, tag="3")]
pub names: ::prost::alloc::vec::Vec<super::common::Name>, pub names: ::prost::alloc::vec::Vec<super::common::Name>,
#[prost(uint32, tag = "4")] #[prost(uint32, tag="4")]
pub current_turn: u32, pub current_turn: u32,
} }
/// Nested message and enum types in `GameStatus`. /// Nested message and enum types in `GameStatus`.
pub mod game_status { pub mod game_status {
#[derive(Clone, PartialEq, ::prost::Message)] #[derive(Clone, PartialEq, ::prost::Message)]
pub struct Card { pub struct Card {
#[prost(message, optional, tag = "1")] #[prost(message, optional, tag="1")]
pub kind: ::core::option::Option<super::CardKind>, pub kind: ::core::option::Option<super::CardKind>,
#[prost(bool, tag = "2")] #[prost(bool, tag="2")]
pub visible: bool, pub visible: bool,
#[prost(string, tag = "3")] #[prost(string, tag="3")]
pub uuid: ::prost::alloc::string::String, pub uuid: ::prost::alloc::string::String,
} }
#[derive(Clone, PartialEq, ::prost::Message)] #[derive(Clone, PartialEq, ::prost::Message)]
pub struct Pile { pub struct Pile {
#[prost(message, repeated, tag = "1")] #[prost(message, repeated, tag="1")]
pub cards: ::prost::alloc::vec::Vec<Card>, pub cards: ::prost::alloc::vec::Vec<Card>,
#[prost(bool, tag = "2")] #[prost(bool, tag="2")]
pub face_down: bool, pub face_down: bool,
#[prost(bool, tag = "3")] #[prost(bool, tag="3")]
pub visible: bool, pub visible: bool,
#[prost(string, tag = "4")] #[prost(string, tag="4")]
pub name: ::prost::alloc::string::String, pub name: ::prost::alloc::string::String,
} }
#[derive(Clone, PartialEq, ::prost::Message)] #[derive(Clone, PartialEq, ::prost::Message)]
pub struct Piles { pub struct Piles {
#[prost(map = "string, message", tag = "1")] #[prost(map="string, message", tag="1")]
pub piles: ::std::collections::HashMap<::prost::alloc::string::String, Pile>, pub piles: ::std::collections::HashMap<::prost::alloc::string::String, Pile>,
} }
} }

14
server/src/server/protos/lobby.rs
View File

@ -10,24 +10,24 @@
#[derive(Clone, PartialEq, ::prost::Message)] #[derive(Clone, PartialEq, ::prost::Message)]
pub struct Vote { pub struct Vote {
#[prost(string, tag = "1")] #[prost(string, tag="1")]
pub player: ::prost::alloc::string::String, pub player: ::prost::alloc::string::String,
#[prost(uint32, tag = "2")] #[prost(uint32, tag="2")]
pub game: u32, pub game: u32,
#[prost(bool, tag = "3")] #[prost(bool, tag="3")]
pub ready: bool, pub ready: bool,
} }
#[derive(Clone, PartialEq, ::prost::Message)] #[derive(Clone, PartialEq, ::prost::Message)]
pub struct SingleVote { pub struct SingleVote {
#[prost(uint32, tag = "2")] #[prost(uint32, tag="2")]
pub game: u32, pub game: u32,
} }
#[derive(Clone, PartialEq, ::prost::Message)] #[derive(Clone, PartialEq, ::prost::Message)]
pub struct LobbyStatus { pub struct LobbyStatus {
#[prost(message, repeated, tag = "1")] #[prost(message, repeated, tag="1")]
pub names: ::prost::alloc::vec::Vec<super::common::Name>, pub names: ::prost::alloc::vec::Vec<super::common::Name>,
#[prost(message, repeated, tag = "2")] #[prost(message, repeated, tag="2")]
pub votes: ::prost::alloc::vec::Vec<Vote>, pub votes: ::prost::alloc::vec::Vec<Vote>,
#[prost(bool, tag = "3")] #[prost(bool, tag="3")]
pub is_starting: bool, pub is_starting: bool,
} }

62
server/src/server/protos/protocol.rs
View File

@ -1,9 +1,6 @@
#[derive(Clone, PartialEq, ::prost::Message)] #[derive(Clone, PartialEq, ::prost::Message)]
pub struct ClientServerPacket { pub struct ClientServerPacket {
#[prost( #[prost(oneof="client_server_packet::Data", tags="1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14")]
oneof = "client_server_packet::Data",
tags = "1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14"
)]
pub data: ::core::option::Option<client_server_packet::Data>, pub data: ::core::option::Option<client_server_packet::Data>,
} }
/// Nested message and enum types in `ClientServerPacket`. /// Nested message and enum types in `ClientServerPacket`.
@ -11,44 +8,41 @@ pub mod client_server_packet {
#[derive(Clone, PartialEq, ::prost::Oneof)] #[derive(Clone, PartialEq, ::prost::Oneof)]
pub enum Data { pub enum Data {
/// CONNECTION /// CONNECTION
#[prost(message, tag = "1")] #[prost(message, tag="1")]
QueryName(()), QueryName(()),
#[prost(message, tag = "2")] #[prost(message, tag="2")]
Connect(super::super::common::Name), Connect(super::super::common::Name),
#[prost(message, tag = "3")] #[prost(message, tag="3")]
Disconnect(()), Disconnect(()),
#[prost(message, tag = "4")] #[prost(message, tag="4")]
JoinLobby(super::super::connection::LobbyCode), JoinLobby(super::super::connection::LobbyCode),
#[prost(message, tag = "5")] #[prost(message, tag="5")]
CreateLobby(super::super::connection::LobbyConfig), CreateLobby(super::super::connection::LobbyConfig),
#[prost(message, tag = "6")] #[prost(message, tag="6")]
QueryGames(()), QueryGames(()),
#[prost(message, tag = "7")] #[prost(message, tag="7")]
QueryPublicLobbies(()), QueryPublicLobbies(()),
/// LOBBY /// LOBBY
#[prost(message, tag = "8")] #[prost(message, tag="8")]
QueryUsers(()), QueryUsers(()),
#[prost(message, tag = "9")] #[prost(message, tag="9")]
Vote(super::super::lobby::SingleVote), Vote(super::super::lobby::SingleVote),
#[prost(message, tag = "10")] #[prost(message, tag="10")]
Ready(()), Ready(()),
#[prost(message, tag = "11")] #[prost(message, tag="11")]
Leave(()), Leave(()),
/// GAME /// GAME
#[prost(message, tag = "12")] #[prost(message, tag="12")]
QueryCardImage(super::super::game::CardKind), QueryCardImage(super::super::game::CardKind),
#[prost(message, tag = "13")] #[prost(message, tag="13")]
CallOnClick(super::super::game::CardId), CallOnClick(super::super::game::CardId),
#[prost(message, tag = "14")] #[prost(message, tag="14")]
QueryGameStatus(()), QueryGameStatus(()),
} }
} }
#[derive(Clone, PartialEq, ::prost::Message)] #[derive(Clone, PartialEq, ::prost::Message)]
pub struct ServerClientPacket { pub struct ServerClientPacket {
#[prost( #[prost(oneof="server_client_packet::Data", tags="1, 2, 3, 4, 5, 6, 7, 8, 9")]
oneof = "server_client_packet::Data",
tags = "1, 2, 3, 4, 5, 6, 7, 8, 9"
)]
pub data: ::core::option::Option<server_client_packet::Data>, pub data: ::core::option::Option<server_client_packet::Data>,
} }
/// Nested message and enum types in `ServerClientPacket`. /// Nested message and enum types in `ServerClientPacket`.
@ -56,40 +50,40 @@ pub mod server_client_packet {
#[derive(Clone, PartialEq, ::prost::Oneof)] #[derive(Clone, PartialEq, ::prost::Oneof)]
pub enum Data { pub enum Data {
/// CONNECTION /// CONNECTION
#[prost(message, tag = "1")] #[prost(message, tag="1")]
ReturnName(super::super::common::Name), ReturnName(super::super::common::Name),
#[prost(message, tag = "2")] #[prost(message, tag="2")]
ReturnConnect(super::super::connection::UserId), ReturnConnect(super::super::connection::UserId),
#[prost(message, tag = "3")] #[prost(message, tag="3")]
ReturnCreateLobby(super::super::connection::LobbyCode), ReturnCreateLobby(super::super::connection::LobbyCode),
#[prost(message, tag = "4")] #[prost(message, tag="4")]
ReturnGames(super::Games), ReturnGames(super::Games),
#[prost(message, tag = "5")] #[prost(message, tag="5")]
ReturnPublicLobbies(super::LobbyCodes), ReturnPublicLobbies(super::LobbyCodes),
/// LOBBY /// LOBBY
#[prost(message, tag = "6")] #[prost(message, tag="6")]
ReturnUsers(super::Names), ReturnUsers(super::Names),
#[prost(message, tag = "7")] #[prost(message, tag="7")]
LobbyStatus(super::super::lobby::LobbyStatus), LobbyStatus(super::super::lobby::LobbyStatus),
/// GAME /// GAME
#[prost(message, tag = "8")] #[prost(message, tag="8")]
ReturnCardImage(super::super::game::Image), ReturnCardImage(super::super::game::Image),
#[prost(message, tag = "9")] #[prost(message, tag="9")]
GameStatus(super::super::game::GameStatus), GameStatus(super::super::game::GameStatus),
} }
} }
#[derive(Clone, PartialEq, ::prost::Message)] #[derive(Clone, PartialEq, ::prost::Message)]
pub struct Games { pub struct Games {
#[prost(message, repeated, tag = "1")] #[prost(message, repeated, tag="1")]
pub games: ::prost::alloc::vec::Vec<super::connection::Game>, pub games: ::prost::alloc::vec::Vec<super::connection::Game>,
} }
#[derive(Clone, PartialEq, ::prost::Message)] #[derive(Clone, PartialEq, ::prost::Message)]
pub struct LobbyCodes { pub struct LobbyCodes {
#[prost(message, repeated, tag = "1")] #[prost(message, repeated, tag="1")]
pub lobby_codes: ::prost::alloc::vec::Vec<super::connection::LobbyCode>, pub lobby_codes: ::prost::alloc::vec::Vec<super::connection::LobbyCode>,
} }
#[derive(Clone, PartialEq, ::prost::Message)] #[derive(Clone, PartialEq, ::prost::Message)]
pub struct Names { pub struct Names {
#[prost(message, repeated, tag = "1")] #[prost(message, repeated, tag="1")]
pub names: ::prost::alloc::vec::Vec<super::common::Name>, pub names: ::prost::alloc::vec::Vec<super::common::Name>,
} }

Write Preview
Loading…
Cancel
Save