-
Notifications
You must be signed in to change notification settings - Fork 53
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into bot
# Conflicts: # backend/canisters/user_index/CHANGELOG.md # backend/canisters/user_index/api/can.did # backend/canisters/user_index/api/src/queries/explore_bots.rs # backend/canisters/user_index/impl/src/model/user_map.rs # backend/libraries/types/src/bots.rs
- Loading branch information
Showing
12 changed files
with
254 additions
and
5 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
228 changes: 228 additions & 0 deletions
228
backend/libraries/group_chat_core/src/members/stable_memory.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,228 @@ | ||
| use crate::members_map::MembersMap; | ||
| use crate::GroupMemberInternal; | ||
| use candid::{Deserialize, Principal}; | ||
| use serde::de::{Error, Visitor}; | ||
| use serde::{Deserializer, Serialize, Serializer}; | ||
| use stable_memory_map::{with_map, with_map_mut, KeyType}; | ||
| use std::fmt::Formatter; | ||
| use types::{MultiUserChat, UserId}; | ||
|
|
||
| #[derive(Serialize, Deserialize)] | ||
| pub struct MembersStableStorage { | ||
| prefix: KeyPrefix, | ||
| } | ||
|
|
||
| impl MembersStableStorage { | ||
| #[allow(dead_code)] | ||
| pub fn new(chat: MultiUserChat, member: GroupMemberInternal) -> Self { | ||
| let mut map = MembersStableStorage { prefix: chat.into() }; | ||
| map.insert(member); | ||
| map | ||
| } | ||
|
|
||
| fn key(&self, user_id: UserId) -> Key { | ||
| Key::new(self.prefix, user_id) | ||
| } | ||
| } | ||
|
|
||
| impl MembersMap for MembersStableStorage { | ||
| fn get(&self, user_id: &UserId) -> Option<GroupMemberInternal> { | ||
| with_map(|m| m.get(&self.key(*user_id).to_vec()).map(bytes_to_member)) | ||
| } | ||
|
|
||
| fn insert(&mut self, member: GroupMemberInternal) { | ||
| with_map_mut(|m| m.insert(self.key(member.user_id).to_vec(), member_to_bytes(&member))); | ||
| } | ||
|
|
||
| fn remove(&mut self, user_id: &UserId) -> Option<GroupMemberInternal> { | ||
| with_map_mut(|m| m.remove(&self.key(*user_id).to_vec()).map(bytes_to_member)) | ||
| } | ||
| } | ||
|
|
||
| fn member_to_bytes(member: &GroupMemberInternal) -> Vec<u8> { | ||
| msgpack::serialize_then_unwrap(member) | ||
| } | ||
|
|
||
| fn bytes_to_member(bytes: Vec<u8>) -> GroupMemberInternal { | ||
| msgpack::deserialize_then_unwrap(&bytes) | ||
| } | ||
|
|
||
| #[derive(Eq, PartialEq, Ord, PartialOrd, Debug)] | ||
| pub struct Key { | ||
| prefix: KeyPrefix, | ||
| user_id: UserId, | ||
| } | ||
|
|
||
| impl Key { | ||
| fn new(prefix: KeyPrefix, user_id: UserId) -> Self { | ||
| Self { prefix, user_id } | ||
| } | ||
| } | ||
|
|
||
| impl Key { | ||
| fn to_vec(&self) -> Vec<u8> { | ||
| let user_id_bytes = self.user_id.as_slice(); | ||
| let mut bytes = Vec::with_capacity(1 + self.prefix.byte_len() + user_id_bytes.len()); | ||
| bytes.push(KeyType::ChatMember as u8); | ||
| bytes.extend_from_slice(&self.prefix.to_vec()); | ||
| bytes.extend_from_slice(user_id_bytes); | ||
| bytes | ||
| } | ||
| } | ||
|
|
||
| impl TryFrom<&[u8]> for Key { | ||
| type Error = (); | ||
|
|
||
| fn try_from(value: &[u8]) -> Result<Self, Self::Error> { | ||
| match value.split_first() { | ||
| Some((kt, tail)) if *kt == KeyType::ChatMember as u8 => { | ||
| let prefix_len = match tail.first() { | ||
| Some(1) => 1, | ||
| Some(2) => 5, | ||
| _ => return Err(()), | ||
| }; | ||
| let prefix = KeyPrefix::try_from(&tail[..prefix_len])?; | ||
| let user_id = Principal::from_slice(&tail[prefix_len..]).into(); | ||
|
|
||
| Ok(Key::new(prefix, user_id)) | ||
| } | ||
| _ => Err(()), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #[derive(Clone, Copy, Eq, PartialEq, Ord, PartialOrd, Debug)] | ||
| pub enum KeyPrefix { | ||
| GroupChat, | ||
| Channel(u32), | ||
| } | ||
|
|
||
| impl KeyPrefix { | ||
| fn to_vec(self) -> Vec<u8> { | ||
| match self { | ||
| KeyPrefix::GroupChat => vec![1], | ||
| KeyPrefix::Channel(channel_id) => { | ||
| let mut vec = Vec::with_capacity(5); | ||
| vec.push(2); | ||
| vec.extend_from_slice(&channel_id.to_be_bytes()); | ||
| vec | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fn byte_len(&self) -> usize { | ||
| match self { | ||
| KeyPrefix::GroupChat => 1, | ||
| KeyPrefix::Channel(_) => 5, | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl TryFrom<&[u8]> for KeyPrefix { | ||
| type Error = (); | ||
|
|
||
| fn try_from(value: &[u8]) -> Result<Self, Self::Error> { | ||
| match value.split_first() { | ||
| Some((1, _)) => Ok(KeyPrefix::GroupChat), | ||
| Some((2, bytes)) if bytes.len() >= 4 => Ok(KeyPrefix::Channel(u32::from_be_bytes(bytes[..4].try_into().unwrap()))), | ||
| _ => Err(()), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl From<MultiUserChat> for KeyPrefix { | ||
| fn from(value: MultiUserChat) -> Self { | ||
| match value { | ||
| MultiUserChat::Group(_) => KeyPrefix::GroupChat, | ||
| MultiUserChat::Channel(_, c) => KeyPrefix::Channel(c.as_u32()), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl Serialize for KeyPrefix { | ||
| fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> | ||
| where | ||
| S: Serializer, | ||
| { | ||
| serializer.serialize_bytes(&self.to_vec()) | ||
| } | ||
| } | ||
|
|
||
| struct KeyPrefixVisitor; | ||
|
|
||
| impl<'de> Visitor<'de> for KeyPrefixVisitor { | ||
| type Value = KeyPrefix; | ||
|
|
||
| fn expecting(&self, formatter: &mut Formatter) -> std::fmt::Result { | ||
| formatter.write_str("a byte array") | ||
| } | ||
|
|
||
| fn visit_bytes<E: Error>(self, v: &[u8]) -> Result<Self::Value, E> { | ||
| KeyPrefix::try_from(v).map_err(|_| E::custom("invalid key prefix")) | ||
| } | ||
| } | ||
|
|
||
| impl<'de> Deserialize<'de> for KeyPrefix { | ||
| fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> | ||
| where | ||
| D: Deserializer<'de>, | ||
| { | ||
| deserializer.deserialize_bytes(KeyPrefixVisitor) | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
| use super::*; | ||
| use rand::{thread_rng, Rng, RngCore}; | ||
|
|
||
| #[test] | ||
| fn group_key_roundtrip() { | ||
| for _ in 0..100 { | ||
| let user_id_bytes: [u8; 10] = thread_rng().gen(); | ||
| let user_id = Principal::from_slice(&user_id_bytes).into(); | ||
|
|
||
| let key_in = Key::new(KeyPrefix::GroupChat, user_id); | ||
| let bytes = key_in.to_vec(); | ||
| let key_out = Key::try_from(&bytes[..]).unwrap(); | ||
|
|
||
| assert_eq!(key_in, key_out); | ||
| } | ||
| } | ||
|
|
||
| #[test] | ||
| fn channel_key_roundtrip() { | ||
| for _ in 0..100 { | ||
| let channel_id: u32 = thread_rng().next_u32(); | ||
| let user_id_bytes: [u8; 10] = thread_rng().gen(); | ||
| let user_id = Principal::from_slice(&user_id_bytes).into(); | ||
|
|
||
| let key_in = Key::new(KeyPrefix::Channel(channel_id), user_id); | ||
| let bytes = key_in.to_vec(); | ||
| let key_out = Key::try_from(&bytes[..]).unwrap(); | ||
|
|
||
| assert_eq!(key_in, key_out); | ||
| } | ||
| } | ||
|
|
||
| #[test] | ||
| fn group_key_prefix_serialization_roundtrip() { | ||
| let key_prefix_in = KeyPrefix::GroupChat; | ||
| let bytes = msgpack::serialize_then_unwrap(key_prefix_in); | ||
| let key_prefix_out = msgpack::deserialize_then_unwrap(&bytes); | ||
|
|
||
| assert_eq!(key_prefix_in, key_prefix_out); | ||
| } | ||
|
|
||
| #[test] | ||
| fn channel_key_prefix_serialization_roundtrip() { | ||
| for _ in 0..100 { | ||
| let channel_id: u32 = thread_rng().next_u32(); | ||
| let key_prefix_in = KeyPrefix::Channel(channel_id); | ||
| let bytes = msgpack::serialize_then_unwrap(key_prefix_in); | ||
| let key_prefix_out = msgpack::deserialize_then_unwrap(&bytes); | ||
|
|
||
| assert_eq!(key_prefix_in, key_prefix_out); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters