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

Update protocol

new_protocol
ThePerkinrex 5 years ago
parent
bd1ab15599
commit
9c809e1bec
No known key found for this signature in database GPG Key ID: FD81DE6D75E20917
5 changed files with 108 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      protobuf/protocol.proto
  2. 5
      server/src/server.rs
  3. 46
      server/src/server/game.rs
  4. 4
      server/src/server/protos/protocol.rs
  5. 85
      unity/Assets/Scripts/grpc/Protocol.cs

1
protobuf/protocol.proto
View File

@ -27,6 +27,7 @@ message ClientServerPacket {
// GAME
game.CardKind queryCardImage = 12;
game.CardId callOnClick = 13;
google.protobuf.Empty queryGameStatus = 14;
}
}

5
server/src/server.rs
View File

@ -18,7 +18,7 @@ use crate::{
connection::{
connect, create_lobby, disconnect, get_public_lobbies, join_lobby_with_code, name,
},
game::{get_card_image, on_click},
game::{get_card_image, on_click, query_status},
lobby::{leave, ready, users, vote},
},
server_properties::ServerProperties,
@ -244,6 +244,9 @@ pub async fn serve(
.await
.expect("Error handling on_click call")
}
Data::QueryGameStatus(()) => query_status(&mut service_data, &socket_manager)
.await
.expect("Error handling game_status query"),
}
}
if let Some(user) = service_data.user_id.0 {

46
server/src/server/game.rs
View File

@ -1,4 +1,8 @@
use super::{ServiceData, protos::game::{game_status::Piles, CardKind, GameStatus, Image}, socket_manager::SocketManager};
use super::{
protos::game::{game_status::Piles, CardKind, GameStatus, Image},
socket_manager::SocketManager,
ServiceData,
};
use crate::{
games::{CardId, CardIdx, Pile, PileKind},
server::protos::protocol::server_client_packet::Data,
@ -6,8 +10,7 @@ use crate::{
use anyhow::{anyhow, Result};
pub(super) async fn get_status(data: &mut ServiceData) -> Result<GameStatus> {
let uuid = data
.user_id.get()?;
let uuid = data.user_id.get()?;
log::info!("Creating a new status for {}", uuid);
let lobby: u32 = match data.db.get_lobby_for_user(uuid).await {
Some(l) => l,
@ -85,12 +88,21 @@ pub(super) async fn get_status(data: &mut ServiceData) -> Result<GameStatus> {
Ok(status)
}
pub(super) async fn get_card_image(data: &mut ServiceData,
socket_mgr: &SocketManager, card_kind: CardKind) -> Result<()> {
pub(super) async fn query_status(data: &mut ServiceData, socket_mgr: &SocketManager) -> Result<()> {
let status = get_status(data).await?;
socket_mgr
.write(data.user_id.get_ref()?, Data::GameStatus(status))
.await
}
pub(super) async fn get_card_image(
data: &mut ServiceData,
socket_mgr: &SocketManager,
card_kind: CardKind,
) -> Result<()> {
log::info!("Getting image location");
let time = std::time::Instant::now();
let uuid = data
.user_id.get()?;
let uuid = data.user_id.get()?;
let lobby: u32 = match data.db.get_lobby_for_user(uuid).await {
Some(l) => l,
None => return Err(anyhow!("User isn't in a lobby")),
@ -112,10 +124,13 @@ pub(super) async fn get_card_image(data: &mut ServiceData,
log::info!("Loaded images [{:?}]", time.elapsed());
socket_mgr
.write(data.user_id.get_ref()?, Data::ReturnCardImage(Image {
face: face_buf,
back: back_buf,
}))
.write(
data.user_id.get_ref()?,
Data::ReturnCardImage(Image {
face: face_buf,
back: back_buf,
}),
)
.await?;
Ok(())
}
@ -125,8 +140,7 @@ pub(super) async fn on_click(
socket_mgr: &SocketManager,
card: super::protos::game::CardId,
) -> Result<()> {
let uuid = data
.user_id.get()?;
let uuid = data.user_id.get()?;
{
let lobby: u32 = match data.db.get_lobby_for_user(uuid).await {
Some(l) => l,
@ -157,7 +171,9 @@ pub(super) async fn on_click(
} // drop the connection so that the lock is released
let status = get_status(data).await?;
socket_mgr.broadcast_to_lobby(&mut data.db, data.user_id.get()?, Data::GameStatus(status)).await?;
socket_mgr
.broadcast_to_lobby(&mut data.db, data.user_id.get()?, Data::GameStatus(status))
.await?;
// self.update_status(uuid).await?;
Ok(())
}
}

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

@ -1,6 +1,6 @@
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct ClientServerPacket {
#[prost(oneof="client_server_packet::Data", tags="1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13")]
#[prost(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>,
}
/// Nested message and enum types in `ClientServerPacket`.
@ -36,6 +36,8 @@ pub mod client_server_packet {
QueryCardImage(super::super::game::CardKind),
#[prost(message, tag="13")]
CallOnClick(super::super::game::CardId),
#[prost(message, tag="14")]
QueryGameStatus(()),
}
}
#[derive(Clone, PartialEq, ::prost::Message)]

85
unity/Assets/Scripts/grpc/Protocol.cs
View File

@ -26,7 +26,7 @@ namespace Protocol {
string.Concat(
"Cg5wcm90b2NvbC5wcm90bxIIcHJvdG9jb2waG2dvb2dsZS9wcm90b2J1Zi9l",
"bXB0eS5wcm90bxoMY29tbW9uLnByb3RvGhBjb25uZWN0aW9uLnByb3RvGgts",
"b2JieS5wcm90bxoKZ2FtZS5wcm90byLKBAoSQ2xpZW50U2VydmVyUGFja2V0",
"b2JieS5wcm90bxoKZ2FtZS5wcm90byL9BAoSQ2xpZW50U2VydmVyUGFja2V0",
"EisKCXF1ZXJ5TmFtZRgBIAEoCzIWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eUgA",
"Eh8KB2Nvbm5lY3QYAiABKAsyDC5jb21tb24uTmFtZUgAEiwKCmRpc2Nvbm5l",
"Y3QYAyABKAsyFi5nb29nbGUucHJvdG9idWYuRW1wdHlIABIqCglqb2luTG9i",
@ -39,24 +39,25 @@ namespace Protocol {
"eRgKIAEoCzIWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eUgAEicKBWxlYXZlGAsg",
"ASgLMhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5SAASKAoOcXVlcnlDYXJkSW1h",
"Z2UYDCABKAsyDi5nYW1lLkNhcmRLaW5kSAASIwoLY2FsbE9uQ2xpY2sYDSAB",
"KAsyDC5nYW1lLkNhcmRJZEgAQgYKBGRhdGEioQMKElNlcnZlckNsaWVudFBh",
"Y2tldBIiCgpyZXR1cm5OYW1lGAEgASgLMgwuY29tbW9uLk5hbWVIABIrCg1y",
"ZXR1cm5Db25uZWN0GAIgASgLMhIuY29ubmVjdGlvbi5Vc2VySURIABIyChFy",
"ZXR1cm5DcmVhdGVMb2JieRgDIAEoCzIVLmNvbm5lY3Rpb24uTG9iYnlDb2Rl",
"SAASJgoLcmV0dXJuR2FtZXMYBCABKAsyDy5wcm90b2NvbC5HYW1lc0gAEjMK",
"E3JldHVyblB1YmxpY0xvYmJpZXMYBSABKAsyFC5wcm90b2NvbC5Mb2JieUNv",
"ZGVzSAASJgoLcmV0dXJuVXNlcnMYBiABKAsyDy5wcm90b2NvbC5OYW1lc0gA",
"EikKC2xvYmJ5U3RhdHVzGAcgASgLMhIubG9iYnkuTG9iYnlTdGF0dXNIABIm",
"Cg9yZXR1cm5DYXJkSW1hZ2UYCCABKAsyCy5nYW1lLkltYWdlSAASJgoKZ2Ft",
"ZVN0YXR1cxgJIAEoCzIQLmdhbWUuR2FtZVN0YXR1c0gAQgYKBGRhdGEiKAoF",
"R2FtZXMSHwoFZ2FtZXMYASADKAsyEC5jb25uZWN0aW9uLkdhbWUiNwoKTG9i",
"YnlDb2RlcxIpCgpsb2JieUNvZGVzGAEgAygLMhUuY29ubmVjdGlvbi5Mb2Ji",
"eUNvZGUiJAoFTmFtZXMSGwoFbmFtZXMYASADKAsyDC5jb21tb24uTmFtZWIG",
"cHJvdG8z"));
"KAsyDC5nYW1lLkNhcmRJZEgAEjEKD3F1ZXJ5R2FtZVN0YXR1cxgOIAEoCzIW",
"Lmdvb2dsZS5wcm90b2J1Zi5FbXB0eUgAQgYKBGRhdGEioQMKElNlcnZlckNs",
"aWVudFBhY2tldBIiCgpyZXR1cm5OYW1lGAEgASgLMgwuY29tbW9uLk5hbWVI",
"ABIrCg1yZXR1cm5Db25uZWN0GAIgASgLMhIuY29ubmVjdGlvbi5Vc2VySURI",
"ABIyChFyZXR1cm5DcmVhdGVMb2JieRgDIAEoCzIVLmNvbm5lY3Rpb24uTG9i",
"YnlDb2RlSAASJgoLcmV0dXJuR2FtZXMYBCABKAsyDy5wcm90b2NvbC5HYW1l",
"c0gAEjMKE3JldHVyblB1YmxpY0xvYmJpZXMYBSABKAsyFC5wcm90b2NvbC5M",
"b2JieUNvZGVzSAASJgoLcmV0dXJuVXNlcnMYBiABKAsyDy5wcm90b2NvbC5O",
"YW1lc0gAEikKC2xvYmJ5U3RhdHVzGAcgASgLMhIubG9iYnkuTG9iYnlTdGF0",
"dXNIABImCg9yZXR1cm5DYXJkSW1hZ2UYCCABKAsyCy5nYW1lLkltYWdlSAAS",
"JgoKZ2FtZVN0YXR1cxgJIAEoCzIQLmdhbWUuR2FtZVN0YXR1c0gAQgYKBGRh",
"dGEiKAoFR2FtZXMSHwoFZ2FtZXMYASADKAsyEC5jb25uZWN0aW9uLkdhbWUi",
"NwoKTG9iYnlDb2RlcxIpCgpsb2JieUNvZGVzGAEgAygLMhUuY29ubmVjdGlv",
"bi5Mb2JieUNvZGUiJAoFTmFtZXMSGwoFbmFtZXMYASADKAsyDC5jb21tb24u",
"TmFtZWIGcHJvdG8z"));
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
new pbr::FileDescriptor[] { global::Google.Protobuf.WellKnownTypes.EmptyReflection.Descriptor, global::Common.CommonReflection.Descriptor, global::Connection.ConnectionReflection.Descriptor, global::Lobby.LobbyReflection.Descriptor, global::Game.GameReflection.Descriptor, },
new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
new pbr::GeneratedClrTypeInfo(typeof(global::Protocol.ClientServerPacket), global::Protocol.ClientServerPacket.Parser, new[]{ "QueryName", "Connect", "Disconnect", "JoinLobby", "CreateLobby", "QueryGames", "QueryPublicLobbies", "QueryUsers", "Vote", "Ready", "Leave", "QueryCardImage", "CallOnClick" }, new[]{ "Data" }, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::Protocol.ClientServerPacket), global::Protocol.ClientServerPacket.Parser, new[]{ "QueryName", "Connect", "Disconnect", "JoinLobby", "CreateLobby", "QueryGames", "QueryPublicLobbies", "QueryUsers", "Vote", "Ready", "Leave", "QueryCardImage", "CallOnClick", "QueryGameStatus" }, new[]{ "Data" }, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::Protocol.ServerClientPacket), global::Protocol.ServerClientPacket.Parser, new[]{ "ReturnName", "ReturnConnect", "ReturnCreateLobby", "ReturnGames", "ReturnPublicLobbies", "ReturnUsers", "LobbyStatus", "ReturnCardImage", "GameStatus" }, new[]{ "Data" }, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::Protocol.Games), global::Protocol.Games.Parser, new[]{ "Games_" }, null, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::Protocol.LobbyCodes), global::Protocol.LobbyCodes.Parser, new[]{ "LobbyCodes_" }, null, null, null, null),
@ -136,6 +137,9 @@ namespace Protocol {
case DataOneofCase.CallOnClick:
CallOnClick = other.CallOnClick.Clone();
break;
case DataOneofCase.QueryGameStatus:
QueryGameStatus = other.QueryGameStatus.Clone();
break;
}
_unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
@ -298,6 +302,17 @@ namespace Protocol {
}
}
/// <summary>Field number for the "queryGameStatus" field.</summary>
public const int QueryGameStatusFieldNumber = 14;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public global::Google.Protobuf.WellKnownTypes.Empty QueryGameStatus {
get { return dataCase_ == DataOneofCase.QueryGameStatus ? (global::Google.Protobuf.WellKnownTypes.Empty) data_ : null; }
set {
data_ = value;
dataCase_ = value == null ? DataOneofCase.None : DataOneofCase.QueryGameStatus;
}
}
private object data_;
/// <summary>Enum of possible cases for the "data" oneof.</summary>
public enum DataOneofCase {
@ -315,6 +330,7 @@ namespace Protocol {
Leave = 11,
QueryCardImage = 12,
CallOnClick = 13,
QueryGameStatus = 14,
}
private DataOneofCase dataCase_ = DataOneofCase.None;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@ -354,6 +370,7 @@ namespace Protocol {
if (!object.Equals(Leave, other.Leave)) return false;
if (!object.Equals(QueryCardImage, other.QueryCardImage)) return false;
if (!object.Equals(CallOnClick, other.CallOnClick)) return false;
if (!object.Equals(QueryGameStatus, other.QueryGameStatus)) return false;
if (DataCase != other.DataCase) return false;
return Equals(_unknownFields, other._unknownFields);
}
@ -374,6 +391,7 @@ namespace Protocol {
if (dataCase_ == DataOneofCase.Leave) hash ^= Leave.GetHashCode();
if (dataCase_ == DataOneofCase.QueryCardImage) hash ^= QueryCardImage.GetHashCode();
if (dataCase_ == DataOneofCase.CallOnClick) hash ^= CallOnClick.GetHashCode();
if (dataCase_ == DataOneofCase.QueryGameStatus) hash ^= QueryGameStatus.GetHashCode();
hash ^= (int) dataCase_;
if (_unknownFields != null) {
hash ^= _unknownFields.GetHashCode();
@ -443,6 +461,10 @@ namespace Protocol {
output.WriteRawTag(106);
output.WriteMessage(CallOnClick);
}
if (dataCase_ == DataOneofCase.QueryGameStatus) {
output.WriteRawTag(114);
output.WriteMessage(QueryGameStatus);
}
if (_unknownFields != null) {
_unknownFields.WriteTo(output);
}
@ -504,6 +526,10 @@ namespace Protocol {
output.WriteRawTag(106);
output.WriteMessage(CallOnClick);
}
if (dataCase_ == DataOneofCase.QueryGameStatus) {
output.WriteRawTag(114);
output.WriteMessage(QueryGameStatus);
}
if (_unknownFields != null) {
_unknownFields.WriteTo(ref output);
}
@ -552,6 +578,9 @@ namespace Protocol {
if (dataCase_ == DataOneofCase.CallOnClick) {
size += 1 + pb::CodedOutputStream.ComputeMessageSize(CallOnClick);
}
if (dataCase_ == DataOneofCase.QueryGameStatus) {
size += 1 + pb::CodedOutputStream.ComputeMessageSize(QueryGameStatus);
}
if (_unknownFields != null) {
size += _unknownFields.CalculateSize();
}
@ -642,6 +671,12 @@ namespace Protocol {
}
CallOnClick.MergeFrom(other.CallOnClick);
break;
case DataOneofCase.QueryGameStatus:
if (QueryGameStatus == null) {
QueryGameStatus = new global::Google.Protobuf.WellKnownTypes.Empty();
}
QueryGameStatus.MergeFrom(other.QueryGameStatus);
break;
}
_unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@ -775,6 +810,15 @@ namespace Protocol {
CallOnClick = subBuilder;
break;
}
case 114: {
global::Google.Protobuf.WellKnownTypes.Empty subBuilder = new global::Google.Protobuf.WellKnownTypes.Empty();
if (dataCase_ == DataOneofCase.QueryGameStatus) {
subBuilder.MergeFrom(QueryGameStatus);
}
input.ReadMessage(subBuilder);
QueryGameStatus = subBuilder;
break;
}
}
}
#endif
@ -906,6 +950,15 @@ namespace Protocol {
CallOnClick = subBuilder;
break;
}
case 114: {
global::Google.Protobuf.WellKnownTypes.Empty subBuilder = new global::Google.Protobuf.WellKnownTypes.Empty();
if (dataCase_ == DataOneofCase.QueryGameStatus) {
subBuilder.MergeFrom(QueryGameStatus);
}
input.ReadMessage(subBuilder);
QueryGameStatus = subBuilder;
break;
}
}
}
}

Write Preview
Loading…
Cancel
Save