feat(client): protocol v2 wire layer, screen sharing, channel webhooks and secure voice

Verified against the real gateway via tests/gateway_interop.rs.
This commit is contained in:
Loki 2026-10-24 16:51:15 +02:00
parent 8460fb28fd
commit 3d7dd5413b
Signed by: boba
GPG key ID: 253067914055423B
65 changed files with 6048 additions and 1156 deletions

View file

@ -1,60 +1,64 @@
use crate::net::wire;
use anyhow::Result;
use serde_json;
use tokio::net::TcpStream;
use crate::net::{crypto::SessionCrypto, framing, payloads::*, types::NetCommand};
pub async fn handle_cmd(
cmd: NetCommand,
stream: &mut TcpStream,
stream: &mut (impl tokio::io::AsyncWrite + Unpin),
seq: &mut u32,
crypto: &SessionCrypto,
) -> Result<()> {
match cmd {
NetCommand::PresenceUpdate {
status,
custom_status,
custom_status: _,
activity,
activity_text,
} => {
let payload = serde_json::to_vec(&PresenceUpdatePayload {
let payload = wire::encode(&PresenceUpdatePayload {
status,
activity_type: activity,
activity_text,
custom_status,
})?;
framing::io::write_encrypted(stream, PID_PRESENCE_UPDATE, seq, &payload, crypto)
.await?;
}
NetCommand::FriendRequest { target_user_id } => {
let payload = serde_json::to_vec(&FriendRequestPayload { target_user_id })?;
let payload = wire::encode(&FriendRequestPayload {
to_user_id: target_user_id,
})?;
framing::io::write_encrypted(stream, PID_FRIEND_REQUEST, seq, &payload, crypto).await?;
}
NetCommand::FriendAccept { user_id } => {
let payload = serde_json::to_vec(&FriendAcceptPayload { user_id })?;
let payload = wire::encode(&FriendAcceptPayload {
from_user_id: user_id,
})?;
framing::io::write_encrypted(stream, PID_FRIEND_ACCEPT, seq, &payload, crypto).await?;
}
NetCommand::FriendDecline { user_id } => {
let payload = serde_json::to_vec(&FriendDeclinePayload { user_id })?;
let payload = wire::encode(&FriendDeclinePayload {
from_user_id: user_id,
})?;
framing::io::write_encrypted(stream, PID_FRIEND_DECLINE, seq, &payload, crypto).await?;
}
NetCommand::FriendRemove { user_id } => {
let payload = serde_json::to_vec(&FriendRemovePayload { user_id })?;
let payload = wire::encode(&FriendRemovePayload { user_id })?;
framing::io::write_encrypted(stream, PID_FRIEND_REMOVE, seq, &payload, crypto).await?;
}
NetCommand::FriendList => {
framing::io::write_encrypted(stream, PID_FRIEND_LIST, seq, b"{}", crypto).await?;
framing::io::write_encrypted(stream, PID_FRIEND_LIST, seq, b"", crypto).await?;
}
NetCommand::BlockUser { user_id } => {
let payload = serde_json::to_vec(&BlockUserPayload { user_id })?;
let payload = wire::encode(&BlockUserPayload { user_id })?;
framing::io::write_encrypted(stream, PID_BLOCK_USER, seq, &payload, crypto).await?;
}
NetCommand::UnblockUser { user_id } => {
let payload = serde_json::to_vec(&UnblockUserPayload { user_id })?;
let payload = wire::encode(&UnblockUserPayload { user_id })?;
framing::io::write_encrypted(stream, PID_UNBLOCK_USER, seq, &payload, crypto).await?;
}
NetCommand::BlockList => {
framing::io::write_encrypted(stream, PID_BLOCK_LIST, seq, b"{}", crypto).await?;
framing::io::write_encrypted(stream, PID_BLOCK_LIST, seq, b"", crypto).await?;
}
_ => {}
}

View file

@ -1,43 +1,48 @@
use crate::net::wire;
use anyhow::Result;
use serde_json;
use tokio::net::TcpStream;
use crate::net::{crypto::SessionCrypto, framing, payloads::*, types::NetCommand};
pub async fn handle_cmd(
cmd: NetCommand,
stream: &mut TcpStream,
stream: &mut (impl tokio::io::AsyncWrite + Unpin),
seq: &mut u32,
crypto: &SessionCrypto,
) -> Result<()> {
match cmd {
NetCommand::GuildCreate { name } => {
let payload = serde_json::to_vec(&GuildCreatePayload {
name,
icon_url: None,
})?;
let payload = wire::encode(&GuildCreatePayload { name })?;
framing::io::write_encrypted(stream, PID_GUILD_CREATE, seq, &payload, crypto).await?;
}
NetCommand::GuildDelete { guild_id } => {
let payload = serde_json::to_vec(&GuildDeletePayload { guild_id })?;
let payload = wire::encode(&GuildDeletePayload { guild_id })?;
framing::io::write_encrypted(stream, PID_GUILD_DELETE, seq, &payload, crypto).await?;
}
NetCommand::GuildList => {
framing::io::write_encrypted(stream, PID_GUILD_LIST, seq, b"{}", crypto).await?;
framing::io::write_encrypted(stream, PID_GUILD_LIST, seq, b"", crypto).await?;
}
NetCommand::GuildJoin {
guild_id,
invite_code,
} => {
let payload = serde_json::to_vec(&GuildJoinPayload {
guild_id,
invite_code,
})?;
framing::io::write_encrypted(stream, PID_GUILD_MEMBER_JOIN, seq, &payload, crypto)
.await?;
if let Some(code) = invite_code {
let payload = wire::encode(&InviteAcceptPayload {
code,
..Default::default()
})?;
framing::io::write_encrypted(stream, PID_INVITE_ACCEPT, seq, &payload, crypto)
.await?;
} else {
let payload = wire::encode(&GuildJoinPayload { guild_id })?;
framing::io::write_encrypted(stream, PID_GUILD_MEMBER_JOIN, seq, &payload, crypto)
.await?;
}
}
NetCommand::GuildLeave { guild_id } => {
let payload = serde_json::to_vec(&GuildLeavePayload { guild_id })?;
let payload = wire::encode(&GuildLeavePayload {
guild_id,
user_id: String::new(),
})?;
framing::io::write_encrypted(stream, PID_GUILD_MEMBER_LEAVE, seq, &payload, crypto)
.await?;
}
@ -46,7 +51,7 @@ pub async fn handle_cmd(
max_uses,
expires_in_seconds,
} => {
let payload = serde_json::to_vec(&InviteCreatePayload {
let payload = wire::encode(&InviteCreatePayload {
guild_id,
max_uses,
expires_in_seconds,
@ -54,14 +59,17 @@ pub async fn handle_cmd(
framing::io::write_encrypted(stream, PID_INVITE_CREATE, seq, &payload, crypto).await?;
}
NetCommand::InviteAccept { code } => {
let payload = serde_json::to_vec(&InviteAcceptPayload { code })?;
let payload = wire::encode(&InviteAcceptPayload {
code,
..Default::default()
})?;
framing::io::write_encrypted(stream, PID_INVITE_ACCEPT, seq, &payload, crypto).await?;
}
NetCommand::InviteDelete {
guild_id,
invite_id,
} => {
let payload = serde_json::to_vec(&InviteDeletePayload {
let payload = wire::encode(&InviteDeletePayload {
guild_id,
invite_id,
})?;
@ -73,30 +81,31 @@ pub async fn handle_cmd(
color,
permissions,
} => {
let payload = serde_json::to_vec(&RoleCreatePayload {
let payload = wire::encode(&RoleCreatePayload {
guild_id,
name,
color,
permissions,
id: String::new(),
})?;
framing::io::write_encrypted(stream, PID_ROLE_CREATE, seq, &payload, crypto).await?;
}
NetCommand::RoleDelete { guild_id, role_id } => {
let payload = serde_json::to_vec(&RoleDeletePayload { guild_id, role_id })?;
let payload = wire::encode(&RoleDeletePayload { guild_id, role_id })?;
framing::io::write_encrypted(stream, PID_ROLE_DELETE, seq, &payload, crypto).await?;
}
NetCommand::GuildMemberKick { guild_id, user_id } => {
let payload = serde_json::to_vec(&GuildMemberKickPayload { guild_id, user_id })?;
let payload = wire::encode(&GuildMemberKickPayload { guild_id, user_id })?;
framing::io::write_encrypted(stream, PID_GUILD_MEMBER_KICK, seq, &payload, crypto)
.await?;
}
NetCommand::GuildAuditLogFetch { guild_id, limit } => {
let payload = serde_json::to_vec(&GuildAuditLogFetchPayload { guild_id, limit })?;
let payload = wire::encode(&GuildAuditLogFetchPayload { guild_id, limit })?;
framing::io::write_encrypted(stream, PID_GUILD_AUDIT_LOG_FETCH, seq, &payload, crypto)
.await?;
}
NetCommand::GuildMemberListFetch { guild_id } => {
let payload = serde_json::to_vec(&GuildMemberListFetchPayload { guild_id })?;
let payload = wire::encode(&GuildMemberListFetchPayload { guild_id })?;
framing::io::write_encrypted(
stream,
PID_GUILD_MEMBER_LIST_FETCH,
@ -111,7 +120,7 @@ pub async fn handle_cmd(
user_id,
role_id,
} => {
let payload = serde_json::to_vec(&RoleAssignPayload {
let payload = wire::encode(&RoleAssignPayload {
guild_id,
user_id,
role_id,
@ -124,7 +133,7 @@ pub async fn handle_cmd(
user_id,
role_id,
} => {
let payload = serde_json::to_vec(&RoleAssignPayload {
let payload = wire::encode(&RoleAssignPayload {
guild_id,
user_id,
role_id,
@ -133,7 +142,7 @@ pub async fn handle_cmd(
.await?;
}
NetCommand::GuildRoleListFetch { guild_id } => {
let payload = serde_json::to_vec(&GuildRoleListFetchPayload { guild_id })?;
let payload = wire::encode(&GuildRoleListFetchPayload { guild_id })?;
framing::io::write_encrypted(stream, PID_GUILD_ROLE_LIST_FETCH, seq, &payload, crypto)
.await?;
}

View file

@ -1,9 +1,8 @@
mod friends;
mod guild;
use crate::net::wire;
use anyhow::Result;
use serde_json;
use tokio::net::TcpStream;
use crate::identity::Identity;
use crate::net::{crypto::SessionCrypto, framing, payloads::*, types::NetCommand};
@ -12,12 +11,32 @@ use super::core::now_ms;
pub async fn handle_cmd(
cmd: NetCommand,
stream: &mut TcpStream,
stream: &mut (impl tokio::io::AsyncWrite + Unpin),
seq: &mut u32,
crypto: &SessionCrypto,
identity: &Identity,
) -> Result<()> {
match cmd {
NetCommand::MediaControl(message) => {
framing::io::write_encrypted(
stream,
PID_MEDIA_CONTROL,
seq,
&wire::encode(&message)?,
crypto,
)
.await?;
}
NetCommand::Webhook { operation, request } => {
framing::io::write_encrypted(
stream,
operation.packet_id(),
seq,
&wire::encode(&request)?,
crypto,
)
.await?;
}
cmd @ (NetCommand::GuildCreate { .. }
| NetCommand::GuildDelete { .. }
| NetCommand::GuildList
@ -52,7 +71,7 @@ pub async fn handle_cmd(
message_id,
emoji,
} => {
let payload = serde_json::to_vec(&ReactionPayload {
let payload = wire::encode(&ReactionPayload {
message_id,
channel_id,
emoji,
@ -66,7 +85,7 @@ pub async fn handle_cmd(
message_id,
emoji,
} => {
let payload = serde_json::to_vec(&ReactionPayload {
let payload = wire::encode(&ReactionPayload {
message_id,
channel_id,
emoji,
@ -86,7 +105,7 @@ pub async fn handle_cmd(
message_id,
content,
} => {
let payload = serde_json::to_vec(&MessageEditPayload {
let payload = wire::encode(&MessageEditPayload {
message_id,
channel_id,
content,
@ -97,14 +116,14 @@ pub async fn handle_cmd(
channel_id,
message_id,
} => {
let payload = serde_json::to_vec(&MessageDeletePayload {
let payload = wire::encode(&MessageDeletePayload {
message_id,
channel_id,
})?;
framing::io::write_encrypted(stream, PID_MESSAGE_DELETE, seq, &payload, crypto).await?;
}
NetCommand::DmStart { target_user_id } => {
let payload = serde_json::to_vec(&DmStartPayload { target_user_id })?;
let payload = wire::encode(&DmStartPayload { target_user_id })?;
framing::io::write_encrypted(stream, PID_DM_START, seq, &payload, crypto).await?;
}
NetCommand::DmSend { dm_id, content } => {
@ -114,25 +133,19 @@ pub async fn handle_cmd(
content,
timestamp: now_ms(),
};
framing::io::write_encrypted(
stream,
PID_DM_MESSAGE,
seq,
&serde_json::to_vec(&msg)?,
crypto,
)
.await?;
framing::io::write_encrypted(stream, PID_DM_MESSAGE, seq, &wire::encode(&msg)?, crypto)
.await?;
}
NetCommand::TypingStart { channel_id } => {
let payload = serde_json::to_vec(&serde_json::json!({"channel_id": channel_id}))?;
let payload = wire::encode(&TypingStart { channel_id })?;
framing::io::write_encrypted(stream, PID_TYPING_START, seq, &payload, crypto).await?;
}
NetCommand::DmReadAck { dm_id } => {
let payload = serde_json::to_vec(&serde_json::json!({"dm_id": dm_id}))?;
let payload = wire::encode(&crate::net::wire::DmReadAck { dm_id })?;
framing::io::write_encrypted(stream, PID_DM_READ_ACK, seq, &payload, crypto).await?;
}
NetCommand::DmSearch { dm_id, query } => {
let payload = serde_json::to_vec(&DmHistoryPayload {
let payload = wire::encode(&DmHistoryPayload {
dm_id,
messages: vec![],
search_query: if query.is_empty() { None } else { Some(query) },
@ -144,7 +157,7 @@ pub async fn handle_cmd(
dm_id,
e2ee_public_key,
} => {
let payload = serde_json::to_vec(&E2eeDmKeyExchangePayload {
let payload = wire::encode(&E2eeDmKeyExchangePayload {
dm_id,
e2ee_public_key,
})?;
@ -152,7 +165,7 @@ pub async fn handle_cmd(
.await?;
}
NetCommand::E2eeDmKeyExchangeAck { dm_id } => {
let payload = serde_json::to_vec(&E2eeDmKeyExchangeAckPayload { dm_id })?;
let payload = wire::encode(&E2eeDmKeyExchangeAckPayload { dm_id })?;
framing::io::write_encrypted(
stream,
PID_E2EE_DM_KEY_EXCHANGE_ACK,
@ -173,13 +186,13 @@ pub async fn handle_cmd(
stream,
PID_E2EE_DM_MESSAGE,
seq,
&serde_json::to_vec(&msg)?,
&wire::encode(&msg)?,
crypto,
)
.await?;
}
NetCommand::E2eeDmHistory { dm_id, limit } => {
let payload = serde_json::to_vec(&E2eeDmHistoryPayload {
let payload = wire::encode(&E2eeDmHistoryPayload {
dm_id,
messages: vec![],
limit,