Trim whitespace from chat messages and limit their length
Add a way for the server to respond to any request with an error
This commit is contained in:
+33
-28
@@ -6,34 +6,35 @@ message Envelope {
|
||||
optional uint32 responding_to = 2;
|
||||
optional uint32 original_sender_id = 3;
|
||||
oneof payload {
|
||||
Ping ping = 4;
|
||||
Pong pong = 5;
|
||||
ShareWorktree share_worktree = 6;
|
||||
ShareWorktreeResponse share_worktree_response = 7;
|
||||
OpenWorktree open_worktree = 8;
|
||||
OpenWorktreeResponse open_worktree_response = 9;
|
||||
UpdateWorktree update_worktree = 10;
|
||||
CloseWorktree close_worktree = 11;
|
||||
OpenBuffer open_buffer = 12;
|
||||
OpenBufferResponse open_buffer_response = 13;
|
||||
CloseBuffer close_buffer = 14;
|
||||
UpdateBuffer update_buffer = 15;
|
||||
SaveBuffer save_buffer = 16;
|
||||
BufferSaved buffer_saved = 17;
|
||||
AddPeer add_peer = 18;
|
||||
RemovePeer remove_peer = 19;
|
||||
GetChannels get_channels = 20;
|
||||
GetChannelsResponse get_channels_response = 21;
|
||||
GetUsers get_users = 22;
|
||||
GetUsersResponse get_users_response = 23;
|
||||
JoinChannel join_channel = 24;
|
||||
JoinChannelResponse join_channel_response = 25;
|
||||
LeaveChannel leave_channel = 26;
|
||||
SendChannelMessage send_channel_message = 27;
|
||||
SendChannelMessageResponse send_channel_message_response = 28;
|
||||
ChannelMessageSent channel_message_sent = 29;
|
||||
GetChannelMessages get_channel_messages = 30;
|
||||
GetChannelMessagesResponse get_channel_messages_response = 31;
|
||||
Error error = 4;
|
||||
Ping ping = 5;
|
||||
Pong pong = 6;
|
||||
ShareWorktree share_worktree = 7;
|
||||
ShareWorktreeResponse share_worktree_response = 8;
|
||||
OpenWorktree open_worktree = 9;
|
||||
OpenWorktreeResponse open_worktree_response = 10;
|
||||
UpdateWorktree update_worktree = 11;
|
||||
CloseWorktree close_worktree = 12;
|
||||
OpenBuffer open_buffer = 13;
|
||||
OpenBufferResponse open_buffer_response = 14;
|
||||
CloseBuffer close_buffer = 15;
|
||||
UpdateBuffer update_buffer = 16;
|
||||
SaveBuffer save_buffer = 17;
|
||||
BufferSaved buffer_saved = 18;
|
||||
AddPeer add_peer = 19;
|
||||
RemovePeer remove_peer = 20;
|
||||
GetChannels get_channels = 21;
|
||||
GetChannelsResponse get_channels_response = 22;
|
||||
GetUsers get_users = 23;
|
||||
GetUsersResponse get_users_response = 24;
|
||||
JoinChannel join_channel = 25;
|
||||
JoinChannelResponse join_channel_response = 26;
|
||||
LeaveChannel leave_channel = 27;
|
||||
SendChannelMessage send_channel_message = 28;
|
||||
SendChannelMessageResponse send_channel_message_response = 29;
|
||||
ChannelMessageSent channel_message_sent = 30;
|
||||
GetChannelMessages get_channel_messages = 31;
|
||||
GetChannelMessagesResponse get_channel_messages_response = 32;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -47,6 +48,10 @@ message Pong {
|
||||
int32 id = 2;
|
||||
}
|
||||
|
||||
message Error {
|
||||
string message = 1;
|
||||
}
|
||||
|
||||
message ShareWorktree {
|
||||
Worktree worktree = 1;
|
||||
}
|
||||
|
||||
+25
-2
@@ -238,8 +238,12 @@ impl Peer {
|
||||
.recv()
|
||||
.await
|
||||
.ok_or_else(|| anyhow!("connection was closed"))?;
|
||||
T::Response::from_envelope(response)
|
||||
.ok_or_else(|| anyhow!("received response of the wrong type"))
|
||||
if let Some(proto::envelope::Payload::Error(error)) = &response.payload {
|
||||
Err(anyhow!("request failed").context(error.message.clone()))
|
||||
} else {
|
||||
T::Response::from_envelope(response)
|
||||
.ok_or_else(|| anyhow!("received response of the wrong type"))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -301,6 +305,25 @@ impl Peer {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn respond_with_error<T: RequestMessage>(
|
||||
self: &Arc<Self>,
|
||||
receipt: Receipt<T>,
|
||||
response: proto::Error,
|
||||
) -> impl Future<Output = Result<()>> {
|
||||
let this = self.clone();
|
||||
async move {
|
||||
let mut connection = this.connection(receipt.sender_id).await?;
|
||||
let message_id = connection
|
||||
.next_message_id
|
||||
.fetch_add(1, atomic::Ordering::SeqCst);
|
||||
connection
|
||||
.outgoing_tx
|
||||
.send(response.into_envelope(message_id, Some(receipt.message_id), None))
|
||||
.await?;
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
fn connection(
|
||||
self: &Arc<Self>,
|
||||
connection_id: ConnectionId,
|
||||
|
||||
@@ -125,6 +125,7 @@ messages!(
|
||||
ChannelMessageSent,
|
||||
CloseBuffer,
|
||||
CloseWorktree,
|
||||
Error,
|
||||
GetChannelMessages,
|
||||
GetChannelMessagesResponse,
|
||||
GetChannels,
|
||||
|
||||
Reference in New Issue
Block a user