protobuf migration: replace JSON with prost-generated wire format
- Expanded protocol/lnex.proto with full message set for all packet types - Added prost + prost-build to gateway build pipeline - Refactored all handlers and framing to use prost encode/decode - Removed serde payload structs (now generated from .proto) - Server starts and admin endpoint responds
This commit is contained in:
parent
5534cd01f7
commit
9821814240
31 changed files with 719 additions and 661 deletions
|
|
@ -1,4 +1,5 @@
|
|||
use anyhow::Result;
|
||||
use prost::Message;
|
||||
use tokio::io::{AsyncRead, AsyncWrite};
|
||||
|
||||
use crate::{
|
||||
|
|
@ -19,7 +20,7 @@ pub async fn handle_audit_log_fetch(
|
|||
crypto: &SessionCrypto,
|
||||
state: &State,
|
||||
) -> Result<()> {
|
||||
let req: GuildAuditLogFetchPayload = serde_json::from_slice(payload)?;
|
||||
let req = GuildAuditLogFetchPayload::decode(payload)?;
|
||||
let sess = match crate::domain::session::get(&state.sessions, session_id).await {
|
||||
Some(s) => s,
|
||||
None => return Ok(()),
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
use anyhow::Result;
|
||||
use prost::Message;
|
||||
use tokio::io::{AsyncRead, AsyncWrite};
|
||||
use tracing::debug;
|
||||
|
||||
|
|
@ -18,7 +19,7 @@ pub async fn handle_guild_create(
|
|||
crypto: &SessionCrypto,
|
||||
state: &State,
|
||||
) -> Result<()> {
|
||||
let req: GuildCreatePayload = serde_json::from_slice(payload)?;
|
||||
let req = GuildCreatePayload::decode(payload)?;
|
||||
let sess = session::get(&state.sessions, session_id)
|
||||
.await
|
||||
.ok_or_else(|| anyhow::anyhow!("session not found"))?;
|
||||
|
|
@ -74,11 +75,7 @@ pub async fn handle_guild_delete(
|
|||
crypto: &SessionCrypto,
|
||||
state: &State,
|
||||
) -> Result<()> {
|
||||
#[derive(serde::Deserialize)]
|
||||
struct Req {
|
||||
guild_id: String,
|
||||
}
|
||||
let req: Req = serde_json::from_slice(payload)?;
|
||||
let req = crate::proto::GuildDeletePayload::decode(payload)?;
|
||||
let sess = session::get(&state.sessions, session_id)
|
||||
.await
|
||||
.ok_or_else(|| anyhow::anyhow!("session not found"))?;
|
||||
|
|
@ -112,11 +109,14 @@ pub async fn handle_guild_delete(
|
|||
None,
|
||||
)
|
||||
.await?;
|
||||
|
||||
io::send_encrypted(
|
||||
stream,
|
||||
PacketId::GuildDelete,
|
||||
seq,
|
||||
&to_payload(&serde_json::json!({"guild_id": req.guild_id})),
|
||||
&to_payload(&crate::proto::GuildDeletePayload {
|
||||
guild_id: req.guild_id.clone(),
|
||||
}),
|
||||
crypto,
|
||||
)
|
||||
.await?;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
use anyhow::Result;
|
||||
use prost::Message;
|
||||
use tokio::io::{AsyncRead, AsyncWrite};
|
||||
|
||||
use crate::{
|
||||
|
|
@ -20,7 +21,7 @@ pub async fn handle_invite_create(
|
|||
crypto: &SessionCrypto,
|
||||
state: &State,
|
||||
) -> Result<()> {
|
||||
let req: InviteCreatePayload = serde_json::from_slice(payload)?;
|
||||
let req = InviteCreatePayload::decode(payload)?;
|
||||
let sess = session::get(&state.sessions, session_id)
|
||||
.await
|
||||
.ok_or_else(|| anyhow::anyhow!("session not found"))?;
|
||||
|
|
@ -96,7 +97,7 @@ pub async fn handle_invite_accept(
|
|||
crypto: &SessionCrypto,
|
||||
state: &State,
|
||||
) -> Result<()> {
|
||||
let req: InviteAcceptPayload = serde_json::from_slice(payload)?;
|
||||
let req = InviteAcceptPayload::decode(payload)?;
|
||||
let sess = session::get(&state.sessions, session_id)
|
||||
.await
|
||||
.ok_or_else(|| anyhow::anyhow!("session not found"))?;
|
||||
|
|
@ -156,7 +157,11 @@ pub async fn handle_invite_accept(
|
|||
stream,
|
||||
PacketId::InviteAccept,
|
||||
seq,
|
||||
&to_payload(&serde_json::json!({"guild_id": inv.guild_id, "guild_name": inv.guild_name})),
|
||||
&to_payload(&InviteAcceptPayload {
|
||||
code: "".into(),
|
||||
guild_id: inv.guild_id.clone(),
|
||||
guild_name: inv.guild_name.clone(),
|
||||
}),
|
||||
crypto,
|
||||
)
|
||||
.await?;
|
||||
|
|
@ -171,7 +176,7 @@ pub async fn handle_invite_delete(
|
|||
crypto: &SessionCrypto,
|
||||
state: &State,
|
||||
) -> Result<()> {
|
||||
let req: InviteDeletePayload = serde_json::from_slice(payload)?;
|
||||
let req = InviteDeletePayload::decode(payload)?;
|
||||
let sess = session::get(&state.sessions, session_id)
|
||||
.await
|
||||
.ok_or_else(|| anyhow::anyhow!("session not found"))?;
|
||||
|
|
@ -211,7 +216,10 @@ pub async fn handle_invite_delete(
|
|||
stream,
|
||||
PacketId::InviteDelete,
|
||||
seq,
|
||||
&to_payload(&serde_json::json!({"invite_id": req.invite_id})),
|
||||
&to_payload(&InviteDeletePayload {
|
||||
guild_id: req.guild_id.clone(),
|
||||
invite_id: req.invite_id.clone(),
|
||||
}),
|
||||
crypto,
|
||||
)
|
||||
.await?;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ use tokio::io::{AsyncRead, AsyncWrite};
|
|||
use crate::{
|
||||
domain::session,
|
||||
net::{io, state::State},
|
||||
proto::{GuildInfo, GuildListPayload, PacketId, SessionCrypto, to_payload},
|
||||
proto::{GuildInfo, GuildListPayload, PacketId, SessionCrypto, UserRoleUpdatePayload, to_payload},
|
||||
};
|
||||
|
||||
pub async fn handle_guild_list(
|
||||
|
|
@ -41,9 +41,11 @@ pub async fn handle_guild_list(
|
|||
stream,
|
||||
PacketId::UserRoleUpdate,
|
||||
seq,
|
||||
&to_payload(
|
||||
&serde_json::json!({"user_id": sess.user_id, "guild_id": g.id, "color": color}),
|
||||
),
|
||||
&to_payload(&UserRoleUpdatePayload {
|
||||
user_id: sess.user_id.clone(),
|
||||
guild_id: g.id.clone(),
|
||||
color,
|
||||
}),
|
||||
crypto,
|
||||
)
|
||||
.await?;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
use anyhow::Result;
|
||||
use prost::Message;
|
||||
use tokio::io::{AsyncRead, AsyncWrite};
|
||||
|
||||
use crate::{
|
||||
|
|
@ -20,7 +21,7 @@ pub async fn handle_guild_member_join(
|
|||
crypto: &SessionCrypto,
|
||||
state: &State,
|
||||
) -> Result<()> {
|
||||
let req: GuildMemberJoinPayload = serde_json::from_slice(payload)?;
|
||||
let req = GuildMemberJoinPayload::decode(payload)?;
|
||||
let sess = session::get(&state.sessions, session_id)
|
||||
.await
|
||||
.ok_or_else(|| anyhow::anyhow!("session not found"))?;
|
||||
|
|
@ -44,7 +45,9 @@ pub async fn handle_guild_member_join(
|
|||
stream,
|
||||
PacketId::GuildMemberJoin,
|
||||
seq,
|
||||
&to_payload(&serde_json::json!({"guild_id": req.guild_id, "user_id": sess.user_id})),
|
||||
&to_payload(&crate::proto::GuildMemberJoinPayload {
|
||||
guild_id: req.guild_id.clone(),
|
||||
}),
|
||||
crypto,
|
||||
)
|
||||
.await?;
|
||||
|
|
@ -53,9 +56,11 @@ pub async fn handle_guild_member_join(
|
|||
stream,
|
||||
PacketId::UserRoleUpdate,
|
||||
seq,
|
||||
&to_payload(
|
||||
&serde_json::json!({"user_id": sess.user_id, "guild_id": req.guild_id, "color": color}),
|
||||
),
|
||||
&to_payload(&crate::proto::UserRoleUpdatePayload {
|
||||
user_id: sess.user_id.clone(),
|
||||
guild_id: req.guild_id.clone(),
|
||||
color,
|
||||
}),
|
||||
crypto,
|
||||
)
|
||||
.await?;
|
||||
|
|
@ -70,25 +75,28 @@ pub async fn handle_guild_member_leave(
|
|||
crypto: &SessionCrypto,
|
||||
state: &State,
|
||||
) -> Result<()> {
|
||||
let req: GuildMemberLeavePayload = serde_json::from_slice(payload)?;
|
||||
let req = GuildMemberLeavePayload::decode(payload)?;
|
||||
let sess = session::get(&state.sessions, session_id)
|
||||
.await
|
||||
.ok_or_else(|| anyhow::anyhow!("session not found"))?;
|
||||
|
||||
let target = if req.user_id.is_empty() {
|
||||
&sess.user_id
|
||||
sess.user_id.clone()
|
||||
} else {
|
||||
&req.user_id
|
||||
req.user_id.clone()
|
||||
};
|
||||
state
|
||||
.storage
|
||||
.remove_guild_member(&req.guild_id, target)
|
||||
.remove_guild_member(&req.guild_id, target.as_str())
|
||||
.await?;
|
||||
io::send_encrypted(
|
||||
stream,
|
||||
PacketId::GuildMemberLeave,
|
||||
seq,
|
||||
&to_payload(&serde_json::json!({"guild_id": req.guild_id, "user_id": target})),
|
||||
&to_payload(&GuildMemberLeavePayload {
|
||||
guild_id: req.guild_id.clone(),
|
||||
user_id: target,
|
||||
}),
|
||||
crypto,
|
||||
)
|
||||
.await?;
|
||||
|
|
@ -103,7 +111,7 @@ pub async fn handle_guild_member_kick(
|
|||
crypto: &SessionCrypto,
|
||||
state: &State,
|
||||
) -> Result<()> {
|
||||
let req: GuildMemberKickPayload = serde_json::from_slice(payload)?;
|
||||
let req = GuildMemberKickPayload::decode(payload)?;
|
||||
let sess = session::get(&state.sessions, session_id)
|
||||
.await
|
||||
.ok_or_else(|| anyhow::anyhow!("session not found"))?;
|
||||
|
|
@ -146,7 +154,10 @@ pub async fn handle_guild_member_kick(
|
|||
stream,
|
||||
PacketId::GuildMemberKick,
|
||||
seq,
|
||||
&to_payload(&serde_json::json!({"guild_id": req.guild_id, "user_id": req.user_id})),
|
||||
&to_payload(&GuildMemberKickPayload {
|
||||
guild_id: req.guild_id.clone(),
|
||||
user_id: req.user_id.clone(),
|
||||
}),
|
||||
crypto,
|
||||
)
|
||||
.await?;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
use anyhow::Result;
|
||||
use prost::Message;
|
||||
use tokio::io::{AsyncRead, AsyncWrite};
|
||||
|
||||
use crate::{
|
||||
|
|
@ -22,7 +23,7 @@ pub async fn handle_member_list_fetch(
|
|||
crypto: &SessionCrypto,
|
||||
state: &State,
|
||||
) -> Result<()> {
|
||||
let req: GuildMemberListFetchPayload = serde_json::from_slice(payload)?;
|
||||
let req = GuildMemberListFetchPayload::decode(payload)?;
|
||||
let sess = match session::get(&state.sessions, session_id).await {
|
||||
Some(s) => s,
|
||||
None => return Ok(()),
|
||||
|
|
@ -72,7 +73,7 @@ pub async fn handle_role_assign(
|
|||
crypto: &SessionCrypto,
|
||||
state: &State,
|
||||
) -> Result<()> {
|
||||
let req: RoleAssignPayload = serde_json::from_slice(payload)?;
|
||||
let req = RoleAssignPayload::decode(payload)?;
|
||||
let sess = match session::get(&state.sessions, session_id).await {
|
||||
Some(s) => s,
|
||||
None => return Ok(()),
|
||||
|
|
@ -118,9 +119,11 @@ pub async fn handle_role_assign(
|
|||
stream,
|
||||
PacketId::GuildRoleAssign,
|
||||
seq,
|
||||
&to_payload(
|
||||
&serde_json::json!({"ok": true, "user_id": req.user_id, "role_id": req.role_id}),
|
||||
),
|
||||
&to_payload(&RoleAssignPayload {
|
||||
guild_id: req.guild_id.clone(),
|
||||
user_id: req.user_id.clone(),
|
||||
role_id: req.role_id.clone(),
|
||||
}),
|
||||
crypto,
|
||||
)
|
||||
.await?;
|
||||
|
|
@ -136,7 +139,7 @@ pub async fn handle_role_unassign(
|
|||
crypto: &SessionCrypto,
|
||||
state: &State,
|
||||
) -> Result<()> {
|
||||
let req: RoleAssignPayload = serde_json::from_slice(payload)?;
|
||||
let req = RoleAssignPayload::decode(payload)?;
|
||||
let sess = match session::get(&state.sessions, session_id).await {
|
||||
Some(s) => s,
|
||||
None => return Ok(()),
|
||||
|
|
@ -181,9 +184,11 @@ pub async fn handle_role_unassign(
|
|||
stream,
|
||||
PacketId::GuildRoleUnassign,
|
||||
seq,
|
||||
&to_payload(
|
||||
&serde_json::json!({"ok": true, "user_id": req.user_id, "role_id": req.role_id}),
|
||||
),
|
||||
&to_payload(&RoleAssignPayload {
|
||||
guild_id: req.guild_id.clone(),
|
||||
user_id: req.user_id.clone(),
|
||||
role_id: req.role_id.clone(),
|
||||
}),
|
||||
crypto,
|
||||
)
|
||||
.await?;
|
||||
|
|
@ -199,7 +204,7 @@ pub async fn handle_role_list_fetch(
|
|||
crypto: &SessionCrypto,
|
||||
state: &State,
|
||||
) -> Result<()> {
|
||||
let req: GuildRoleListFetchPayload = serde_json::from_slice(payload)?;
|
||||
let req = GuildRoleListFetchPayload::decode(payload)?;
|
||||
let _sess = session::get(&state.sessions, session_id).await;
|
||||
|
||||
let rows = state.storage.list_guild_roles(&req.guild_id).await?;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
use anyhow::Result;
|
||||
use prost::Message;
|
||||
use tokio::io::{AsyncRead, AsyncWrite};
|
||||
|
||||
use crate::{
|
||||
|
|
@ -17,7 +18,7 @@ pub async fn handle_role_create(
|
|||
crypto: &SessionCrypto,
|
||||
state: &State,
|
||||
) -> Result<()> {
|
||||
let req: RoleCreatePayload = serde_json::from_slice(payload)?;
|
||||
let req = RoleCreatePayload::decode(payload)?;
|
||||
let sess = session::get(&state.sessions, session_id)
|
||||
.await
|
||||
.ok_or_else(|| anyhow::anyhow!("session not found"))?;
|
||||
|
|
@ -63,9 +64,13 @@ pub async fn handle_role_create(
|
|||
stream,
|
||||
PacketId::RoleCreate,
|
||||
seq,
|
||||
&to_payload(
|
||||
&serde_json::json!({"id": role_id, "guild_id": req.guild_id, "name": req.name}),
|
||||
),
|
||||
&to_payload(&RoleCreatePayload {
|
||||
guild_id: req.guild_id.clone(),
|
||||
name: req.name.clone(),
|
||||
color: req.color.clone(),
|
||||
permissions: req.permissions,
|
||||
id: role_id,
|
||||
}),
|
||||
crypto,
|
||||
)
|
||||
.await?;
|
||||
|
|
@ -80,7 +85,7 @@ pub async fn handle_role_delete(
|
|||
crypto: &SessionCrypto,
|
||||
state: &State,
|
||||
) -> Result<()> {
|
||||
let req: RoleDeletePayload = serde_json::from_slice(payload)?;
|
||||
let req = RoleDeletePayload::decode(payload)?;
|
||||
let sess = session::get(&state.sessions, session_id)
|
||||
.await
|
||||
.ok_or_else(|| anyhow::anyhow!("session not found"))?;
|
||||
|
|
@ -120,7 +125,10 @@ pub async fn handle_role_delete(
|
|||
stream,
|
||||
PacketId::RoleDelete,
|
||||
seq,
|
||||
&to_payload(&serde_json::json!({"role_id": req.role_id})),
|
||||
&to_payload(&RoleDeletePayload {
|
||||
guild_id: req.guild_id.clone(),
|
||||
role_id: req.role_id.clone(),
|
||||
}),
|
||||
crypto,
|
||||
)
|
||||
.await?;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue