mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-18 05:30:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor(indexeddb): add conversions into IndexeddbSerializerError

Browse Source 
Signed-off-by: Michael Goldenberg <m@mgoldenberg.net>
This commit is contained in:
Michael Goldenberg
2025-05-01 12:03:12 -04:00
committed by Ivan Enderlin
parent 3f3daef01c
commit af90b7ac4e
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
crates/matrix-sdk-indexeddb/src/crypto_store/indexeddb_serializer.rs
View File

@@ -56,6 +56,18 @@ pub enum IndexeddbSerializerError {
CryptoStoreError(#[from] CryptoStoreError),
}
impl From<web_sys::DomException> for IndexeddbSerializerError {
fn from(frm: web_sys::DomException) -> Self {
Self::DomException { name: frm.name(), message: frm.message(), code: frm.code() }
}
}
impl From<serde_wasm_bindgen::Error> for IndexeddbSerializerError {
fn from(e: serde_wasm_bindgen::Error) -> Self {
Self::Serialization(serde::de::Error::custom(e.to_string()))
}
}
#[derive(Debug, Deserialize, Serialize)]
#[serde(untagged)]
pub enum MaybeEncrypted {
@@ -107,7 +119,7 @@ impl IndexeddbSerializer {
&self,
table_name: &str,
key: T,
) -> Result<IdbKeyRange, IndexeddbCryptoStoreError>
) -> Result<IdbKeyRange, IndexeddbSerializerError>
where
T: SafeEncode,
{
@@ -115,7 +127,7 @@ impl IndexeddbSerializer {
Some(cipher) => key.encode_to_range_secure(table_name, cipher),
None => key.encode_to_range(),
}
.map_err(|e| IndexeddbCryptoStoreError::DomException {
.map_err(|e| IndexeddbSerializerError::DomException {
code: 0,
name: "IdbKeyRangeMakeError".to_owned(),
message: e,
@@ -130,7 +142,7 @@ impl IndexeddbSerializer {
pub fn serialize_value(
&self,
value: &impl Serialize,
) -> Result<JsValue, IndexeddbCryptoStoreError> {
) -> Result<JsValue, IndexeddbSerializerError> {
let serialized = self.maybe_encrypt_value(value)?;
Ok(serde_wasm_bindgen::to_value(&serialized)?)
}
@@ -184,7 +196,7 @@ impl IndexeddbSerializer {
pub fn deserialize_value<T: DeserializeOwned>(
&self,
value: JsValue,
) -> Result<T, IndexeddbCryptoStoreError> {
) -> Result<T, IndexeddbSerializerError> {
// Objects which are serialized nowadays should be represented as a
// `MaybeEncrypted`. However, `serialize_value` previously used a
// different format, so we need to handle that in case we have old data.
@@ -238,11 +250,11 @@ impl IndexeddbSerializer {
pub fn deserialize_legacy_value<T: DeserializeOwned>(
&self,
value: JsValue,
) -> Result<T, IndexeddbCryptoStoreError> {
) -> Result<T, IndexeddbSerializerError> {
match &self.store_cipher {
Some(cipher) => {
if !value.is_array() {
return Err(IndexeddbCryptoStoreError::CryptoStoreError(
return Err(IndexeddbSerializerError::CryptoStoreError(
CryptoStoreError::UnpicklingError,
));
}

8
crates/matrix-sdk-indexeddb/src/crypto_store/mod.rs
View File

@@ -1156,7 +1156,7 @@ impl_crypto_store! {
.object_store(keys::DEVICES)?
.get(&key)?
.await?
.map(|i| self.serializer.deserialize_value(i))
.map(|i| self.serializer.deserialize_value(i).map_err(Into::into))
.transpose()
}
@@ -1193,7 +1193,7 @@ impl_crypto_store! {
.object_store(keys::IDENTITIES)?
.get(&self.serializer.encode_key(keys::IDENTITIES, user_id))?
.await?
.map(|i| self.serializer.deserialize_value(i))
.map(|i| self.serializer.deserialize_value(i).map_err(Into::into))
.transpose()
}
@@ -1370,7 +1370,7 @@ impl_crypto_store! {
.object_store(keys::ROOM_SETTINGS)?
.get(&key)?
.await?
.map(|v| self.serializer.deserialize_value(v))
.map(|v| self.serializer.deserialize_value(v).map_err(Into::into))
.transpose()
}
@@ -1387,7 +1387,7 @@ impl_crypto_store! {
.object_store(keys::CORE)?
.get(&JsValue::from_str(key))?
.await?
.map(|v| self.serializer.deserialize_value(v))
.map(|v| self.serializer.deserialize_value(v).map_err(Into::into))
.transpose()
}